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 009fcc8337..7dfc33e0d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -771,7 +771,8 @@ jobs:
timeout-minutes: 120
name: Create a Windows installer
runs-on: [self-hosted, Windows, X64]
- if: (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/Cargo.lock b/Cargo.lock
index f31ecdef99..767d9a4c9a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -114,7 +114,6 @@ dependencies = [
"pretty_assertions",
"project",
"prompt_store",
- "proto",
"rand 0.8.5",
"ref-cast",
"rope",
@@ -357,10 +356,10 @@ name = "ai_onboarding"
version = "0.1.0"
dependencies = [
"client",
+ "cloud_llm_client",
"component",
"gpui",
"language_model",
- "proto",
"serde",
"smallvec",
"telemetry",
@@ -1077,17 +1076,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"
@@ -2973,11 +2961,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",
@@ -3033,6 +3021,31 @@ 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"
@@ -4271,41 +4284,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"
@@ -4521,37 +4499,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"
@@ -4962,6 +4909,7 @@ dependencies = [
"theme",
"time",
"tree-sitter-bash",
+ "tree-sitter-c",
"tree-sitter-html",
"tree-sitter-python",
"tree-sitter-rust",
@@ -5930,7 +5878,7 @@ dependencies = [
"ignore",
"libc",
"log",
- "notify",
+ "notify 8.0.0",
"objc",
"parking_lot",
"paths",
@@ -7369,9 +7317,8 @@ dependencies = [
"wayland-backend",
"wayland-client",
"wayland-cursor",
- "wayland-protocols 0.31.2",
+ "wayland-protocols",
"wayland-protocols-plasma",
- "wayland-protocols-wlr",
"windows 0.61.1",
"windows-core 0.61.0",
"windows-numerics",
@@ -7488,18 +7435,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]]
@@ -7680,12 +7625,6 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-[[package]]
-name = "hex-literal"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcaaec4551594c969335c98c903c1397853d4198408ea609190f420500f6be71"
-
[[package]]
name = "hexf-parse"
version = "0.2.1"
@@ -7863,6 +7802,7 @@ dependencies = [
"http 1.3.1",
"http-body 1.0.1",
"log",
+ "parking_lot",
"serde",
"serde_json",
"url",
@@ -8170,12 +8110,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"
@@ -8394,6 +8328,17 @@ dependencies = [
"zeta",
]
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
[[package]]
name = "inotify"
version = "0.11.0"
@@ -8547,7 +8492,7 @@ dependencies = [
"fnv",
"lazy_static",
"libc",
- "mio",
+ "mio 1.0.3",
"rand 0.8.5",
"serde",
"tempfile",
@@ -9129,7 +9074,6 @@ dependencies = [
"open_router",
"partial-json-fixer",
"project",
- "proto",
"release_channel",
"schemars",
"serde",
@@ -9401,7 +9345,7 @@ dependencies = [
[[package]]
name = "libwebrtc"
version = "0.3.10"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=383e5377f8b7de1f8627ee16f0cf11c5293337bd#383e5377f8b7de1f8627ee16f0cf11c5293337bd"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"cxx",
"jni",
@@ -9481,7 +9425,7 @@ checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
[[package]]
name = "livekit"
version = "0.7.8"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=383e5377f8b7de1f8627ee16f0cf11c5293337bd#383e5377f8b7de1f8627ee16f0cf11c5293337bd"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"chrono",
"futures-util",
@@ -9504,7 +9448,7 @@ dependencies = [
[[package]]
name = "livekit-api"
version = "0.4.2"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=383e5377f8b7de1f8627ee16f0cf11c5293337bd#383e5377f8b7de1f8627ee16f0cf11c5293337bd"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"futures-util",
"http 0.2.12",
@@ -9528,7 +9472,7 @@ dependencies = [
[[package]]
name = "livekit-protocol"
version = "0.3.9"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=383e5377f8b7de1f8627ee16f0cf11c5293337bd#383e5377f8b7de1f8627ee16f0cf11c5293337bd"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"futures-util",
"livekit-runtime",
@@ -9545,7 +9489,7 @@ dependencies = [
[[package]]
name = "livekit-runtime"
version = "0.4.0"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=383e5377f8b7de1f8627ee16f0cf11c5293337bd#383e5377f8b7de1f8627ee16f0cf11c5293337bd"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"tokio",
"tokio-stream",
@@ -9867,7 +9811,7 @@ name = "markdown_preview"
version = "0.1.0"
dependencies = [
"anyhow",
- "async-recursion 1.1.1",
+ "async-recursion",
"collections",
"editor",
"fs",
@@ -9987,9 +9931,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",
@@ -9999,12 +9943,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",
@@ -10013,7 +9956,6 @@ dependencies = [
"regex",
"serde",
"serde_json",
- "sha2",
"shlex",
"tempfile",
"tokio",
@@ -10156,6 +10098,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"
@@ -10502,6 +10456,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"
@@ -10510,11 +10483,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",
@@ -10522,14 +10495,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]]
@@ -10669,21 +10641,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,21 +10911,33 @@ 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]]
@@ -14732,6 +14701,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"
@@ -14754,7 +14744,6 @@ dependencies = [
"notifications",
"paths",
"project",
- "schemars",
"search",
"serde",
"serde_json",
@@ -16191,7 +16180,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"assistant_slash_command",
- "async-recursion 1.1.1",
+ "async-recursion",
"breadcrumbs",
"client",
"collections",
@@ -16540,6 +16529,7 @@ dependencies = [
"call",
"chrono",
"client",
+ "cloud_llm_client",
"collections",
"db",
"gpui",
@@ -16575,7 +16565,7 @@ dependencies = [
"backtrace",
"bytes 1.10.1",
"libc",
- "mio",
+ "mio 1.0.3",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
@@ -18388,9 +18378,9 @@ dependencies = [
[[package]]
name = "wayland-backend"
-version = "0.3.10"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
+checksum = "b7208998eaa3870dad37ec8836979581506e0c5c64c20c9e79e9d2a10d6f47bf"
dependencies = [
"cc",
"downcast-rs",
@@ -18402,9 +18392,9 @@ dependencies = [
[[package]]
name = "wayland-client"
-version = "0.31.10"
+version = "0.31.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
+checksum = "c2120de3d33638aaef5b9f4472bff75f07c56379cf76ea320bd3a3d65ecaf73f"
dependencies = [
"bitflags 2.9.0",
"rustix 0.38.44",
@@ -18435,18 +18425,6 @@ dependencies = [
"wayland-scanner",
]
-[[package]]
-name = "wayland-protocols"
-version = "0.32.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
-dependencies = [
- "bitflags 2.9.0",
- "wayland-backend",
- "wayland-client",
- "wayland-scanner",
-]
-
[[package]]
name = "wayland-protocols-plasma"
version = "0.2.0"
@@ -18456,20 +18434,7 @@ dependencies = [
"bitflags 2.9.0",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.31.2",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols-wlr"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
-dependencies = [
- "bitflags 2.9.0",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols 0.32.8",
+ "wayland-protocols",
"wayland-scanner",
]
@@ -18578,7 +18543,7 @@ dependencies = [
[[package]]
name = "webrtc-sys"
version = "0.3.7"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=383e5377f8b7de1f8627ee16f0cf11c5293337bd#383e5377f8b7de1f8627ee16f0cf11c5293337bd"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"cc",
"cxx",
@@ -18591,15 +18556,13 @@ dependencies = [
[[package]]
name = "webrtc-sys-build"
version = "0.3.6"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=383e5377f8b7de1f8627ee16f0cf11c5293337bd#383e5377f8b7de1f8627ee16f0cf11c5293337bd"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"fs2",
- "hex-literal",
"regex",
"reqwest 0.11.27",
"scratch",
"semver",
- "sha2",
"zip",
]
@@ -18628,7 +18591,6 @@ dependencies = [
"serde",
"settings",
"telemetry",
- "theme",
"ui",
"util",
"vim_mode_setting",
@@ -19643,7 +19605,7 @@ version = "0.1.0"
dependencies = [
"any_vec",
"anyhow",
- "async-recursion 1.1.1",
+ "async-recursion",
"bincode",
"call",
"client",
@@ -19777,7 +19739,7 @@ dependencies = [
"md-5",
"memchr",
"miniz_oxide",
- "mio",
+ "mio 1.0.3",
"naga",
"nix 0.29.0",
"nom",
@@ -20168,7 +20130,7 @@ dependencies = [
"async-io",
"async-lock",
"async-process",
- "async-recursion 1.1.1",
+ "async-recursion",
"async-task",
"async-trait",
"blocking",
@@ -20221,7 +20183,7 @@ dependencies = [
[[package]]
name = "zed"
-version = "0.198.0"
+version = "0.199.0"
dependencies = [
"activity_indicator",
"agent",
@@ -20324,6 +20286,7 @@ dependencies = [
"serde_json",
"session",
"settings",
+ "settings_profile_selector",
"settings_ui",
"shellexpand 2.1.2",
"smol",
@@ -20600,6 +20563,7 @@ dependencies = [
"call",
"client",
"clock",
+ "cloud_api_types",
"cloud_llm_client",
"collections",
"command_palette_hooks",
@@ -20620,7 +20584,6 @@ dependencies = [
"menu",
"postage",
"project",
- "proto",
"regex",
"release_channel",
"reqwest_client",
@@ -20645,6 +20608,42 @@ dependencies = [
"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 df1e1d7467..902c7e8d19 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,13 @@
[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/agent_servers",
+ "crates/agent_settings",
+ "crates/agent_ui",
+ "crates/ai_onboarding",
"crates/anthropic",
"crates/askpass",
"crates/assets",
@@ -29,6 +29,8 @@ members = [
"crates/cli",
"crates/client",
"crates/clock",
+ "crates/cloud_api_client",
+ "crates/cloud_api_types",
"crates/cloud_llm_client",
"crates/collab",
"crates/collab_ui",
@@ -49,8 +51,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",
@@ -99,7 +101,6 @@ members = [
"crates/markdown_preview",
"crates/media",
"crates/menu",
- "crates/svg_preview",
"crates/migrator",
"crates/mistral",
"crates/multi_buffer",
@@ -140,6 +141,7 @@ members = [
"crates/semantic_version",
"crates/session",
"crates/settings",
+ "crates/settings_profile_selector",
"crates/settings_ui",
"crates/snippet",
"crates/snippet_provider",
@@ -152,6 +154,7 @@ members = [
"crates/sum_tree",
"crates/supermaven",
"crates/supermaven_api",
+ "crates/svg_preview",
"crates/tab_switcher",
"crates/task",
"crates/tasks_ui",
@@ -186,6 +189,7 @@ members = [
"crates/zed",
"crates/zed_actions",
"crates/zeta",
+ "crates/zeta_cli",
"crates/zlog",
"crates/zlog_settings",
@@ -251,6 +255,8 @@ 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" }
@@ -338,6 +344,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" }
@@ -672,14 +679,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",
diff --git a/assets/icons/editor_atom.svg b/assets/icons/editor_atom.svg
new file mode 100644
index 0000000000..cc5fa83843
--- /dev/null
+++ b/assets/icons/editor_atom.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/editor_cursor.svg b/assets/icons/editor_cursor.svg
new file mode 100644
index 0000000000..338697be8a
--- /dev/null
+++ b/assets/icons/editor_cursor.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/icons/editor_emacs.svg b/assets/icons/editor_emacs.svg
new file mode 100644
index 0000000000..951d7b2be1
--- /dev/null
+++ b/assets/icons/editor_emacs.svg
@@ -0,0 +1,10 @@
+
diff --git a/assets/icons/editor_jet_brains.svg b/assets/icons/editor_jet_brains.svg
new file mode 100644
index 0000000000..7d9cf0c65c
--- /dev/null
+++ b/assets/icons/editor_jet_brains.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/editor_sublime.svg b/assets/icons/editor_sublime.svg
new file mode 100644
index 0000000000..95a04f6b54
--- /dev/null
+++ b/assets/icons/editor_sublime.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/editor_vs_code.svg b/assets/icons/editor_vs_code.svg
new file mode 100644
index 0000000000..2a71ad52af
--- /dev/null
+++ b/assets/icons/editor_vs_code.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/shield_check.svg b/assets/icons/shield_check.svg
new file mode 100644
index 0000000000..6e58c31468
--- /dev/null
+++ b/assets/icons/shield_check.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index e36e093e22..ef5354e82d 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -232,7 +232,7 @@
"ctrl-n": "agent::NewThread",
"ctrl-alt-n": "agent::NewTextThread",
"ctrl-shift-h": "agent::OpenHistory",
- "ctrl-alt-c": "agent::OpenConfiguration",
+ "ctrl-alt-c": "agent::OpenSettings",
"ctrl-alt-p": "agent::OpenRulesLibrary",
"ctrl-i": "agent::ToggleProfileSelector",
"ctrl-alt-/": "agent::ToggleModelSelector",
@@ -598,6 +598,7 @@
"ctrl-shift-t": "pane::ReopenClosedItem",
"ctrl-k ctrl-s": "zed::OpenKeymapEditor",
"ctrl-k ctrl-t": "theme_selector::Toggle",
+ "ctrl-alt-super-p": "settings_profile_selector::Toggle",
"ctrl-t": "project_symbols::Toggle",
"ctrl-p": "file_finder::Toggle",
"ctrl-tab": "tab_switcher::Toggle",
@@ -1167,5 +1168,14 @@
"up": "menu::SelectPrevious",
"down": "menu::SelectNext"
}
+ },
+ {
+ "context": "Onboarding",
+ "use_key_equivalents": true,
+ "bindings": {
+ "ctrl-1": "onboarding::ActivateBasicsPage",
+ "ctrl-2": "onboarding::ActivateEditingPage",
+ "ctrl-3": "onboarding::ActivateAISetupPage"
+ }
}
]
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 0114e2da1d..3287e50acb 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -272,7 +272,7 @@
"cmd-n": "agent::NewThread",
"cmd-alt-n": "agent::NewTextThread",
"cmd-shift-h": "agent::OpenHistory",
- "cmd-alt-c": "agent::OpenConfiguration",
+ "cmd-alt-c": "agent::OpenSettings",
"cmd-alt-p": "agent::OpenRulesLibrary",
"cmd-i": "agent::ToggleProfileSelector",
"cmd-alt-/": "agent::ToggleModelSelector",
@@ -665,6 +665,7 @@
"cmd-shift-t": "pane::ReopenClosedItem",
"cmd-k cmd-s": "zed::OpenKeymapEditor",
"cmd-k cmd-t": "theme_selector::Toggle",
+ "ctrl-alt-cmd-p": "settings_profile_selector::Toggle",
"cmd-t": "project_symbols::Toggle",
"cmd-p": "file_finder::Toggle",
"ctrl-tab": "tab_switcher::Toggle",
@@ -1269,5 +1270,14 @@
"up": "menu::SelectPrevious",
"down": "menu::SelectNext"
}
+ },
+ {
+ "context": "Onboarding",
+ "use_key_equivalents": true,
+ "bindings": {
+ "cmd-1": "onboarding::ActivateBasicsPage",
+ "cmd-2": "onboarding::ActivateEditingPage",
+ "cmd-3": "onboarding::ActivateAISetupPage"
+ }
}
]
diff --git a/assets/keymaps/linux/cursor.json b/assets/keymaps/linux/cursor.json
index 347b7885fc..1c381b0cf0 100644
--- a/assets/keymaps/linux/cursor.json
+++ b/assets/keymaps/linux/cursor.json
@@ -8,7 +8,7 @@
"ctrl-shift-i": "agent::ToggleFocus",
"ctrl-l": "agent::ToggleFocus",
"ctrl-shift-l": "agent::ToggleFocus",
- "ctrl-shift-j": "agent::OpenConfiguration"
+ "ctrl-shift-j": "agent::OpenSettings"
}
},
{
diff --git a/assets/keymaps/linux/jetbrains.json b/assets/keymaps/linux/jetbrains.json
index f81f363ae0..9bc1f24bfb 100644
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -95,7 +95,7 @@
"ctrl-shift-r": ["pane::DeploySearch", { "replace_enabled": true }],
"alt-shift-f10": "task::Spawn",
"ctrl-e": "file_finder::Toggle",
- "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
+ // "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
"ctrl-shift-n": "file_finder::Toggle",
"ctrl-shift-a": "command_palette::Toggle",
"shift shift": "command_palette::Toggle",
diff --git a/assets/keymaps/macos/cursor.json b/assets/keymaps/macos/cursor.json
index b1d39bef9e..fdf9c437cf 100644
--- a/assets/keymaps/macos/cursor.json
+++ b/assets/keymaps/macos/cursor.json
@@ -8,7 +8,7 @@
"cmd-shift-i": "agent::ToggleFocus",
"cmd-l": "agent::ToggleFocus",
"cmd-shift-l": "agent::ToggleFocus",
- "cmd-shift-j": "agent::OpenConfiguration"
+ "cmd-shift-j": "agent::OpenSettings"
}
},
{
diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.json
index 5795d2ac7e..b1cd51a338 100644
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -97,7 +97,7 @@
"cmd-shift-r": ["pane::DeploySearch", { "replace_enabled": true }],
"ctrl-alt-r": "task::Spawn",
"cmd-e": "file_finder::Toggle",
- "cmd-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
+ // "cmd-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
"cmd-shift-o": "file_finder::Toggle",
"cmd-shift-a": "command_palette::Toggle",
"shift shift": "command_palette::Toggle",
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 3a7a48efc2..4734b5d118 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1877,5 +1877,25 @@
"save_breakpoints": true,
"dock": "bottom",
"button": true
- }
+ },
+ // Configures any number of settings profiles that are temporarily applied on
+ // top of your existing user settings when selected from
+ // `settings profile selector: toggle`.
+ // Examples:
+ // "profiles": {
+ // "Presenting": {
+ // "agent_font_size": 20.0,
+ // "buffer_font_size": 20.0,
+ // "theme": "One Light",
+ // "ui_font_size": 20.0
+ // },
+ // "Python (ty)": {
+ // "languages": {
+ // "Python": {
+ // "language_servers": ["ty"]
+ // }
+ // }
+ // }
+ // }
+ "profiles": []
}
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 3bf6134862..d10fecdb28 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -580,6 +580,9 @@ pub struct AcpThread {
pub enum AcpThreadEvent {
NewEntry,
EntryUpdated(usize),
+ ToolAuthorizationRequired,
+ Stopped,
+ Error,
}
impl EventEmitter for AcpThread {}
@@ -677,6 +680,18 @@ impl AcpThread {
false
}
+ pub fn used_tools_since_last_user_message(&self) -> bool {
+ for entry in self.entries.iter().rev() {
+ match entry {
+ AgentThreadEntry::UserMessage(..) => return false,
+ AgentThreadEntry::AssistantMessage(..) => continue,
+ AgentThreadEntry::ToolCall(..) => return true,
+ }
+ }
+
+ false
+ }
+
pub fn handle_session_update(
&mut self,
update: acp::SessionUpdate,
@@ -880,6 +895,7 @@ impl AcpThread {
};
self.upsert_tool_call_inner(tool_call, status, cx);
+ cx.emit(AcpThreadEvent::ToolAuthorizationRequired);
rx
}
@@ -1015,12 +1031,18 @@ impl AcpThread {
.log_err();
}));
- async move {
- match rx.await {
- Ok(Err(e)) => Err(e)?,
- _ => Ok(()),
+ cx.spawn(async move |this, cx| match rx.await {
+ Ok(Err(e)) => {
+ this.update(cx, |_, cx| cx.emit(AcpThreadEvent::Error))
+ .log_err();
+ Err(e)?
}
- }
+ _ => {
+ this.update(cx, |_, cx| cx.emit(AcpThreadEvent::Stopped))
+ .log_err();
+ Ok(())
+ }
+ })
.boxed()
}
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
index c89a7f3303..7bc0e82cad 100644
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -47,7 +47,6 @@ paths.workspace = true
postage.workspace = true
project.workspace = true
prompt_store.workspace = true
-proto.workspace = true
ref-cast.workspace = true
rope.workspace = true
schemars.workspace = true
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 0e5da2d43b..8558dd528d 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -13,7 +13,7 @@ use anyhow::{Result, anyhow};
use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolWorkingSet};
use chrono::{DateTime, Utc};
use client::{ModelRequestUsage, RequestUsage};
-use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, UsageLimit};
+use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, Plan, UsageLimit};
use collections::HashMap;
use feature_flags::{self, FeatureFlagAppExt};
use futures::{FutureExt, StreamExt as _, future::Shared};
@@ -37,7 +37,6 @@ use project::{
git_store::{GitStore, GitStoreCheckpoint, RepositoryState},
};
use prompt_store::{ModelContext, PromptBuilder};
-use proto::Plan;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings::Settings;
@@ -3255,8 +3254,10 @@ impl Thread {
}
fn update_model_request_usage(&self, amount: u32, limit: UsageLimit, cx: &mut Context) {
- self.project.update(cx, |project, cx| {
- project.user_store().update(cx, |user_store, cx| {
+ self.project
+ .read(cx)
+ .user_store()
+ .update(cx, |user_store, cx| {
user_store.update_model_request_usage(
ModelRequestUsage(RequestUsage {
amount: amount as i32,
@@ -3264,8 +3265,7 @@ impl Thread {
}),
cx,
)
- })
- });
+ });
}
pub fn deny_tool_use(
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 17575e42db..167f7e6136 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1,5 +1,7 @@
use acp_thread::{AgentConnection, Plan};
use agent_servers::AgentServer;
+use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
+use audio::{Audio, Sound};
use std::cell::RefCell;
use std::collections::BTreeMap;
use std::path::Path;
@@ -18,10 +20,10 @@ use editor::{
use file_icons::FileIcons;
use gpui::{
Action, Animation, AnimationExt, App, BorderStyle, EdgesRefinement, Empty, Entity, EntityId,
- FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, SharedString, StyleRefinement,
- Subscription, Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity,
- Window, div, linear_color_stop, linear_gradient, list, percentage, point, prelude::*,
- pulsating_between,
+ FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, PlatformDisplay, SharedString,
+ StyleRefinement, Subscription, Task, TextStyle, TextStyleRefinement, Transformation,
+ UnderlineStyle, WeakEntity, Window, WindowHandle, div, linear_color_stop, linear_gradient,
+ list, percentage, point, prelude::*, pulsating_between,
};
use language::language_settings::SoftWrap;
use language::{Buffer, Language};
@@ -45,7 +47,10 @@ use crate::acp::completion_provider::{ContextPickerCompletionProvider, MentionSe
use crate::acp::message_history::MessageHistory;
use crate::agent_diff::AgentDiff;
use crate::message_editor::{MAX_EDITOR_LINES, MIN_EDITOR_LINES};
-use crate::{AgentDiffPane, ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, RejectAll};
+use crate::ui::{AgentNotification, AgentNotificationEvent};
+use crate::{
+ AgentDiffPane, AgentPanel, ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, RejectAll,
+};
const RESPONSE_PADDING_X: Pixels = px(19.);
@@ -59,6 +64,8 @@ pub struct AcpThreadView {
message_set_from_history: bool,
_message_editor_subscription: Subscription,
mention_set: Arc>,
+ notifications: Vec>,
+ notification_subscriptions: HashMap, Vec>,
last_error: Option>,
list_state: ListState,
auth_task: Option>,
@@ -174,6 +181,8 @@ impl AcpThreadView {
message_set_from_history: false,
_message_editor_subscription: message_editor_subscription,
mention_set,
+ notifications: Vec::new(),
+ notification_subscriptions: HashMap::default(),
diff_editors: Default::default(),
list_state: list_state,
last_error: None,
@@ -382,7 +391,9 @@ impl AcpThreadView {
return;
}
- let Some(thread) = self.thread() else { return };
+ let Some(thread) = self.thread() else {
+ return;
+ };
let task = thread.update(cx, |thread, cx| thread.send(chunks.clone(), cx));
cx.spawn(async move |this, cx| {
@@ -565,6 +576,30 @@ impl AcpThreadView {
self.sync_thread_entry_view(index, window, cx);
self.list_state.splice(index..index + 1, 1);
}
+ AcpThreadEvent::ToolAuthorizationRequired => {
+ self.notify_with_sound("Waiting for tool confirmation", IconName::Info, window, cx);
+ }
+ AcpThreadEvent::Stopped => {
+ let used_tools = thread.read(cx).used_tools_since_last_user_message();
+ self.notify_with_sound(
+ if used_tools {
+ "Finished running tools"
+ } else {
+ "New message"
+ },
+ IconName::ZedAssistant,
+ window,
+ cx,
+ );
+ }
+ AcpThreadEvent::Error => {
+ self.notify_with_sound(
+ "Agent stopped due to an error",
+ IconName::Warning,
+ window,
+ cx,
+ );
+ }
}
cx.notify();
}
@@ -2166,6 +2201,154 @@ impl AcpThreadView {
self.list_state.scroll_to(ListOffset::default());
cx.notify();
}
+
+ fn notify_with_sound(
+ &mut self,
+ caption: impl Into,
+ icon: IconName,
+ window: &mut Window,
+ cx: &mut Context,
+ ) {
+ self.play_notification_sound(window, cx);
+ self.show_notification(caption, icon, window, cx);
+ }
+
+ fn play_notification_sound(&self, window: &Window, cx: &mut App) {
+ let settings = AgentSettings::get_global(cx);
+ if settings.play_sound_when_agent_done && !window.is_window_active() {
+ Audio::play_sound(Sound::AgentDone, cx);
+ }
+ }
+
+ fn show_notification(
+ &mut self,
+ caption: impl Into,
+ icon: IconName,
+ window: &mut Window,
+ cx: &mut Context,
+ ) {
+ if window.is_window_active() || !self.notifications.is_empty() {
+ return;
+ }
+
+ let title = self.title(cx);
+
+ match AgentSettings::get_global(cx).notify_when_agent_waiting {
+ NotifyWhenAgentWaiting::PrimaryScreen => {
+ if let Some(primary) = cx.primary_display() {
+ self.pop_up(icon, caption.into(), title, window, primary, cx);
+ }
+ }
+ NotifyWhenAgentWaiting::AllScreens => {
+ let caption = caption.into();
+ for screen in cx.displays() {
+ self.pop_up(icon, caption.clone(), title.clone(), window, screen, cx);
+ }
+ }
+ NotifyWhenAgentWaiting::Never => {
+ // Don't show anything
+ }
+ }
+ }
+
+ fn pop_up(
+ &mut self,
+ icon: IconName,
+ caption: SharedString,
+ title: SharedString,
+ window: &mut Window,
+ screen: Rc,
+ cx: &mut Context,
+ ) {
+ let options = AgentNotification::window_options(screen, cx);
+
+ let project_name = self.workspace.upgrade().and_then(|workspace| {
+ workspace
+ .read(cx)
+ .project()
+ .read(cx)
+ .visible_worktrees(cx)
+ .next()
+ .map(|worktree| worktree.read(cx).root_name().to_string())
+ });
+
+ if let Some(screen_window) = cx
+ .open_window(options, |_, cx| {
+ cx.new(|_| {
+ AgentNotification::new(title.clone(), caption.clone(), icon, project_name)
+ })
+ })
+ .log_err()
+ {
+ if let Some(pop_up) = screen_window.entity(cx).log_err() {
+ self.notification_subscriptions
+ .entry(screen_window)
+ .or_insert_with(Vec::new)
+ .push(cx.subscribe_in(&pop_up, window, {
+ |this, _, event, window, cx| match event {
+ AgentNotificationEvent::Accepted => {
+ let handle = window.window_handle();
+ cx.activate(true);
+
+ let workspace_handle = this.workspace.clone();
+
+ // If there are multiple Zed windows, activate the correct one.
+ cx.defer(move |cx| {
+ handle
+ .update(cx, |_view, window, _cx| {
+ window.activate_window();
+
+ if let Some(workspace) = workspace_handle.upgrade() {
+ workspace.update(_cx, |workspace, cx| {
+ workspace.focus_panel::(window, cx);
+ });
+ }
+ })
+ .log_err();
+ });
+
+ this.dismiss_notifications(cx);
+ }
+ AgentNotificationEvent::Dismissed => {
+ this.dismiss_notifications(cx);
+ }
+ }
+ }));
+
+ self.notifications.push(screen_window);
+
+ // If the user manually refocuses the original window, dismiss the popup.
+ self.notification_subscriptions
+ .entry(screen_window)
+ .or_insert_with(Vec::new)
+ .push({
+ let pop_up_weak = pop_up.downgrade();
+
+ cx.observe_window_activation(window, move |_, window, cx| {
+ if window.is_window_active() {
+ if let Some(pop_up) = pop_up_weak.upgrade() {
+ pop_up.update(cx, |_, cx| {
+ cx.emit(AgentNotificationEvent::Dismissed);
+ });
+ }
+ }
+ })
+ });
+ }
+ }
+ }
+
+ fn dismiss_notifications(&mut self, cx: &mut Context) {
+ for window in self.notifications.drain(..) {
+ window
+ .update(cx, |_, window, _| {
+ window.remove_window();
+ })
+ .ok();
+
+ self.notification_subscriptions.remove(&window);
+ }
+ }
}
impl Focusable for AcpThreadView {
@@ -2451,3 +2634,331 @@ fn plan_label_markdown_style(
..default_md_style
}
}
+
+#[cfg(test)]
+mod tests {
+ use agent_client_protocol::SessionId;
+ use editor::EditorSettings;
+ use fs::FakeFs;
+ use futures::future::try_join_all;
+ use gpui::{SemanticVersion, TestAppContext, VisualTestContext};
+ use rand::Rng;
+ use settings::SettingsStore;
+
+ use super::*;
+
+ #[gpui::test]
+ async fn test_notification_for_stop_event(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let (thread_view, cx) = setup_thread_view(StubAgentServer::default(), cx).await;
+
+ let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+ message_editor.update_in(cx, |editor, window, cx| {
+ editor.set_text("Hello", window, cx);
+ });
+
+ cx.deactivate_window();
+
+ thread_view.update_in(cx, |thread_view, window, cx| {
+ thread_view.chat(&Chat, window, cx);
+ });
+
+ cx.run_until_parked();
+
+ assert!(
+ cx.windows()
+ .iter()
+ .any(|window| window.downcast::().is_some())
+ );
+ }
+
+ #[gpui::test]
+ async fn test_notification_for_error(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let (thread_view, cx) =
+ setup_thread_view(StubAgentServer::new(SaboteurAgentConnection), cx).await;
+
+ let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+ message_editor.update_in(cx, |editor, window, cx| {
+ editor.set_text("Hello", window, cx);
+ });
+
+ cx.deactivate_window();
+
+ thread_view.update_in(cx, |thread_view, window, cx| {
+ thread_view.chat(&Chat, window, cx);
+ });
+
+ cx.run_until_parked();
+
+ assert!(
+ cx.windows()
+ .iter()
+ .any(|window| window.downcast::().is_some())
+ );
+ }
+
+ #[gpui::test]
+ async fn test_notification_for_tool_authorization(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let tool_call_id = acp::ToolCallId("1".into());
+ let tool_call = acp::ToolCall {
+ id: tool_call_id.clone(),
+ label: "Label".into(),
+ kind: acp::ToolKind::Edit,
+ status: acp::ToolCallStatus::Pending,
+ content: vec!["hi".into()],
+ locations: vec![],
+ raw_input: None,
+ };
+ let connection = StubAgentConnection::new(vec![acp::SessionUpdate::ToolCall(tool_call)])
+ .with_permission_requests(HashMap::from_iter([(
+ tool_call_id,
+ vec![acp::PermissionOption {
+ id: acp::PermissionOptionId("1".into()),
+ label: "Allow".into(),
+ kind: acp::PermissionOptionKind::AllowOnce,
+ }],
+ )]));
+ let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
+
+ let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+ message_editor.update_in(cx, |editor, window, cx| {
+ editor.set_text("Hello", window, cx);
+ });
+
+ cx.deactivate_window();
+
+ thread_view.update_in(cx, |thread_view, window, cx| {
+ thread_view.chat(&Chat, window, cx);
+ });
+
+ cx.run_until_parked();
+
+ assert!(
+ cx.windows()
+ .iter()
+ .any(|window| window.downcast::().is_some())
+ );
+ }
+
+ async fn setup_thread_view(
+ agent: impl AgentServer + 'static,
+ cx: &mut TestAppContext,
+ ) -> (Entity, &mut VisualTestContext) {
+ let fs = FakeFs::new(cx.executor());
+ let project = Project::test(fs, [], cx).await;
+ let (workspace, cx) =
+ cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+
+ let thread_view = cx.update(|window, cx| {
+ cx.new(|cx| {
+ AcpThreadView::new(
+ Rc::new(agent),
+ workspace.downgrade(),
+ project,
+ Rc::new(RefCell::new(MessageHistory::default())),
+ 1,
+ None,
+ window,
+ cx,
+ )
+ })
+ });
+ cx.run_until_parked();
+ (thread_view, cx)
+ }
+
+ struct StubAgentServer {
+ connection: C,
+ }
+
+ impl StubAgentServer {
+ fn new(connection: C) -> Self {
+ Self { connection }
+ }
+ }
+
+ impl StubAgentServer {
+ fn default() -> Self {
+ Self::new(StubAgentConnection::default())
+ }
+ }
+
+ impl AgentServer for StubAgentServer
+ where
+ C: 'static + AgentConnection + Send + Clone,
+ {
+ fn logo(&self) -> ui::IconName {
+ unimplemented!()
+ }
+
+ fn name(&self) -> &'static str {
+ unimplemented!()
+ }
+
+ fn empty_state_headline(&self) -> &'static str {
+ unimplemented!()
+ }
+
+ fn empty_state_message(&self) -> &'static str {
+ unimplemented!()
+ }
+
+ fn connect(
+ &self,
+ _root_dir: &Path,
+ _project: &Entity,
+ _cx: &mut App,
+ ) -> Task>> {
+ Task::ready(Ok(Rc::new(self.connection.clone())))
+ }
+ }
+
+ #[derive(Clone, Default)]
+ struct StubAgentConnection {
+ sessions: Arc>>>,
+ permission_requests: HashMap>,
+ updates: Vec,
+ }
+
+ impl StubAgentConnection {
+ fn new(updates: Vec) -> Self {
+ Self {
+ updates,
+ permission_requests: HashMap::default(),
+ sessions: Arc::default(),
+ }
+ }
+
+ fn with_permission_requests(
+ mut self,
+ permission_requests: HashMap>,
+ ) -> Self {
+ self.permission_requests = permission_requests;
+ self
+ }
+ }
+
+ impl AgentConnection for StubAgentConnection {
+ fn name(&self) -> &'static str {
+ "StubAgentConnection"
+ }
+
+ fn new_thread(
+ self: Rc,
+ project: Entity,
+ _cwd: &Path,
+ cx: &mut gpui::AsyncApp,
+ ) -> Task>> {
+ let session_id = SessionId(
+ rand::thread_rng()
+ .sample_iter(&rand::distributions::Alphanumeric)
+ .take(7)
+ .map(char::from)
+ .collect::()
+ .into(),
+ );
+ let thread = cx
+ .new(|cx| AcpThread::new(self.clone(), project, session_id.clone(), cx))
+ .unwrap();
+ self.sessions.lock().insert(session_id, thread.downgrade());
+ Task::ready(Ok(thread))
+ }
+
+ fn authenticate(&self, _cx: &mut App) -> Task> {
+ unimplemented!()
+ }
+
+ fn prompt(&self, params: acp::PromptArguments, cx: &mut App) -> Task> {
+ let sessions = self.sessions.lock();
+ let thread = sessions.get(¶ms.session_id).unwrap();
+ let mut tasks = vec![];
+ for update in &self.updates {
+ let thread = thread.clone();
+ let update = update.clone();
+ let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) = &update
+ && let Some(options) = self.permission_requests.get(&tool_call.id)
+ {
+ Some((tool_call.clone(), options.clone()))
+ } else {
+ None
+ };
+ let task = cx.spawn(async move |cx| {
+ if let Some((tool_call, options)) = permission_request {
+ let permission = thread.update(cx, |thread, cx| {
+ thread.request_tool_call_permission(
+ tool_call.clone(),
+ options.clone(),
+ cx,
+ )
+ })?;
+ permission.await?;
+ }
+ thread.update(cx, |thread, cx| {
+ thread.handle_session_update(update.clone(), cx).unwrap();
+ })?;
+ anyhow::Ok(())
+ });
+ tasks.push(task);
+ }
+ cx.spawn(async move |_| {
+ try_join_all(tasks).await?;
+ Ok(())
+ })
+ }
+
+ fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
+ unimplemented!()
+ }
+ }
+
+ #[derive(Clone)]
+ struct SaboteurAgentConnection;
+
+ impl AgentConnection for SaboteurAgentConnection {
+ fn name(&self) -> &'static str {
+ "SaboteurAgentConnection"
+ }
+
+ fn new_thread(
+ self: Rc,
+ project: Entity,
+ _cwd: &Path,
+ cx: &mut gpui::AsyncApp,
+ ) -> Task>> {
+ Task::ready(Ok(cx
+ .new(|cx| AcpThread::new(self, project, SessionId("test".into()), cx))
+ .unwrap()))
+ }
+
+ fn authenticate(&self, _cx: &mut App) -> Task> {
+ unimplemented!()
+ }
+
+ fn prompt(&self, _params: acp::PromptArguments, _cx: &mut App) -> Task> {
+ Task::ready(Err(anyhow::anyhow!("Error prompting")))
+ }
+
+ fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
+ unimplemented!()
+ }
+ }
+
+ fn init_test(cx: &mut TestAppContext) {
+ cx.update(|cx| {
+ let settings_store = SettingsStore::test(cx);
+ cx.set_global(settings_store);
+ language::init(cx);
+ Project::init_settings(cx);
+ AgentSettings::register(cx);
+ workspace::init_settings(cx);
+ ThemeSettings::register(cx);
+ release_channel::init(SemanticVersion::default(), cx);
+ EditorSettings::register(cx);
+ });
+ }
+}
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index fae04188eb..dad930be9e 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -7,6 +7,7 @@ use std::{sync::Arc, time::Duration};
use agent_settings::AgentSettings;
use assistant_tool::{ToolSource, ToolWorkingSet};
+use cloud_llm_client::Plan;
use collections::HashMap;
use context_server::ContextServerId;
use extension::ExtensionManifest;
@@ -25,7 +26,6 @@ use project::{
context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
project_settings::{ContextServerSettings, ProjectSettings},
};
-use proto::Plan;
use settings::{Settings, update_settings_file};
use ui::{
Chip, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu,
@@ -180,7 +180,7 @@ impl AgentConfiguration {
let current_plan = if is_zed_provider {
self.workspace
.upgrade()
- .and_then(|workspace| workspace.read(cx).user_store().read(cx).current_plan())
+ .and_then(|workspace| workspace.read(cx).user_store().read(cx).plan())
} else {
None
};
@@ -406,7 +406,9 @@ impl AgentConfiguration {
SwitchField::new(
"always-allow-tool-actions-switch",
"Allow running commands without asking for confirmation",
- "The agent can perform potentially destructive actions without asking for your confirmation.",
+ Some(
+ "The agent can perform potentially destructive actions without asking for your confirmation.".into(),
+ ),
always_allow_tool_actions,
move |state, _window, cx| {
let allow = state == &ToggleState::Selected;
@@ -424,7 +426,7 @@ impl AgentConfiguration {
SwitchField::new(
"single-file-review",
"Enable single-file agent reviews",
- "Agent edits are also displayed in single-file editors for review.",
+ Some("Agent edits are also displayed in single-file editors for review.".into()),
single_file_review,
move |state, _window, cx| {
let allow = state == &ToggleState::Selected;
@@ -442,7 +444,9 @@ impl AgentConfiguration {
SwitchField::new(
"sound-notification",
"Play sound when finished generating",
- "Hear a notification sound when the agent is done generating changes or needs your input.",
+ Some(
+ "Hear a notification sound when the agent is done generating changes or needs your input.".into(),
+ ),
play_sound_when_agent_done,
move |state, _window, cx| {
let allow = state == &ToggleState::Selected;
@@ -460,7 +464,9 @@ impl AgentConfiguration {
SwitchField::new(
"modifier-send",
"Use modifier to submit a message",
- "Make a modifier (cmd-enter on macOS, ctrl-enter on Linux) required to send messages.",
+ Some(
+ "Make a modifier (cmd-enter on macOS, ctrl-enter on Linux) required to send messages.".into(),
+ ),
use_modifier_to_send,
move |state, _window, cx| {
let allow = state == &ToggleState::Selected;
@@ -502,7 +508,7 @@ impl AgentConfiguration {
.blend(cx.theme().colors().text_accent.opacity(0.2));
let (plan_name, label_color, bg_color) = match plan {
- Plan::Free => ("Free", Color::Default, free_chip_bg),
+ Plan::ZedFree => ("Free", Color::Default, free_chip_bg),
Plan::ZedProTrial => ("Pro Trial", Color::Accent, pro_chip_bg),
Plan::ZedPro => ("Pro", Color::Accent, pro_chip_bg),
};
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index ec0a11f86b..c4dc359093 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1521,6 +1521,9 @@ impl AgentDiff {
self.update_reviewing_editors(workspace, window, cx);
}
}
+ AcpThreadEvent::Stopped
+ | AcpThreadEvent::ToolAuthorizationRequired
+ | AcpThreadEvent::Error => {}
}
}
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 875320372d..a09c669769 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -44,7 +44,7 @@ use assistant_context::{AssistantContext, ContextEvent, ContextSummary};
use assistant_slash_command::SlashCommandWorkingSet;
use assistant_tool::ToolWorkingSet;
use client::{DisableAiSettings, UserStore, zed_urls};
-use cloud_llm_client::{CompletionIntent, UsageLimit};
+use cloud_llm_client::{CompletionIntent, Plan, UsageLimit};
use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
use feature_flags::{self, FeatureFlagAppExt};
use fs::Fs;
@@ -60,7 +60,6 @@ use language_model::{
};
use project::{Project, ProjectPath, Worktree};
use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
-use proto::Plan;
use rules_library::{RulesLibrary, open_rules_library};
use search::{BufferSearchBar, buffer_search};
use settings::{Settings, update_settings_file};
@@ -78,7 +77,7 @@ use workspace::{
};
use zed_actions::{
DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize,
- agent::{OpenConfiguration, OpenOnboardingModal, ResetOnboarding, ToggleModelSelector},
+ agent::{OpenOnboardingModal, OpenSettings, ResetOnboarding, ToggleModelSelector},
assistant::{OpenRulesLibrary, ToggleFocus},
};
@@ -105,7 +104,7 @@ pub fn init(cx: &mut App) {
panel.update(cx, |panel, cx| panel.open_history(window, cx));
}
})
- .register_action(|workspace, _: &OpenConfiguration, window, cx| {
+ .register_action(|workspace, _: &OpenSettings, window, cx| {
if let Some(panel) = workspace.panel::(cx) {
workspace.focus_panel::(window, cx);
panel.update(cx, |panel, cx| panel.open_configuration(window, cx));
@@ -579,7 +578,6 @@ impl AgentPanel {
MessageEditor::new(
fs.clone(),
workspace.clone(),
- user_store.clone(),
message_editor_context_store.clone(),
prompt_store.clone(),
thread_store.downgrade(),
@@ -848,7 +846,6 @@ impl AgentPanel {
MessageEditor::new(
self.fs.clone(),
self.workspace.clone(),
- self.user_store.clone(),
context_store.clone(),
self.prompt_store.clone(),
self.thread_store.downgrade(),
@@ -1122,7 +1119,6 @@ impl AgentPanel {
MessageEditor::new(
self.fs.clone(),
self.workspace.clone(),
- self.user_store.clone(),
context_store,
self.prompt_store.clone(),
self.thread_store.downgrade(),
@@ -2074,7 +2070,7 @@ impl AgentPanel {
menu = menu
.action("Rules…", Box::new(OpenRulesLibrary::default()))
- .action("Settings", Box::new(OpenConfiguration))
+ .action("Settings", Box::new(OpenSettings))
.action(zoom_in_label, Box::new(ToggleZoom));
menu
}))
@@ -2279,10 +2275,10 @@ impl AgentPanel {
| ActiveView::Configuration => return false,
}
- let plan = self.user_store.read(cx).current_plan();
+ let plan = self.user_store.read(cx).plan();
let has_previous_trial = self.user_store.read(cx).trial_started_at().is_some();
- matches!(plan, Some(Plan::Free)) && has_previous_trial
+ matches!(plan, Some(Plan::ZedFree)) && has_previous_trial
}
fn should_render_onboarding(&self, cx: &mut Context) -> bool {
@@ -2468,14 +2464,14 @@ impl AgentPanel {
.icon_color(Color::Muted)
.full_width()
.key_binding(KeyBinding::for_action_in(
- &OpenConfiguration,
+ &OpenSettings,
&focus_handle,
window,
cx,
))
.on_click(|_event, window, cx| {
window.dispatch_action(
- OpenConfiguration.boxed_clone(),
+ OpenSettings.boxed_clone(),
cx,
)
}),
@@ -2680,16 +2676,11 @@ impl AgentPanel {
.style(ButtonStyle::Tinted(ui::TintColor::Warning))
.label_size(LabelSize::Small)
.key_binding(
- KeyBinding::for_action_in(
- &OpenConfiguration,
- &focus_handle,
- window,
- cx,
- )
- .map(|kb| kb.size(rems_from_px(12.))),
+ KeyBinding::for_action_in(&OpenSettings, &focus_handle, window, cx)
+ .map(|kb| kb.size(rems_from_px(12.))),
)
.on_click(|_event, window, cx| {
- window.dispatch_action(OpenConfiguration.boxed_clone(), cx)
+ window.dispatch_action(OpenSettings.boxed_clone(), cx)
}),
),
ConfigurationError::ProviderPendingTermsAcceptance(provider) => {
@@ -2883,7 +2874,7 @@ impl AgentPanel {
) -> AnyElement {
let error_message = match plan {
Plan::ZedPro => "Upgrade to usage-based billing for more prompts.",
- Plan::ZedProTrial | Plan::Free => "Upgrade to Zed Pro for more prompts.",
+ Plan::ZedProTrial | Plan::ZedFree => "Upgrade to Zed Pro for more prompts.",
};
let icon = Icon::new(IconName::XCircle)
@@ -3193,7 +3184,7 @@ impl Render for AgentPanel {
.on_action(cx.listener(|this, _: &OpenHistory, window, cx| {
this.open_history(window, cx);
}))
- .on_action(cx.listener(|this, _: &OpenConfiguration, window, cx| {
+ .on_action(cx.listener(|this, _: &OpenSettings, window, cx| {
this.open_configuration(window, cx);
}))
.on_action(cx.listener(Self::open_active_thread_as_markdown))
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 6ae78585de..c5574c2371 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -263,8 +263,8 @@ fn update_command_palette_filter(cx: &mut App) {
filter.hide_namespace("agent");
filter.hide_namespace("assistant");
filter.hide_namespace("copilot");
+ filter.hide_namespace("supermaven");
filter.hide_namespace("zed_predict_onboarding");
-
filter.hide_namespace("edit_prediction");
use editor::actions::{
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 44ec050ae2..ffa654d12b 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -48,7 +48,7 @@ use text::{OffsetRangeExt, ToPoint as _};
use ui::prelude::*;
use util::{RangeExt, ResultExt, maybe};
use workspace::{ItemHandle, Toast, Workspace, dock::Panel, notifications::NotificationId};
-use zed_actions::agent::OpenConfiguration;
+use zed_actions::agent::OpenSettings;
pub fn init(
fs: Arc,
@@ -345,7 +345,7 @@ impl InlineAssistant {
if let Some(answer) = answer {
if answer == 0 {
cx.update(|window, cx| {
- window.dispatch_action(Box::new(OpenConfiguration), cx)
+ window.dispatch_action(Box::new(OpenSettings), cx)
})
.ok();
}
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index 655e87d7cd..7121624c87 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -576,7 +576,7 @@ impl PickerDelegate for LanguageModelPickerDelegate {
.icon_position(IconPosition::Start)
.on_click(|_, window, cx| {
window.dispatch_action(
- zed_actions::agent::OpenConfiguration.boxed_clone(),
+ zed_actions::agent::OpenSettings.boxed_clone(),
cx,
);
}),
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 082d1dfb51..2185885347 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -17,7 +17,6 @@ use agent::{
use agent_settings::{AgentSettings, CompletionMode};
use ai_onboarding::ApiKeysWithProviders;
use buffer_diff::BufferDiff;
-use client::UserStore;
use cloud_llm_client::CompletionIntent;
use collections::{HashMap, HashSet};
use editor::actions::{MoveUp, Paste};
@@ -43,7 +42,6 @@ use language_model::{
use multi_buffer;
use project::Project;
use prompt_store::PromptStore;
-use proto::Plan;
use settings::Settings;
use std::time::Duration;
use theme::ThemeSettings;
@@ -79,7 +77,6 @@ pub struct MessageEditor {
editor: Entity,
workspace: WeakEntity,
project: Entity,
- user_store: Entity,
context_store: Entity,
prompt_store: Option>,
history_store: Option>,
@@ -159,7 +156,6 @@ impl MessageEditor {
pub fn new(
fs: Arc,
workspace: WeakEntity,
- user_store: Entity,
context_store: Entity,
prompt_store: Option>,
thread_store: WeakEntity,
@@ -231,7 +227,6 @@ impl MessageEditor {
Self {
editor: editor.clone(),
project: thread.read(cx).project().clone(),
- user_store,
thread,
incompatible_tools_state: incompatible_tools.clone(),
workspace,
@@ -1287,24 +1282,12 @@ impl MessageEditor {
return None;
}
- let user_store = self.user_store.read(cx);
-
- let ubb_enable = user_store
- .usage_based_billing_enabled()
- .map_or(false, |enabled| enabled);
-
- if ubb_enable {
+ let user_store = self.project.read(cx).user_store().read(cx);
+ if user_store.is_usage_based_billing_enabled() {
return None;
}
- let plan = user_store
- .current_plan()
- .map(|plan| match plan {
- Plan::Free => cloud_llm_client::Plan::ZedFree,
- Plan::ZedPro => cloud_llm_client::Plan::ZedPro,
- Plan::ZedProTrial => cloud_llm_client::Plan::ZedProTrial,
- })
- .unwrap_or(cloud_llm_client::Plan::ZedFree);
+ let plan = user_store.plan().unwrap_or(cloud_llm_client::Plan::ZedFree);
let usage = user_store.model_request_usage()?;
@@ -1769,7 +1752,6 @@ impl AgentPreview for MessageEditor {
) -> Option {
if let Some(workspace) = workspace.upgrade() {
let fs = workspace.read(cx).app_state().fs.clone();
- let user_store = workspace.read(cx).app_state().user_store.clone();
let project = workspace.read(cx).project().clone();
let weak_project = project.downgrade();
let context_store = cx.new(|_cx| ContextStore::new(weak_project, None));
@@ -1782,7 +1764,6 @@ impl AgentPreview for MessageEditor {
MessageEditor::new(
fs,
workspace.downgrade(),
- user_store,
context_store,
None,
thread_store.downgrade(),
diff --git a/crates/ai_onboarding/Cargo.toml b/crates/ai_onboarding/Cargo.toml
index 9031e14e29..95a45b1a6f 100644
--- a/crates/ai_onboarding/Cargo.toml
+++ b/crates/ai_onboarding/Cargo.toml
@@ -16,10 +16,10 @@ default = []
[dependencies]
client.workspace = true
+cloud_llm_client.workspace = true
component.workspace = true
gpui.workspace = true
language_model.workspace = true
-proto.workspace = true
serde.workspace = true
smallvec.workspace = true
telemetry.workspace = true
diff --git a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
index 5f56e4d26e..e86568fe7a 100644
--- a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
+++ b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
@@ -136,10 +136,7 @@ impl RenderOnce for ApiKeysWithoutProviders {
.full_width()
.style(ButtonStyle::Outlined)
.on_click(move |_, window, cx| {
- window.dispatch_action(
- zed_actions::agent::OpenConfiguration.boxed_clone(),
- cx,
- );
+ window.dispatch_action(zed_actions::agent::OpenSettings.boxed_clone(), cx);
}),
)
}
diff --git a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
index e8a62f7ff2..f1629eeff8 100644
--- a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
+++ b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
@@ -1,6 +1,7 @@
use std::sync::Arc;
use client::{Client, UserStore};
+use cloud_llm_client::Plan;
use gpui::{Entity, IntoElement, ParentElement};
use language_model::{LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
use ui::prelude::*;
@@ -56,15 +57,8 @@ impl AgentPanelOnboarding {
impl Render for AgentPanelOnboarding {
fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement {
- let enrolled_in_trial = matches!(
- self.user_store.read(cx).current_plan(),
- Some(proto::Plan::ZedProTrial)
- );
-
- let is_pro_user = matches!(
- self.user_store.read(cx).current_plan(),
- Some(proto::Plan::ZedPro)
- );
+ let enrolled_in_trial = self.user_store.read(cx).plan() == Some(Plan::ZedProTrial);
+ let is_pro_user = self.user_store.read(cx).plan() == Some(Plan::ZedPro);
AgentPanelOnboardingCard::new()
.child(
diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rs
index 3aec9c62cd..c252b65f20 100644
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -9,6 +9,7 @@ pub use agent_api_keys_onboarding::{ApiKeysWithProviders, ApiKeysWithoutProvider
pub use agent_panel_onboarding_card::AgentPanelOnboardingCard;
pub use agent_panel_onboarding_content::AgentPanelOnboarding;
pub use ai_upsell_card::AiUpsellCard;
+use cloud_llm_client::Plan;
pub use edit_prediction_onboarding_content::EditPredictionOnboarding;
pub use young_account_banner::YoungAccountBanner;
@@ -79,7 +80,7 @@ impl From for SignInStatus {
pub struct ZedAiOnboarding {
pub sign_in_status: SignInStatus,
pub has_accepted_terms_of_service: bool,
- pub plan: Option,
+ pub plan: Option,
pub account_too_young: bool,
pub continue_with_zed_ai: Arc,
pub sign_in: Arc,
@@ -99,8 +100,8 @@ impl ZedAiOnboarding {
Self {
sign_in_status: status.into(),
- has_accepted_terms_of_service: store.current_user_has_accepted_terms().unwrap_or(false),
- plan: store.current_plan(),
+ has_accepted_terms_of_service: store.has_accepted_terms_of_service(),
+ plan: store.plan(),
account_too_young: store.account_too_young(),
continue_with_zed_ai,
accept_terms_of_service: Arc::new({
@@ -113,11 +114,9 @@ impl ZedAiOnboarding {
sign_in: Arc::new(move |_window, cx| {
cx.spawn({
let client = client.clone();
- async move |cx| {
- client.authenticate_and_connect(true, cx).await;
- }
+ async move |cx| client.sign_in_with_optional_connect(true, cx).await
})
- .detach();
+ .detach_and_log_err(cx);
}),
dismiss_onboarding: None,
}
@@ -411,9 +410,9 @@ impl RenderOnce for ZedAiOnboarding {
if matches!(self.sign_in_status, SignInStatus::SignedIn) {
if self.has_accepted_terms_of_service {
match self.plan {
- None | Some(proto::Plan::Free) => self.render_free_plan_state(cx),
- Some(proto::Plan::ZedProTrial) => self.render_trial_state(cx),
- Some(proto::Plan::ZedPro) => self.render_pro_plan_state(cx),
+ None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
+ Some(Plan::ZedProTrial) => self.render_trial_state(cx),
+ Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
}
} else {
self.render_accept_terms_of_service()
@@ -433,7 +432,7 @@ impl Component for ZedAiOnboarding {
fn onboarding(
sign_in_status: SignInStatus,
has_accepted_terms_of_service: bool,
- plan: Option,
+ plan: Option,
account_too_young: bool,
) -> AnyElement {
ZedAiOnboarding {
@@ -468,25 +467,15 @@ impl Component for ZedAiOnboarding {
),
single_example(
"Free Plan",
- onboarding(SignInStatus::SignedIn, true, Some(proto::Plan::Free), false),
+ onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedFree), false),
),
single_example(
"Pro Trial",
- onboarding(
- SignInStatus::SignedIn,
- true,
- Some(proto::Plan::ZedProTrial),
- false,
- ),
+ onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedProTrial), false),
),
single_example(
"Pro Plan",
- onboarding(
- SignInStatus::SignedIn,
- true,
- Some(proto::Plan::ZedPro),
- false,
- ),
+ onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedPro), false),
),
])
.into_any_element(),
diff --git a/crates/ai_onboarding/src/ai_upsell_card.rs b/crates/ai_onboarding/src/ai_upsell_card.rs
index 041e0d87ec..2408b6aa37 100644
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -1,6 +1,7 @@
use std::sync::Arc;
use client::{Client, zed_urls};
+use cloud_llm_client::Plan;
use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
use ui::{Divider, List, Vector, VectorName, prelude::*};
@@ -10,22 +11,22 @@ use crate::{BulletItem, SignInStatus};
pub struct AiUpsellCard {
pub sign_in_status: SignInStatus,
pub sign_in: Arc,
+ pub user_plan: Option,
}
impl AiUpsellCard {
- pub fn new(client: Arc) -> Self {
+ pub fn new(client: Arc, user_plan: Option) -> Self {
let status = *client.status().borrow();
Self {
+ user_plan,
sign_in_status: status.into(),
sign_in: Arc::new(move |_window, cx| {
cx.spawn({
let client = client.clone();
- async move |cx| {
- client.authenticate_and_connect(true, cx).await;
- }
+ async move |cx| client.sign_in_with_optional_connect(true, cx).await
})
- .detach();
+ .detach_and_log_err(cx);
}),
}
}
@@ -34,6 +35,7 @@ impl AiUpsellCard {
impl RenderOnce for AiUpsellCard {
fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
let pro_section = v_flex()
+ .flex_grow()
.w_full()
.gap_1()
.child(
@@ -56,6 +58,7 @@ impl RenderOnce for AiUpsellCard {
);
let free_section = v_flex()
+ .flex_grow()
.w_full()
.gap_1()
.child(
@@ -71,7 +74,7 @@ impl RenderOnce for AiUpsellCard {
)
.child(
List::new()
- .child(BulletItem::new("50 prompts with the Claude models"))
+ .child(BulletItem::new("50 prompts with Claude models"))
.child(BulletItem::new("2,000 accepted edit predictions")),
);
@@ -132,22 +135,28 @@ impl RenderOnce for AiUpsellCard {
v_flex()
.relative()
- .p_6()
- .pt_4()
+ .p_4()
+ .pt_3()
.border_1()
.border_color(cx.theme().colors().border)
.rounded_lg()
.overflow_hidden()
.child(grid_bg)
.child(gradient_bg)
- .child(Headline::new("Try Zed AI"))
- .child(Label::new(DESCRIPTION).color(Color::Muted).mb_2())
+ .child(Label::new("Try Zed AI").size(LabelSize::Large))
+ .child(
+ div()
+ .max_w_3_4()
+ .mb_2()
+ .child(Label::new(DESCRIPTION).color(Color::Muted)),
+ )
.child(
h_flex()
+ .w_full()
.mt_1p5()
.mb_2p5()
.items_start()
- .gap_12()
+ .gap_6()
.child(free_section)
.child(pro_section),
)
@@ -183,6 +192,7 @@ impl Component for AiUpsellCard {
AiUpsellCard {
sign_in_status: SignInStatus::SignedOut,
sign_in: Arc::new(|_, _| {}),
+ user_plan: None,
}
.into_any_element(),
),
@@ -191,6 +201,7 @@ impl Component for AiUpsellCard {
AiUpsellCard {
sign_in_status: SignInStatus::SignedIn,
sign_in: Arc::new(|_, _| {}),
+ user_plan: None,
}
.into_any_element(),
),
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index b7ba811421..4ad156b9fb 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -126,7 +126,7 @@ impl ChannelMembership {
proto::channel_member::Kind::Member => 0,
proto::channel_member::Kind::Invitee => 1,
},
- username_order: self.user.github_login.as_str(),
+ username_order: &self.user.github_login,
}
}
}
diff --git a/crates/channel/src/channel_store_tests.rs b/crates/channel/src/channel_store_tests.rs
index f8f5de3c39..c92226eeeb 100644
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -259,20 +259,6 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
assert_channels(&channel_store, &[(0, "the-channel".to_string())], cx);
});
- let get_users = server.receive::().await.unwrap();
- assert_eq!(get_users.payload.user_ids, vec![5]);
- server.respond(
- get_users.receipt(),
- proto::UsersResponse {
- users: vec![proto::User {
- id: 5,
- github_login: "nathansobo".into(),
- avatar_url: "http://avatar.com/nathansobo".into(),
- name: None,
- }],
- },
- );
-
// Join a channel and populate its existing messages.
let channel = channel_store.update(cx, |store, cx| {
let channel_id = store.ordered_channels().next().unwrap().1.id;
@@ -334,7 +320,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
.map(|message| (message.sender.github_login.clone(), message.body.clone()))
.collect::>(),
&[
- ("nathansobo".into(), "a".into()),
+ ("user-5".into(), "a".into()),
("maxbrunsfeld".into(), "b".into())
]
);
@@ -437,7 +423,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
.map(|message| (message.sender.github_login.clone(), message.body.clone()))
.collect::>(),
&[
- ("nathansobo".into(), "y".into()),
+ ("user-5".into(), "y".into()),
("maxbrunsfeld".into(), "z".into())
]
);
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index dd97bd9ca4..365625b445 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -17,11 +17,11 @@ test-support = ["clock/test-support", "collections/test-support", "gpui/test-sup
[dependencies]
anyhow.workspace = true
-async-recursion = "0.3"
async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots"] }
base64.workspace = true
chrono = { workspace = true, features = ["serde"] }
clock.workspace = true
+cloud_api_client.workspace = true
cloud_llm_client.workspace = true
collections.workspace = true
credentials_provider.workspace = true
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index e0f4a70b15..b9b20aa4f2 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -6,22 +6,21 @@ pub mod telemetry;
pub mod user;
pub mod zed_urls;
-use anyhow::{Context as _, Result, anyhow, bail};
-use async_recursion::async_recursion;
+use anyhow::{Context as _, Result, anyhow};
use async_tungstenite::tungstenite::{
client::IntoClientRequest,
error::Error as WebsocketError,
http::{HeaderValue, Request, StatusCode},
};
-use chrono::{DateTime, Utc};
use clock::SystemClock;
+use cloud_api_client::CloudApiClient;
use credentials_provider::CredentialsProvider;
use futures::{
AsyncReadExt, FutureExt, SinkExt, Stream, StreamExt, TryFutureExt as _, TryStreamExt,
channel::oneshot, future::BoxFuture,
};
use gpui::{App, AsyncApp, Entity, Global, Task, WeakEntity, actions};
-use http_client::{AsyncBody, HttpClient, HttpClientWithUrl, http};
+use http_client::{HttpClient, HttpClientWithUrl, http};
use parking_lot::RwLock;
use postage::watch;
use proxy::connect_proxy_stream;
@@ -31,7 +30,6 @@ use rpc::proto::{AnyTypedEnvelope, EnvelopedMessage, PeerId, RequestMessage};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings::{Settings, SettingsSources};
-use std::pin::Pin;
use std::{
any::TypeId,
convert::TryFrom,
@@ -45,6 +43,7 @@ use std::{
},
time::{Duration, Instant},
};
+use std::{cmp, pin::Pin};
use telemetry::Telemetry;
use thiserror::Error;
use tokio::net::TcpStream;
@@ -78,7 +77,7 @@ pub static ZED_ALWAYS_ACTIVE: LazyLock =
LazyLock::new(|| std::env::var("ZED_ALWAYS_ACTIVE").map_or(false, |e| !e.is_empty()));
pub const INITIAL_RECONNECTION_DELAY: Duration = Duration::from_millis(500);
-pub const MAX_RECONNECTION_DELAY: Duration = Duration::from_secs(10);
+pub const MAX_RECONNECTION_DELAY: Duration = Duration::from_secs(30);
pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(20);
actions!(
@@ -162,20 +161,8 @@ pub fn init(client: &Arc, cx: &mut App) {
let client = client.clone();
move |_: &SignIn, cx| {
if let Some(client) = client.upgrade() {
- cx.spawn(
- async move |cx| match client.authenticate_and_connect(true, &cx).await {
- ConnectionResult::Timeout => {
- log::error!("Initial authentication timed out");
- }
- ConnectionResult::ConnectionReset => {
- log::error!("Initial authentication connection reset");
- }
- ConnectionResult::Result(r) => {
- r.log_err();
- }
- },
- )
- .detach();
+ cx.spawn(async move |cx| client.sign_in_with_optional_connect(true, &cx).await)
+ .detach_and_log_err(cx);
}
}
});
@@ -213,6 +200,7 @@ pub struct Client {
id: AtomicU64,
peer: Arc,
http: Arc,
+ cloud_client: Arc,
telemetry: Arc,
credentials_provider: ClientCredentialsProvider,
state: RwLock,
@@ -283,6 +271,8 @@ pub enum Status {
SignedOut,
UpgradeRequired,
Authenticating,
+ Authenticated,
+ AuthenticationError,
Connecting,
ConnectionError,
Connected {
@@ -586,6 +576,7 @@ impl Client {
id: AtomicU64::new(0),
peer: Peer::new(0),
telemetry: Telemetry::new(clock, http.clone(), cx),
+ cloud_client: Arc::new(CloudApiClient::new(http.clone())),
http,
credentials_provider: ClientCredentialsProvider::new(cx),
state: Default::default(),
@@ -618,6 +609,10 @@ impl Client {
self.http.clone()
}
+ pub fn cloud_client(&self) -> Arc {
+ self.cloud_client.clone()
+ }
+
pub fn set_id(&self, id: u64) -> &Self {
self.id.store(id, Ordering::SeqCst);
self
@@ -704,7 +699,7 @@ impl Client {
let mut delay = INITIAL_RECONNECTION_DELAY;
loop {
- match client.authenticate_and_connect(true, &cx).await {
+ match client.connect(true, &cx).await {
ConnectionResult::Timeout => {
log::error!("client connect attempt timed out")
}
@@ -727,11 +722,10 @@ impl Client {
},
&cx,
);
- cx.background_executor().timer(delay).await;
- delay = delay
- .mul_f32(rng.gen_range(0.5..=2.5))
- .max(INITIAL_RECONNECTION_DELAY)
- .min(MAX_RECONNECTION_DELAY);
+ let jitter =
+ Duration::from_millis(rng.gen_range(0..delay.as_millis() as u64));
+ cx.background_executor().timer(delay + jitter).await;
+ delay = cmp::min(delay * 2, MAX_RECONNECTION_DELAY);
} else {
break;
}
@@ -875,17 +869,122 @@ impl Client {
.is_some()
}
- #[async_recursion(?Send)]
- pub async fn authenticate_and_connect(
+ pub async fn sign_in(
+ self: &Arc,
+ try_provider: bool,
+ cx: &AsyncApp,
+ ) -> Result {
+ if self.status().borrow().is_signed_out() {
+ self.set_status(Status::Authenticating, cx);
+ } else {
+ self.set_status(Status::Reauthenticating, cx);
+ }
+
+ let mut credentials = None;
+
+ let old_credentials = self.state.read().credentials.clone();
+ if let Some(old_credentials) = old_credentials {
+ self.cloud_client.set_credentials(
+ old_credentials.user_id as u32,
+ old_credentials.access_token.clone(),
+ );
+
+ // Fetch the authenticated user with the old credentials, to ensure they are still valid.
+ if self.cloud_client.get_authenticated_user().await.is_ok() {
+ credentials = Some(old_credentials);
+ }
+ }
+
+ if credentials.is_none() && try_provider {
+ if let Some(stored_credentials) = self.credentials_provider.read_credentials(cx).await {
+ self.cloud_client.set_credentials(
+ stored_credentials.user_id as u32,
+ stored_credentials.access_token.clone(),
+ );
+
+ // Fetch the authenticated user with the stored credentials, and
+ // clear them from the credentials provider if that fails.
+ if self.cloud_client.get_authenticated_user().await.is_ok() {
+ credentials = Some(stored_credentials);
+ } else {
+ self.credentials_provider
+ .delete_credentials(cx)
+ .await
+ .log_err();
+ }
+ }
+ }
+
+ if credentials.is_none() {
+ let mut status_rx = self.status();
+ let _ = status_rx.next().await;
+ futures::select_biased! {
+ authenticate = self.authenticate(cx).fuse() => {
+ match authenticate {
+ Ok(creds) => {
+ if IMPERSONATE_LOGIN.is_none() {
+ self.credentials_provider
+ .write_credentials(creds.user_id, creds.access_token.clone(), cx)
+ .await
+ .log_err();
+ }
+
+ credentials = Some(creds);
+ },
+ Err(err) => {
+ self.set_status(Status::AuthenticationError, cx);
+ return Err(err);
+ }
+ }
+ }
+ _ = status_rx.next().fuse() => {
+ return Err(anyhow!("authentication canceled"));
+ }
+ }
+ }
+
+ let credentials = credentials.unwrap();
+ self.set_id(credentials.user_id);
+ self.cloud_client
+ .set_credentials(credentials.user_id as u32, credentials.access_token.clone());
+ self.state.write().credentials = Some(credentials.clone());
+ self.set_status(Status::Authenticated, cx);
+
+ Ok(credentials)
+ }
+
+ /// Performs a sign-in and also connects to Collab.
+ ///
+ /// This is called in places where we *don't* need to connect in the future. We will replace these calls with calls
+ /// to `sign_in` when we're ready to remove auto-connection to Collab.
+ pub async fn sign_in_with_optional_connect(
+ self: &Arc,
+ try_provider: bool,
+ cx: &AsyncApp,
+ ) -> Result<()> {
+ let credentials = self.sign_in(try_provider, cx).await?;
+
+ let connect_result = match self.connect_with_credentials(credentials, cx).await {
+ ConnectionResult::Timeout => Err(anyhow!("connection timed out")),
+ ConnectionResult::ConnectionReset => Err(anyhow!("connection reset")),
+ ConnectionResult::Result(result) => result.context("client auth and connect"),
+ };
+ connect_result.log_err();
+
+ Ok(())
+ }
+
+ pub async fn connect(
self: &Arc,
try_provider: bool,
cx: &AsyncApp,
) -> ConnectionResult<()> {
let was_disconnected = match *self.status().borrow() {
- Status::SignedOut => true,
+ Status::SignedOut | Status::Authenticated => true,
Status::ConnectionError
| Status::ConnectionLost
| Status::Authenticating { .. }
+ | Status::AuthenticationError
| Status::Reauthenticating { .. }
| Status::ReconnectionError { .. } => false,
Status::Connected { .. } | Status::Connecting { .. } | Status::Reconnecting { .. } => {
@@ -898,39 +997,10 @@ impl Client {
);
}
};
- if was_disconnected {
- self.set_status(Status::Authenticating, cx);
- } else {
- self.set_status(Status::Reauthenticating, cx)
- }
-
- let mut read_from_provider = false;
- let mut credentials = self.state.read().credentials.clone();
- if credentials.is_none() && try_provider {
- credentials = self.credentials_provider.read_credentials(cx).await;
- read_from_provider = credentials.is_some();
- }
-
- if credentials.is_none() {
- let mut status_rx = self.status();
- let _ = status_rx.next().await;
- futures::select_biased! {
- authenticate = self.authenticate(cx).fuse() => {
- match authenticate {
- Ok(creds) => credentials = Some(creds),
- Err(err) => {
- self.set_status(Status::ConnectionError, cx);
- return ConnectionResult::Result(Err(err));
- }
- }
- }
- _ = status_rx.next().fuse() => {
- return ConnectionResult::Result(Err(anyhow!("authentication canceled")));
- }
- }
- }
- let credentials = credentials.unwrap();
- self.set_id(credentials.user_id);
+ let credentials = match self.sign_in(try_provider, cx).await {
+ Ok(credentials) => credentials,
+ Err(err) => return ConnectionResult::Result(Err(err)),
+ };
if was_disconnected {
self.set_status(Status::Connecting, cx);
@@ -938,17 +1008,20 @@ impl Client {
self.set_status(Status::Reconnecting, cx);
}
+ self.connect_with_credentials(credentials, cx).await
+ }
+
+ async fn connect_with_credentials(
+ self: &Arc,
+ credentials: Credentials,
+ cx: &AsyncApp,
+ ) -> ConnectionResult<()> {
let mut timeout =
futures::FutureExt::fuse(cx.background_executor().timer(CONNECTION_TIMEOUT));
futures::select_biased! {
connection = self.establish_connection(&credentials, cx).fuse() => {
match connection {
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();
- }
-
futures::select_biased! {
result = self.set_connection(conn, cx).fuse() => {
match result.context("client auth and connect") {
@@ -966,15 +1039,8 @@ impl Client {
}
}
Err(EstablishConnectionError::Unauthorized) => {
- self.state.write().credentials.take();
- if read_from_provider {
- self.credentials_provider.delete_credentials(cx).await.log_err();
- self.set_status(Status::SignedOut, cx);
- self.authenticate_and_connect(false, cx).await
- } else {
- self.set_status(Status::ConnectionError, cx);
- ConnectionResult::Result(Err(EstablishConnectionError::Unauthorized).context("client auth and connect"))
- }
+ self.set_status(Status::ConnectionError, cx);
+ ConnectionResult::Result(Err(EstablishConnectionError::Unauthorized).context("client auth and connect"))
}
Err(EstablishConnectionError::UpgradeRequired) => {
self.set_status(Status::UpgradeRequired, cx);
@@ -1369,96 +1435,31 @@ impl Client {
self: &Arc,
http: Arc,
login: String,
- mut api_token: String,
+ api_token: String,
) -> Result {
- #[derive(Deserialize)]
- struct AuthenticatedUserResponse {
- user: User,
+ #[derive(Serialize)]
+ struct ImpersonateUserBody {
+ github_login: String,
}
#[derive(Deserialize)]
- struct User {
- id: u64,
+ struct ImpersonateUserResponse {
+ user_id: u64,
+ access_token: String,
}
- let github_user = {
- #[derive(Deserialize)]
- struct GithubUser {
- id: i32,
- login: String,
- created_at: DateTime,
- }
-
- let request = {
- let mut request_builder =
- Request::get(&format!("https://api.github.com/users/{login}"));
- if let Ok(github_token) = std::env::var("GITHUB_TOKEN") {
- request_builder =
- request_builder.header("Authorization", format!("Bearer {}", github_token));
- }
-
- request_builder.body(AsyncBody::empty())?
- };
-
- let mut response = http
- .send(request)
- .await
- .context("error fetching GitHub user")?;
-
- let mut body = Vec::new();
- response
- .body_mut()
- .read_to_end(&mut body)
- .await
- .context("error reading GitHub user")?;
-
- if !response.status().is_success() {
- let text = String::from_utf8_lossy(body.as_slice());
- bail!(
- "status error {}, response: {text:?}",
- response.status().as_u16()
- );
- }
-
- serde_json::from_slice::(body.as_slice()).map_err(|err| {
- log::error!("Error deserializing: {:?}", err);
- log::error!(
- "GitHub API response text: {:?}",
- String::from_utf8_lossy(body.as_slice())
- );
- anyhow!("error deserializing GitHub user")
- })?
- };
-
- let query_params = [
- ("github_login", &github_user.login),
- ("github_user_id", &github_user.id.to_string()),
- (
- "github_user_created_at",
- &github_user.created_at.to_rfc3339(),
- ),
- ];
-
- // Use the collab server's admin API to retrieve the ID
- // of the impersonated user.
- let mut url = self.rpc_url(http.clone(), None).await?;
- url.set_path("/user");
- url.set_query(Some(
- &query_params
- .iter()
- .map(|(key, value)| {
- format!(
- "{}={}",
- key,
- url::form_urlencoded::byte_serialize(value.as_bytes()).collect::()
- )
- })
- .collect::>()
- .join("&"),
- ));
- let request: http_client::Request = Request::get(url.as_str())
- .header("Authorization", format!("token {api_token}"))
- .body("".into())?;
+ let url = self
+ .http
+ .build_zed_cloud_url("/internal/users/impersonate", &[])?;
+ let request = Request::post(url.as_str())
+ .header("Content-Type", "application/json")
+ .header("Authorization", format!("Bearer {api_token}"))
+ .body(
+ serde_json::to_string(&ImpersonateUserBody {
+ github_login: login,
+ })?
+ .into(),
+ )?;
let mut response = http.send(request).await?;
let mut body = String::new();
@@ -1469,18 +1470,17 @@ impl Client {
response.status().as_u16(),
body,
);
- let response: AuthenticatedUserResponse = serde_json::from_str(&body)?;
+ let response: ImpersonateUserResponse = serde_json::from_str(&body)?;
- // Use the admin API token to authenticate as the impersonated user.
- api_token.insert_str(0, "ADMIN_TOKEN:");
Ok(Credentials {
- user_id: response.user.id,
- access_token: api_token,
+ user_id: response.user_id,
+ access_token: response.access_token,
})
}
pub async fn sign_out(self: &Arc, cx: &AsyncApp) {
self.state.write().credentials = None;
+ self.cloud_client.clear_credentials();
self.disconnect(cx);
if self.has_credentials(cx).await {
@@ -1790,7 +1790,7 @@ mod tests {
});
let auth_and_connect = cx.spawn({
let client = client.clone();
- |cx| async move { client.authenticate_and_connect(false, &cx).await }
+ |cx| async move { client.connect(false, &cx).await }
});
executor.run_until_parked();
assert!(matches!(status.next().await, Some(Status::Connecting)));
@@ -1867,7 +1867,7 @@ mod tests {
let _authenticate = cx.spawn({
let client = client.clone();
- move |cx| async move { client.authenticate_and_connect(false, &cx).await }
+ move |cx| async move { client.connect(false, &cx).await }
});
executor.run_until_parked();
assert_eq!(*auth_count.lock(), 1);
@@ -1875,7 +1875,7 @@ mod tests {
let _authenticate = cx.spawn({
let client = client.clone();
- |cx| async move { client.authenticate_and_connect(false, &cx).await }
+ |cx| async move { client.connect(false, &cx).await }
});
executor.run_until_parked();
assert_eq!(*auth_count.lock(), 2);
diff --git a/crates/client/src/test.rs b/crates/client/src/test.rs
index 6ce79fa9c5..439fb100d2 100644
--- a/crates/client/src/test.rs
+++ b/crates/client/src/test.rs
@@ -1,8 +1,11 @@
use crate::{Client, Connection, Credentials, EstablishConnectionError, UserStore};
use anyhow::{Context as _, Result, anyhow};
use chrono::Duration;
+use cloud_api_client::{AuthenticatedUser, GetAuthenticatedUserResponse, PlanInfo};
+use cloud_llm_client::{CurrentUsage, Plan, UsageData, UsageLimit};
use futures::{StreamExt, stream::BoxStream};
use gpui::{AppContext as _, BackgroundExecutor, Entity, TestAppContext};
+use http_client::{AsyncBody, Method, Request, http};
use parking_lot::Mutex;
use rpc::{
ConnectionId, Peer, Receipt, TypedEnvelope,
@@ -39,6 +42,44 @@ impl FakeServer {
executor: cx.executor(),
};
+ client.http_client().as_fake().replace_handler({
+ let state = server.state.clone();
+ move |old_handler, req| {
+ let state = state.clone();
+ let old_handler = old_handler.clone();
+ async move {
+ match (req.method(), req.uri().path()) {
+ (&Method::GET, "/client/users/me") => {
+ let credentials = parse_authorization_header(&req);
+ if credentials
+ != Some(Credentials {
+ user_id: client_user_id,
+ access_token: state.lock().access_token.to_string(),
+ })
+ {
+ return Ok(http_client::Response::builder()
+ .status(401)
+ .body("Unauthorized".into())
+ .unwrap());
+ }
+
+ Ok(http_client::Response::builder()
+ .status(200)
+ .body(
+ serde_json::to_string(&make_get_authenticated_user_response(
+ client_user_id as i32,
+ format!("user-{client_user_id}"),
+ ))
+ .unwrap()
+ .into(),
+ )
+ .unwrap())
+ }
+ _ => old_handler(req).await,
+ }
+ }
+ }
+ });
client
.override_authenticate({
let state = Arc::downgrade(&server.state);
@@ -105,7 +146,7 @@ impl FakeServer {
});
client
- .authenticate_and_connect(false, &cx.to_async())
+ .connect(false, &cx.to_async())
.await
.into_response()
.unwrap();
@@ -223,3 +264,54 @@ impl Drop for FakeServer {
self.disconnect();
}
}
+
+pub fn parse_authorization_header(req: &Request) -> Option {
+ let mut auth_header = req
+ .headers()
+ .get(http::header::AUTHORIZATION)?
+ .to_str()
+ .ok()?
+ .split_whitespace();
+ let user_id = auth_header.next()?.parse().ok()?;
+ let access_token = auth_header.next()?;
+ Some(Credentials {
+ user_id,
+ access_token: access_token.to_string(),
+ })
+}
+
+pub fn make_get_authenticated_user_response(
+ user_id: i32,
+ github_login: String,
+) -> GetAuthenticatedUserResponse {
+ GetAuthenticatedUserResponse {
+ user: AuthenticatedUser {
+ id: user_id,
+ metrics_id: format!("metrics-id-{user_id}"),
+ avatar_url: "".to_string(),
+ github_login,
+ name: None,
+ is_staff: false,
+ accepted_tos_at: None,
+ },
+ feature_flags: vec![],
+ plan: PlanInfo {
+ plan: Plan::ZedPro,
+ subscription_period: None,
+ usage: CurrentUsage {
+ model_requests: UsageData {
+ used: 0,
+ limit: UsageLimit::Limited(500),
+ },
+ edit_predictions: UsageData {
+ used: 250,
+ limit: UsageLimit::Unlimited,
+ },
+ },
+ trial_started_at: None,
+ is_usage_based_billing_enabled: false,
+ is_account_too_young: false,
+ has_overdue_invoices: false,
+ },
+ }
+}
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index a7dab2a8d3..3c125a0882 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -1,6 +1,7 @@
use super::{Client, Status, TypedEnvelope, proto};
use anyhow::{Context as _, Result, anyhow};
use chrono::{DateTime, Utc};
+use cloud_api_client::{GetAuthenticatedUserResponse, PlanInfo};
use cloud_llm_client::{
EDIT_PREDICTIONS_USAGE_AMOUNT_HEADER_NAME, EDIT_PREDICTIONS_USAGE_LIMIT_HEADER_NAME,
MODEL_REQUESTS_USAGE_AMOUNT_HEADER_NAME, MODEL_REQUESTS_USAGE_LIMIT_HEADER_NAME, UsageLimit,
@@ -20,7 +21,7 @@ use std::{
sync::{Arc, Weak},
};
use text::ReplicaId;
-use util::{TryFutureExt as _, maybe};
+use util::{ResultExt, TryFutureExt as _};
pub type UserId = u64;
@@ -55,7 +56,7 @@ pub struct ParticipantIndex(pub u32);
#[derive(Default, Debug)]
pub struct User {
pub id: UserId,
- pub github_login: String,
+ pub github_login: SharedString,
pub avatar_uri: SharedUri,
pub name: Option,
}
@@ -107,19 +108,14 @@ pub enum ContactRequestStatus {
pub struct UserStore {
users: HashMap>,
- by_github_login: HashMap,
+ by_github_login: HashMap,
participant_indices: HashMap,
update_contacts_tx: mpsc::UnboundedSender,
- current_plan: Option,
- subscription_period: Option<(DateTime, DateTime)>,
- trial_started_at: Option>,
model_request_usage: Option,
edit_prediction_usage: Option,
- is_usage_based_billing_enabled: Option,
- account_too_young: Option,
- has_overdue_invoices: Option,
+ plan_info: Option,
current_user: watch::Receiver>>,
- accepted_tos_at: Option>>,
+ accepted_tos_at: Option>,
contacts: Vec>,
incoming_contact_requests: Vec>,
outgoing_contact_requests: Vec>,
@@ -145,6 +141,7 @@ pub enum Event {
ShowContacts,
ParticipantIndicesChanged,
PrivateUserInfoUpdated,
+ PlanUpdated,
}
#[derive(Clone, Copy)]
@@ -188,14 +185,9 @@ impl UserStore {
users: Default::default(),
by_github_login: Default::default(),
current_user: current_user_rx,
- current_plan: None,
- subscription_period: None,
- trial_started_at: None,
+ plan_info: None,
model_request_usage: None,
edit_prediction_usage: None,
- is_usage_based_billing_enabled: None,
- account_too_young: None,
- has_overdue_invoices: None,
accepted_tos_at: None,
contacts: Default::default(),
incoming_contact_requests: Default::default(),
@@ -225,53 +217,30 @@ impl UserStore {
return Ok(());
};
match status {
- Status::Connected { .. } => {
+ Status::Authenticated | Status::Connected { .. } => {
if let Some(user_id) = client.user_id() {
- let fetch_user = if let Ok(fetch_user) =
- this.update(cx, |this, cx| this.get_user(user_id, cx).log_err())
- {
- fetch_user
- } else {
- break;
- };
- let fetch_private_user_info =
- client.request(proto::GetPrivateUserInfo {}).log_err();
- let (user, info) =
- futures::join!(fetch_user, fetch_private_user_info);
-
+ let response = client.cloud_client().get_authenticated_user().await;
+ let mut current_user = None;
cx.update(|cx| {
- if let Some(info) = info {
- let staff =
- info.staff && !*feature_flags::ZED_DISABLE_STAFF;
- cx.update_flags(staff, info.flags);
- client.telemetry.set_authenticated_user_info(
- Some(info.metrics_id.clone()),
- staff,
- );
-
+ if let Some(response) = response.log_err() {
+ let user = Arc::new(User {
+ id: user_id,
+ github_login: response.user.github_login.clone().into(),
+ avatar_uri: response.user.avatar_url.clone().into(),
+ name: response.user.name.clone(),
+ });
+ current_user = Some(user.clone());
this.update(cx, |this, cx| {
- let accepted_tos_at = {
- #[cfg(debug_assertions)]
- if std::env::var("ZED_IGNORE_ACCEPTED_TOS").is_ok()
- {
- None
- } else {
- info.accepted_tos_at
- }
-
- #[cfg(not(debug_assertions))]
- info.accepted_tos_at
- };
-
- this.set_current_user_accepted_tos_at(accepted_tos_at);
- cx.emit(Event::PrivateUserInfoUpdated);
+ this.by_github_login
+ .insert(user.github_login.clone(), user_id);
+ this.users.insert(user_id, user);
+ this.update_authenticated_user(response, cx)
})
} else {
anyhow::Ok(())
}
})??;
-
- current_user_tx.send(user).await.ok();
+ current_user_tx.send(current_user).await.ok();
this.update(cx, |_, cx| cx.notify())?;
}
@@ -352,59 +321,22 @@ impl UserStore {
async fn handle_update_plan(
this: Entity,
- message: TypedEnvelope,
+ _message: TypedEnvelope,
mut cx: AsyncApp,
) -> Result<()> {
+ let client = this
+ .read_with(&cx, |this, _| this.client.upgrade())?
+ .context("client was dropped")?;
+
+ let response = client
+ .cloud_client()
+ .get_authenticated_user()
+ .await
+ .context("failed to fetch authenticated user")?;
+
this.update(&mut cx, |this, cx| {
- this.current_plan = Some(message.payload.plan());
- this.subscription_period = maybe!({
- let period = message.payload.subscription_period?;
- let started_at = DateTime::from_timestamp(period.started_at as i64, 0)?;
- let ended_at = DateTime::from_timestamp(period.ended_at as i64, 0)?;
-
- Some((started_at, ended_at))
- });
- this.trial_started_at = message
- .payload
- .trial_started_at
- .and_then(|trial_started_at| DateTime::from_timestamp(trial_started_at as i64, 0));
- this.is_usage_based_billing_enabled = message.payload.is_usage_based_billing_enabled;
- this.account_too_young = message.payload.account_too_young;
- this.has_overdue_invoices = message.payload.has_overdue_invoices;
-
- if let Some(usage) = message.payload.usage {
- // limits are always present even though they are wrapped in Option
- this.model_request_usage = usage
- .model_requests_usage_limit
- .and_then(|limit| {
- RequestUsage::from_proto(usage.model_requests_usage_amount, limit)
- })
- .map(ModelRequestUsage);
- this.edit_prediction_usage = usage
- .edit_predictions_usage_limit
- .and_then(|limit| {
- RequestUsage::from_proto(usage.model_requests_usage_amount, limit)
- })
- .map(EditPredictionUsage);
- }
-
- cx.notify();
- })?;
- Ok(())
- }
-
- pub fn update_model_request_usage(&mut self, usage: ModelRequestUsage, cx: &mut Context) {
- self.model_request_usage = Some(usage);
- cx.notify();
- }
-
- pub fn update_edit_prediction_usage(
- &mut self,
- usage: EditPredictionUsage,
- cx: &mut Context,
- ) {
- self.edit_prediction_usage = Some(usage);
- cx.notify();
+ this.update_authenticated_user(response, cx);
+ })
}
fn update_contacts(&mut self, message: UpdateContacts, cx: &Context) -> Task> {
@@ -763,59 +695,131 @@ impl UserStore {
self.current_user.borrow().clone()
}
- pub fn current_plan(&self) -> Option {
+ pub fn plan(&self) -> Option {
#[cfg(debug_assertions)]
if let Ok(plan) = std::env::var("ZED_SIMULATE_PLAN").as_ref() {
return match plan.as_str() {
- "free" => Some(proto::Plan::Free),
- "trial" => Some(proto::Plan::ZedProTrial),
- "pro" => Some(proto::Plan::ZedPro),
+ "free" => Some(cloud_llm_client::Plan::ZedFree),
+ "trial" => Some(cloud_llm_client::Plan::ZedProTrial),
+ "pro" => Some(cloud_llm_client::Plan::ZedPro),
_ => {
panic!("ZED_SIMULATE_PLAN must be one of 'free', 'trial', or 'pro'");
}
};
}
- self.current_plan
+ self.plan_info.as_ref().map(|info| info.plan)
}
pub fn subscription_period(&self) -> Option<(DateTime, DateTime)> {
- self.subscription_period
+ self.plan_info
+ .as_ref()
+ .and_then(|plan| plan.subscription_period)
+ .map(|subscription_period| {
+ (
+ subscription_period.started_at.0,
+ subscription_period.ended_at.0,
+ )
+ })
}
pub fn trial_started_at(&self) -> Option> {
- self.trial_started_at
+ self.plan_info
+ .as_ref()
+ .and_then(|plan| plan.trial_started_at)
+ .map(|trial_started_at| trial_started_at.0)
}
- pub fn usage_based_billing_enabled(&self) -> Option {
- self.is_usage_based_billing_enabled
+ /// Returns whether the user's account is too new to use the service.
+ pub fn account_too_young(&self) -> bool {
+ self.plan_info
+ .as_ref()
+ .map(|plan| plan.is_account_too_young)
+ .unwrap_or_default()
+ }
+
+ /// Returns whether the current user has overdue invoices and usage should be blocked.
+ pub fn has_overdue_invoices(&self) -> bool {
+ self.plan_info
+ .as_ref()
+ .map(|plan| plan.has_overdue_invoices)
+ .unwrap_or_default()
+ }
+
+ pub fn is_usage_based_billing_enabled(&self) -> bool {
+ self.plan_info
+ .as_ref()
+ .map(|plan| plan.is_usage_based_billing_enabled)
+ .unwrap_or_default()
}
pub fn model_request_usage(&self) -> Option {
self.model_request_usage
}
+ pub fn update_model_request_usage(&mut self, usage: ModelRequestUsage, cx: &mut Context) {
+ self.model_request_usage = Some(usage);
+ cx.notify();
+ }
+
pub fn edit_prediction_usage(&self) -> Option {
self.edit_prediction_usage
}
+ pub fn update_edit_prediction_usage(
+ &mut self,
+ usage: EditPredictionUsage,
+ cx: &mut Context,
+ ) {
+ self.edit_prediction_usage = Some(usage);
+ cx.notify();
+ }
+
+ fn update_authenticated_user(
+ &mut self,
+ response: GetAuthenticatedUserResponse,
+ cx: &mut Context,
+ ) {
+ let staff = response.user.is_staff && !*feature_flags::ZED_DISABLE_STAFF;
+ cx.update_flags(staff, response.feature_flags);
+ if let Some(client) = self.client.upgrade() {
+ client
+ .telemetry
+ .set_authenticated_user_info(Some(response.user.metrics_id.clone()), staff);
+ }
+
+ let accepted_tos_at = {
+ #[cfg(debug_assertions)]
+ if std::env::var("ZED_IGNORE_ACCEPTED_TOS").is_ok() {
+ None
+ } else {
+ response.user.accepted_tos_at
+ }
+
+ #[cfg(not(debug_assertions))]
+ response.user.accepted_tos_at
+ };
+
+ self.accepted_tos_at = Some(accepted_tos_at);
+ self.model_request_usage = Some(ModelRequestUsage(RequestUsage {
+ limit: response.plan.usage.model_requests.limit,
+ amount: response.plan.usage.model_requests.used as i32,
+ }));
+ self.edit_prediction_usage = Some(EditPredictionUsage(RequestUsage {
+ limit: response.plan.usage.edit_predictions.limit,
+ amount: response.plan.usage.edit_predictions.used as i32,
+ }));
+ self.plan_info = Some(response.plan);
+ cx.emit(Event::PrivateUserInfoUpdated);
+ }
+
pub fn watch_current_user(&self) -> watch::Receiver>> {
self.current_user.clone()
}
- /// Returns whether the user's account is too new to use the service.
- pub fn account_too_young(&self) -> bool {
- self.account_too_young.unwrap_or(false)
- }
-
- /// Returns whether the current user has overdue invoices and usage should be blocked.
- pub fn has_overdue_invoices(&self) -> bool {
- self.has_overdue_invoices.unwrap_or(false)
- }
-
- pub fn current_user_has_accepted_terms(&self) -> Option {
+ pub fn has_accepted_terms_of_service(&self) -> bool {
self.accepted_tos_at
- .map(|accepted_tos_at| accepted_tos_at.is_some())
+ .map_or(false, |accepted_tos_at| accepted_tos_at.is_some())
}
pub fn accept_terms_of_service(&self, cx: &Context) -> Task> {
@@ -827,23 +831,18 @@ impl UserStore {
cx.spawn(async move |this, cx| -> anyhow::Result<()> {
let client = client.upgrade().context("client not found")?;
let response = client
- .request(proto::AcceptTermsOfService {})
+ .cloud_client()
+ .accept_terms_of_service()
.await
.context("error accepting tos")?;
this.update(cx, |this, cx| {
- this.set_current_user_accepted_tos_at(Some(response.accepted_tos_at));
+ this.accepted_tos_at = Some(response.user.accepted_tos_at);
cx.emit(Event::PrivateUserInfoUpdated);
})?;
Ok(())
})
}
- fn set_current_user_accepted_tos_at(&mut self, accepted_tos_at: Option) {
- self.accepted_tos_at = Some(
- accepted_tos_at.and_then(|timestamp| DateTime::from_timestamp(timestamp as i64, 0)),
- );
- }
-
fn load_users(
&self,
request: impl RequestMessage,
@@ -902,7 +901,7 @@ impl UserStore {
let mut missing_user_ids = Vec::new();
for id in user_ids {
if let Some(github_login) = self.get_cached_user(id).map(|u| u.github_login.clone()) {
- ret.insert(id, github_login.into());
+ ret.insert(id, github_login);
} else {
missing_user_ids.push(id)
}
@@ -923,7 +922,7 @@ impl User {
fn new(message: proto::User) -> Arc {
Arc::new(User {
id: message.id,
- github_login: message.github_login,
+ github_login: message.github_login.into(),
avatar_uri: message.avatar_url.into(),
name: message.name,
})
diff --git a/crates/cloud_api_client/Cargo.toml b/crates/cloud_api_client/Cargo.toml
new file mode 100644
index 0000000000..d56aa94c6e
--- /dev/null
+++ b/crates/cloud_api_client/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "cloud_api_client"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "Apache-2.0"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/cloud_api_client.rs"
+
+[dependencies]
+anyhow.workspace = true
+cloud_api_types.workspace = true
+futures.workspace = true
+http_client.workspace = true
+parking_lot.workspace = true
+serde_json.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/cloud_api_client/LICENSE-APACHE b/crates/cloud_api_client/LICENSE-APACHE
new file mode 120000
index 0000000000..1cd601d0a3
--- /dev/null
+++ b/crates/cloud_api_client/LICENSE-APACHE
@@ -0,0 +1 @@
+../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/cloud_api_client/src/cloud_api_client.rs b/crates/cloud_api_client/src/cloud_api_client.rs
new file mode 100644
index 0000000000..6689475dae
--- /dev/null
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@@ -0,0 +1,155 @@
+use std::sync::Arc;
+
+use anyhow::{Result, anyhow};
+pub use cloud_api_types::*;
+use futures::AsyncReadExt as _;
+use http_client::http::request;
+use http_client::{AsyncBody, HttpClientWithUrl, Method, Request};
+use parking_lot::RwLock;
+
+struct Credentials {
+ user_id: u32,
+ access_token: String,
+}
+
+pub struct CloudApiClient {
+ credentials: RwLock>,
+ http_client: Arc,
+}
+
+impl CloudApiClient {
+ pub fn new(http_client: Arc) -> Self {
+ Self {
+ credentials: RwLock::new(None),
+ http_client,
+ }
+ }
+
+ pub fn has_credentials(&self) -> bool {
+ self.credentials.read().is_some()
+ }
+
+ pub fn set_credentials(&self, user_id: u32, access_token: String) {
+ *self.credentials.write() = Some(Credentials {
+ user_id,
+ access_token,
+ });
+ }
+
+ pub fn clear_credentials(&self) {
+ *self.credentials.write() = None;
+ }
+
+ fn authorization_header(&self) -> Result {
+ let guard = self.credentials.read();
+ let credentials = guard
+ .as_ref()
+ .ok_or_else(|| anyhow!("No credentials provided"))?;
+
+ Ok(format!(
+ "{} {}",
+ credentials.user_id, credentials.access_token
+ ))
+ }
+
+ fn build_request(
+ &self,
+ req: request::Builder,
+ body: impl Into,
+ ) -> Result> {
+ Ok(req
+ .header("Content-Type", "application/json")
+ .header("Authorization", self.authorization_header()?)
+ .body(body.into())?)
+ }
+
+ pub async fn get_authenticated_user(&self) -> Result {
+ let request = self.build_request(
+ Request::builder().method(Method::GET).uri(
+ self.http_client
+ .build_zed_cloud_url("/client/users/me", &[])?
+ .as_ref(),
+ ),
+ AsyncBody::default(),
+ )?;
+
+ let mut response = self.http_client.send(request).await?;
+
+ if !response.status().is_success() {
+ let mut body = String::new();
+ response.body_mut().read_to_string(&mut body).await?;
+
+ anyhow::bail!(
+ "Failed to get authenticated user.\nStatus: {:?}\nBody: {body}",
+ response.status()
+ )
+ }
+
+ let mut body = String::new();
+ response.body_mut().read_to_string(&mut body).await?;
+
+ Ok(serde_json::from_str(&body)?)
+ }
+
+ pub async fn accept_terms_of_service(&self) -> Result {
+ let request = self.build_request(
+ Request::builder().method(Method::POST).uri(
+ self.http_client
+ .build_zed_cloud_url("/client/terms_of_service/accept", &[])?
+ .as_ref(),
+ ),
+ AsyncBody::default(),
+ )?;
+
+ let mut response = self.http_client.send(request).await?;
+
+ if !response.status().is_success() {
+ let mut body = String::new();
+ response.body_mut().read_to_string(&mut body).await?;
+
+ anyhow::bail!(
+ "Failed to accept terms of service.\nStatus: {:?}\nBody: {body}",
+ response.status()
+ )
+ }
+
+ let mut body = String::new();
+ response.body_mut().read_to_string(&mut body).await?;
+
+ Ok(serde_json::from_str(&body)?)
+ }
+
+ pub async fn create_llm_token(
+ &self,
+ system_id: Option,
+ ) -> Result {
+ let mut request_builder = Request::builder().method(Method::POST).uri(
+ self.http_client
+ .build_zed_cloud_url("/client/llm_tokens", &[])?
+ .as_ref(),
+ );
+
+ if let Some(system_id) = system_id {
+ request_builder = request_builder.header(ZED_SYSTEM_ID_HEADER_NAME, system_id);
+ }
+
+ let request = self.build_request(request_builder, AsyncBody::default())?;
+
+ let mut response = self.http_client.send(request).await?;
+
+ if !response.status().is_success() {
+ let mut body = String::new();
+ response.body_mut().read_to_string(&mut body).await?;
+
+ anyhow::bail!(
+ "Failed to create LLM token.\nStatus: {:?}\nBody: {body}",
+ response.status()
+ )
+ }
+
+ let mut body = String::new();
+ response.body_mut().read_to_string(&mut body).await?;
+
+ Ok(serde_json::from_str(&body)?)
+ }
+}
diff --git a/crates/cloud_api_types/Cargo.toml b/crates/cloud_api_types/Cargo.toml
new file mode 100644
index 0000000000..868797df3b
--- /dev/null
+++ b/crates/cloud_api_types/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "cloud_api_types"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "Apache-2.0"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/cloud_api_types.rs"
+
+[dependencies]
+chrono.workspace = true
+cloud_llm_client.workspace = true
+serde.workspace = true
+workspace-hack.workspace = true
+
+[dev-dependencies]
+pretty_assertions.workspace = true
+serde_json.workspace = true
diff --git a/crates/cloud_api_types/LICENSE-APACHE b/crates/cloud_api_types/LICENSE-APACHE
new file mode 120000
index 0000000000..1cd601d0a3
--- /dev/null
+++ b/crates/cloud_api_types/LICENSE-APACHE
@@ -0,0 +1 @@
+../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
new file mode 100644
index 0000000000..b38b38cde1
--- /dev/null
+++ b/crates/cloud_api_types/src/cloud_api_types.rs
@@ -0,0 +1,55 @@
+mod timestamp;
+
+use serde::{Deserialize, Serialize};
+
+pub use crate::timestamp::Timestamp;
+
+pub const ZED_SYSTEM_ID_HEADER_NAME: &str = "x-zed-system-id";
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct GetAuthenticatedUserResponse {
+ pub user: AuthenticatedUser,
+ pub feature_flags: Vec,
+ pub plan: PlanInfo,
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct AuthenticatedUser {
+ pub id: i32,
+ pub metrics_id: String,
+ pub avatar_url: String,
+ pub github_login: String,
+ pub name: Option,
+ pub is_staff: bool,
+ pub accepted_tos_at: Option,
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct PlanInfo {
+ pub plan: cloud_llm_client::Plan,
+ pub subscription_period: Option,
+ pub usage: cloud_llm_client::CurrentUsage,
+ pub trial_started_at: Option,
+ pub is_usage_based_billing_enabled: bool,
+ pub is_account_too_young: bool,
+ pub has_overdue_invoices: bool,
+}
+
+#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize)]
+pub struct SubscriptionPeriod {
+ pub started_at: Timestamp,
+ pub ended_at: Timestamp,
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct AcceptTermsOfServiceResponse {
+ pub user: AuthenticatedUser,
+}
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+pub struct LlmToken(pub String);
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+pub struct CreateLlmTokenResponse {
+ pub token: LlmToken,
+}
diff --git a/crates/cloud_api_types/src/timestamp.rs b/crates/cloud_api_types/src/timestamp.rs
new file mode 100644
index 0000000000..1f055d58ef
--- /dev/null
+++ b/crates/cloud_api_types/src/timestamp.rs
@@ -0,0 +1,166 @@
+use chrono::{DateTime, NaiveDateTime, SecondsFormat, Utc};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+/// A timestamp with a serialized representation in RFC 3339 format.
+#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
+pub struct Timestamp(pub DateTime);
+
+impl Timestamp {
+ pub fn new(datetime: DateTime) -> Self {
+ Self(datetime)
+ }
+}
+
+impl From> for Timestamp {
+ fn from(value: DateTime) -> Self {
+ Self(value)
+ }
+}
+
+impl From for Timestamp {
+ fn from(value: NaiveDateTime) -> Self {
+ Self(value.and_utc())
+ }
+}
+
+impl Serialize for Timestamp {
+ fn serialize(&self, serializer: S) -> Result
+ where
+ S: Serializer,
+ {
+ let rfc3339_string = self.0.to_rfc3339_opts(SecondsFormat::Millis, true);
+ serializer.serialize_str(&rfc3339_string)
+ }
+}
+
+impl<'de> Deserialize<'de> for Timestamp {
+ fn deserialize(deserializer: D) -> Result
+ where
+ D: Deserializer<'de>,
+ {
+ let value = String::deserialize(deserializer)?;
+ let datetime = DateTime::parse_from_rfc3339(&value)
+ .map_err(serde::de::Error::custom)?
+ .to_utc();
+ Ok(Self(datetime))
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use chrono::NaiveDate;
+ use pretty_assertions::assert_eq;
+
+ use super::*;
+
+ #[test]
+ fn test_timestamp_serialization() {
+ let datetime = DateTime::parse_from_rfc3339("2023-12-25T14:30:45.123Z")
+ .unwrap()
+ .to_utc();
+ let timestamp = Timestamp::new(datetime);
+
+ let json = serde_json::to_string(×tamp).unwrap();
+ assert_eq!(json, "\"2023-12-25T14:30:45.123Z\"");
+ }
+
+ #[test]
+ fn test_timestamp_deserialization() {
+ let json = "\"2023-12-25T14:30:45.123Z\"";
+ let timestamp: Timestamp = serde_json::from_str(json).unwrap();
+
+ let expected = DateTime::parse_from_rfc3339("2023-12-25T14:30:45.123Z")
+ .unwrap()
+ .to_utc();
+
+ assert_eq!(timestamp.0, expected);
+ }
+
+ #[test]
+ fn test_timestamp_roundtrip() {
+ let original = DateTime::parse_from_rfc3339("2023-12-25T14:30:45.123Z")
+ .unwrap()
+ .to_utc();
+
+ let timestamp = Timestamp::new(original);
+ let json = serde_json::to_string(×tamp).unwrap();
+ let deserialized: Timestamp = serde_json::from_str(&json).unwrap();
+
+ assert_eq!(deserialized.0, original);
+ }
+
+ #[test]
+ fn test_timestamp_from_datetime_utc() {
+ let datetime = DateTime::parse_from_rfc3339("2023-12-25T14:30:45.123Z")
+ .unwrap()
+ .to_utc();
+
+ let timestamp = Timestamp::from(datetime);
+ assert_eq!(timestamp.0, datetime);
+ }
+
+ #[test]
+ fn test_timestamp_from_naive_datetime() {
+ let naive_dt = NaiveDate::from_ymd_opt(2023, 12, 25)
+ .unwrap()
+ .and_hms_milli_opt(14, 30, 45, 123)
+ .unwrap();
+
+ let timestamp = Timestamp::from(naive_dt);
+ let expected = naive_dt.and_utc();
+
+ assert_eq!(timestamp.0, expected);
+ }
+
+ #[test]
+ fn test_timestamp_serialization_with_microseconds() {
+ // Test that microseconds are truncated to milliseconds
+ let datetime = NaiveDate::from_ymd_opt(2023, 12, 25)
+ .unwrap()
+ .and_hms_micro_opt(14, 30, 45, 123456)
+ .unwrap()
+ .and_utc();
+
+ let timestamp = Timestamp::new(datetime);
+ let json = serde_json::to_string(×tamp).unwrap();
+
+ // Should be truncated to milliseconds
+ assert_eq!(json, "\"2023-12-25T14:30:45.123Z\"");
+ }
+
+ #[test]
+ fn test_timestamp_deserialization_without_milliseconds() {
+ let json = "\"2023-12-25T14:30:45Z\"";
+ let timestamp: Timestamp = serde_json::from_str(json).unwrap();
+
+ let expected = NaiveDate::from_ymd_opt(2023, 12, 25)
+ .unwrap()
+ .and_hms_opt(14, 30, 45)
+ .unwrap()
+ .and_utc();
+
+ assert_eq!(timestamp.0, expected);
+ }
+
+ #[test]
+ fn test_timestamp_deserialization_with_timezone() {
+ let json = "\"2023-12-25T14:30:45.123+05:30\"";
+ let timestamp: Timestamp = serde_json::from_str(json).unwrap();
+
+ // Should be converted to UTC
+ let expected = NaiveDate::from_ymd_opt(2023, 12, 25)
+ .unwrap()
+ .and_hms_milli_opt(9, 0, 45, 123) // 14:30:45 + 5:30 = 20:00:45, but we want UTC so subtract 5:30
+ .unwrap()
+ .and_utc();
+
+ assert_eq!(timestamp.0, expected);
+ }
+
+ #[test]
+ fn test_timestamp_deserialization_with_invalid_format() {
+ let json = "\"invalid-date\"";
+ let result: Result = serde_json::from_str(json);
+ assert!(result.is_err());
+ }
+}
diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index 2488088a49..171c923154 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -308,13 +308,13 @@ pub struct GetSubscriptionResponse {
pub usage: Option,
}
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct CurrentUsage {
pub model_requests: UsageData,
pub edit_predictions: UsageData,
}
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct UsageData {
pub used: u32,
pub limit: UsageLimit,
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 5c35394e1d..e648617fe1 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -42,7 +42,7 @@ use collections::{HashMap, HashSet};
pub use connection_pool::{ConnectionPool, ZedVersion};
use core::fmt::{self, Debug, Formatter};
use reqwest_client::ReqwestClient;
-use rpc::proto::split_repository_update;
+use rpc::proto::{MultiLspQuery, split_repository_update};
use supermaven_api::{CreateExternalUserRequest, SupermavenAdminApi};
use futures::{
@@ -374,7 +374,7 @@ impl Server {
.add_request_handler(forward_mutating_project_request::)
.add_request_handler(forward_mutating_project_request::)
.add_request_handler(forward_mutating_project_request::)
- .add_request_handler(forward_mutating_project_request::)
+ .add_request_handler(multi_lsp_query)
.add_request_handler(forward_mutating_project_request::)
.add_request_handler(forward_mutating_project_request::)
.add_request_handler(forward_mutating_project_request::)
@@ -838,7 +838,7 @@ impl Server {
// This arrangement ensures we will attempt to process earlier messages first, but fall
// back to processing messages arrived later in the spirit of making progress.
let mut foreground_message_handlers = FuturesUnordered::new();
- let concurrent_handlers = Arc::new(Semaphore::new(512));
+ let concurrent_handlers = Arc::new(Semaphore::new(256));
loop {
let next_message = async {
let permit = concurrent_handlers.clone().acquire_owned().await.unwrap();
@@ -865,6 +865,7 @@ impl Server {
user_id=field::Empty,
login=field::Empty,
impersonator=field::Empty,
+ multi_lsp_query_request=field::Empty,
);
principal.update_span(&span);
let span_enter = span.enter();
@@ -2329,6 +2330,15 @@ where
Ok(())
}
+async fn multi_lsp_query(
+ request: MultiLspQuery,
+ response: Response,
+ session: Session,
+) -> Result<()> {
+ tracing::Span::current().record("multi_lsp_query_request", request.request_str());
+ forward_mutating_project_request(request, response, session).await
+}
+
/// Notify other participants that a new buffer has been created
async fn create_buffer_for_peer(
request: proto::CreateBufferForPeer,
diff --git a/crates/collab/src/tests.rs b/crates/collab/src/tests.rs
index 19e410de5b..8d5d076780 100644
--- a/crates/collab/src/tests.rs
+++ b/crates/collab/src/tests.rs
@@ -38,12 +38,12 @@ fn room_participants(room: &Entity, cx: &mut TestAppContext) -> RoomPartic
let mut remote = room
.remote_participants()
.values()
- .map(|participant| participant.user.github_login.clone())
+ .map(|participant| participant.user.github_login.clone().to_string())
.collect::>();
let mut pending = room
.pending_participants()
.iter()
- .map(|user| user.github_login.clone())
+ .map(|user| user.github_login.clone().to_string())
.collect::>();
remote.sort();
pending.sort();
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 9795c27574..aea359d75b 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -842,7 +842,7 @@ async fn test_client_disconnecting_from_room(
// Allow user A to reconnect to the server.
server.allow_connections();
- executor.advance_clock(RECEIVE_TIMEOUT);
+ executor.advance_clock(RECONNECT_TIMEOUT);
// Call user B again from client A.
active_call_a
@@ -1286,7 +1286,7 @@ async fn test_calls_on_multiple_connections(
client_b1.disconnect(&cx_b1.to_async());
executor.advance_clock(RECEIVE_TIMEOUT);
client_b1
- .authenticate_and_connect(false, &cx_b1.to_async())
+ .connect(false, &cx_b1.to_async())
.await
.into_response()
.unwrap();
@@ -1358,7 +1358,7 @@ async fn test_calls_on_multiple_connections(
// User A reconnects automatically, then calls user B again.
server.allow_connections();
- executor.advance_clock(RECEIVE_TIMEOUT);
+ executor.advance_clock(RECONNECT_TIMEOUT);
active_call_a
.update(cx_a, |call, cx| {
call.invite(client_b1.user_id().unwrap(), None, cx)
@@ -1667,7 +1667,7 @@ async fn test_project_reconnect(
// Client A reconnects. Their project is re-shared, and client B re-joins it.
server.allow_connections();
client_a
- .authenticate_and_connect(false, &cx_a.to_async())
+ .connect(false, &cx_a.to_async())
.await
.into_response()
.unwrap();
@@ -1796,7 +1796,7 @@ async fn test_project_reconnect(
// Client B reconnects. They re-join the room and the remaining shared project.
server.allow_connections();
client_b
- .authenticate_and_connect(false, &cx_b.to_async())
+ .connect(false, &cx_b.to_async())
.await
.into_response()
.unwrap();
@@ -1881,7 +1881,7 @@ async fn test_active_call_events(
vec![room::Event::RemoteProjectShared {
owner: Arc::new(User {
id: client_a.user_id().unwrap(),
- github_login: "user_a".to_string(),
+ github_login: "user_a".into(),
avatar_uri: "avatar_a".into(),
name: None,
}),
@@ -1900,7 +1900,7 @@ async fn test_active_call_events(
vec![room::Event::RemoteProjectShared {
owner: Arc::new(User {
id: client_b.user_id().unwrap(),
- github_login: "user_b".to_string(),
+ github_login: "user_b".into(),
avatar_uri: "avatar_b".into(),
name: None,
}),
@@ -5738,7 +5738,7 @@ async fn test_contacts(
server.allow_connections();
client_c
- .authenticate_and_connect(false, &cx_c.to_async())
+ .connect(false, &cx_c.to_async())
.await
.into_response()
.unwrap();
@@ -6079,7 +6079,7 @@ async fn test_contacts(
.iter()
.map(|contact| {
(
- contact.user.github_login.clone(),
+ contact.user.github_login.clone().to_string(),
if contact.online { "online" } else { "offline" },
if contact.busy { "busy" } else { "free" },
)
@@ -6269,7 +6269,7 @@ async fn test_contact_requests(
client.disconnect(&cx.to_async());
client.clear_contacts(cx).await;
client
- .authenticate_and_connect(false, &cx.to_async())
+ .connect(false, &cx.to_async())
.await
.into_response()
.unwrap();
diff --git a/crates/collab/src/tests/notification_tests.rs b/crates/collab/src/tests/notification_tests.rs
index 4e64b5526b..9bf906694e 100644
--- a/crates/collab/src/tests/notification_tests.rs
+++ b/crates/collab/src/tests/notification_tests.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
use gpui::{BackgroundExecutor, TestAppContext};
use notifications::NotificationEvent;
use parking_lot::Mutex;
+use pretty_assertions::assert_eq;
use rpc::{Notification, proto};
use crate::tests::TestServer;
@@ -17,6 +18,9 @@ async fn test_notifications(
let client_a = server.create_client(cx_a, "user_a").await;
let client_b = server.create_client(cx_b, "user_b").await;
+ // Wait for authentication/connection to Collab to be established.
+ executor.run_until_parked();
+
let notification_events_a = Arc::new(Mutex::new(Vec::new()));
let notification_events_b = Arc::new(Mutex::new(Vec::new()));
client_a.notification_store().update(cx_a, |_, cx| {
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index 5192db16a7..5fcc622fc1 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -8,6 +8,7 @@ use crate::{
use anyhow::anyhow;
use call::ActiveCall;
use channel::{ChannelBuffer, ChannelStore};
+use client::test::{make_get_authenticated_user_response, parse_authorization_header};
use client::{
self, ChannelId, Client, Connection, Credentials, EstablishConnectionError, UserStore,
proto::PeerId,
@@ -20,7 +21,7 @@ use fs::FakeFs;
use futures::{StreamExt as _, channel::oneshot};
use git::GitHostingProviderRegistry;
use gpui::{AppContext as _, BackgroundExecutor, Entity, Task, TestAppContext, VisualTestContext};
-use http_client::FakeHttpClient;
+use http_client::{FakeHttpClient, Method};
use language::LanguageRegistry;
use node_runtime::NodeRuntime;
use notifications::NotificationStore;
@@ -161,6 +162,8 @@ impl TestServer {
}
pub async fn create_client(&mut self, cx: &mut TestAppContext, name: &str) -> TestClient {
+ const ACCESS_TOKEN: &str = "the-token";
+
let fs = FakeFs::new(cx.executor());
cx.update(|cx| {
@@ -175,7 +178,7 @@ impl TestServer {
});
let clock = Arc::new(FakeSystemClock::new());
- let http = FakeHttpClient::with_404_response();
+
let user_id = if let Ok(Some(user)) = self.app_state.db.get_user_by_github_login(name).await
{
user.id
@@ -197,6 +200,47 @@ impl TestServer {
.expect("creating user failed")
.user_id
};
+
+ let http = FakeHttpClient::create({
+ let name = name.to_string();
+ move |req| {
+ let name = name.clone();
+ async move {
+ match (req.method(), req.uri().path()) {
+ (&Method::GET, "/client/users/me") => {
+ let credentials = parse_authorization_header(&req);
+ if credentials
+ != Some(Credentials {
+ user_id: user_id.to_proto(),
+ access_token: ACCESS_TOKEN.into(),
+ })
+ {
+ return Ok(http_client::Response::builder()
+ .status(401)
+ .body("Unauthorized".into())
+ .unwrap());
+ }
+
+ Ok(http_client::Response::builder()
+ .status(200)
+ .body(
+ serde_json::to_string(&make_get_authenticated_user_response(
+ user_id.0, name,
+ ))
+ .unwrap()
+ .into(),
+ )
+ .unwrap())
+ }
+ _ => Ok(http_client::Response::builder()
+ .status(404)
+ .body("Not Found".into())
+ .unwrap()),
+ }
+ }
+ }
+ });
+
let client_name = name.to_string();
let mut client = cx.update(|cx| Client::new(clock, http.clone(), cx));
let server = self.server.clone();
@@ -208,11 +252,10 @@ impl TestServer {
.unwrap()
.set_id(user_id.to_proto())
.override_authenticate(move |cx| {
- let access_token = "the-token".to_string();
cx.spawn(async move |_| {
Ok(Credentials {
user_id: user_id.to_proto(),
- access_token,
+ access_token: ACCESS_TOKEN.into(),
})
})
})
@@ -221,7 +264,7 @@ impl TestServer {
credentials,
&Credentials {
user_id: user_id.0 as u64,
- access_token: "the-token".into()
+ access_token: ACCESS_TOKEN.into(),
}
);
@@ -319,7 +362,7 @@ impl TestServer {
});
client
- .authenticate_and_connect(false, &cx.to_async())
+ .connect(false, &cx.to_async())
.await
.into_response()
.unwrap();
@@ -692,17 +735,17 @@ impl TestClient {
current: store
.contacts()
.iter()
- .map(|contact| contact.user.github_login.clone())
+ .map(|contact| contact.user.github_login.clone().to_string())
.collect(),
outgoing_requests: store
.outgoing_contact_requests()
.iter()
- .map(|user| user.github_login.clone())
+ .map(|user| user.github_login.clone().to_string())
.collect(),
incoming_requests: store
.incoming_contact_requests()
.iter()
- .map(|user| user.github_login.clone())
+ .map(|user| user.github_login.clone().to_string())
.collect(),
})
}
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 4d5973481e..54077303a1 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -940,7 +940,7 @@ impl CollabPanel {
room.read(cx).local_participant().role == proto::ChannelRole::Admin
});
- ListItem::new(SharedString::from(user.github_login.clone()))
+ ListItem::new(user.github_login.clone())
.start_slot(Avatar::new(user.avatar_uri.clone()))
.child(Label::new(user.github_login.clone()))
.toggle_state(is_selected)
@@ -2331,7 +2331,7 @@ impl CollabPanel {
let client = this.client.clone();
cx.spawn_in(window, async move |_, cx| {
client
- .authenticate_and_connect(true, &cx)
+ .connect(true, &cx)
.await
.into_response()
.notify_async_err(cx);
@@ -2583,7 +2583,7 @@ impl CollabPanel {
) -> impl IntoElement {
let online = contact.online;
let busy = contact.busy || calling;
- let github_login = SharedString::from(contact.user.github_login.clone());
+ let github_login = contact.user.github_login.clone();
let item = ListItem::new(github_login.clone())
.indent_level(1)
.indent_step_size(px(20.))
@@ -2662,7 +2662,7 @@ impl CollabPanel {
is_selected: bool,
cx: &mut Context,
) -> impl IntoElement {
- let github_login = SharedString::from(user.github_login.clone());
+ let github_login = user.github_login.clone();
let user_id = user.id;
let is_response_pending = self.user_store.read(cx).is_contact_request_pending(user);
let color = if is_response_pending {
diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs
index fba8f66c2d..c3e834b645 100644
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -634,13 +634,13 @@ impl Render for NotificationPanel {
.child(Icon::new(IconName::Envelope)),
)
.map(|this| {
- if self.client.user_id().is_none() {
+ if !self.client.status().borrow().is_connected() {
this.child(
v_flex()
.gap_2()
.p_4()
.child(
- Button::new("sign_in_prompt_button", "Sign in")
+ Button::new("connect_prompt_button", "Connect")
.icon_color(Color::Muted)
.icon(IconName::Github)
.icon_position(IconPosition::Start)
@@ -652,10 +652,7 @@ impl Render for NotificationPanel {
let client = client.clone();
window
.spawn(cx, async move |cx| {
- match client
- .authenticate_and_connect(true, &cx)
- .await
- {
+ match client.connect(true, &cx).await {
util::ConnectionResult::Timeout => {
log::error!("Connection timeout");
}
@@ -673,7 +670,7 @@ impl Render for NotificationPanel {
)
.child(
div().flex().w_full().items_center().child(
- Label::new("Sign in to view notifications.")
+ Label::new("Connect to view notifications.")
.color(Color::Muted)
.size(LabelSize::Small),
),
diff --git a/crates/dap/src/client.rs b/crates/dap/src/client.rs
index 86a15b2d8a..7b791450ec 100644
--- a/crates/dap/src/client.rs
+++ b/crates/dap/src/client.rs
@@ -295,7 +295,7 @@ mod tests {
request: dap_types::StartDebuggingRequestArgumentsRequest::Launch,
},
},
- Box::new(|_| panic!("Did not expect to hit this code path")),
+ Box::new(|_| {}),
&mut cx.to_async(),
)
.await
diff --git a/crates/dap/src/transport.rs b/crates/dap/src/transport.rs
index 6dadf1cf35..f9fbbfc842 100644
--- a/crates/dap/src/transport.rs
+++ b/crates/dap/src/transport.rs
@@ -883,6 +883,7 @@ impl FakeTransport {
break Err(anyhow!("exit in response to request"));
}
};
+ let success = response.success;
let message =
serde_json::to_string(&Message::Response(response)).unwrap();
@@ -893,6 +894,25 @@ impl FakeTransport {
)
.await
.unwrap();
+
+ if request.command == dap_types::requests::Initialize::COMMAND
+ && success
+ {
+ let message = serde_json::to_string(&Message::Event(Box::new(
+ dap_types::messages::Events::Initialized(Some(
+ Default::default(),
+ )),
+ )))
+ .unwrap();
+ writer
+ .write_all(
+ TransportDelegate::build_rpc_message(message)
+ .as_bytes(),
+ )
+ .await
+ .unwrap();
+ }
+
writer.flush().await.unwrap();
}
}
diff --git a/crates/docs_preprocessor/Cargo.toml b/crates/docs_preprocessor/Cargo.toml
index a9eff17fa1..e46ceb18db 100644
--- a/crates/docs_preprocessor/Cargo.toml
+++ b/crates/docs_preprocessor/Cargo.toml
@@ -9,7 +9,9 @@ license = "GPL-3.0-or-later"
anyhow.workspace = true
command_palette.workspace = true
gpui.workspace = true
-mdbook = "0.4.40"
+# We are specifically pinning this version of mdbook, as later versions introduce issues with double-nested subdirectories.
+# Ask @maxdeviant about this before bumping.
+mdbook = "= 0.4.40"
regex.workspace = true
serde.workspace = true
serde_json.workspace = true
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index 0692c7fbe6..ab2d1c8ecb 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -22,6 +22,7 @@ test-support = [
"theme/test-support",
"util/test-support",
"workspace/test-support",
+ "tree-sitter-c",
"tree-sitter-rust",
"tree-sitter-typescript",
"tree-sitter-html",
@@ -76,6 +77,7 @@ telemetry.workspace = true
text.workspace = true
time.workspace = true
theme.workspace = true
+tree-sitter-c = { workspace = true, optional = true }
tree-sitter-html = { workspace = true, optional = true }
tree-sitter-rust = { workspace = true, optional = true }
tree-sitter-typescript = { workspace = true, optional = true }
@@ -106,6 +108,7 @@ settings = { workspace = true, features = ["test-support"] }
tempfile.workspace = true
text = { workspace = true, features = ["test-support"] }
theme = { workspace = true, features = ["test-support"] }
+tree-sitter-c.workspace = true
tree-sitter-html.workspace = true
tree-sitter-rust.workspace = true
tree-sitter-typescript.workspace = true
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a2f2310144..3516eff45c 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -56,7 +56,7 @@ use aho_corasick::AhoCorasick;
use anyhow::{Context as _, Result, anyhow};
use blink_manager::BlinkManager;
use buffer_diff::DiffHunkStatus;
-use client::{Collaborator, ParticipantIndex};
+use client::{Collaborator, DisableAiSettings, ParticipantIndex};
use clock::{AGENT_REPLICA_ID, ReplicaId};
use collections::{BTreeMap, HashMap, HashSet, VecDeque};
use convert_case::{Case, Casing};
@@ -1305,6 +1305,7 @@ impl Default for SelectionHistoryMode {
///
/// Similarly, you might want to disable scrolling if you don't want the viewport to
/// move.
+#[derive(Clone)]
pub struct SelectionEffects {
nav_history: Option,
completions: bool,
@@ -2944,10 +2945,12 @@ impl Editor {
}
}
+ let selection_anchors = self.selections.disjoint_anchors();
+
if self.focus_handle.is_focused(window) && self.leader_id.is_none() {
self.buffer.update(cx, |buffer, cx| {
buffer.set_active_selections(
- &self.selections.disjoint_anchors(),
+ &selection_anchors,
self.selections.line_mode,
self.cursor_shape,
cx,
@@ -2964,9 +2967,8 @@ impl Editor {
self.select_next_state = None;
self.select_prev_state = None;
self.select_syntax_node_history.try_clear();
- self.invalidate_autoclose_regions(&self.selections.disjoint_anchors(), buffer);
- self.snippet_stack
- .invalidate(&self.selections.disjoint_anchors(), buffer);
+ self.invalidate_autoclose_regions(&selection_anchors, buffer);
+ self.snippet_stack.invalidate(&selection_anchors, buffer);
self.take_rename(false, window, cx);
let newest_selection = self.selections.newest_anchor();
@@ -4047,7 +4049,8 @@ impl Editor {
// then don't insert that closing bracket again; just move the selection
// past the closing bracket.
let should_skip = selection.end == region.range.end.to_point(&snapshot)
- && text.as_ref() == region.pair.end.as_str();
+ && text.as_ref() == region.pair.end.as_str()
+ && snapshot.contains_str_at(region.range.end, text.as_ref());
if should_skip {
let anchor = snapshot.anchor_after(selection.end);
new_selections
@@ -4973,13 +4976,17 @@ impl Editor {
})
}
- /// Remove any autoclose regions that no longer contain their selection.
+ /// Remove any autoclose regions that no longer contain their selection or have invalid anchors in ranges.
fn invalidate_autoclose_regions(
&mut self,
mut selections: &[Selection],
buffer: &MultiBufferSnapshot,
) {
self.autoclose_regions.retain(|state| {
+ if !state.range.start.is_valid(buffer) || !state.range.end.is_valid(buffer) {
+ return false;
+ }
+
let mut i = 0;
while let Some(selection) = selections.get(i) {
if selection.end.cmp(&state.range.start, buffer).is_lt() {
@@ -5891,18 +5898,20 @@ impl Editor {
text: new_text[common_prefix_len..].into(),
});
- self.transact(window, cx, |this, window, cx| {
+ self.transact(window, cx, |editor, window, cx| {
if let Some(mut snippet) = snippet {
snippet.text = new_text.to_string();
- this.insert_snippet(&ranges, snippet, window, cx).log_err();
+ editor
+ .insert_snippet(&ranges, snippet, window, cx)
+ .log_err();
} else {
- this.buffer.update(cx, |buffer, cx| {
+ editor.buffer.update(cx, |multi_buffer, cx| {
let auto_indent = match completion.insert_text_mode {
Some(InsertTextMode::AS_IS) => None,
- _ => this.autoindent_mode.clone(),
+ _ => editor.autoindent_mode.clone(),
};
let edits = ranges.into_iter().map(|range| (range, new_text.as_str()));
- buffer.edit(edits, auto_indent, cx);
+ multi_buffer.edit(edits, auto_indent, cx);
});
}
for (buffer, edits) in linked_edits {
@@ -5921,8 +5930,9 @@ impl Editor {
})
}
- this.refresh_inline_completion(true, false, window, cx);
+ editor.refresh_inline_completion(true, false, window, cx);
});
+ self.invalidate_autoclose_regions(&self.selections.disjoint_anchors(), &snapshot);
let show_new_completions_on_confirm = completion
.confirm
@@ -7048,7 +7058,7 @@ impl Editor {
}
pub fn update_edit_prediction_settings(&mut self, cx: &mut Context) {
- if self.edit_prediction_provider.is_none() {
+ if self.edit_prediction_provider.is_none() || DisableAiSettings::get_global(cx).disable_ai {
self.edit_prediction_settings = EditPredictionSettings::Disabled;
} else {
let selection = self.selections.newest_anchor();
@@ -9562,27 +9572,46 @@ impl Editor {
// Check whether the just-entered snippet ends with an auto-closable bracket.
if self.autoclose_regions.is_empty() {
let snapshot = self.buffer.read(cx).snapshot(cx);
- for selection in &mut self.selections.all::(cx) {
+ let mut all_selections = self.selections.all::(cx);
+ for selection in &mut all_selections {
let selection_head = selection.head();
let Some(scope) = snapshot.language_scope_at(selection_head) else {
continue;
};
let mut bracket_pair = None;
- let next_chars = snapshot.chars_at(selection_head).collect::();
- let prev_chars = snapshot
- .reversed_chars_at(selection_head)
- .collect::();
- for (pair, enabled) in scope.brackets() {
- if enabled
- && pair.close
- && prev_chars.starts_with(pair.start.as_str())
- && next_chars.starts_with(pair.end.as_str())
- {
- bracket_pair = Some(pair.clone());
- break;
+ let max_lookup_length = scope
+ .brackets()
+ .map(|(pair, _)| {
+ pair.start
+ .as_str()
+ .chars()
+ .count()
+ .max(pair.end.as_str().chars().count())
+ })
+ .max();
+ if let Some(max_lookup_length) = max_lookup_length {
+ let next_text = snapshot
+ .chars_at(selection_head)
+ .take(max_lookup_length)
+ .collect::();
+ let prev_text = snapshot
+ .reversed_chars_at(selection_head)
+ .take(max_lookup_length)
+ .collect::();
+
+ for (pair, enabled) in scope.brackets() {
+ if enabled
+ && pair.close
+ && prev_text.starts_with(pair.start.as_str())
+ && next_text.starts_with(pair.end.as_str())
+ {
+ bracket_pair = Some(pair.clone());
+ break;
+ }
}
}
+
if let Some(pair) = bracket_pair {
let snapshot_settings = snapshot.language_settings_at(selection_head, cx);
let autoclose_enabled =
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index a13708c580..1a4f444275 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -8612,6 +8612,7 @@ async fn test_autoclose_with_embedded_language(cx: &mut TestAppContext) {
cx.language_registry().add(html_language.clone());
cx.language_registry().add(javascript_language.clone());
+ cx.executor().run_until_parked();
cx.update_buffer(|buffer, cx| {
buffer.set_language(Some(html_language), cx);
@@ -13400,6 +13401,178 @@ async fn test_as_is_completions(cx: &mut TestAppContext) {
cx.assert_editor_state("fn a() {}\n unsafeˇ");
}
+#[gpui::test]
+async fn test_panic_during_c_completions(cx: &mut TestAppContext) {
+ init_test(cx, |_| {});
+ let language =
+ Arc::try_unwrap(languages::language("c", tree_sitter_c::LANGUAGE.into())).unwrap();
+ let mut cx = EditorLspTestContext::new(
+ language,
+ lsp::ServerCapabilities {
+ completion_provider: Some(lsp::CompletionOptions {
+ ..lsp::CompletionOptions::default()
+ }),
+ ..lsp::ServerCapabilities::default()
+ },
+ cx,
+ )
+ .await;
+
+ cx.set_state(
+ "#ifndef BAR_H
+#define BAR_H
+
+#include
+
+int fn_branch(bool do_branch1, bool do_branch2);
+
+#endif // BAR_H
+ˇ",
+ );
+ cx.executor().run_until_parked();
+ cx.update_editor(|editor, window, cx| {
+ editor.handle_input("#", window, cx);
+ });
+ cx.executor().run_until_parked();
+ cx.update_editor(|editor, window, cx| {
+ editor.handle_input("i", window, cx);
+ });
+ cx.executor().run_until_parked();
+ cx.update_editor(|editor, window, cx| {
+ editor.handle_input("n", window, cx);
+ });
+ cx.executor().run_until_parked();
+ cx.assert_editor_state(
+ "#ifndef BAR_H
+#define BAR_H
+
+#include
+
+int fn_branch(bool do_branch1, bool do_branch2);
+
+#endif // BAR_H
+#inˇ",
+ );
+
+ cx.lsp
+ .set_request_handler::(move |_, _| async move {
+ Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
+ is_incomplete: false,
+ item_defaults: None,
+ items: vec![lsp::CompletionItem {
+ kind: Some(lsp::CompletionItemKind::SNIPPET),
+ label_details: Some(lsp::CompletionItemLabelDetails {
+ detail: Some("header".to_string()),
+ description: None,
+ }),
+ label: " include".to_string(),
+ text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+ range: lsp::Range {
+ start: lsp::Position {
+ line: 8,
+ character: 1,
+ },
+ end: lsp::Position {
+ line: 8,
+ character: 1,
+ },
+ },
+ new_text: "include \"$0\"".to_string(),
+ })),
+ sort_text: Some("40b67681include".to_string()),
+ insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
+ filter_text: Some("include".to_string()),
+ insert_text: Some("include \"$0\"".to_string()),
+ ..lsp::CompletionItem::default()
+ }],
+ })))
+ });
+ cx.update_editor(|editor, window, cx| {
+ editor.show_completions(&ShowCompletions { trigger: None }, window, cx);
+ });
+ cx.executor().run_until_parked();
+ cx.update_editor(|editor, window, cx| {
+ editor.confirm_completion(&ConfirmCompletion::default(), window, cx)
+ });
+ cx.executor().run_until_parked();
+ cx.assert_editor_state(
+ "#ifndef BAR_H
+#define BAR_H
+
+#include
+
+int fn_branch(bool do_branch1, bool do_branch2);
+
+#endif // BAR_H
+#include \"ˇ\"",
+ );
+
+ cx.lsp
+ .set_request_handler::(move |_, _| async move {
+ Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
+ is_incomplete: true,
+ item_defaults: None,
+ items: vec![lsp::CompletionItem {
+ kind: Some(lsp::CompletionItemKind::FILE),
+ label: "AGL/".to_string(),
+ text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+ range: lsp::Range {
+ start: lsp::Position {
+ line: 8,
+ character: 10,
+ },
+ end: lsp::Position {
+ line: 8,
+ character: 11,
+ },
+ },
+ new_text: "AGL/".to_string(),
+ })),
+ sort_text: Some("40b67681AGL/".to_string()),
+ insert_text_format: Some(lsp::InsertTextFormat::PLAIN_TEXT),
+ filter_text: Some("AGL/".to_string()),
+ insert_text: Some("AGL/".to_string()),
+ ..lsp::CompletionItem::default()
+ }],
+ })))
+ });
+ cx.update_editor(|editor, window, cx| {
+ editor.show_completions(&ShowCompletions { trigger: None }, window, cx);
+ });
+ cx.executor().run_until_parked();
+ cx.update_editor(|editor, window, cx| {
+ editor.confirm_completion(&ConfirmCompletion::default(), window, cx)
+ });
+ cx.executor().run_until_parked();
+ cx.assert_editor_state(
+ r##"#ifndef BAR_H
+#define BAR_H
+
+#include
+
+int fn_branch(bool do_branch1, bool do_branch2);
+
+#endif // BAR_H
+#include "AGL/ˇ"##,
+ );
+
+ cx.update_editor(|editor, window, cx| {
+ editor.handle_input("\"", window, cx);
+ });
+ cx.executor().run_until_parked();
+ cx.assert_editor_state(
+ r##"#ifndef BAR_H
+#define BAR_H
+
+#include
+
+int fn_branch(bool do_branch1, bool do_branch2);
+
+#endif // BAR_H
+#include "AGL/"ˇ"##,
+ );
+}
+
#[gpui::test]
async fn test_no_duplicated_completion_requests(cx: &mut TestAppContext) {
init_test(cx, |_| {});
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
index a02b4a7f0b..d638ac171f 100644
--- a/crates/eval/src/eval.rs
+++ b/crates/eval/src/eval.rs
@@ -18,7 +18,7 @@ use collections::{HashMap, HashSet};
use extension::ExtensionHostProxy;
use futures::future;
use gpui::http_client::read_proxy_from_env;
-use gpui::{App, AppContext, Application, AsyncApp, Entity, SemanticVersion, UpdateGlobal};
+use gpui::{App, AppContext, Application, AsyncApp, Entity, UpdateGlobal};
use gpui_tokio::Tokio;
use language::LanguageRegistry;
use language_model::{ConfiguredModel, LanguageModel, LanguageModelRegistry, SelectedModel};
@@ -337,7 +337,8 @@ pub struct AgentAppState {
}
pub fn init(cx: &mut App) -> Arc {
- release_channel::init(SemanticVersion::default(), cx);
+ let app_version = AppVersion::global(cx);
+ release_channel::init(app_version, cx);
gpui_tokio::init(cx);
let mut settings_store = SettingsStore::new(cx);
@@ -350,7 +351,7 @@ pub fn init(cx: &mut App) -> Arc {
// Set User-Agent so we can download language servers from GitHub
let user_agent = format!(
"Zed/{} ({}; {})",
- AppVersion::global(cx),
+ app_version,
std::env::consts::OS,
std::env::consts::ARCH
);
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index e196a5b139..ee74ac4d54 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2416,7 +2416,7 @@ impl GitPanel {
.committer_name
.clone()
.or_else(|| participant.user.name.clone())
- .unwrap_or_else(|| participant.user.github_login.clone());
+ .unwrap_or_else(|| participant.user.github_login.clone().to_string());
new_co_authors.push((name.clone(), email.clone()))
}
}
@@ -2436,7 +2436,7 @@ impl GitPanel {
.name
.clone()
.or_else(|| user.name.clone())
- .unwrap_or_else(|| user.github_login.clone());
+ .unwrap_or_else(|| user.github_login.clone().to_string());
Some((name, email))
}
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 4023ddf2dc..2bf49fa7d8 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -47,7 +47,6 @@ wayland = [
"wayland-cursor",
"wayland-protocols",
"wayland-protocols-plasma",
- "wayland-protocols-wlr",
"filedescriptor",
"xkbcommon",
"open",
@@ -194,9 +193,6 @@ wayland-protocols = { version = "0.31.2", features = [
wayland-protocols-plasma = { version = "0.2.0", features = [
"client",
], optional = true }
-wayland-protocols-wlr = { version = "0.3.8", features = [
- "client"
-], optional = true}
# X11
as-raw-xcb-connection = { version = "1", optional = true }
@@ -220,10 +216,6 @@ xim = { git = "https://github.com/XDeme1/xim-rs", rev = "d50d461764c2213655cd9cf
x11-clipboard = { version = "0.9.3", optional = true }
[target.'cfg(target_os = "windows")'.dependencies]
-blade-util.workspace = true
-bytemuck = "1"
-blade-graphics.workspace = true
-blade-macros.workspace = true
flume = "0.11"
rand.workspace = true
windows.workspace = true
@@ -244,7 +236,6 @@ util = { workspace = true, features = ["test-support"] }
[target.'cfg(target_os = "windows")'.build-dependencies]
embed-resource = "3.0"
-naga.workspace = true
[target.'cfg(target_os = "macos")'.build-dependencies]
bindgen = "0.71"
diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index 7ab44a73f5..93a1c15c41 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -9,7 +9,10 @@ fn main() {
let target = env::var("CARGO_CFG_TARGET_OS");
println!("cargo::rustc-check-cfg=cfg(gles)");
- #[cfg(any(not(target_os = "macos"), feature = "macos-blade"))]
+ #[cfg(any(
+ not(any(target_os = "macos", target_os = "windows")),
+ all(target_os = "macos", feature = "macos-blade")
+ ))]
check_wgsl_shaders();
match target.as_deref() {
@@ -17,21 +20,18 @@ fn main() {
#[cfg(target_os = "macos")]
macos::build();
}
- #[cfg(all(target_os = "windows", feature = "windows-manifest"))]
Ok("windows") => {
- let manifest = std::path::Path::new("resources/windows/gpui.manifest.xml");
- let rc_file = std::path::Path::new("resources/windows/gpui.rc");
- println!("cargo:rerun-if-changed={}", manifest.display());
- println!("cargo:rerun-if-changed={}", rc_file.display());
- embed_resource::compile(rc_file, embed_resource::NONE)
- .manifest_required()
- .unwrap();
+ #[cfg(target_os = "windows")]
+ windows::build();
}
_ => (),
};
}
-#[allow(dead_code)]
+#[cfg(any(
+ not(any(target_os = "macos", target_os = "windows")),
+ all(target_os = "macos", feature = "macos-blade")
+))]
fn check_wgsl_shaders() {
use std::path::PathBuf;
use std::process;
@@ -243,3 +243,215 @@ mod macos {
}
}
}
+
+#[cfg(target_os = "windows")]
+mod windows {
+ use std::{
+ fs,
+ io::Write,
+ path::{Path, PathBuf},
+ process::{self, Command},
+ };
+
+ pub(super) fn build() {
+ // Compile HLSL shaders
+ #[cfg(not(debug_assertions))]
+ compile_shaders();
+
+ // Embed the Windows manifest and resource file
+ #[cfg(feature = "windows-manifest")]
+ embed_resource();
+ }
+
+ #[cfg(feature = "windows-manifest")]
+ fn embed_resource() {
+ let manifest = std::path::Path::new("resources/windows/gpui.manifest.xml");
+ let rc_file = std::path::Path::new("resources/windows/gpui.rc");
+ println!("cargo:rerun-if-changed={}", manifest.display());
+ println!("cargo:rerun-if-changed={}", rc_file.display());
+ embed_resource::compile(rc_file, embed_resource::NONE)
+ .manifest_required()
+ .unwrap();
+ }
+
+ /// You can set the `GPUI_FXC_PATH` environment variable to specify the path to the fxc.exe compiler.
+ fn compile_shaders() {
+ let shader_path = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap())
+ .join("src/platform/windows/shaders.hlsl");
+ let out_dir = std::env::var("OUT_DIR").unwrap();
+
+ println!("cargo:rerun-if-changed={}", shader_path.display());
+
+ // Check if fxc.exe is available
+ let fxc_path = find_fxc_compiler();
+
+ // Define all modules
+ let modules = [
+ "quad",
+ "shadow",
+ "path_rasterization",
+ "path_sprite",
+ "underline",
+ "monochrome_sprite",
+ "polychrome_sprite",
+ ];
+
+ let rust_binding_path = format!("{}/shaders_bytes.rs", out_dir);
+ if Path::new(&rust_binding_path).exists() {
+ fs::remove_file(&rust_binding_path)
+ .expect("Failed to remove existing Rust binding file");
+ }
+ for module in modules {
+ compile_shader_for_module(
+ module,
+ &out_dir,
+ &fxc_path,
+ shader_path.to_str().unwrap(),
+ &rust_binding_path,
+ );
+ }
+
+ {
+ let shader_path = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap())
+ .join("src/platform/windows/color_text_raster.hlsl");
+ compile_shader_for_module(
+ "emoji_rasterization",
+ &out_dir,
+ &fxc_path,
+ shader_path.to_str().unwrap(),
+ &rust_binding_path,
+ );
+ }
+ }
+
+ /// You can set the `GPUI_FXC_PATH` environment variable to specify the path to the fxc.exe compiler.
+ fn find_fxc_compiler() -> String {
+ // Check environment variable
+ if let Ok(path) = std::env::var("GPUI_FXC_PATH") {
+ if Path::new(&path).exists() {
+ return path;
+ }
+ }
+
+ // Try to find in PATH
+ // NOTE: This has to be `where.exe` on Windows, not `where`, it must be ended with `.exe`
+ if let Ok(output) = std::process::Command::new("where.exe")
+ .arg("fxc.exe")
+ .output()
+ {
+ if output.status.success() {
+ let path = String::from_utf8_lossy(&output.stdout);
+ return path.trim().to_string();
+ }
+ }
+
+ // Check the default path
+ if Path::new(r"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\fxc.exe")
+ .exists()
+ {
+ return r"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\fxc.exe"
+ .to_string();
+ }
+
+ panic!("Failed to find fxc.exe");
+ }
+
+ fn compile_shader_for_module(
+ module: &str,
+ out_dir: &str,
+ fxc_path: &str,
+ shader_path: &str,
+ rust_binding_path: &str,
+ ) {
+ // Compile vertex shader
+ let output_file = format!("{}/{}_vs.h", out_dir, module);
+ let const_name = format!("{}_VERTEX_BYTES", module.to_uppercase());
+ compile_shader_impl(
+ fxc_path,
+ &format!("{module}_vertex"),
+ &output_file,
+ &const_name,
+ shader_path,
+ "vs_4_1",
+ );
+ generate_rust_binding(&const_name, &output_file, &rust_binding_path);
+
+ // Compile fragment shader
+ let output_file = format!("{}/{}_ps.h", out_dir, module);
+ let const_name = format!("{}_FRAGMENT_BYTES", module.to_uppercase());
+ compile_shader_impl(
+ fxc_path,
+ &format!("{module}_fragment"),
+ &output_file,
+ &const_name,
+ shader_path,
+ "ps_4_1",
+ );
+ generate_rust_binding(&const_name, &output_file, &rust_binding_path);
+ }
+
+ fn compile_shader_impl(
+ fxc_path: &str,
+ entry_point: &str,
+ output_path: &str,
+ var_name: &str,
+ shader_path: &str,
+ target: &str,
+ ) {
+ let output = Command::new(fxc_path)
+ .args([
+ "/T",
+ target,
+ "/E",
+ entry_point,
+ "/Fh",
+ output_path,
+ "/Vn",
+ var_name,
+ "/O3",
+ shader_path,
+ ])
+ .output();
+
+ match output {
+ Ok(result) => {
+ if result.status.success() {
+ return;
+ }
+ eprintln!(
+ "Shader compilation failed for {}:\n{}",
+ entry_point,
+ String::from_utf8_lossy(&result.stderr)
+ );
+ process::exit(1);
+ }
+ Err(e) => {
+ eprintln!("Failed to run fxc for {}: {}", entry_point, e);
+ process::exit(1);
+ }
+ }
+ }
+
+ fn generate_rust_binding(const_name: &str, head_file: &str, output_path: &str) {
+ let header_content = fs::read_to_string(head_file).expect("Failed to read header file");
+ let const_definition = {
+ let global_var_start = header_content.find("const BYTE").unwrap();
+ let global_var = &header_content[global_var_start..];
+ let equal = global_var.find('=').unwrap();
+ global_var[equal + 1..].trim()
+ };
+ let rust_binding = format!(
+ "const {}: &[u8] = &{}\n",
+ const_name,
+ const_definition.replace('{', "[").replace('}', "]")
+ );
+ let mut options = fs::OpenOptions::new()
+ .create(true)
+ .append(true)
+ .open(output_path)
+ .expect("Failed to open Rust binding file");
+ options
+ .write_all(rust_binding.as_bytes())
+ .expect("Failed to write Rust binding file");
+ }
+}
diff --git a/crates/gpui/examples/text.rs b/crates/gpui/examples/text.rs
index 19214aebde..1166bb2795 100644
--- a/crates/gpui/examples/text.rs
+++ b/crates/gpui/examples/text.rs
@@ -198,7 +198,7 @@ impl RenderOnce for CharacterGrid {
"χ", "ψ", "∂", "а", "в", "Ж", "ж", "З", "з", "К", "к", "л", "м", "Н", "н", "Р", "р",
"У", "у", "ф", "ч", "ь", "ы", "Э", "э", "Я", "я", "ij", "öẋ", ".,", "⣝⣑", "~", "*",
"_", "^", "`", "'", "(", "{", "«", "#", "&", "@", "$", "¢", "%", "|", "?", "¶", "µ",
- "❮", "<=", "!=", "==", "--", "++", "=>", "->",
+ "❮", "<=", "!=", "==", "--", "++", "=>", "->", "🏀", "🎊", "😍", "❤️", "👍", "👎",
];
let columns = 11;
diff --git a/crates/gpui/src/color.rs b/crates/gpui/src/color.rs
index a16c8f46be..639c84c101 100644
--- a/crates/gpui/src/color.rs
+++ b/crates/gpui/src/color.rs
@@ -35,6 +35,7 @@ pub(crate) fn swap_rgba_pa_to_bgra(color: &mut [u8]) {
/// An RGBA color
#[derive(PartialEq, Clone, Copy, Default)]
+#[repr(C)]
pub struct Rgba {
/// The red component of the color, in the range 0.0 to 1.0
pub r: f32,
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index febf294e48..b495d70dfd 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -13,8 +13,7 @@ mod mac;
any(target_os = "linux", target_os = "freebsd"),
any(feature = "x11", feature = "wayland")
),
- target_os = "windows",
- feature = "macos-blade"
+ all(target_os = "macos", feature = "macos-blade")
))]
mod blade;
@@ -448,6 +447,8 @@ impl Tiling {
#[derive(Debug, Copy, Clone, Eq, PartialEq, Default)]
pub(crate) struct RequestFrameOptions {
pub(crate) require_presentation: bool,
+ /// Force refresh of all rendering states when true
+ pub(crate) force_render: bool,
}
pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
@@ -1216,10 +1217,6 @@ pub enum WindowKind {
/// A window that appears above all other windows, usually used for alerts or popups
/// use sparingly!
PopUp,
- /// An overlay such as a notification window, a launcher, ...
- ///
- /// Only supported on wayland
- Overlay,
}
/// The appearance of the window, as defined by the operating system.
diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs
index 33b22e7ce5..72e4477ecf 100644
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -61,7 +61,6 @@ use wayland_protocols::xdg::decoration::zv1::client::{
};
use wayland_protocols::xdg::shell::client::{xdg_surface, xdg_toplevel, xdg_wm_base};
use wayland_protocols_plasma::blur::client::{org_kde_kwin_blur, org_kde_kwin_blur_manager};
-use wayland_protocols_wlr::layer_shell::v1::client::{zwlr_layer_shell_v1, zwlr_layer_surface_v1};
use xkbcommon::xkb::ffi::XKB_KEYMAP_FORMAT_TEXT_V1;
use xkbcommon::xkb::{self, KEYMAP_COMPILE_NO_FLAGS, Keycode};
@@ -115,7 +114,6 @@ pub struct Globals {
pub fractional_scale_manager:
Option,
pub decoration_manager: Option,
- pub layer_shell: Option,
pub blur_manager: Option,
pub text_input_manager: Option,
pub executor: ForegroundExecutor,
@@ -153,7 +151,6 @@ impl Globals {
viewporter: globals.bind(&qh, 1..=1, ()).ok(),
fractional_scale_manager: globals.bind(&qh, 1..=1, ()).ok(),
decoration_manager: globals.bind(&qh, 1..=1, ()).ok(),
- layer_shell: globals.bind(&qh, 1..=1, ()).ok(),
blur_manager: globals.bind(&qh, 1..=1, ()).ok(),
text_input_manager: globals.bind(&qh, 1..=1, ()).ok(),
executor,
@@ -932,7 +929,6 @@ delegate_noop!(WaylandClientStatePtr: ignore wl_buffer::WlBuffer);
delegate_noop!(WaylandClientStatePtr: ignore wl_region::WlRegion);
delegate_noop!(WaylandClientStatePtr: ignore wp_fractional_scale_manager_v1::WpFractionalScaleManagerV1);
delegate_noop!(WaylandClientStatePtr: ignore zxdg_decoration_manager_v1::ZxdgDecorationManagerV1);
-delegate_noop!(WaylandClientStatePtr: ignore zwlr_layer_shell_v1::ZwlrLayerShellV1);
delegate_noop!(WaylandClientStatePtr: ignore org_kde_kwin_blur_manager::OrgKdeKwinBlurManager);
delegate_noop!(WaylandClientStatePtr: ignore zwp_text_input_manager_v3::ZwpTextInputManagerV3);
delegate_noop!(WaylandClientStatePtr: ignore org_kde_kwin_blur::OrgKdeKwinBlur);
@@ -1078,31 +1074,6 @@ impl Dispatch for WaylandClientStatePtr {
}
}
-impl Dispatch for WaylandClientStatePtr {
- fn event(
- this: &mut Self,
- _: &zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
- event: ::Event,
- surface_id: &ObjectId,
- _: &Connection,
- _: &QueueHandle,
- ) {
- let client = this.get_client();
- let mut state = client.borrow_mut();
- let Some(window) = get_window(&mut state, surface_id) else {
- return;
- };
- drop(state);
-
- let should_close = window.handle_layersurface_event(event);
-
- if should_close {
- // The close logic will be handled in drop_window()
- window.close();
- }
- }
-}
-
impl Dispatch for WaylandClientStatePtr {
fn event(
_: &mut Self,
diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs
index 33c908d1b2..2b2207e22c 100644
--- a/crates/gpui/src/platform/linux/wayland/window.rs
+++ b/crates/gpui/src/platform/linux/wayland/window.rs
@@ -1,6 +1,3 @@
-use blade_graphics as gpu;
-use collections::HashMap;
-use futures::channel::oneshot::Receiver;
use std::{
cell::{Ref, RefCell, RefMut},
ffi::c_void,
@@ -9,14 +6,9 @@ use std::{
sync::Arc,
};
-use crate::{
- Capslock,
- platform::{
- PlatformAtlas, PlatformInputHandler, PlatformWindow,
- blade::{BladeContext, BladeRenderer, BladeSurfaceConfig},
- linux::wayland::{display::WaylandDisplay, serial::SerialKind},
- },
-};
+use blade_graphics as gpu;
+use collections::HashMap;
+use futures::channel::oneshot::Receiver;
use raw_window_handle as rwh;
use wayland_backend::client::ObjectId;
@@ -28,8 +20,6 @@ use wayland_protocols::xdg::decoration::zv1::client::zxdg_toplevel_decoration_v1
use wayland_protocols::xdg::shell::client::xdg_surface;
use wayland_protocols::xdg::shell::client::xdg_toplevel::{self};
use wayland_protocols_plasma::blur::client::org_kde_kwin_blur;
-use wayland_protocols_wlr::layer_shell::v1::client::zwlr_layer_shell_v1::Layer;
-use wayland_protocols_wlr::layer_shell::v1::client::zwlr_layer_surface_v1;
use crate::scene::Scene;
use crate::{
@@ -37,7 +27,15 @@ use crate::{
PlatformDisplay, PlatformInput, Point, PromptButton, PromptLevel, RequestFrameOptions,
ResizeEdge, ScaledPixels, Size, Tiling, WaylandClientStatePtr, WindowAppearance,
WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowControls, WindowDecorations,
- WindowKind, WindowParams, px, size,
+ WindowParams, px, size,
+};
+use crate::{
+ Capslock,
+ platform::{
+ PlatformAtlas, PlatformInputHandler, PlatformWindow,
+ blade::{BladeContext, BladeRenderer, BladeSurfaceConfig},
+ linux::wayland::{display::WaylandDisplay, serial::SerialKind},
+ },
};
#[derive(Default)]
@@ -83,12 +81,14 @@ struct InProgressConfigure {
}
pub struct WaylandWindowState {
- surface_state: WaylandSurfaceState,
+ xdg_surface: xdg_surface::XdgSurface,
acknowledged_first_configure: bool,
pub surface: wl_surface::WlSurface,
+ decoration: Option,
app_id: Option,
appearance: WindowAppearance,
blur: Option,
+ toplevel: xdg_toplevel::XdgToplevel,
viewport: Option,
outputs: HashMap,
display: Option<(ObjectId, Output)>,
@@ -114,78 +114,6 @@ pub struct WaylandWindowState {
client_inset: Option,
}
-pub enum WaylandSurfaceState {
- Xdg(WaylandXdgSurfaceState),
- LayerShell(WaylandLayerSurfaceState),
-}
-
-pub struct WaylandXdgSurfaceState {
- xdg_surface: xdg_surface::XdgSurface,
- toplevel: xdg_toplevel::XdgToplevel,
- decoration: Option,
-}
-
-pub struct WaylandLayerSurfaceState {
- layer_surface: zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
-}
-
-impl WaylandSurfaceState {
- fn ack_configure(&self, serial: u32) {
- match self {
- WaylandSurfaceState::Xdg(WaylandXdgSurfaceState { xdg_surface, .. }) => {
- xdg_surface.ack_configure(serial);
- }
- WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface, .. }) => {
- layer_surface.ack_configure(serial);
- }
- }
- }
-
- fn decoration(&self) -> Option<&zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1> {
- if let WaylandSurfaceState::Xdg(WaylandXdgSurfaceState { decoration, .. }) = self {
- decoration.as_ref()
- } else {
- None
- }
- }
-
- fn toplevel(&self) -> Option<&xdg_toplevel::XdgToplevel> {
- if let WaylandSurfaceState::Xdg(WaylandXdgSurfaceState { toplevel, .. }) = self {
- Some(toplevel)
- } else {
- None
- }
- }
-
- fn set_geometry(&self, x: i32, y: i32, width: i32, height: i32) {
- match self {
- WaylandSurfaceState::Xdg(WaylandXdgSurfaceState { xdg_surface, .. }) => {
- xdg_surface.set_window_geometry(x, y, width, height);
- }
- WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface, .. }) => {
- // cannot set window position of a layer surface
- layer_surface.set_size(width as u32, height as u32);
- }
- }
- }
-
- fn destroy(&mut self) {
- match self {
- WaylandSurfaceState::Xdg(WaylandXdgSurfaceState {
- xdg_surface,
- toplevel,
- decoration: _decoration,
- }) => {
- toplevel.destroy();
- xdg_surface.destroy();
- }
- WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface }) => {
- layer_surface.destroy();
- }
- }
- }
-}
-
#[derive(Clone)]
pub struct WaylandWindowStatePtr {
state: Rc>,
@@ -196,7 +124,9 @@ impl WaylandWindowState {
pub(crate) fn new(
handle: AnyWindowHandle,
surface: wl_surface::WlSurface,
- surface_state: WaylandSurfaceState,
+ xdg_surface: xdg_surface::XdgSurface,
+ toplevel: xdg_toplevel::XdgToplevel,
+ decoration: Option,
appearance: WindowAppearance,
viewport: Option,
client: WaylandClientStatePtr,
@@ -226,11 +156,13 @@ impl WaylandWindowState {
};
Ok(Self {
- surface_state,
+ xdg_surface,
acknowledged_first_configure: false,
surface,
+ decoration,
app_id: None,
blur: None,
+ toplevel,
viewport,
globals,
outputs: HashMap::default(),
@@ -303,16 +235,17 @@ impl Drop for WaylandWindow {
let client = state.client.clone();
state.renderer.destroy();
- if let Some(decoration) = &state.surface_state.decoration() {
+ if let Some(decoration) = &state.decoration {
decoration.destroy();
}
if let Some(blur) = &state.blur {
blur.release();
}
- state.surface_state.destroy();
+ state.toplevel.destroy();
if let Some(viewport) = &state.viewport {
viewport.destroy();
}
+ state.xdg_surface.destroy();
state.surface.destroy();
let state_ptr = self.0.clone();
@@ -346,65 +279,27 @@ impl WaylandWindow {
appearance: WindowAppearance,
) -> anyhow::Result<(Self, ObjectId)> {
let surface = globals.compositor.create_surface(&globals.qh, ());
+ let xdg_surface = globals
+ .wm_base
+ .get_xdg_surface(&surface, &globals.qh, surface.id());
+ let toplevel = xdg_surface.get_toplevel(&globals.qh, surface.id());
- let surface_state = match (params.kind, globals.layer_shell.as_ref()) {
- // Matching on layer_shell here means that if kind is Overlay, but the compositor doesn't support layer_shell,
- // we end up defaulting to xdg_surface anyway
- (WindowKind::Overlay, Some(layer_shell)) => {
- let layer_surface = layer_shell.get_layer_surface(
- &surface,
- None,
- Layer::Overlay,
- "".to_string(),
- &globals.qh,
- surface.id(),
- );
-
- let width = params.bounds.size.width.0;
- let height = params.bounds.size.height.0;
- layer_surface.set_size(width as u32, height as u32);
- layer_surface.set_keyboard_interactivity(
- zwlr_layer_surface_v1::KeyboardInteractivity::OnDemand,
- );
-
- WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface })
- }
- _ => {
- let xdg_surface =
- globals
- .wm_base
- .get_xdg_surface(&surface, &globals.qh, surface.id());
-
- let toplevel = xdg_surface.get_toplevel(&globals.qh, surface.id());
-
- if let Some(size) = params.window_min_size {
- toplevel.set_min_size(size.width.0 as i32, size.height.0 as i32);
- }
-
- // Attempt to set up window decorations based on the requested configuration
- let decoration = globals
- .decoration_manager
- .as_ref()
- .map(|decoration_manager| {
- decoration_manager.get_toplevel_decoration(
- &toplevel,
- &globals.qh,
- surface.id(),
- )
- });
-
- WaylandSurfaceState::Xdg(WaylandXdgSurfaceState {
- xdg_surface,
- toplevel,
- decoration,
- })
- }
- };
+ if let Some(size) = params.window_min_size {
+ toplevel.set_min_size(size.width.0 as i32, size.height.0 as i32);
+ }
if let Some(fractional_scale_manager) = globals.fractional_scale_manager.as_ref() {
fractional_scale_manager.get_fractional_scale(&surface, &globals.qh, surface.id());
}
+ // Attempt to set up window decorations based on the requested configuration
+ let decoration = globals
+ .decoration_manager
+ .as_ref()
+ .map(|decoration_manager| {
+ decoration_manager.get_toplevel_decoration(&toplevel, &globals.qh, surface.id())
+ });
+
let viewport = globals
.viewporter
.as_ref()
@@ -414,7 +309,9 @@ impl WaylandWindow {
state: Rc::new(RefCell::new(WaylandWindowState::new(
handle,
surface.clone(),
- surface_state,
+ xdg_surface,
+ toplevel,
+ decoration,
appearance,
viewport,
client,
@@ -506,7 +403,7 @@ impl WaylandWindowStatePtr {
}
}
let mut state = self.state.borrow_mut();
- state.surface_state.ack_configure(serial);
+ state.xdg_surface.ack_configure(serial);
let window_geometry = inset_by_tiling(
state.bounds.map_origin(|_| px(0.0)),
@@ -516,7 +413,7 @@ impl WaylandWindowStatePtr {
.map(|v| v.0 as i32)
.map_size(|v| if v <= 0 { 1 } else { v });
- state.surface_state.set_geometry(
+ state.xdg_surface.set_window_geometry(
window_geometry.origin.x,
window_geometry.origin.y,
window_geometry.size.width,
@@ -681,42 +578,6 @@ impl WaylandWindowStatePtr {
}
}
- pub fn handle_layersurface_event(&self, event: zwlr_layer_surface_v1::Event) -> bool {
- match event {
- zwlr_layer_surface_v1::Event::Configure {
- width,
- height,
- serial,
- } => {
- let mut size = if width == 0 || height == 0 {
- None
- } else {
- Some(size(px(width as f32), px(height as f32)))
- };
-
- let mut state = self.state.borrow_mut();
- state.in_progress_configure = Some(InProgressConfigure {
- size,
- fullscreen: false,
- maximized: false,
- resizing: false,
- tiling: Tiling::default(),
- });
- drop(state);
-
- // just do the same thing we'd do as an xdg_surface
- self.handle_xdg_surface_event(xdg_surface::Event::Configure { serial });
-
- false
- }
- zwlr_layer_surface_v1::Event::Closed => {
- // unlike xdg, we don't have a choice here: the surface is closing.
- true
- }
- _ => false,
- }
- }
-
#[allow(clippy::mutable_key_type)]
pub fn handle_surface_event(
&self,
@@ -979,7 +840,7 @@ impl PlatformWindow for WaylandWindow {
let state_ptr = self.0.clone();
let dp_size = size.to_device_pixels(self.scale_factor());
- state.surface_state.set_geometry(
+ state.xdg_surface.set_window_geometry(
state.bounds.origin.x.0 as i32,
state.bounds.origin.y.0 as i32,
dp_size.width.0,
@@ -1073,16 +934,12 @@ impl PlatformWindow for WaylandWindow {
}
fn set_title(&mut self, title: &str) {
- if let Some(toplevel) = self.borrow().surface_state.toplevel() {
- toplevel.set_title(title.to_string());
- }
+ self.borrow().toplevel.set_title(title.to_string());
}
fn set_app_id(&mut self, app_id: &str) {
let mut state = self.borrow_mut();
- if let Some(toplevel) = self.borrow().surface_state.toplevel() {
- toplevel.set_app_id(app_id.to_owned());
- }
+ state.toplevel.set_app_id(app_id.to_owned());
state.app_id = Some(app_id.to_owned());
}
@@ -1093,30 +950,24 @@ impl PlatformWindow for WaylandWindow {
}
fn minimize(&self) {
- if let Some(toplevel) = self.borrow().surface_state.toplevel() {
- toplevel.set_minimized();
- }
+ self.borrow().toplevel.set_minimized();
}
fn zoom(&self) {
let state = self.borrow();
- if let Some(toplevel) = state.surface_state.toplevel() {
- if !state.maximized {
- toplevel.set_maximized();
- } else {
- toplevel.unset_maximized();
- }
+ if !state.maximized {
+ state.toplevel.set_maximized();
+ } else {
+ state.toplevel.unset_maximized();
}
}
fn toggle_fullscreen(&self) {
- let mut state = self.borrow();
- if let Some(toplevel) = state.surface_state.toplevel() {
- if !state.fullscreen {
- toplevel.set_fullscreen(None);
- } else {
- toplevel.unset_fullscreen();
- }
+ let mut state = self.borrow_mut();
+ if !state.fullscreen {
+ state.toplevel.set_fullscreen(None);
+ } else {
+ state.toplevel.unset_fullscreen();
}
}
@@ -1181,33 +1032,27 @@ impl PlatformWindow for WaylandWindow {
fn show_window_menu(&self, position: Point) {
let state = self.borrow();
let serial = state.client.get_serial(SerialKind::MousePress);
- if let Some(toplevel) = state.surface_state.toplevel() {
- toplevel.show_window_menu(
- &state.globals.seat,
- serial,
- position.x.0 as i32,
- position.y.0 as i32,
- );
- }
+ state.toplevel.show_window_menu(
+ &state.globals.seat,
+ serial,
+ position.x.0 as i32,
+ position.y.0 as i32,
+ );
}
fn start_window_move(&self) {
let state = self.borrow();
let serial = state.client.get_serial(SerialKind::MousePress);
- if let Some(toplevel) = state.surface_state.toplevel() {
- toplevel._move(&state.globals.seat, serial);
- }
+ state.toplevel._move(&state.globals.seat, serial);
}
fn start_window_resize(&self, edge: crate::ResizeEdge) {
let state = self.borrow();
- if let Some(toplevel) = state.surface_state.toplevel() {
- toplevel.resize(
- &state.globals.seat,
- state.client.get_serial(SerialKind::MousePress),
- edge.to_xdg(),
- )
- }
+ state.toplevel.resize(
+ &state.globals.seat,
+ state.client.get_serial(SerialKind::MousePress),
+ edge.to_xdg(),
+ )
}
fn window_decorations(&self) -> Decorations {
@@ -1223,7 +1068,7 @@ impl PlatformWindow for WaylandWindow {
fn request_decorations(&self, decorations: WindowDecorations) {
let mut state = self.borrow_mut();
state.decorations = decorations;
- if let Some(decoration) = state.surface_state.decoration() {
+ if let Some(decoration) = state.decoration.as_ref() {
decoration.set_mode(decorations.to_xdg());
update_window(state);
}
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index d1cb7d00cc..573e4addf7 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -1004,12 +1004,13 @@ impl X11Client {
let mut keystroke = crate::Keystroke::from_xkb(&state.xkb, modifiers, code);
let keysym = state.xkb.key_get_one_sym(code);
- // should be called after key_get_one_sym
- state.xkb.update_key(code, xkbc::KeyDirection::Down);
-
if keysym.is_modifier_key() {
return Some(());
}
+
+ // should be called after key_get_one_sym
+ state.xkb.update_key(code, xkbc::KeyDirection::Down);
+
if let Some(mut compose_state) = state.compose_state.take() {
compose_state.feed(keysym);
match compose_state.status() {
@@ -1067,12 +1068,13 @@ impl X11Client {
let keystroke = crate::Keystroke::from_xkb(&state.xkb, modifiers, code);
let keysym = state.xkb.key_get_one_sym(code);
- // should be called after key_get_one_sym
- state.xkb.update_key(code, xkbc::KeyDirection::Up);
-
if keysym.is_modifier_key() {
return Some(());
}
+
+ // should be called after key_get_one_sym
+ state.xkb.update_key(code, xkbc::KeyDirection::Up);
+
keystroke
};
drop(state);
@@ -1793,6 +1795,7 @@ impl X11ClientState {
drop(state);
window.refresh(RequestFrameOptions {
require_presentation: expose_event_received,
+ force_render: false,
});
}
xcb_connection
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index f01d33147b..aedf131909 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -559,7 +559,7 @@ impl MacWindow {
}
let native_window: id = match kind {
- WindowKind::Normal | WindowKind::Overlay => msg_send![WINDOW_CLASS, alloc],
+ WindowKind::Normal => msg_send![WINDOW_CLASS, alloc],
WindowKind::PopUp => {
style_mask |= NSWindowStyleMaskNonactivatingPanel;
msg_send![PANEL_CLASS, alloc]
@@ -711,7 +711,7 @@ impl MacWindow {
native_window.makeFirstResponder_(native_view);
match kind {
- WindowKind::Normal | WindowKind::Overlay => {
+ WindowKind::Normal => {
native_window.setLevel_(NSNormalWindowLevel);
native_window.setAcceptsMouseMovedEvents_(YES);
}
diff --git a/crates/gpui/src/platform/windows.rs b/crates/gpui/src/platform/windows.rs
index 4bdf42080d..5268d3ccba 100644
--- a/crates/gpui/src/platform/windows.rs
+++ b/crates/gpui/src/platform/windows.rs
@@ -1,6 +1,8 @@
mod clipboard;
mod destination_list;
mod direct_write;
+mod directx_atlas;
+mod directx_renderer;
mod dispatcher;
mod display;
mod events;
@@ -14,6 +16,8 @@ mod wrapper;
pub(crate) use clipboard::*;
pub(crate) use destination_list::*;
pub(crate) use direct_write::*;
+pub(crate) use directx_atlas::*;
+pub(crate) use directx_renderer::*;
pub(crate) use dispatcher::*;
pub(crate) use display::*;
pub(crate) use events::*;
diff --git a/crates/gpui/src/platform/windows/color_text_raster.hlsl b/crates/gpui/src/platform/windows/color_text_raster.hlsl
new file mode 100644
index 0000000000..ccc5fa26f0
--- /dev/null
+++ b/crates/gpui/src/platform/windows/color_text_raster.hlsl
@@ -0,0 +1,39 @@
+struct RasterVertexOutput {
+ float4 position : SV_Position;
+ float2 texcoord : TEXCOORD0;
+};
+
+RasterVertexOutput emoji_rasterization_vertex(uint vertexID : SV_VERTEXID)
+{
+ RasterVertexOutput output;
+ output.texcoord = float2((vertexID << 1) & 2, vertexID & 2);
+ output.position = float4(output.texcoord * 2.0f - 1.0f, 0.0f, 1.0f);
+ output.position.y = -output.position.y;
+
+ return output;
+}
+
+struct PixelInput {
+ float4 position: SV_Position;
+ float2 texcoord : TEXCOORD0;
+};
+
+struct Bounds {
+ int2 origin;
+ int2 size;
+};
+
+Texture2D t_layer : register(t0);
+SamplerState s_layer : register(s0);
+
+cbuffer GlyphLayerTextureParams : register(b0) {
+ Bounds bounds;
+ float4 run_color;
+};
+
+float4 emoji_rasterization_fragment(PixelInput input): SV_Target {
+ float3 sampled = t_layer.Sample(s_layer, input.texcoord.xy).rgb;
+ float alpha = (sampled.r + sampled.g + sampled.b) / 3;
+
+ return float4(run_color.rgb, alpha);
+}
diff --git a/crates/gpui/src/platform/windows/direct_write.rs b/crates/gpui/src/platform/windows/direct_write.rs
index ada306c15c..587cb7b4a6 100644
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -10,10 +10,11 @@ use windows::{
Foundation::*,
Globalization::GetUserDefaultLocaleName,
Graphics::{
- Direct2D::{Common::*, *},
+ Direct3D::D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
+ Direct3D11::*,
DirectWrite::*,
Dxgi::Common::*,
- Gdi::LOGFONTW,
+ Gdi::{IsRectEmpty, LOGFONTW},
Imaging::*,
},
System::SystemServices::LOCALE_NAME_MAX_LENGTH,
@@ -40,16 +41,21 @@ struct DirectWriteComponent {
locale: String,
factory: IDWriteFactory5,
bitmap_factory: AgileReference,
- d2d1_factory: ID2D1Factory,
in_memory_loader: IDWriteInMemoryFontFileLoader,
builder: IDWriteFontSetBuilder1,
text_renderer: Arc,
- render_context: GlyphRenderContext,
+
+ render_params: IDWriteRenderingParams3,
+ gpu_state: GPUState,
}
-struct GlyphRenderContext {
- params: IDWriteRenderingParams3,
- dc_target: ID2D1DeviceContext4,
+struct GPUState {
+ device: ID3D11Device,
+ device_context: ID3D11DeviceContext,
+ sampler: [Option; 1],
+ blend_state: ID3D11BlendState,
+ vertex_shader: ID3D11VertexShader,
+ pixel_shader: ID3D11PixelShader,
}
struct DirectWriteState {
@@ -70,12 +76,11 @@ struct FontIdentifier {
}
impl DirectWriteComponent {
- pub fn new(bitmap_factory: &IWICImagingFactory) -> Result {
+ pub fn new(bitmap_factory: &IWICImagingFactory, gpu_context: &DirectXDevices) -> Result {
+ // todo: ideally this would not be a large unsafe block but smaller isolated ones for easier auditing
unsafe {
let factory: IDWriteFactory5 = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED)?;
let bitmap_factory = AgileReference::new(bitmap_factory)?;
- let d2d1_factory: ID2D1Factory =
- D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, None)?;
// The `IDWriteInMemoryFontFileLoader` here is supported starting from
// Windows 10 Creators Update, which consequently requires the entire
// `DirectWriteTextSystem` to run on `win10 1703`+.
@@ -86,60 +91,132 @@ impl DirectWriteComponent {
GetUserDefaultLocaleName(&mut locale_vec);
let locale = String::from_utf16_lossy(&locale_vec);
let text_renderer = Arc::new(TextRendererWrapper::new(&locale));
- let render_context = GlyphRenderContext::new(&factory, &d2d1_factory)?;
+
+ let render_params = {
+ let default_params: IDWriteRenderingParams3 =
+ factory.CreateRenderingParams()?.cast()?;
+ let gamma = default_params.GetGamma();
+ let enhanced_contrast = default_params.GetEnhancedContrast();
+ let gray_contrast = default_params.GetGrayscaleEnhancedContrast();
+ let cleartype_level = default_params.GetClearTypeLevel();
+ let grid_fit_mode = default_params.GetGridFitMode();
+
+ factory.CreateCustomRenderingParams(
+ gamma,
+ enhanced_contrast,
+ gray_contrast,
+ cleartype_level,
+ DWRITE_PIXEL_GEOMETRY_RGB,
+ DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC,
+ grid_fit_mode,
+ )?
+ };
+
+ let gpu_state = GPUState::new(gpu_context)?;
Ok(DirectWriteComponent {
locale,
factory,
bitmap_factory,
- d2d1_factory,
in_memory_loader,
builder,
text_renderer,
- render_context,
+ render_params,
+ gpu_state,
})
}
}
}
-impl GlyphRenderContext {
- pub fn new(factory: &IDWriteFactory5, d2d1_factory: &ID2D1Factory) -> Result {
- unsafe {
- let default_params: IDWriteRenderingParams3 =
- factory.CreateRenderingParams()?.cast()?;
- let gamma = default_params.GetGamma();
- let enhanced_contrast = default_params.GetEnhancedContrast();
- let gray_contrast = default_params.GetGrayscaleEnhancedContrast();
- let cleartype_level = default_params.GetClearTypeLevel();
- let grid_fit_mode = default_params.GetGridFitMode();
+impl GPUState {
+ fn new(gpu_context: &DirectXDevices) -> Result {
+ let device = gpu_context.device.clone();
+ let device_context = gpu_context.device_context.clone();
- let params = factory.CreateCustomRenderingParams(
- gamma,
- enhanced_contrast,
- gray_contrast,
- cleartype_level,
- DWRITE_PIXEL_GEOMETRY_RGB,
- DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC,
- grid_fit_mode,
- )?;
- let dc_target = {
- let target = d2d1_factory.CreateDCRenderTarget(&get_render_target_property(
- DXGI_FORMAT_B8G8R8A8_UNORM,
- D2D1_ALPHA_MODE_PREMULTIPLIED,
- ))?;
- let target = target.cast::()?;
- target.SetTextRenderingParams(¶ms);
- target
+ let blend_state = {
+ let mut blend_state = None;
+ let desc = D3D11_BLEND_DESC {
+ AlphaToCoverageEnable: false.into(),
+ IndependentBlendEnable: false.into(),
+ RenderTarget: [
+ D3D11_RENDER_TARGET_BLEND_DESC {
+ BlendEnable: true.into(),
+ SrcBlend: D3D11_BLEND_SRC_ALPHA,
+ DestBlend: D3D11_BLEND_INV_SRC_ALPHA,
+ BlendOp: D3D11_BLEND_OP_ADD,
+ SrcBlendAlpha: D3D11_BLEND_SRC_ALPHA,
+ DestBlendAlpha: D3D11_BLEND_INV_SRC_ALPHA,
+ BlendOpAlpha: D3D11_BLEND_OP_ADD,
+ RenderTargetWriteMask: D3D11_COLOR_WRITE_ENABLE_ALL.0 as u8,
+ },
+ Default::default(),
+ Default::default(),
+ Default::default(),
+ Default::default(),
+ Default::default(),
+ Default::default(),
+ Default::default(),
+ ],
};
+ unsafe { device.CreateBlendState(&desc, Some(&mut blend_state)) }?;
+ blend_state.unwrap()
+ };
- Ok(Self { params, dc_target })
- }
+ let sampler = {
+ let mut sampler = None;
+ let desc = D3D11_SAMPLER_DESC {
+ Filter: D3D11_FILTER_MIN_MAG_MIP_POINT,
+ AddressU: D3D11_TEXTURE_ADDRESS_BORDER,
+ AddressV: D3D11_TEXTURE_ADDRESS_BORDER,
+ AddressW: D3D11_TEXTURE_ADDRESS_BORDER,
+ MipLODBias: 0.0,
+ MaxAnisotropy: 1,
+ ComparisonFunc: D3D11_COMPARISON_ALWAYS,
+ BorderColor: [0.0, 0.0, 0.0, 0.0],
+ MinLOD: 0.0,
+ MaxLOD: 0.0,
+ };
+ unsafe { device.CreateSamplerState(&desc, Some(&mut sampler)) }?;
+ [sampler]
+ };
+
+ let vertex_shader = {
+ let source = shader_resources::RawShaderBytes::new(
+ shader_resources::ShaderModule::EmojiRasterization,
+ shader_resources::ShaderTarget::Vertex,
+ )?;
+ let mut shader = None;
+ unsafe { device.CreateVertexShader(source.as_bytes(), None, Some(&mut shader)) }?;
+ shader.unwrap()
+ };
+
+ let pixel_shader = {
+ let source = shader_resources::RawShaderBytes::new(
+ shader_resources::ShaderModule::EmojiRasterization,
+ shader_resources::ShaderTarget::Fragment,
+ )?;
+ let mut shader = None;
+ unsafe { device.CreatePixelShader(source.as_bytes(), None, Some(&mut shader)) }?;
+ shader.unwrap()
+ };
+
+ Ok(Self {
+ device,
+ device_context,
+ sampler,
+ blend_state,
+ vertex_shader,
+ pixel_shader,
+ })
}
}
impl DirectWriteTextSystem {
- pub(crate) fn new(bitmap_factory: &IWICImagingFactory) -> Result {
- let components = DirectWriteComponent::new(bitmap_factory)?;
+ pub(crate) fn new(
+ gpu_context: &DirectXDevices,
+ bitmap_factory: &IWICImagingFactory,
+ ) -> Result {
+ let components = DirectWriteComponent::new(bitmap_factory, gpu_context)?;
let system_font_collection = unsafe {
let mut result = std::mem::zeroed();
components
@@ -648,15 +725,13 @@ impl DirectWriteState {
}
}
- fn raster_bounds(&self, params: &RenderGlyphParams) -> Result> {
- let render_target = &self.components.render_context.dc_target;
- unsafe {
- render_target.SetUnitMode(D2D1_UNIT_MODE_DIPS);
- render_target.SetDpi(96.0 * params.scale_factor, 96.0 * params.scale_factor);
- }
+ fn create_glyph_run_analysis(
+ &self,
+ params: &RenderGlyphParams,
+ ) -> Result {
let font = &self.fonts[params.font_id.0];
let glyph_id = [params.glyph_id.0 as u16];
- let advance = [0.0f32];
+ let advance = [0.0];
let offset = [DWRITE_GLYPH_OFFSET::default()];
let glyph_run = DWRITE_GLYPH_RUN {
fontFace: unsafe { std::mem::transmute_copy(&font.font_face) },
@@ -668,44 +743,87 @@ impl DirectWriteState {
isSideways: BOOL(0),
bidiLevel: 0,
};
- let bounds = unsafe {
- render_target.GetGlyphRunWorldBounds(
- Vector2 { X: 0.0, Y: 0.0 },
- &glyph_run,
- DWRITE_MEASURING_MODE_NATURAL,
- )?
+ let transform = DWRITE_MATRIX {
+ m11: params.scale_factor,
+ m12: 0.0,
+ m21: 0.0,
+ m22: params.scale_factor,
+ dx: 0.0,
+ dy: 0.0,
};
- // todo(windows)
- // This is a walkaround, deleted when figured out.
- let y_offset;
- let extra_height;
- if params.is_emoji {
- y_offset = 0;
- extra_height = 0;
- } else {
- // make some room for scaler.
- y_offset = -1;
- extra_height = 2;
+ let subpixel_shift = params
+ .subpixel_variant
+ .map(|v| v as f32 / SUBPIXEL_VARIANTS as f32);
+ let baseline_origin_x = subpixel_shift.x / params.scale_factor;
+ let baseline_origin_y = subpixel_shift.y / params.scale_factor;
+
+ let mut rendering_mode = DWRITE_RENDERING_MODE1::default();
+ let mut grid_fit_mode = DWRITE_GRID_FIT_MODE::default();
+ unsafe {
+ font.font_face.GetRecommendedRenderingMode(
+ params.font_size.0,
+ // The dpi here seems that it has the same effect with `Some(&transform)`
+ 1.0,
+ 1.0,
+ Some(&transform),
+ false,
+ DWRITE_OUTLINE_THRESHOLD_ANTIALIASED,
+ DWRITE_MEASURING_MODE_NATURAL,
+ &self.components.render_params,
+ &mut rendering_mode,
+ &mut grid_fit_mode,
+ )?;
}
- if bounds.right < bounds.left {
+ let glyph_analysis = unsafe {
+ self.components.factory.CreateGlyphRunAnalysis(
+ &glyph_run,
+ Some(&transform),
+ rendering_mode,
+ DWRITE_MEASURING_MODE_NATURAL,
+ grid_fit_mode,
+ // We're using cleartype not grayscale for monochrome is because it provides better quality
+ DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE,
+ baseline_origin_x,
+ baseline_origin_y,
+ )
+ }?;
+ Ok(glyph_analysis)
+ }
+
+ fn raster_bounds(&self, params: &RenderGlyphParams) -> Result> {
+ let glyph_analysis = self.create_glyph_run_analysis(params)?;
+
+ let bounds = unsafe { glyph_analysis.GetAlphaTextureBounds(DWRITE_TEXTURE_CLEARTYPE_3x1)? };
+ // Some glyphs cannot be drawn with ClearType, such as bitmap fonts. In that case
+ // GetAlphaTextureBounds() supposedly returns an empty RECT, but I haven't tested that yet.
+ if !unsafe { IsRectEmpty(&bounds) }.as_bool() {
Ok(Bounds {
- origin: point(0.into(), 0.into()),
- size: size(0.into(), 0.into()),
+ origin: point(bounds.left.into(), bounds.top.into()),
+ size: size(
+ (bounds.right - bounds.left).into(),
+ (bounds.bottom - bounds.top).into(),
+ ),
})
} else {
- Ok(Bounds {
- origin: point(
- ((bounds.left * params.scale_factor).ceil() as i32).into(),
- ((bounds.top * params.scale_factor).ceil() as i32 + y_offset).into(),
- ),
- size: size(
- (((bounds.right - bounds.left) * params.scale_factor).ceil() as i32).into(),
- (((bounds.bottom - bounds.top) * params.scale_factor).ceil() as i32
- + extra_height)
- .into(),
- ),
- })
+ // If it's empty, retry with grayscale AA.
+ let bounds =
+ unsafe { glyph_analysis.GetAlphaTextureBounds(DWRITE_TEXTURE_ALIASED_1x1)? };
+
+ if bounds.right < bounds.left {
+ Ok(Bounds {
+ origin: point(0.into(), 0.into()),
+ size: size(0.into(), 0.into()),
+ })
+ } else {
+ Ok(Bounds {
+ origin: point(bounds.left.into(), bounds.top.into()),
+ size: size(
+ (bounds.right - bounds.left).into(),
+ (bounds.bottom - bounds.top).into(),
+ ),
+ })
+ }
}
}
@@ -731,7 +849,95 @@ impl DirectWriteState {
anyhow::bail!("glyph bounds are empty");
}
- let font_info = &self.fonts[params.font_id.0];
+ let bitmap_data = if params.is_emoji {
+ if let Ok(color) = self.rasterize_color(¶ms, glyph_bounds) {
+ color
+ } else {
+ let monochrome = self.rasterize_monochrome(params, glyph_bounds)?;
+ monochrome
+ .into_iter()
+ .flat_map(|pixel| [0, 0, 0, pixel])
+ .collect::>()
+ }
+ } else {
+ self.rasterize_monochrome(params, glyph_bounds)?
+ };
+
+ Ok((glyph_bounds.size, bitmap_data))
+ }
+
+ fn rasterize_monochrome(
+ &self,
+ params: &RenderGlyphParams,
+ glyph_bounds: Bounds,
+ ) -> Result> {
+ let mut bitmap_data =
+ vec![0u8; glyph_bounds.size.width.0 as usize * glyph_bounds.size.height.0 as usize * 3];
+
+ let glyph_analysis = self.create_glyph_run_analysis(params)?;
+ unsafe {
+ glyph_analysis.CreateAlphaTexture(
+ // We're using cleartype not grayscale for monochrome is because it provides better quality
+ DWRITE_TEXTURE_CLEARTYPE_3x1,
+ &RECT {
+ left: glyph_bounds.origin.x.0,
+ top: glyph_bounds.origin.y.0,
+ right: glyph_bounds.size.width.0 + glyph_bounds.origin.x.0,
+ bottom: glyph_bounds.size.height.0 + glyph_bounds.origin.y.0,
+ },
+ &mut bitmap_data,
+ )?;
+ }
+
+ let bitmap_factory = self.components.bitmap_factory.resolve()?;
+ let bitmap = unsafe {
+ bitmap_factory.CreateBitmapFromMemory(
+ glyph_bounds.size.width.0 as u32,
+ glyph_bounds.size.height.0 as u32,
+ &GUID_WICPixelFormat24bppRGB,
+ glyph_bounds.size.width.0 as u32 * 3,
+ &bitmap_data,
+ )
+ }?;
+
+ let grayscale_bitmap =
+ unsafe { WICConvertBitmapSource(&GUID_WICPixelFormat8bppGray, &bitmap) }?;
+
+ let mut bitmap_data =
+ vec![0u8; glyph_bounds.size.width.0 as usize * glyph_bounds.size.height.0 as usize];
+ unsafe {
+ grayscale_bitmap.CopyPixels(
+ std::ptr::null() as _,
+ glyph_bounds.size.width.0 as u32,
+ &mut bitmap_data,
+ )
+ }?;
+
+ Ok(bitmap_data)
+ }
+
+ fn rasterize_color(
+ &self,
+ params: &RenderGlyphParams,
+ glyph_bounds: Bounds,
+ ) -> Result> {
+ let bitmap_size = glyph_bounds.size;
+ let subpixel_shift = params
+ .subpixel_variant
+ .map(|v| v as f32 / SUBPIXEL_VARIANTS as f32);
+ let baseline_origin_x = subpixel_shift.x / params.scale_factor;
+ let baseline_origin_y = subpixel_shift.y / params.scale_factor;
+
+ let transform = DWRITE_MATRIX {
+ m11: params.scale_factor,
+ m12: 0.0,
+ m21: 0.0,
+ m22: params.scale_factor,
+ dx: 0.0,
+ dy: 0.0,
+ };
+
+ let font = &self.fonts[params.font_id.0];
let glyph_id = [params.glyph_id.0 as u16];
let advance = [glyph_bounds.size.width.0 as f32];
let offset = [DWRITE_GLYPH_OFFSET {
@@ -739,7 +945,7 @@ impl DirectWriteState {
ascenderOffset: glyph_bounds.origin.y.0 as f32 / params.scale_factor,
}];
let glyph_run = DWRITE_GLYPH_RUN {
- fontFace: unsafe { std::mem::transmute_copy(&font_info.font_face) },
+ fontFace: unsafe { std::mem::transmute_copy(&font.font_face) },
fontEmSize: params.font_size.0,
glyphCount: 1,
glyphIndices: glyph_id.as_ptr(),
@@ -749,160 +955,254 @@ impl DirectWriteState {
bidiLevel: 0,
};
- // Add an extra pixel when the subpixel variant isn't zero to make room for anti-aliasing.
- let mut bitmap_size = glyph_bounds.size;
- if params.subpixel_variant.x > 0 {
- bitmap_size.width += DevicePixels(1);
- }
- if params.subpixel_variant.y > 0 {
- bitmap_size.height += DevicePixels(1);
- }
- let bitmap_size = bitmap_size;
+ // todo: support formats other than COLR
+ let color_enumerator = unsafe {
+ self.components.factory.TranslateColorGlyphRun(
+ Vector2::new(baseline_origin_x, baseline_origin_y),
+ &glyph_run,
+ None,
+ DWRITE_GLYPH_IMAGE_FORMATS_COLR,
+ DWRITE_MEASURING_MODE_NATURAL,
+ Some(&transform),
+ 0,
+ )
+ }?;
- let total_bytes;
- let bitmap_format;
- let render_target_property;
- let bitmap_width;
- let bitmap_height;
- let bitmap_stride;
- let bitmap_dpi;
- if params.is_emoji {
- total_bytes = bitmap_size.height.0 as usize * bitmap_size.width.0 as usize * 4;
- bitmap_format = &GUID_WICPixelFormat32bppPBGRA;
- render_target_property = get_render_target_property(
- DXGI_FORMAT_B8G8R8A8_UNORM,
- D2D1_ALPHA_MODE_PREMULTIPLIED,
- );
- bitmap_width = bitmap_size.width.0 as u32;
- bitmap_height = bitmap_size.height.0 as u32;
- bitmap_stride = bitmap_size.width.0 as u32 * 4;
- bitmap_dpi = 96.0;
- } else {
- total_bytes = bitmap_size.height.0 as usize * bitmap_size.width.0 as usize;
- bitmap_format = &GUID_WICPixelFormat8bppAlpha;
- render_target_property =
- get_render_target_property(DXGI_FORMAT_A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT);
- bitmap_width = bitmap_size.width.0 as u32 * 2;
- bitmap_height = bitmap_size.height.0 as u32 * 2;
- bitmap_stride = bitmap_size.width.0 as u32;
- bitmap_dpi = 192.0;
+ let mut glyph_layers = Vec::new();
+ loop {
+ let color_run = unsafe { color_enumerator.GetCurrentRun() }?;
+ let color_run = unsafe { &*color_run };
+ let image_format = color_run.glyphImageFormat & !DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE;
+ if image_format == DWRITE_GLYPH_IMAGE_FORMATS_COLR {
+ let color_analysis = unsafe {
+ self.components.factory.CreateGlyphRunAnalysis(
+ &color_run.Base.glyphRun as *const _,
+ Some(&transform),
+ DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC,
+ DWRITE_MEASURING_MODE_NATURAL,
+ DWRITE_GRID_FIT_MODE_DEFAULT,
+ DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE,
+ baseline_origin_x,
+ baseline_origin_y,
+ )
+ }?;
+
+ let color_bounds =
+ unsafe { color_analysis.GetAlphaTextureBounds(DWRITE_TEXTURE_CLEARTYPE_3x1) }?;
+
+ let color_size = size(
+ color_bounds.right - color_bounds.left,
+ color_bounds.bottom - color_bounds.top,
+ );
+ if color_size.width > 0 && color_size.height > 0 {
+ let mut alpha_data =
+ vec![0u8; (color_size.width * color_size.height * 3) as usize];
+ unsafe {
+ color_analysis.CreateAlphaTexture(
+ DWRITE_TEXTURE_CLEARTYPE_3x1,
+ &color_bounds,
+ &mut alpha_data,
+ )
+ }?;
+
+ let run_color = {
+ let run_color = color_run.Base.runColor;
+ Rgba {
+ r: run_color.r,
+ g: run_color.g,
+ b: run_color.b,
+ a: run_color.a,
+ }
+ };
+ let bounds = bounds(point(color_bounds.left, color_bounds.top), color_size);
+ let alpha_data = alpha_data
+ .chunks_exact(3)
+ .flat_map(|chunk| [chunk[0], chunk[1], chunk[2], 255])
+ .collect::>();
+ glyph_layers.push(GlyphLayerTexture::new(
+ &self.components.gpu_state,
+ run_color,
+ bounds,
+ &alpha_data,
+ )?);
+ }
+ }
+
+ let has_next = unsafe { color_enumerator.MoveNext() }
+ .map(|e| e.as_bool())
+ .unwrap_or(false);
+ if !has_next {
+ break;
+ }
}
- let bitmap_factory = self.components.bitmap_factory.resolve()?;
- unsafe {
- let bitmap = bitmap_factory.CreateBitmap(
- bitmap_width,
- bitmap_height,
- bitmap_format,
- WICBitmapCacheOnLoad,
- )?;
- let render_target = self
- .components
- .d2d1_factory
- .CreateWicBitmapRenderTarget(&bitmap, &render_target_property)?;
- let brush = render_target.CreateSolidColorBrush(&BRUSH_COLOR, None)?;
- let subpixel_shift = params
- .subpixel_variant
- .map(|v| v as f32 / SUBPIXEL_VARIANTS as f32);
- let baseline_origin = Vector2 {
- X: subpixel_shift.x / params.scale_factor,
- Y: subpixel_shift.y / params.scale_factor,
+ let gpu_state = &self.components.gpu_state;
+ let params_buffer = {
+ let desc = D3D11_BUFFER_DESC {
+ ByteWidth: std::mem::size_of::() as u32,
+ Usage: D3D11_USAGE_DYNAMIC,
+ BindFlags: D3D11_BIND_CONSTANT_BUFFER.0 as u32,
+ CPUAccessFlags: D3D11_CPU_ACCESS_WRITE.0 as u32,
+ MiscFlags: 0,
+ StructureByteStride: 0,
};
- // This `cast()` action here should never fail since we are running on Win10+, and
- // ID2D1DeviceContext4 requires Win8+
- let render_target = render_target.cast::().unwrap();
- render_target.SetUnitMode(D2D1_UNIT_MODE_DIPS);
- render_target.SetDpi(
- bitmap_dpi * params.scale_factor,
- bitmap_dpi * params.scale_factor,
- );
- render_target.SetTextRenderingParams(&self.components.render_context.params);
- render_target.BeginDraw();
+ let mut buffer = None;
+ unsafe {
+ gpu_state
+ .device
+ .CreateBuffer(&desc, None, Some(&mut buffer))
+ }?;
+ [buffer]
+ };
- if params.is_emoji {
- // WARN: only DWRITE_GLYPH_IMAGE_FORMATS_COLR has been tested
- let enumerator = self.components.factory.TranslateColorGlyphRun(
- baseline_origin,
- &glyph_run as _,
- None,
- DWRITE_GLYPH_IMAGE_FORMATS_COLR
- | DWRITE_GLYPH_IMAGE_FORMATS_SVG
- | DWRITE_GLYPH_IMAGE_FORMATS_PNG
- | DWRITE_GLYPH_IMAGE_FORMATS_JPEG
- | DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8,
- DWRITE_MEASURING_MODE_NATURAL,
- None,
+ let render_target_texture = {
+ let mut texture = None;
+ let desc = D3D11_TEXTURE2D_DESC {
+ Width: bitmap_size.width.0 as u32,
+ Height: bitmap_size.height.0 as u32,
+ MipLevels: 1,
+ ArraySize: 1,
+ Format: DXGI_FORMAT_B8G8R8A8_UNORM,
+ SampleDesc: DXGI_SAMPLE_DESC {
+ Count: 1,
+ Quality: 0,
+ },
+ Usage: D3D11_USAGE_DEFAULT,
+ BindFlags: D3D11_BIND_RENDER_TARGET.0 as u32,
+ CPUAccessFlags: 0,
+ MiscFlags: 0,
+ };
+ unsafe {
+ gpu_state
+ .device
+ .CreateTexture2D(&desc, None, Some(&mut texture))
+ }?;
+ texture.unwrap()
+ };
+
+ let render_target_view = {
+ let desc = D3D11_RENDER_TARGET_VIEW_DESC {
+ Format: DXGI_FORMAT_B8G8R8A8_UNORM,
+ ViewDimension: D3D11_RTV_DIMENSION_TEXTURE2D,
+ Anonymous: D3D11_RENDER_TARGET_VIEW_DESC_0 {
+ Texture2D: D3D11_TEX2D_RTV { MipSlice: 0 },
+ },
+ };
+ let mut rtv = None;
+ unsafe {
+ gpu_state.device.CreateRenderTargetView(
+ &render_target_texture,
+ Some(&desc),
+ Some(&mut rtv),
+ )
+ }?;
+ [rtv]
+ };
+
+ let staging_texture = {
+ let mut texture = None;
+ let desc = D3D11_TEXTURE2D_DESC {
+ Width: bitmap_size.width.0 as u32,
+ Height: bitmap_size.height.0 as u32,
+ MipLevels: 1,
+ ArraySize: 1,
+ Format: DXGI_FORMAT_B8G8R8A8_UNORM,
+ SampleDesc: DXGI_SAMPLE_DESC {
+ Count: 1,
+ Quality: 0,
+ },
+ Usage: D3D11_USAGE_STAGING,
+ BindFlags: 0,
+ CPUAccessFlags: D3D11_CPU_ACCESS_READ.0 as u32,
+ MiscFlags: 0,
+ };
+ unsafe {
+ gpu_state
+ .device
+ .CreateTexture2D(&desc, None, Some(&mut texture))
+ }?;
+ texture.unwrap()
+ };
+
+ let device_context = &gpu_state.device_context;
+ unsafe { device_context.IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP) };
+ unsafe { device_context.VSSetShader(&gpu_state.vertex_shader, None) };
+ unsafe { device_context.PSSetShader(&gpu_state.pixel_shader, None) };
+ unsafe { device_context.VSSetConstantBuffers(0, Some(¶ms_buffer)) };
+ unsafe { device_context.PSSetConstantBuffers(0, Some(¶ms_buffer)) };
+ unsafe { device_context.OMSetRenderTargets(Some(&render_target_view), None) };
+ unsafe { device_context.PSSetSamplers(0, Some(&gpu_state.sampler)) };
+ unsafe { device_context.OMSetBlendState(&gpu_state.blend_state, None, 0xffffffff) };
+
+ for layer in glyph_layers {
+ let params = GlyphLayerTextureParams {
+ run_color: layer.run_color,
+ bounds: layer.bounds,
+ };
+ unsafe {
+ let mut dest = std::mem::zeroed();
+ gpu_state.device_context.Map(
+ params_buffer[0].as_ref().unwrap(),
0,
+ D3D11_MAP_WRITE_DISCARD,
+ 0,
+ Some(&mut dest),
)?;
- while enumerator.MoveNext().is_ok() {
- let Ok(color_glyph) = enumerator.GetCurrentRun() else {
- break;
- };
- let color_glyph = &*color_glyph;
- let brush_color = translate_color(&color_glyph.Base.runColor);
- brush.SetColor(&brush_color);
- match color_glyph.glyphImageFormat {
- DWRITE_GLYPH_IMAGE_FORMATS_PNG
- | DWRITE_GLYPH_IMAGE_FORMATS_JPEG
- | DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 => render_target
- .DrawColorBitmapGlyphRun(
- color_glyph.glyphImageFormat,
- baseline_origin,
- &color_glyph.Base.glyphRun,
- color_glyph.measuringMode,
- D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION_DEFAULT,
- ),
- DWRITE_GLYPH_IMAGE_FORMATS_SVG => render_target.DrawSvgGlyphRun(
- baseline_origin,
- &color_glyph.Base.glyphRun,
- &brush,
- None,
- color_glyph.Base.paletteIndex as u32,
- color_glyph.measuringMode,
- ),
- _ => render_target.DrawGlyphRun(
- baseline_origin,
- &color_glyph.Base.glyphRun,
- Some(color_glyph.Base.glyphRunDescription as *const _),
- &brush,
- color_glyph.measuringMode,
- ),
- }
- }
- } else {
- render_target.DrawGlyphRun(
- baseline_origin,
- &glyph_run,
- None,
- &brush,
- DWRITE_MEASURING_MODE_NATURAL,
- );
- }
- render_target.EndDraw(None, None)?;
+ std::ptr::copy_nonoverlapping(¶ms as *const _, dest.pData as *mut _, 1);
+ gpu_state
+ .device_context
+ .Unmap(params_buffer[0].as_ref().unwrap(), 0);
+ };
- let mut raw_data = vec![0u8; total_bytes];
- if params.is_emoji {
- bitmap.CopyPixels(std::ptr::null() as _, bitmap_stride, &mut raw_data)?;
- // Convert from BGRA with premultiplied alpha to BGRA with straight alpha.
- for pixel in raw_data.chunks_exact_mut(4) {
- let a = pixel[3] as f32 / 255.;
- pixel[0] = (pixel[0] as f32 / a) as u8;
- pixel[1] = (pixel[1] as f32 / a) as u8;
- pixel[2] = (pixel[2] as f32 / a) as u8;
- }
- } else {
- let scaler = bitmap_factory.CreateBitmapScaler()?;
- scaler.Initialize(
- &bitmap,
- bitmap_size.width.0 as u32,
- bitmap_size.height.0 as u32,
- WICBitmapInterpolationModeHighQualityCubic,
- )?;
- scaler.CopyPixels(std::ptr::null() as _, bitmap_stride, &mut raw_data)?;
- }
- Ok((bitmap_size, raw_data))
+ let texture = [Some(layer.texture_view)];
+ unsafe { device_context.PSSetShaderResources(0, Some(&texture)) };
+
+ let viewport = [D3D11_VIEWPORT {
+ TopLeftX: layer.bounds.origin.x as f32,
+ TopLeftY: layer.bounds.origin.y as f32,
+ Width: layer.bounds.size.width as f32,
+ Height: layer.bounds.size.height as f32,
+ MinDepth: 0.0,
+ MaxDepth: 1.0,
+ }];
+ unsafe { device_context.RSSetViewports(Some(&viewport)) };
+
+ unsafe { device_context.Draw(4, 0) };
}
+
+ unsafe { device_context.CopyResource(&staging_texture, &render_target_texture) };
+
+ let mapped_data = {
+ let mut mapped_data = D3D11_MAPPED_SUBRESOURCE::default();
+ unsafe {
+ device_context.Map(
+ &staging_texture,
+ 0,
+ D3D11_MAP_READ,
+ 0,
+ Some(&mut mapped_data),
+ )
+ }?;
+ mapped_data
+ };
+ let mut rasterized =
+ vec![0u8; (bitmap_size.width.0 as u32 * bitmap_size.height.0 as u32 * 4) as usize];
+
+ for y in 0..bitmap_size.height.0 as usize {
+ let width = bitmap_size.width.0 as usize;
+ unsafe {
+ std::ptr::copy_nonoverlapping::(
+ (mapped_data.pData as *const u8).byte_add(mapped_data.RowPitch as usize * y),
+ rasterized
+ .as_mut_ptr()
+ .byte_add(width * y * std::mem::size_of::()),
+ width * std::mem::size_of::(),
+ )
+ };
+ }
+
+ Ok(rasterized)
}
fn get_typographic_bounds(&self, font_id: FontId, glyph_id: GlyphId) -> Result> {
@@ -976,6 +1276,84 @@ impl Drop for DirectWriteState {
}
}
+struct GlyphLayerTexture {
+ run_color: Rgba,
+ bounds: Bounds,
+ texture_view: ID3D11ShaderResourceView,
+ // holding on to the texture to not RAII drop it
+ _texture: ID3D11Texture2D,
+}
+
+impl GlyphLayerTexture {
+ pub fn new(
+ gpu_state: &GPUState,
+ run_color: Rgba,
+ bounds: Bounds