diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 0000000000..35049cbcb1
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[alias]
+xtask = "run --package xtask --"
diff --git a/.config/nextest.toml b/.config/nextest.toml
new file mode 100644
index 0000000000..b05d68911f
--- /dev/null
+++ b/.config/nextest.toml
@@ -0,0 +1,6 @@
+[test-groups]
+sequential-db-tests = { max-threads = 1 }
+
+[[profile.default.overrides]]
+filter = 'package(db)'
+test-group = 'sequential-db-tests'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1c16b2d4d..a906c8b82d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,7 @@ jobs:
rustup set profile minimal
rustup update stable
rustup target add wasm32-wasi
+ cargo install cargo-nextest
- name: Install Node
uses: actions/setup-node@v2
@@ -70,7 +71,7 @@ jobs:
run: cargo check --workspace
- name: Run tests
- run: cargo test --workspace --no-fail-fast
+ run: cargo nextest run --workspace --no-fail-fast
- name: Build collab
run: cargo build -p collab
diff --git a/.gitignore b/.gitignore
index 30d0fcbf1c..dbffa0f829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
/plugins/bin
/script/node_modules
/styles/node_modules
+/styles/src/types/zed.ts
+/crates/theme/schemas/theme.json
/crates/collab/static/styles.css
/vendor/bin
/assets/themes/*.json
diff --git a/Cargo.lock b/Cargo.lock
index 55e10ed326..a9b2e29ea0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,6 +109,8 @@ dependencies = [
"isahc",
"language",
"menu",
+ "project",
+ "regex",
"schemars",
"search",
"serde",
@@ -190,6 +192,55 @@ dependencies = [
"libc",
]
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal 0.4.7",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "anyhow"
version = "1.0.71"
@@ -1102,8 +1153,8 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
dependencies = [
"atty",
"bitflags",
- "clap_derive",
- "clap_lex",
+ "clap_derive 3.2.25",
+ "clap_lex 0.2.4",
"indexmap",
"once_cell",
"strsim",
@@ -1111,6 +1162,30 @@ dependencies = [
"textwrap",
]
+[[package]]
+name = "clap"
+version = "4.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc"
+dependencies = [
+ "clap_builder",
+ "clap_derive 4.3.2",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags",
+ "clap_lex 0.5.0",
+ "strsim",
+]
+
[[package]]
name = "clap_derive"
version = "3.2.25"
@@ -1124,6 +1199,18 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "clap_derive"
+version = "4.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
[[package]]
name = "clap_lex"
version = "0.2.4"
@@ -1133,12 +1220,18 @@ dependencies = [
"os_str_bytes",
]
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
[[package]]
name = "cli"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap",
+ "clap 3.2.25",
"core-foundation",
"core-services",
"dirs 3.0.2",
@@ -1240,7 +1333,7 @@ dependencies = [
[[package]]
name = "collab"
-version = "0.14.2"
+version = "0.15.0"
dependencies = [
"anyhow",
"async-tungstenite",
@@ -1248,7 +1341,7 @@ dependencies = [
"axum-extra",
"base64 0.13.1",
"call",
- "clap",
+ "clap 3.2.25",
"client",
"collections",
"ctor",
@@ -1326,8 +1419,10 @@ dependencies = [
"serde_derive",
"settings",
"theme",
+ "theme_selector",
"util",
"workspace",
+ "zed-actions",
]
[[package]]
@@ -1343,6 +1438,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
[[package]]
name = "command_palette"
version = "0.1.0"
@@ -6917,18 +7018,6 @@ dependencies = [
"workspace",
]
-[[package]]
-name = "theme_testbench"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "project",
- "settings",
- "smallvec",
- "theme",
- "workspace",
-]
-
[[package]]
name = "thiserror"
version = "1.0.40"
@@ -8781,6 +8870,17 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
+[[package]]
+name = "xtask"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap 4.3.5",
+ "schemars",
+ "serde_json",
+ "theme",
+]
+
[[package]]
name = "yaml-rust"
version = "0.4.5"
@@ -8810,7 +8910,7 @@ dependencies = [
[[package]]
name = "zed"
-version = "0.92.0"
+version = "0.94.0"
dependencies = [
"activity_indicator",
"ai",
@@ -8889,7 +8989,6 @@ dependencies = [
"text",
"theme",
"theme_selector",
- "theme_testbench",
"thiserror",
"tiny_http",
"toml",
@@ -8921,6 +9020,14 @@ dependencies = [
"vim",
"welcome",
"workspace",
+ "zed-actions",
+]
+
+[[package]]
+name = "zed-actions"
+version = "0.1.0"
+dependencies = [
+ "gpui",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index fca7355964..3f3953096e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,12 +61,13 @@ members = [
"crates/text",
"crates/theme",
"crates/theme_selector",
- "crates/theme_testbench",
"crates/util",
"crates/vim",
"crates/workspace",
"crates/welcome",
+ "crates/xtask",
"crates/zed",
+ "crates/zed-actions"
]
default-members = ["crates/zed"]
resolver = "2"
@@ -118,3 +119,4 @@ split-debuginfo = "unpacked"
[profile.release]
debug = true
lto = "thin"
+codegen-units = 1
diff --git a/assets/icons/assist_15.svg b/assets/icons/assist_15.svg
new file mode 100644
index 0000000000..3baf8df3e9
--- /dev/null
+++ b/assets/icons/assist_15.svg
@@ -0,0 +1 @@
+
diff --git a/assets/icons/hamburger_15.svg b/assets/icons/hamburger_15.svg
new file mode 100644
index 0000000000..060caeecbf
--- /dev/null
+++ b/assets/icons/hamburger_15.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/quote_15.svg b/assets/icons/quote_15.svg
new file mode 100644
index 0000000000..be5eabd9b0
--- /dev/null
+++ b/assets/icons/quote_15.svg
@@ -0,0 +1 @@
+
diff --git a/assets/icons/radix/accessibility.svg b/assets/icons/radix/accessibility.svg
new file mode 100644
index 0000000000..32d78f2d8d
--- /dev/null
+++ b/assets/icons/radix/accessibility.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/activity-log.svg b/assets/icons/radix/activity-log.svg
new file mode 100644
index 0000000000..8feab7d449
--- /dev/null
+++ b/assets/icons/radix/activity-log.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-baseline.svg b/assets/icons/radix/align-baseline.svg
new file mode 100644
index 0000000000..07213dc1ae
--- /dev/null
+++ b/assets/icons/radix/align-baseline.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-bottom.svg b/assets/icons/radix/align-bottom.svg
new file mode 100644
index 0000000000..7d11c0cd5a
--- /dev/null
+++ b/assets/icons/radix/align-bottom.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-center-horizontally.svg b/assets/icons/radix/align-center-horizontally.svg
new file mode 100644
index 0000000000..69509a7d09
--- /dev/null
+++ b/assets/icons/radix/align-center-horizontally.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-center-vertically.svg b/assets/icons/radix/align-center-vertically.svg
new file mode 100644
index 0000000000..4f1b50cc43
--- /dev/null
+++ b/assets/icons/radix/align-center-vertically.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-center.svg b/assets/icons/radix/align-center.svg
new file mode 100644
index 0000000000..caaec36477
--- /dev/null
+++ b/assets/icons/radix/align-center.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-end.svg b/assets/icons/radix/align-end.svg
new file mode 100644
index 0000000000..18f1b64912
--- /dev/null
+++ b/assets/icons/radix/align-end.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-horizontal-centers.svg b/assets/icons/radix/align-horizontal-centers.svg
new file mode 100644
index 0000000000..2d1d64ea4b
--- /dev/null
+++ b/assets/icons/radix/align-horizontal-centers.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-left.svg b/assets/icons/radix/align-left.svg
new file mode 100644
index 0000000000..0d5dba095c
--- /dev/null
+++ b/assets/icons/radix/align-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-right.svg b/assets/icons/radix/align-right.svg
new file mode 100644
index 0000000000..1b6b3f0ffa
--- /dev/null
+++ b/assets/icons/radix/align-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-start.svg b/assets/icons/radix/align-start.svg
new file mode 100644
index 0000000000..ada50e1079
--- /dev/null
+++ b/assets/icons/radix/align-start.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-stretch.svg b/assets/icons/radix/align-stretch.svg
new file mode 100644
index 0000000000..3cb28605cb
--- /dev/null
+++ b/assets/icons/radix/align-stretch.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-top.svg b/assets/icons/radix/align-top.svg
new file mode 100644
index 0000000000..23db80f4dd
--- /dev/null
+++ b/assets/icons/radix/align-top.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/align-vertical-centers.svg b/assets/icons/radix/align-vertical-centers.svg
new file mode 100644
index 0000000000..07eaee7bf7
--- /dev/null
+++ b/assets/icons/radix/align-vertical-centers.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/all-sides.svg b/assets/icons/radix/all-sides.svg
new file mode 100644
index 0000000000..8ace7df03f
--- /dev/null
+++ b/assets/icons/radix/all-sides.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/angle.svg b/assets/icons/radix/angle.svg
new file mode 100644
index 0000000000..a0d93f3460
--- /dev/null
+++ b/assets/icons/radix/angle.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/archive.svg b/assets/icons/radix/archive.svg
new file mode 100644
index 0000000000..74063f1d1e
--- /dev/null
+++ b/assets/icons/radix/archive.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/arrow-bottom-left.svg b/assets/icons/radix/arrow-bottom-left.svg
new file mode 100644
index 0000000000..7a4511aa2d
--- /dev/null
+++ b/assets/icons/radix/arrow-bottom-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/arrow-bottom-right.svg b/assets/icons/radix/arrow-bottom-right.svg
new file mode 100644
index 0000000000..2ba9fef101
--- /dev/null
+++ b/assets/icons/radix/arrow-bottom-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/arrow-down.svg b/assets/icons/radix/arrow-down.svg
new file mode 100644
index 0000000000..5dc21a6689
--- /dev/null
+++ b/assets/icons/radix/arrow-down.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/arrow-left.svg b/assets/icons/radix/arrow-left.svg
new file mode 100644
index 0000000000..3a64c8394f
--- /dev/null
+++ b/assets/icons/radix/arrow-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/arrow-right.svg b/assets/icons/radix/arrow-right.svg
new file mode 100644
index 0000000000..e3d30988d5
--- /dev/null
+++ b/assets/icons/radix/arrow-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/arrow-top-left.svg b/assets/icons/radix/arrow-top-left.svg
new file mode 100644
index 0000000000..69fef41dee
--- /dev/null
+++ b/assets/icons/radix/arrow-top-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/arrow-top-right.svg b/assets/icons/radix/arrow-top-right.svg
new file mode 100644
index 0000000000..c1016376e3
--- /dev/null
+++ b/assets/icons/radix/arrow-top-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/arrow-up.svg b/assets/icons/radix/arrow-up.svg
new file mode 100644
index 0000000000..ba426119e9
--- /dev/null
+++ b/assets/icons/radix/arrow-up.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/aspect-ratio.svg b/assets/icons/radix/aspect-ratio.svg
new file mode 100644
index 0000000000..0851f2e1e9
--- /dev/null
+++ b/assets/icons/radix/aspect-ratio.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/avatar.svg b/assets/icons/radix/avatar.svg
new file mode 100644
index 0000000000..cb229c77fe
--- /dev/null
+++ b/assets/icons/radix/avatar.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/backpack.svg b/assets/icons/radix/backpack.svg
new file mode 100644
index 0000000000..a5c9cedbd3
--- /dev/null
+++ b/assets/icons/radix/backpack.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/badge.svg b/assets/icons/radix/badge.svg
new file mode 100644
index 0000000000..aa764d4726
--- /dev/null
+++ b/assets/icons/radix/badge.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/bar-chart.svg b/assets/icons/radix/bar-chart.svg
new file mode 100644
index 0000000000..f8054781d9
--- /dev/null
+++ b/assets/icons/radix/bar-chart.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/bell.svg b/assets/icons/radix/bell.svg
new file mode 100644
index 0000000000..ea1c6dd42e
--- /dev/null
+++ b/assets/icons/radix/bell.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/blending-mode.svg b/assets/icons/radix/blending-mode.svg
new file mode 100644
index 0000000000..bd58cf4ee3
--- /dev/null
+++ b/assets/icons/radix/blending-mode.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/bookmark-filled.svg b/assets/icons/radix/bookmark-filled.svg
new file mode 100644
index 0000000000..5b725cd88d
--- /dev/null
+++ b/assets/icons/radix/bookmark-filled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/bookmark.svg b/assets/icons/radix/bookmark.svg
new file mode 100644
index 0000000000..90c4d827f1
--- /dev/null
+++ b/assets/icons/radix/bookmark.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/border-all.svg b/assets/icons/radix/border-all.svg
new file mode 100644
index 0000000000..3bfde7d59b
--- /dev/null
+++ b/assets/icons/radix/border-all.svg
@@ -0,0 +1,17 @@
+
diff --git a/assets/icons/radix/border-bottom.svg b/assets/icons/radix/border-bottom.svg
new file mode 100644
index 0000000000..f2d3c3d554
--- /dev/null
+++ b/assets/icons/radix/border-bottom.svg
@@ -0,0 +1,29 @@
+
diff --git a/assets/icons/radix/border-dashed.svg b/assets/icons/radix/border-dashed.svg
new file mode 100644
index 0000000000..85fdcdfe5d
--- /dev/null
+++ b/assets/icons/radix/border-dashed.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/border-dotted.svg b/assets/icons/radix/border-dotted.svg
new file mode 100644
index 0000000000..5eb514ed2a
--- /dev/null
+++ b/assets/icons/radix/border-dotted.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/border-left.svg b/assets/icons/radix/border-left.svg
new file mode 100644
index 0000000000..5deb197da5
--- /dev/null
+++ b/assets/icons/radix/border-left.svg
@@ -0,0 +1,29 @@
+
diff --git a/assets/icons/radix/border-none.svg b/assets/icons/radix/border-none.svg
new file mode 100644
index 0000000000..1ad3f59d7c
--- /dev/null
+++ b/assets/icons/radix/border-none.svg
@@ -0,0 +1,35 @@
+
diff --git a/assets/icons/radix/border-right.svg b/assets/icons/radix/border-right.svg
new file mode 100644
index 0000000000..c939095ad7
--- /dev/null
+++ b/assets/icons/radix/border-right.svg
@@ -0,0 +1,29 @@
+
diff --git a/assets/icons/radix/border-solid.svg b/assets/icons/radix/border-solid.svg
new file mode 100644
index 0000000000..5c0d26a058
--- /dev/null
+++ b/assets/icons/radix/border-solid.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/border-split.svg b/assets/icons/radix/border-split.svg
new file mode 100644
index 0000000000..7fdf6cc34e
--- /dev/null
+++ b/assets/icons/radix/border-split.svg
@@ -0,0 +1,21 @@
+
diff --git a/assets/icons/radix/border-style.svg b/assets/icons/radix/border-style.svg
new file mode 100644
index 0000000000..f729cb993b
--- /dev/null
+++ b/assets/icons/radix/border-style.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/border-top.svg b/assets/icons/radix/border-top.svg
new file mode 100644
index 0000000000..bde739d755
--- /dev/null
+++ b/assets/icons/radix/border-top.svg
@@ -0,0 +1,29 @@
+
diff --git a/assets/icons/radix/border-width.svg b/assets/icons/radix/border-width.svg
new file mode 100644
index 0000000000..37c270756e
--- /dev/null
+++ b/assets/icons/radix/border-width.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/box-model.svg b/assets/icons/radix/box-model.svg
new file mode 100644
index 0000000000..45d1a7ce41
--- /dev/null
+++ b/assets/icons/radix/box-model.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/box.svg b/assets/icons/radix/box.svg
new file mode 100644
index 0000000000..6e035c21ed
--- /dev/null
+++ b/assets/icons/radix/box.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/button.svg b/assets/icons/radix/button.svg
new file mode 100644
index 0000000000..31622bcf15
--- /dev/null
+++ b/assets/icons/radix/button.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/calendar.svg b/assets/icons/radix/calendar.svg
new file mode 100644
index 0000000000..2adbe0bc28
--- /dev/null
+++ b/assets/icons/radix/calendar.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/camera.svg b/assets/icons/radix/camera.svg
new file mode 100644
index 0000000000..d7cccf74c2
--- /dev/null
+++ b/assets/icons/radix/camera.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/card-stack-minus.svg b/assets/icons/radix/card-stack-minus.svg
new file mode 100644
index 0000000000..04d8e51178
--- /dev/null
+++ b/assets/icons/radix/card-stack-minus.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/card-stack-plus.svg b/assets/icons/radix/card-stack-plus.svg
new file mode 100644
index 0000000000..a184f4bc1a
--- /dev/null
+++ b/assets/icons/radix/card-stack-plus.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/card-stack.svg b/assets/icons/radix/card-stack.svg
new file mode 100644
index 0000000000..defea0e165
--- /dev/null
+++ b/assets/icons/radix/card-stack.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/caret-down.svg b/assets/icons/radix/caret-down.svg
new file mode 100644
index 0000000000..ff8b8c3b88
--- /dev/null
+++ b/assets/icons/radix/caret-down.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/caret-left.svg b/assets/icons/radix/caret-left.svg
new file mode 100644
index 0000000000..969bc3b95c
--- /dev/null
+++ b/assets/icons/radix/caret-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/caret-right.svg b/assets/icons/radix/caret-right.svg
new file mode 100644
index 0000000000..75c55d8676
--- /dev/null
+++ b/assets/icons/radix/caret-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/caret-sort.svg b/assets/icons/radix/caret-sort.svg
new file mode 100644
index 0000000000..a65e20b660
--- /dev/null
+++ b/assets/icons/radix/caret-sort.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/caret-up.svg b/assets/icons/radix/caret-up.svg
new file mode 100644
index 0000000000..53026b83d8
--- /dev/null
+++ b/assets/icons/radix/caret-up.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/chat-bubble.svg b/assets/icons/radix/chat-bubble.svg
new file mode 100644
index 0000000000..5766f46de8
--- /dev/null
+++ b/assets/icons/radix/chat-bubble.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/check-circled.svg b/assets/icons/radix/check-circled.svg
new file mode 100644
index 0000000000..19ee22eb51
--- /dev/null
+++ b/assets/icons/radix/check-circled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/check.svg b/assets/icons/radix/check.svg
new file mode 100644
index 0000000000..476a3baa18
--- /dev/null
+++ b/assets/icons/radix/check.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/checkbox.svg b/assets/icons/radix/checkbox.svg
new file mode 100644
index 0000000000..d6bb3c7ef2
--- /dev/null
+++ b/assets/icons/radix/checkbox.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/chevron-down.svg b/assets/icons/radix/chevron-down.svg
new file mode 100644
index 0000000000..175c1312fd
--- /dev/null
+++ b/assets/icons/radix/chevron-down.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/chevron-left.svg b/assets/icons/radix/chevron-left.svg
new file mode 100644
index 0000000000..d7628202f2
--- /dev/null
+++ b/assets/icons/radix/chevron-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/chevron-right.svg b/assets/icons/radix/chevron-right.svg
new file mode 100644
index 0000000000..e3ebd73d99
--- /dev/null
+++ b/assets/icons/radix/chevron-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/chevron-up.svg b/assets/icons/radix/chevron-up.svg
new file mode 100644
index 0000000000..0e8e796dab
--- /dev/null
+++ b/assets/icons/radix/chevron-up.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/circle-backslash.svg b/assets/icons/radix/circle-backslash.svg
new file mode 100644
index 0000000000..40c4dd5398
--- /dev/null
+++ b/assets/icons/radix/circle-backslash.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/circle.svg b/assets/icons/radix/circle.svg
new file mode 100644
index 0000000000..ba4a8f22fe
--- /dev/null
+++ b/assets/icons/radix/circle.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/clipboard-copy.svg b/assets/icons/radix/clipboard-copy.svg
new file mode 100644
index 0000000000..5293fdc493
--- /dev/null
+++ b/assets/icons/radix/clipboard-copy.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/clipboard.svg b/assets/icons/radix/clipboard.svg
new file mode 100644
index 0000000000..e18b32943b
--- /dev/null
+++ b/assets/icons/radix/clipboard.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/clock.svg b/assets/icons/radix/clock.svg
new file mode 100644
index 0000000000..ac3b526fbb
--- /dev/null
+++ b/assets/icons/radix/clock.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/code.svg b/assets/icons/radix/code.svg
new file mode 100644
index 0000000000..70fe381b68
--- /dev/null
+++ b/assets/icons/radix/code.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/codesandbox-logo.svg b/assets/icons/radix/codesandbox-logo.svg
new file mode 100644
index 0000000000..4a3f549c2f
--- /dev/null
+++ b/assets/icons/radix/codesandbox-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/color-wheel.svg b/assets/icons/radix/color-wheel.svg
new file mode 100644
index 0000000000..2153b84428
--- /dev/null
+++ b/assets/icons/radix/color-wheel.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/column-spacing.svg b/assets/icons/radix/column-spacing.svg
new file mode 100644
index 0000000000..aafcf555cb
--- /dev/null
+++ b/assets/icons/radix/column-spacing.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/columns.svg b/assets/icons/radix/columns.svg
new file mode 100644
index 0000000000..e1607611b1
--- /dev/null
+++ b/assets/icons/radix/columns.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/commit.svg b/assets/icons/radix/commit.svg
new file mode 100644
index 0000000000..ac128a2b08
--- /dev/null
+++ b/assets/icons/radix/commit.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/component-1.svg b/assets/icons/radix/component-1.svg
new file mode 100644
index 0000000000..e3e9f38af1
--- /dev/null
+++ b/assets/icons/radix/component-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/component-2.svg b/assets/icons/radix/component-2.svg
new file mode 100644
index 0000000000..df2091d143
--- /dev/null
+++ b/assets/icons/radix/component-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/component-boolean.svg b/assets/icons/radix/component-boolean.svg
new file mode 100644
index 0000000000..942e8832eb
--- /dev/null
+++ b/assets/icons/radix/component-boolean.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/component-instance.svg b/assets/icons/radix/component-instance.svg
new file mode 100644
index 0000000000..048c401291
--- /dev/null
+++ b/assets/icons/radix/component-instance.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/component-none.svg b/assets/icons/radix/component-none.svg
new file mode 100644
index 0000000000..a622c3ee96
--- /dev/null
+++ b/assets/icons/radix/component-none.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/component-placeholder.svg b/assets/icons/radix/component-placeholder.svg
new file mode 100644
index 0000000000..b8892d5d23
--- /dev/null
+++ b/assets/icons/radix/component-placeholder.svg
@@ -0,0 +1,12 @@
+
diff --git a/assets/icons/radix/container.svg b/assets/icons/radix/container.svg
new file mode 100644
index 0000000000..1c2a4fd0e1
--- /dev/null
+++ b/assets/icons/radix/container.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/cookie.svg b/assets/icons/radix/cookie.svg
new file mode 100644
index 0000000000..8c165601a2
--- /dev/null
+++ b/assets/icons/radix/cookie.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/copy.svg b/assets/icons/radix/copy.svg
new file mode 100644
index 0000000000..bf2b504ecf
--- /dev/null
+++ b/assets/icons/radix/copy.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/corner-bottom-left.svg b/assets/icons/radix/corner-bottom-left.svg
new file mode 100644
index 0000000000..26df9dbad8
--- /dev/null
+++ b/assets/icons/radix/corner-bottom-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/corner-bottom-right.svg b/assets/icons/radix/corner-bottom-right.svg
new file mode 100644
index 0000000000..15e3957123
--- /dev/null
+++ b/assets/icons/radix/corner-bottom-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/corner-top-left.svg b/assets/icons/radix/corner-top-left.svg
new file mode 100644
index 0000000000..8fc1b84b82
--- /dev/null
+++ b/assets/icons/radix/corner-top-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/corner-top-right.svg b/assets/icons/radix/corner-top-right.svg
new file mode 100644
index 0000000000..533ea6c678
--- /dev/null
+++ b/assets/icons/radix/corner-top-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/corners.svg b/assets/icons/radix/corners.svg
new file mode 100644
index 0000000000..c41c4e0183
--- /dev/null
+++ b/assets/icons/radix/corners.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/countdown-timer.svg b/assets/icons/radix/countdown-timer.svg
new file mode 100644
index 0000000000..58494bd416
--- /dev/null
+++ b/assets/icons/radix/countdown-timer.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/counter-clockwise-clock.svg b/assets/icons/radix/counter-clockwise-clock.svg
new file mode 100644
index 0000000000..0b3acbcebf
--- /dev/null
+++ b/assets/icons/radix/counter-clockwise-clock.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/crop.svg b/assets/icons/radix/crop.svg
new file mode 100644
index 0000000000..008457fff6
--- /dev/null
+++ b/assets/icons/radix/crop.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/cross-1.svg b/assets/icons/radix/cross-1.svg
new file mode 100644
index 0000000000..62135d27ed
--- /dev/null
+++ b/assets/icons/radix/cross-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/cross-2.svg b/assets/icons/radix/cross-2.svg
new file mode 100644
index 0000000000..4c55700928
--- /dev/null
+++ b/assets/icons/radix/cross-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/cross-circled.svg b/assets/icons/radix/cross-circled.svg
new file mode 100644
index 0000000000..df3cb896c8
--- /dev/null
+++ b/assets/icons/radix/cross-circled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/crosshair-1.svg b/assets/icons/radix/crosshair-1.svg
new file mode 100644
index 0000000000..05b22f8461
--- /dev/null
+++ b/assets/icons/radix/crosshair-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/crosshair-2.svg b/assets/icons/radix/crosshair-2.svg
new file mode 100644
index 0000000000..f5ee0a92af
--- /dev/null
+++ b/assets/icons/radix/crosshair-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/crumpled-paper.svg b/assets/icons/radix/crumpled-paper.svg
new file mode 100644
index 0000000000..33e9b65581
--- /dev/null
+++ b/assets/icons/radix/crumpled-paper.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/cube.svg b/assets/icons/radix/cube.svg
new file mode 100644
index 0000000000..b327158be4
--- /dev/null
+++ b/assets/icons/radix/cube.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/cursor-arrow.svg b/assets/icons/radix/cursor-arrow.svg
new file mode 100644
index 0000000000..b0227e4ded
--- /dev/null
+++ b/assets/icons/radix/cursor-arrow.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/cursor-text.svg b/assets/icons/radix/cursor-text.svg
new file mode 100644
index 0000000000..05939503b8
--- /dev/null
+++ b/assets/icons/radix/cursor-text.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/dash.svg b/assets/icons/radix/dash.svg
new file mode 100644
index 0000000000..d70daf7fed
--- /dev/null
+++ b/assets/icons/radix/dash.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/dashboard.svg b/assets/icons/radix/dashboard.svg
new file mode 100644
index 0000000000..38008c64e4
--- /dev/null
+++ b/assets/icons/radix/dashboard.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/desktop-mute.svg b/assets/icons/radix/desktop-mute.svg
new file mode 100644
index 0000000000..83d249176f
--- /dev/null
+++ b/assets/icons/radix/desktop-mute.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/radix/desktop.svg b/assets/icons/radix/desktop.svg
new file mode 100644
index 0000000000..ad252e64cf
--- /dev/null
+++ b/assets/icons/radix/desktop.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/dimensions.svg b/assets/icons/radix/dimensions.svg
new file mode 100644
index 0000000000..767d1d2896
--- /dev/null
+++ b/assets/icons/radix/dimensions.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/disc.svg b/assets/icons/radix/disc.svg
new file mode 100644
index 0000000000..6e19caab35
--- /dev/null
+++ b/assets/icons/radix/disc.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/discord-logo.svg b/assets/icons/radix/discord-logo.svg
new file mode 100644
index 0000000000..50567c212e
--- /dev/null
+++ b/assets/icons/radix/discord-logo.svg
@@ -0,0 +1,13 @@
+
diff --git a/assets/icons/radix/divider-horizontal.svg b/assets/icons/radix/divider-horizontal.svg
new file mode 100644
index 0000000000..59e43649c9
--- /dev/null
+++ b/assets/icons/radix/divider-horizontal.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/divider-vertical.svg b/assets/icons/radix/divider-vertical.svg
new file mode 100644
index 0000000000..95f5cc8f2f
--- /dev/null
+++ b/assets/icons/radix/divider-vertical.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/dot-filled.svg b/assets/icons/radix/dot-filled.svg
new file mode 100644
index 0000000000..0c1a17b3bd
--- /dev/null
+++ b/assets/icons/radix/dot-filled.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/radix/dot-solid.svg b/assets/icons/radix/dot-solid.svg
new file mode 100644
index 0000000000..0c1a17b3bd
--- /dev/null
+++ b/assets/icons/radix/dot-solid.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/radix/dot.svg b/assets/icons/radix/dot.svg
new file mode 100644
index 0000000000..c553a1422d
--- /dev/null
+++ b/assets/icons/radix/dot.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/dots-horizontal.svg b/assets/icons/radix/dots-horizontal.svg
new file mode 100644
index 0000000000..347d1ae13d
--- /dev/null
+++ b/assets/icons/radix/dots-horizontal.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/dots-vertical.svg b/assets/icons/radix/dots-vertical.svg
new file mode 100644
index 0000000000..5ca1a181e3
--- /dev/null
+++ b/assets/icons/radix/dots-vertical.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/double-arrow-down.svg b/assets/icons/radix/double-arrow-down.svg
new file mode 100644
index 0000000000..8b86db2f8a
--- /dev/null
+++ b/assets/icons/radix/double-arrow-down.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/double-arrow-left.svg b/assets/icons/radix/double-arrow-left.svg
new file mode 100644
index 0000000000..0ef30ff955
--- /dev/null
+++ b/assets/icons/radix/double-arrow-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/double-arrow-right.svg b/assets/icons/radix/double-arrow-right.svg
new file mode 100644
index 0000000000..9997fdc403
--- /dev/null
+++ b/assets/icons/radix/double-arrow-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/double-arrow-up.svg b/assets/icons/radix/double-arrow-up.svg
new file mode 100644
index 0000000000..8d571fcd66
--- /dev/null
+++ b/assets/icons/radix/double-arrow-up.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/download.svg b/assets/icons/radix/download.svg
new file mode 100644
index 0000000000..49a05d5f47
--- /dev/null
+++ b/assets/icons/radix/download.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/drag-handle-dots-1.svg b/assets/icons/radix/drag-handle-dots-1.svg
new file mode 100644
index 0000000000..fc046bb9d9
--- /dev/null
+++ b/assets/icons/radix/drag-handle-dots-1.svg
@@ -0,0 +1,26 @@
+
diff --git a/assets/icons/radix/drag-handle-dots-2.svg b/assets/icons/radix/drag-handle-dots-2.svg
new file mode 100644
index 0000000000..aed0e702d7
--- /dev/null
+++ b/assets/icons/radix/drag-handle-dots-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/drag-handle-horizontal.svg b/assets/icons/radix/drag-handle-horizontal.svg
new file mode 100644
index 0000000000..c1bb138a24
--- /dev/null
+++ b/assets/icons/radix/drag-handle-horizontal.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/drag-handle-vertical.svg b/assets/icons/radix/drag-handle-vertical.svg
new file mode 100644
index 0000000000..8d48c7894a
--- /dev/null
+++ b/assets/icons/radix/drag-handle-vertical.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/drawing-pin-filled.svg b/assets/icons/radix/drawing-pin-filled.svg
new file mode 100644
index 0000000000..e1894619c3
--- /dev/null
+++ b/assets/icons/radix/drawing-pin-filled.svg
@@ -0,0 +1,14 @@
+
diff --git a/assets/icons/radix/drawing-pin-solid.svg b/assets/icons/radix/drawing-pin-solid.svg
new file mode 100644
index 0000000000..e1894619c3
--- /dev/null
+++ b/assets/icons/radix/drawing-pin-solid.svg
@@ -0,0 +1,14 @@
+
diff --git a/assets/icons/radix/drawing-pin.svg b/assets/icons/radix/drawing-pin.svg
new file mode 100644
index 0000000000..5625e7588f
--- /dev/null
+++ b/assets/icons/radix/drawing-pin.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/dropdown-menu.svg b/assets/icons/radix/dropdown-menu.svg
new file mode 100644
index 0000000000..c938052be8
--- /dev/null
+++ b/assets/icons/radix/dropdown-menu.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/enter-full-screen.svg b/assets/icons/radix/enter-full-screen.svg
new file mode 100644
index 0000000000..d368a6d415
--- /dev/null
+++ b/assets/icons/radix/enter-full-screen.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/enter.svg b/assets/icons/radix/enter.svg
new file mode 100644
index 0000000000..cc57d74cea
--- /dev/null
+++ b/assets/icons/radix/enter.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/envelope-closed.svg b/assets/icons/radix/envelope-closed.svg
new file mode 100644
index 0000000000..4b5e037840
--- /dev/null
+++ b/assets/icons/radix/envelope-closed.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/envelope-open.svg b/assets/icons/radix/envelope-open.svg
new file mode 100644
index 0000000000..df1e3fea95
--- /dev/null
+++ b/assets/icons/radix/envelope-open.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/eraser.svg b/assets/icons/radix/eraser.svg
new file mode 100644
index 0000000000..bb448d4d23
--- /dev/null
+++ b/assets/icons/radix/eraser.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/exclamation-triangle.svg b/assets/icons/radix/exclamation-triangle.svg
new file mode 100644
index 0000000000..210d4c45c6
--- /dev/null
+++ b/assets/icons/radix/exclamation-triangle.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/exit-full-screen.svg b/assets/icons/radix/exit-full-screen.svg
new file mode 100644
index 0000000000..9b6439b043
--- /dev/null
+++ b/assets/icons/radix/exit-full-screen.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/exit.svg b/assets/icons/radix/exit.svg
new file mode 100644
index 0000000000..2cc6ce120d
--- /dev/null
+++ b/assets/icons/radix/exit.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/external-link.svg b/assets/icons/radix/external-link.svg
new file mode 100644
index 0000000000..0ee7420162
--- /dev/null
+++ b/assets/icons/radix/external-link.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/eye-closed.svg b/assets/icons/radix/eye-closed.svg
new file mode 100644
index 0000000000..f824fe55f9
--- /dev/null
+++ b/assets/icons/radix/eye-closed.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/eye-none.svg b/assets/icons/radix/eye-none.svg
new file mode 100644
index 0000000000..d4beecd33a
--- /dev/null
+++ b/assets/icons/radix/eye-none.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/eye-open.svg b/assets/icons/radix/eye-open.svg
new file mode 100644
index 0000000000..d39d26b2c1
--- /dev/null
+++ b/assets/icons/radix/eye-open.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/face.svg b/assets/icons/radix/face.svg
new file mode 100644
index 0000000000..81b14dd8d7
--- /dev/null
+++ b/assets/icons/radix/face.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/figma-logo.svg b/assets/icons/radix/figma-logo.svg
new file mode 100644
index 0000000000..6c19276554
--- /dev/null
+++ b/assets/icons/radix/figma-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/file-minus.svg b/assets/icons/radix/file-minus.svg
new file mode 100644
index 0000000000..bd1a841881
--- /dev/null
+++ b/assets/icons/radix/file-minus.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/file-plus.svg b/assets/icons/radix/file-plus.svg
new file mode 100644
index 0000000000..2396e20015
--- /dev/null
+++ b/assets/icons/radix/file-plus.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/file-text.svg b/assets/icons/radix/file-text.svg
new file mode 100644
index 0000000000..f341ab8abf
--- /dev/null
+++ b/assets/icons/radix/file-text.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/file.svg b/assets/icons/radix/file.svg
new file mode 100644
index 0000000000..5f256b42e1
--- /dev/null
+++ b/assets/icons/radix/file.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/font-bold.svg b/assets/icons/radix/font-bold.svg
new file mode 100644
index 0000000000..7dc6caf3b0
--- /dev/null
+++ b/assets/icons/radix/font-bold.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/radix/font-family.svg b/assets/icons/radix/font-family.svg
new file mode 100644
index 0000000000..9134b9086d
--- /dev/null
+++ b/assets/icons/radix/font-family.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/radix/font-italic.svg b/assets/icons/radix/font-italic.svg
new file mode 100644
index 0000000000..6e6288d6bc
--- /dev/null
+++ b/assets/icons/radix/font-italic.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/font-roman.svg b/assets/icons/radix/font-roman.svg
new file mode 100644
index 0000000000..c595b790fc
--- /dev/null
+++ b/assets/icons/radix/font-roman.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/font-size.svg b/assets/icons/radix/font-size.svg
new file mode 100644
index 0000000000..e389a58d73
--- /dev/null
+++ b/assets/icons/radix/font-size.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/font-style.svg b/assets/icons/radix/font-style.svg
new file mode 100644
index 0000000000..31c3730130
--- /dev/null
+++ b/assets/icons/radix/font-style.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/frame.svg b/assets/icons/radix/frame.svg
new file mode 100644
index 0000000000..ec61a48efa
--- /dev/null
+++ b/assets/icons/radix/frame.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/framer-logo.svg b/assets/icons/radix/framer-logo.svg
new file mode 100644
index 0000000000..68be3b317b
--- /dev/null
+++ b/assets/icons/radix/framer-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/gear.svg b/assets/icons/radix/gear.svg
new file mode 100644
index 0000000000..52f9e17312
--- /dev/null
+++ b/assets/icons/radix/gear.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/github-logo.svg b/assets/icons/radix/github-logo.svg
new file mode 100644
index 0000000000..e46612cf56
--- /dev/null
+++ b/assets/icons/radix/github-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/globe.svg b/assets/icons/radix/globe.svg
new file mode 100644
index 0000000000..4728b827df
--- /dev/null
+++ b/assets/icons/radix/globe.svg
@@ -0,0 +1,26 @@
+
diff --git a/assets/icons/radix/grid.svg b/assets/icons/radix/grid.svg
new file mode 100644
index 0000000000..5d9af33572
--- /dev/null
+++ b/assets/icons/radix/grid.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/group.svg b/assets/icons/radix/group.svg
new file mode 100644
index 0000000000..c3c91d211f
--- /dev/null
+++ b/assets/icons/radix/group.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/half-1.svg b/assets/icons/radix/half-1.svg
new file mode 100644
index 0000000000..9890e26bb8
--- /dev/null
+++ b/assets/icons/radix/half-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/half-2.svg b/assets/icons/radix/half-2.svg
new file mode 100644
index 0000000000..4db1d564cb
--- /dev/null
+++ b/assets/icons/radix/half-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/hamburger-menu.svg b/assets/icons/radix/hamburger-menu.svg
new file mode 100644
index 0000000000..039168055b
--- /dev/null
+++ b/assets/icons/radix/hamburger-menu.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/hand.svg b/assets/icons/radix/hand.svg
new file mode 100644
index 0000000000..12afac8f5f
--- /dev/null
+++ b/assets/icons/radix/hand.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/heading.svg b/assets/icons/radix/heading.svg
new file mode 100644
index 0000000000..0a5e2caaf1
--- /dev/null
+++ b/assets/icons/radix/heading.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/heart-filled.svg b/assets/icons/radix/heart-filled.svg
new file mode 100644
index 0000000000..94928accd7
--- /dev/null
+++ b/assets/icons/radix/heart-filled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/heart.svg b/assets/icons/radix/heart.svg
new file mode 100644
index 0000000000..91cbc450fd
--- /dev/null
+++ b/assets/icons/radix/heart.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/height.svg b/assets/icons/radix/height.svg
new file mode 100644
index 0000000000..28424f4d51
--- /dev/null
+++ b/assets/icons/radix/height.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/hobby-knife.svg b/assets/icons/radix/hobby-knife.svg
new file mode 100644
index 0000000000..c2ed3fb1ed
--- /dev/null
+++ b/assets/icons/radix/hobby-knife.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/home.svg b/assets/icons/radix/home.svg
new file mode 100644
index 0000000000..733bd79113
--- /dev/null
+++ b/assets/icons/radix/home.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/iconjar-logo.svg b/assets/icons/radix/iconjar-logo.svg
new file mode 100644
index 0000000000..c154b4e864
--- /dev/null
+++ b/assets/icons/radix/iconjar-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/id-card.svg b/assets/icons/radix/id-card.svg
new file mode 100644
index 0000000000..efde9ffa7e
--- /dev/null
+++ b/assets/icons/radix/id-card.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/image.svg b/assets/icons/radix/image.svg
new file mode 100644
index 0000000000..0ff4475252
--- /dev/null
+++ b/assets/icons/radix/image.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/info-circled.svg b/assets/icons/radix/info-circled.svg
new file mode 100644
index 0000000000..4ab1b260e3
--- /dev/null
+++ b/assets/icons/radix/info-circled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/inner-shadow.svg b/assets/icons/radix/inner-shadow.svg
new file mode 100644
index 0000000000..1056a7bffc
--- /dev/null
+++ b/assets/icons/radix/inner-shadow.svg
@@ -0,0 +1,78 @@
+
diff --git a/assets/icons/radix/input.svg b/assets/icons/radix/input.svg
new file mode 100644
index 0000000000..4ed4605b2c
--- /dev/null
+++ b/assets/icons/radix/input.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/instagram-logo.svg b/assets/icons/radix/instagram-logo.svg
new file mode 100644
index 0000000000..5d78937966
--- /dev/null
+++ b/assets/icons/radix/instagram-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/justify-center.svg b/assets/icons/radix/justify-center.svg
new file mode 100644
index 0000000000..7999a4ea46
--- /dev/null
+++ b/assets/icons/radix/justify-center.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/justify-end.svg b/assets/icons/radix/justify-end.svg
new file mode 100644
index 0000000000..bb52f493d7
--- /dev/null
+++ b/assets/icons/radix/justify-end.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/justify-start.svg b/assets/icons/radix/justify-start.svg
new file mode 100644
index 0000000000..648ca0b603
--- /dev/null
+++ b/assets/icons/radix/justify-start.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/justify-stretch.svg b/assets/icons/radix/justify-stretch.svg
new file mode 100644
index 0000000000..83df0a8959
--- /dev/null
+++ b/assets/icons/radix/justify-stretch.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/keyboard.svg b/assets/icons/radix/keyboard.svg
new file mode 100644
index 0000000000..fc6f86bfc2
--- /dev/null
+++ b/assets/icons/radix/keyboard.svg
@@ -0,0 +1,7 @@
+
diff --git a/assets/icons/radix/lap-timer.svg b/assets/icons/radix/lap-timer.svg
new file mode 100644
index 0000000000..1de0b3be6c
--- /dev/null
+++ b/assets/icons/radix/lap-timer.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/laptop.svg b/assets/icons/radix/laptop.svg
new file mode 100644
index 0000000000..6aff5d6d44
--- /dev/null
+++ b/assets/icons/radix/laptop.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/layers.svg b/assets/icons/radix/layers.svg
new file mode 100644
index 0000000000..821993fc70
--- /dev/null
+++ b/assets/icons/radix/layers.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/layout.svg b/assets/icons/radix/layout.svg
new file mode 100644
index 0000000000..8e4a352f50
--- /dev/null
+++ b/assets/icons/radix/layout.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/letter-case-capitalize.svg b/assets/icons/radix/letter-case-capitalize.svg
new file mode 100644
index 0000000000..16617ecf7e
--- /dev/null
+++ b/assets/icons/radix/letter-case-capitalize.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/letter-case-lowercase.svg b/assets/icons/radix/letter-case-lowercase.svg
new file mode 100644
index 0000000000..61aefb9aad
--- /dev/null
+++ b/assets/icons/radix/letter-case-lowercase.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/letter-case-toggle.svg b/assets/icons/radix/letter-case-toggle.svg
new file mode 100644
index 0000000000..a021a2b922
--- /dev/null
+++ b/assets/icons/radix/letter-case-toggle.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/letter-case-uppercase.svg b/assets/icons/radix/letter-case-uppercase.svg
new file mode 100644
index 0000000000..ccd2be04e7
--- /dev/null
+++ b/assets/icons/radix/letter-case-uppercase.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/letter-spacing.svg b/assets/icons/radix/letter-spacing.svg
new file mode 100644
index 0000000000..073023e0f4
--- /dev/null
+++ b/assets/icons/radix/letter-spacing.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/lightning-bolt.svg b/assets/icons/radix/lightning-bolt.svg
new file mode 100644
index 0000000000..7c35df9cfe
--- /dev/null
+++ b/assets/icons/radix/lightning-bolt.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/line-height.svg b/assets/icons/radix/line-height.svg
new file mode 100644
index 0000000000..1c302d1ffc
--- /dev/null
+++ b/assets/icons/radix/line-height.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/link-1.svg b/assets/icons/radix/link-1.svg
new file mode 100644
index 0000000000..d5682b113e
--- /dev/null
+++ b/assets/icons/radix/link-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/link-2.svg b/assets/icons/radix/link-2.svg
new file mode 100644
index 0000000000..be8370606e
--- /dev/null
+++ b/assets/icons/radix/link-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/link-break-1.svg b/assets/icons/radix/link-break-1.svg
new file mode 100644
index 0000000000..05ae93e47a
--- /dev/null
+++ b/assets/icons/radix/link-break-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/link-break-2.svg b/assets/icons/radix/link-break-2.svg
new file mode 100644
index 0000000000..78f28f98e8
--- /dev/null
+++ b/assets/icons/radix/link-break-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/link-none-1.svg b/assets/icons/radix/link-none-1.svg
new file mode 100644
index 0000000000..6ea56a386f
--- /dev/null
+++ b/assets/icons/radix/link-none-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/link-none-2.svg b/assets/icons/radix/link-none-2.svg
new file mode 100644
index 0000000000..0b19d940d1
--- /dev/null
+++ b/assets/icons/radix/link-none-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/linkedin-logo.svg b/assets/icons/radix/linkedin-logo.svg
new file mode 100644
index 0000000000..0f0138bdf6
--- /dev/null
+++ b/assets/icons/radix/linkedin-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/list-bullet.svg b/assets/icons/radix/list-bullet.svg
new file mode 100644
index 0000000000..2630b95ef0
--- /dev/null
+++ b/assets/icons/radix/list-bullet.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/lock-closed.svg b/assets/icons/radix/lock-closed.svg
new file mode 100644
index 0000000000..3871b5d5ad
--- /dev/null
+++ b/assets/icons/radix/lock-closed.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/lock-open-1.svg b/assets/icons/radix/lock-open-1.svg
new file mode 100644
index 0000000000..8f6bfd5bbf
--- /dev/null
+++ b/assets/icons/radix/lock-open-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/lock-open-2.svg b/assets/icons/radix/lock-open-2.svg
new file mode 100644
index 0000000000..ce69f67f29
--- /dev/null
+++ b/assets/icons/radix/lock-open-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/loop.svg b/assets/icons/radix/loop.svg
new file mode 100644
index 0000000000..bfa90ed084
--- /dev/null
+++ b/assets/icons/radix/loop.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/magic-wand.svg b/assets/icons/radix/magic-wand.svg
new file mode 100644
index 0000000000..bbc9826aa5
--- /dev/null
+++ b/assets/icons/radix/magic-wand.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/magnifying-glass.svg b/assets/icons/radix/magnifying-glass.svg
new file mode 100644
index 0000000000..a3a89bfa50
--- /dev/null
+++ b/assets/icons/radix/magnifying-glass.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/margin.svg b/assets/icons/radix/margin.svg
new file mode 100644
index 0000000000..1a513b37d6
--- /dev/null
+++ b/assets/icons/radix/margin.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/mask-off.svg b/assets/icons/radix/mask-off.svg
new file mode 100644
index 0000000000..5f847668e8
--- /dev/null
+++ b/assets/icons/radix/mask-off.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/mask-on.svg b/assets/icons/radix/mask-on.svg
new file mode 100644
index 0000000000..684c1b934d
--- /dev/null
+++ b/assets/icons/radix/mask-on.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/mic-mute.svg b/assets/icons/radix/mic-mute.svg
new file mode 100644
index 0000000000..fe5f8201cc
--- /dev/null
+++ b/assets/icons/radix/mic-mute.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/radix/mic.svg b/assets/icons/radix/mic.svg
new file mode 100644
index 0000000000..01f4c9bf66
--- /dev/null
+++ b/assets/icons/radix/mic.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/radix/minus-circled.svg b/assets/icons/radix/minus-circled.svg
new file mode 100644
index 0000000000..2c6df4cebf
--- /dev/null
+++ b/assets/icons/radix/minus-circled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/minus.svg b/assets/icons/radix/minus.svg
new file mode 100644
index 0000000000..2b39602979
--- /dev/null
+++ b/assets/icons/radix/minus.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/mix.svg b/assets/icons/radix/mix.svg
new file mode 100644
index 0000000000..9412a01843
--- /dev/null
+++ b/assets/icons/radix/mix.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/mixer-horizontal.svg b/assets/icons/radix/mixer-horizontal.svg
new file mode 100644
index 0000000000..f29ba25548
--- /dev/null
+++ b/assets/icons/radix/mixer-horizontal.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/mixer-vertical.svg b/assets/icons/radix/mixer-vertical.svg
new file mode 100644
index 0000000000..dc85d3a9e7
--- /dev/null
+++ b/assets/icons/radix/mixer-vertical.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/mobile.svg b/assets/icons/radix/mobile.svg
new file mode 100644
index 0000000000..b62b6506ff
--- /dev/null
+++ b/assets/icons/radix/mobile.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/modulz-logo.svg b/assets/icons/radix/modulz-logo.svg
new file mode 100644
index 0000000000..754b229db6
--- /dev/null
+++ b/assets/icons/radix/modulz-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/moon.svg b/assets/icons/radix/moon.svg
new file mode 100644
index 0000000000..1dac2ca212
--- /dev/null
+++ b/assets/icons/radix/moon.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/move.svg b/assets/icons/radix/move.svg
new file mode 100644
index 0000000000..3d0a0e56c9
--- /dev/null
+++ b/assets/icons/radix/move.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/notion-logo.svg b/assets/icons/radix/notion-logo.svg
new file mode 100644
index 0000000000..c2df152619
--- /dev/null
+++ b/assets/icons/radix/notion-logo.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/radix/opacity.svg b/assets/icons/radix/opacity.svg
new file mode 100644
index 0000000000..a2d01bff82
--- /dev/null
+++ b/assets/icons/radix/opacity.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/open-in-new-window.svg b/assets/icons/radix/open-in-new-window.svg
new file mode 100644
index 0000000000..22baf82cff
--- /dev/null
+++ b/assets/icons/radix/open-in-new-window.svg
@@ -0,0 +1,10 @@
+
diff --git a/assets/icons/radix/outer-shadow.svg b/assets/icons/radix/outer-shadow.svg
new file mode 100644
index 0000000000..b44e3d553c
--- /dev/null
+++ b/assets/icons/radix/outer-shadow.svg
@@ -0,0 +1,43 @@
+
diff --git a/assets/icons/radix/overline.svg b/assets/icons/radix/overline.svg
new file mode 100644
index 0000000000..57262c76e6
--- /dev/null
+++ b/assets/icons/radix/overline.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/padding.svg b/assets/icons/radix/padding.svg
new file mode 100644
index 0000000000..483a25a27e
--- /dev/null
+++ b/assets/icons/radix/padding.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/paper-plane.svg b/assets/icons/radix/paper-plane.svg
new file mode 100644
index 0000000000..37ad070300
--- /dev/null
+++ b/assets/icons/radix/paper-plane.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pause.svg b/assets/icons/radix/pause.svg
new file mode 100644
index 0000000000..b399fb2f5a
--- /dev/null
+++ b/assets/icons/radix/pause.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pencil-1.svg b/assets/icons/radix/pencil-1.svg
new file mode 100644
index 0000000000..decf0122ef
--- /dev/null
+++ b/assets/icons/radix/pencil-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pencil-2.svg b/assets/icons/radix/pencil-2.svg
new file mode 100644
index 0000000000..2559a393a9
--- /dev/null
+++ b/assets/icons/radix/pencil-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/person.svg b/assets/icons/radix/person.svg
new file mode 100644
index 0000000000..051abcc703
--- /dev/null
+++ b/assets/icons/radix/person.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pie-chart.svg b/assets/icons/radix/pie-chart.svg
new file mode 100644
index 0000000000..bb58e47274
--- /dev/null
+++ b/assets/icons/radix/pie-chart.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pilcrow.svg b/assets/icons/radix/pilcrow.svg
new file mode 100644
index 0000000000..6996765fd6
--- /dev/null
+++ b/assets/icons/radix/pilcrow.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pin-bottom.svg b/assets/icons/radix/pin-bottom.svg
new file mode 100644
index 0000000000..ad0842054f
--- /dev/null
+++ b/assets/icons/radix/pin-bottom.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pin-left.svg b/assets/icons/radix/pin-left.svg
new file mode 100644
index 0000000000..eb89b2912f
--- /dev/null
+++ b/assets/icons/radix/pin-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pin-right.svg b/assets/icons/radix/pin-right.svg
new file mode 100644
index 0000000000..89a98bae4e
--- /dev/null
+++ b/assets/icons/radix/pin-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/pin-top.svg b/assets/icons/radix/pin-top.svg
new file mode 100644
index 0000000000..edfeb64d5d
--- /dev/null
+++ b/assets/icons/radix/pin-top.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/play.svg b/assets/icons/radix/play.svg
new file mode 100644
index 0000000000..92af9e1ae7
--- /dev/null
+++ b/assets/icons/radix/play.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/plus-circled.svg b/assets/icons/radix/plus-circled.svg
new file mode 100644
index 0000000000..808ddc4c2c
--- /dev/null
+++ b/assets/icons/radix/plus-circled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/plus.svg b/assets/icons/radix/plus.svg
new file mode 100644
index 0000000000..57ce90219b
--- /dev/null
+++ b/assets/icons/radix/plus.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/question-mark-circled.svg b/assets/icons/radix/question-mark-circled.svg
new file mode 100644
index 0000000000..be99968787
--- /dev/null
+++ b/assets/icons/radix/question-mark-circled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/question-mark.svg b/assets/icons/radix/question-mark.svg
new file mode 100644
index 0000000000..577aae5349
--- /dev/null
+++ b/assets/icons/radix/question-mark.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/quote.svg b/assets/icons/radix/quote.svg
new file mode 100644
index 0000000000..50205479c3
--- /dev/null
+++ b/assets/icons/radix/quote.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/radiobutton.svg b/assets/icons/radix/radiobutton.svg
new file mode 100644
index 0000000000..f0c3a60aee
--- /dev/null
+++ b/assets/icons/radix/radiobutton.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/reader.svg b/assets/icons/radix/reader.svg
new file mode 100644
index 0000000000..e893cfa685
--- /dev/null
+++ b/assets/icons/radix/reader.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/reload.svg b/assets/icons/radix/reload.svg
new file mode 100644
index 0000000000..cf1dfb7fa2
--- /dev/null
+++ b/assets/icons/radix/reload.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/reset.svg b/assets/icons/radix/reset.svg
new file mode 100644
index 0000000000..f21a508514
--- /dev/null
+++ b/assets/icons/radix/reset.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/resume.svg b/assets/icons/radix/resume.svg
new file mode 100644
index 0000000000..79cdec2374
--- /dev/null
+++ b/assets/icons/radix/resume.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/rocket.svg b/assets/icons/radix/rocket.svg
new file mode 100644
index 0000000000..2226aacb1a
--- /dev/null
+++ b/assets/icons/radix/rocket.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/rotate-counter-clockwise.svg b/assets/icons/radix/rotate-counter-clockwise.svg
new file mode 100644
index 0000000000..c43c90b90b
--- /dev/null
+++ b/assets/icons/radix/rotate-counter-clockwise.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/row-spacing.svg b/assets/icons/radix/row-spacing.svg
new file mode 100644
index 0000000000..e155bd5947
--- /dev/null
+++ b/assets/icons/radix/row-spacing.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/rows.svg b/assets/icons/radix/rows.svg
new file mode 100644
index 0000000000..fb4ca0f9e3
--- /dev/null
+++ b/assets/icons/radix/rows.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/ruler-horizontal.svg b/assets/icons/radix/ruler-horizontal.svg
new file mode 100644
index 0000000000..db6f1ef488
--- /dev/null
+++ b/assets/icons/radix/ruler-horizontal.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/ruler-square.svg b/assets/icons/radix/ruler-square.svg
new file mode 100644
index 0000000000..7de70cc5dc
--- /dev/null
+++ b/assets/icons/radix/ruler-square.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/scissors.svg b/assets/icons/radix/scissors.svg
new file mode 100644
index 0000000000..2893b34712
--- /dev/null
+++ b/assets/icons/radix/scissors.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/section.svg b/assets/icons/radix/section.svg
new file mode 100644
index 0000000000..1e939e2b2f
--- /dev/null
+++ b/assets/icons/radix/section.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/sewing-pin-filled.svg b/assets/icons/radix/sewing-pin-filled.svg
new file mode 100644
index 0000000000..97f6f1120d
--- /dev/null
+++ b/assets/icons/radix/sewing-pin-filled.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/sewing-pin-solid.svg b/assets/icons/radix/sewing-pin-solid.svg
new file mode 100644
index 0000000000..97f6f1120d
--- /dev/null
+++ b/assets/icons/radix/sewing-pin-solid.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/sewing-pin.svg b/assets/icons/radix/sewing-pin.svg
new file mode 100644
index 0000000000..068dfd7bdf
--- /dev/null
+++ b/assets/icons/radix/sewing-pin.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/shadow-inner.svg b/assets/icons/radix/shadow-inner.svg
new file mode 100644
index 0000000000..4d073bf35f
--- /dev/null
+++ b/assets/icons/radix/shadow-inner.svg
@@ -0,0 +1,78 @@
+
diff --git a/assets/icons/radix/shadow-none.svg b/assets/icons/radix/shadow-none.svg
new file mode 100644
index 0000000000..b02d3466ad
--- /dev/null
+++ b/assets/icons/radix/shadow-none.svg
@@ -0,0 +1,78 @@
+
diff --git a/assets/icons/radix/shadow-outer.svg b/assets/icons/radix/shadow-outer.svg
new file mode 100644
index 0000000000..dc7ea84087
--- /dev/null
+++ b/assets/icons/radix/shadow-outer.svg
@@ -0,0 +1,43 @@
+
diff --git a/assets/icons/radix/shadow.svg b/assets/icons/radix/shadow.svg
new file mode 100644
index 0000000000..c991af6156
--- /dev/null
+++ b/assets/icons/radix/shadow.svg
@@ -0,0 +1,78 @@
+
diff --git a/assets/icons/radix/share-1.svg b/assets/icons/radix/share-1.svg
new file mode 100644
index 0000000000..58328e4d1e
--- /dev/null
+++ b/assets/icons/radix/share-1.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/share-2.svg b/assets/icons/radix/share-2.svg
new file mode 100644
index 0000000000..1302ea5fbe
--- /dev/null
+++ b/assets/icons/radix/share-2.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/shuffle.svg b/assets/icons/radix/shuffle.svg
new file mode 100644
index 0000000000..8670e1a048
--- /dev/null
+++ b/assets/icons/radix/shuffle.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/size.svg b/assets/icons/radix/size.svg
new file mode 100644
index 0000000000..dece8c5182
--- /dev/null
+++ b/assets/icons/radix/size.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/sketch-logo.svg b/assets/icons/radix/sketch-logo.svg
new file mode 100644
index 0000000000..6c54c4c825
--- /dev/null
+++ b/assets/icons/radix/sketch-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/slash.svg b/assets/icons/radix/slash.svg
new file mode 100644
index 0000000000..aa7dac30c1
--- /dev/null
+++ b/assets/icons/radix/slash.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/slider.svg b/assets/icons/radix/slider.svg
new file mode 100644
index 0000000000..66e0452bc0
--- /dev/null
+++ b/assets/icons/radix/slider.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/space-between-horizontally.svg b/assets/icons/radix/space-between-horizontally.svg
new file mode 100644
index 0000000000..a71638d52b
--- /dev/null
+++ b/assets/icons/radix/space-between-horizontally.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/space-between-vertically.svg b/assets/icons/radix/space-between-vertically.svg
new file mode 100644
index 0000000000..bae247222f
--- /dev/null
+++ b/assets/icons/radix/space-between-vertically.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/space-evenly-horizontally.svg b/assets/icons/radix/space-evenly-horizontally.svg
new file mode 100644
index 0000000000..70169492e4
--- /dev/null
+++ b/assets/icons/radix/space-evenly-horizontally.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/space-evenly-vertically.svg b/assets/icons/radix/space-evenly-vertically.svg
new file mode 100644
index 0000000000..469b4c05d4
--- /dev/null
+++ b/assets/icons/radix/space-evenly-vertically.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/speaker-loud.svg b/assets/icons/radix/speaker-loud.svg
new file mode 100644
index 0000000000..68982ee5e9
--- /dev/null
+++ b/assets/icons/radix/speaker-loud.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/speaker-moderate.svg b/assets/icons/radix/speaker-moderate.svg
new file mode 100644
index 0000000000..0f1d1b4210
--- /dev/null
+++ b/assets/icons/radix/speaker-moderate.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/speaker-off.svg b/assets/icons/radix/speaker-off.svg
new file mode 100644
index 0000000000..f60c35de7f
--- /dev/null
+++ b/assets/icons/radix/speaker-off.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/speaker-quiet.svg b/assets/icons/radix/speaker-quiet.svg
new file mode 100644
index 0000000000..eb68cefcee
--- /dev/null
+++ b/assets/icons/radix/speaker-quiet.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/square.svg b/assets/icons/radix/square.svg
new file mode 100644
index 0000000000..82843f51c3
--- /dev/null
+++ b/assets/icons/radix/square.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/stack.svg b/assets/icons/radix/stack.svg
new file mode 100644
index 0000000000..92426ffb0d
--- /dev/null
+++ b/assets/icons/radix/stack.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/star-filled.svg b/assets/icons/radix/star-filled.svg
new file mode 100644
index 0000000000..2b17b7f579
--- /dev/null
+++ b/assets/icons/radix/star-filled.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/radix/star.svg b/assets/icons/radix/star.svg
new file mode 100644
index 0000000000..23f09ad7b2
--- /dev/null
+++ b/assets/icons/radix/star.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/stitches-logo.svg b/assets/icons/radix/stitches-logo.svg
new file mode 100644
index 0000000000..319a1481f3
--- /dev/null
+++ b/assets/icons/radix/stitches-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/stop.svg b/assets/icons/radix/stop.svg
new file mode 100644
index 0000000000..57aac59cab
--- /dev/null
+++ b/assets/icons/radix/stop.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/stopwatch.svg b/assets/icons/radix/stopwatch.svg
new file mode 100644
index 0000000000..ce5661e5cc
--- /dev/null
+++ b/assets/icons/radix/stopwatch.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/stretch-horizontally.svg b/assets/icons/radix/stretch-horizontally.svg
new file mode 100644
index 0000000000..37977363b3
--- /dev/null
+++ b/assets/icons/radix/stretch-horizontally.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/stretch-vertically.svg b/assets/icons/radix/stretch-vertically.svg
new file mode 100644
index 0000000000..c4b1fe79ce
--- /dev/null
+++ b/assets/icons/radix/stretch-vertically.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/strikethrough.svg b/assets/icons/radix/strikethrough.svg
new file mode 100644
index 0000000000..b814ef420a
--- /dev/null
+++ b/assets/icons/radix/strikethrough.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/sun.svg b/assets/icons/radix/sun.svg
new file mode 100644
index 0000000000..1807a51b4c
--- /dev/null
+++ b/assets/icons/radix/sun.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/switch.svg b/assets/icons/radix/switch.svg
new file mode 100644
index 0000000000..6dea528ce9
--- /dev/null
+++ b/assets/icons/radix/switch.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/symbol.svg b/assets/icons/radix/symbol.svg
new file mode 100644
index 0000000000..b529b2b08b
--- /dev/null
+++ b/assets/icons/radix/symbol.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/table.svg b/assets/icons/radix/table.svg
new file mode 100644
index 0000000000..8ff059b847
--- /dev/null
+++ b/assets/icons/radix/table.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/target.svg b/assets/icons/radix/target.svg
new file mode 100644
index 0000000000..d67989e01f
--- /dev/null
+++ b/assets/icons/radix/target.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text-align-bottom.svg b/assets/icons/radix/text-align-bottom.svg
new file mode 100644
index 0000000000..862a5aeb88
--- /dev/null
+++ b/assets/icons/radix/text-align-bottom.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text-align-center.svg b/assets/icons/radix/text-align-center.svg
new file mode 100644
index 0000000000..673cf8cd0a
--- /dev/null
+++ b/assets/icons/radix/text-align-center.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text-align-justify.svg b/assets/icons/radix/text-align-justify.svg
new file mode 100644
index 0000000000..df877f9513
--- /dev/null
+++ b/assets/icons/radix/text-align-justify.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text-align-left.svg b/assets/icons/radix/text-align-left.svg
new file mode 100644
index 0000000000..b7a64fbd43
--- /dev/null
+++ b/assets/icons/radix/text-align-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text-align-middle.svg b/assets/icons/radix/text-align-middle.svg
new file mode 100644
index 0000000000..e739d04efa
--- /dev/null
+++ b/assets/icons/radix/text-align-middle.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text-align-right.svg b/assets/icons/radix/text-align-right.svg
new file mode 100644
index 0000000000..e7609908ff
--- /dev/null
+++ b/assets/icons/radix/text-align-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text-align-top.svg b/assets/icons/radix/text-align-top.svg
new file mode 100644
index 0000000000..21660fe7d3
--- /dev/null
+++ b/assets/icons/radix/text-align-top.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text-none.svg b/assets/icons/radix/text-none.svg
new file mode 100644
index 0000000000..2a87f9372a
--- /dev/null
+++ b/assets/icons/radix/text-none.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/text.svg b/assets/icons/radix/text.svg
new file mode 100644
index 0000000000..bd41d8ac19
--- /dev/null
+++ b/assets/icons/radix/text.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/thick-arrow-down.svg b/assets/icons/radix/thick-arrow-down.svg
new file mode 100644
index 0000000000..32923bec58
--- /dev/null
+++ b/assets/icons/radix/thick-arrow-down.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/thick-arrow-left.svg b/assets/icons/radix/thick-arrow-left.svg
new file mode 100644
index 0000000000..0cfd863903
--- /dev/null
+++ b/assets/icons/radix/thick-arrow-left.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/thick-arrow-right.svg b/assets/icons/radix/thick-arrow-right.svg
new file mode 100644
index 0000000000..a0cb605693
--- /dev/null
+++ b/assets/icons/radix/thick-arrow-right.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/thick-arrow-up.svg b/assets/icons/radix/thick-arrow-up.svg
new file mode 100644
index 0000000000..68687be28d
--- /dev/null
+++ b/assets/icons/radix/thick-arrow-up.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/timer.svg b/assets/icons/radix/timer.svg
new file mode 100644
index 0000000000..20c52dff95
--- /dev/null
+++ b/assets/icons/radix/timer.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/tokens.svg b/assets/icons/radix/tokens.svg
new file mode 100644
index 0000000000..2bbbc82030
--- /dev/null
+++ b/assets/icons/radix/tokens.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/track-next.svg b/assets/icons/radix/track-next.svg
new file mode 100644
index 0000000000..24fd40e36f
--- /dev/null
+++ b/assets/icons/radix/track-next.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/track-previous.svg b/assets/icons/radix/track-previous.svg
new file mode 100644
index 0000000000..d99e7ab53f
--- /dev/null
+++ b/assets/icons/radix/track-previous.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/transform.svg b/assets/icons/radix/transform.svg
new file mode 100644
index 0000000000..e913ccc9a7
--- /dev/null
+++ b/assets/icons/radix/transform.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/transparency-grid.svg b/assets/icons/radix/transparency-grid.svg
new file mode 100644
index 0000000000..6559ef8c2b
--- /dev/null
+++ b/assets/icons/radix/transparency-grid.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/icons/radix/trash.svg b/assets/icons/radix/trash.svg
new file mode 100644
index 0000000000..18780e492c
--- /dev/null
+++ b/assets/icons/radix/trash.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/triangle-down.svg b/assets/icons/radix/triangle-down.svg
new file mode 100644
index 0000000000..ebfd8f2a12
--- /dev/null
+++ b/assets/icons/radix/triangle-down.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/radix/triangle-left.svg b/assets/icons/radix/triangle-left.svg
new file mode 100644
index 0000000000..0014139716
--- /dev/null
+++ b/assets/icons/radix/triangle-left.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/radix/triangle-right.svg b/assets/icons/radix/triangle-right.svg
new file mode 100644
index 0000000000..aed1393b9c
--- /dev/null
+++ b/assets/icons/radix/triangle-right.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/radix/triangle-up.svg b/assets/icons/radix/triangle-up.svg
new file mode 100644
index 0000000000..5eb1b416d3
--- /dev/null
+++ b/assets/icons/radix/triangle-up.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/radix/twitter-logo.svg b/assets/icons/radix/twitter-logo.svg
new file mode 100644
index 0000000000..7dcf2f58eb
--- /dev/null
+++ b/assets/icons/radix/twitter-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/underline.svg b/assets/icons/radix/underline.svg
new file mode 100644
index 0000000000..3344685097
--- /dev/null
+++ b/assets/icons/radix/underline.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/update.svg b/assets/icons/radix/update.svg
new file mode 100644
index 0000000000..b529b2b08b
--- /dev/null
+++ b/assets/icons/radix/update.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/upload.svg b/assets/icons/radix/upload.svg
new file mode 100644
index 0000000000..a7f6bddb2e
--- /dev/null
+++ b/assets/icons/radix/upload.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/value-none.svg b/assets/icons/radix/value-none.svg
new file mode 100644
index 0000000000..a86c08be1a
--- /dev/null
+++ b/assets/icons/radix/value-none.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/value.svg b/assets/icons/radix/value.svg
new file mode 100644
index 0000000000..59dd7d9373
--- /dev/null
+++ b/assets/icons/radix/value.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/vercel-logo.svg b/assets/icons/radix/vercel-logo.svg
new file mode 100644
index 0000000000..5466fd9f0e
--- /dev/null
+++ b/assets/icons/radix/vercel-logo.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/video.svg b/assets/icons/radix/video.svg
new file mode 100644
index 0000000000..e405396bef
--- /dev/null
+++ b/assets/icons/radix/video.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/view-grid.svg b/assets/icons/radix/view-grid.svg
new file mode 100644
index 0000000000..04825a870b
--- /dev/null
+++ b/assets/icons/radix/view-grid.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/view-horizontal.svg b/assets/icons/radix/view-horizontal.svg
new file mode 100644
index 0000000000..2ca7336b99
--- /dev/null
+++ b/assets/icons/radix/view-horizontal.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/view-none.svg b/assets/icons/radix/view-none.svg
new file mode 100644
index 0000000000..71b08a46d2
--- /dev/null
+++ b/assets/icons/radix/view-none.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/view-vertical.svg b/assets/icons/radix/view-vertical.svg
new file mode 100644
index 0000000000..0c8f8164b4
--- /dev/null
+++ b/assets/icons/radix/view-vertical.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/width.svg b/assets/icons/radix/width.svg
new file mode 100644
index 0000000000..3ae2b56e3d
--- /dev/null
+++ b/assets/icons/radix/width.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/zoom-in.svg b/assets/icons/radix/zoom-in.svg
new file mode 100644
index 0000000000..caac722ad0
--- /dev/null
+++ b/assets/icons/radix/zoom-in.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/radix/zoom-out.svg b/assets/icons/radix/zoom-out.svg
new file mode 100644
index 0000000000..62046a9e0f
--- /dev/null
+++ b/assets/icons/radix/zoom-out.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/split_message_15.svg b/assets/icons/split_message_15.svg
new file mode 100644
index 0000000000..54d9e81224
--- /dev/null
+++ b/assets/icons/split_message_15.svg
@@ -0,0 +1 @@
+
diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index a642697a37..6fc06198fe 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -40,7 +40,8 @@
"cmd-o": "workspace::Open",
"alt-cmd-o": "projects::OpenRecent",
"ctrl-~": "workspace::NewTerminal",
- "ctrl-`": "terminal_panel::ToggleFocus"
+ "ctrl-`": "terminal_panel::ToggleFocus",
+ "shift-escape": "workspace::ToggleZoom"
}
},
{
@@ -197,9 +198,17 @@
}
},
{
- "context": "AssistantEditor > Editor",
+ "context": "AssistantPanel",
+ "bindings": {
+ "cmd-g": "search::SelectNextMatch",
+ "cmd-shift-g": "search::SelectPrevMatch"
+ }
+ },
+ {
+ "context": "ConversationEditor > Editor",
"bindings": {
"cmd-enter": "assistant::Assist",
+ "cmd-s": "workspace::Save",
"cmd->": "assistant::QuoteSelection",
"shift-enter": "assistant::Split",
"ctrl-r": "assistant::CycleMessageRole"
@@ -234,8 +243,7 @@
"cmd-shift-g": "search::SelectPrevMatch",
"alt-cmd-c": "search::ToggleCaseSensitive",
"alt-cmd-w": "search::ToggleWholeWord",
- "alt-cmd-r": "search::ToggleRegex",
- "shift-escape": "workspace::ToggleZoom"
+ "alt-cmd-r": "search::ToggleRegex"
}
},
// Bindings from VS Code
@@ -400,6 +408,7 @@
"cmd-shift-p": "command_palette::Toggle",
"cmd-shift-m": "diagnostics::Deploy",
"cmd-shift-e": "project_panel::ToggleFocus",
+ "cmd-?": "assistant::ToggleFocus",
"cmd-alt-s": "workspace::SaveAll",
"cmd-k m": "language_selector::Toggle"
}
@@ -411,6 +420,7 @@
"ctrl-shift-k": "editor::DeleteLine",
"cmd-shift-d": "editor::DuplicateLine",
"cmd-shift-l": "editor::SplitSelectionIntoLines",
+ "ctrl-j": "editor::JoinLines",
"ctrl-cmd-up": "editor::MoveLineUp",
"ctrl-cmd-down": "editor::MoveLineDown",
"ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 47c5f8c458..afee6fcd2e 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -1,6 +1,6 @@
[
{
- "context": "Editor && VimControl && !VimWaiting",
+ "context": "Editor && VimControl && !VimWaiting && !menu",
"bindings": {
"g": [
"vim::PushOperator",
@@ -25,11 +25,15 @@
}
],
"h": "vim::Left",
+ "left": "vim::Left",
"backspace": "vim::Backspace",
"j": "vim::Down",
+ "down": "vim::Down",
"enter": "vim::NextLineStart",
"k": "vim::Up",
+ "up": "vim::Up",
"l": "vim::Right",
+ "right": "vim::Right",
"$": "vim::EndOfLine",
"shift-g": "vim::EndOfDocument",
"w": "vim::NextWordStart",
@@ -54,10 +58,6 @@
}
],
"%": "vim::Matching",
- "ctrl-y": [
- "vim::Scroll",
- "LineUp"
- ],
"f": [
"vim::PushOperator",
{
@@ -90,6 +90,8 @@
}
}
],
+ "ctrl-o": "pane::GoBack",
+ "ctrl-]": "editor::GoToDefinition",
"escape": "editor::Cancel",
"0": "vim::StartOfLine", // When no number operator present, use start of line motion
"1": [
@@ -131,7 +133,7 @@
}
},
{
- "context": "Editor && vim_mode == normal && vim_operator == none && !VimWaiting",
+ "context": "Editor && vim_mode == normal && (vim_operator == none || vim_operator == n) && !VimWaiting",
"bindings": {
"c": [
"vim::PushOperator",
@@ -143,6 +145,7 @@
"Delete"
],
"shift-d": "vim::DeleteToEndOfLine",
+ "shift-j": "editor::JoinLines",
"y": [
"vim::PushOperator",
"Yank"
@@ -165,6 +168,7 @@
"^": "vim::FirstNonWhitespace",
"o": "vim::InsertLineBelow",
"shift-o": "vim::InsertLineAbove",
+ "~": "vim::ChangeCase",
"v": [
"vim::SwitchMode",
{
@@ -184,37 +188,29 @@
"p": "vim::Paste",
"u": "editor::Undo",
"ctrl-r": "editor::Redo",
- "ctrl-o": "pane::GoBack",
"/": [
"buffer_search::Deploy",
{
"focus": true
}
],
- "ctrl-f": [
- "vim::Scroll",
- "PageDown"
- ],
- "ctrl-b": [
- "vim::Scroll",
- "PageUp"
- ],
- "ctrl-d": [
- "vim::Scroll",
- "HalfPageDown"
- ],
- "ctrl-u": [
- "vim::Scroll",
- "HalfPageUp"
- ],
- "ctrl-e": [
- "vim::Scroll",
- "LineDown"
- ],
+ "ctrl-f": "vim::PageDown",
+ "pagedown": "vim::PageDown",
+ "ctrl-b": "vim::PageUp",
+ "pageup": "vim::PageUp",
+ "ctrl-d": "vim::ScrollDown",
+ "ctrl-u": "vim::ScrollUp",
+ "ctrl-e": "vim::LineDown",
+ "ctrl-y": "vim::LineUp",
"r": [
"vim::PushOperator",
"Replace"
- ]
+ ],
+ "s": "vim::Substitute",
+ "> >": "editor::Indent",
+ "< <": "editor::Outdent",
+ "ctrl-pagedown": "pane::ActivateNextItem",
+ "ctrl-pageup": "pane::ActivatePrevItem"
}
},
{
@@ -231,6 +227,8 @@
"bindings": {
"g": "vim::StartOfDocument",
"h": "editor::Hover",
+ "t": "pane::ActivateNextItem",
+ "shift-t": "pane::ActivatePrevItem",
"escape": [
"vim::SwitchMode",
"Normal"
@@ -301,10 +299,14 @@
"x": "vim::VisualDelete",
"y": "vim::VisualYank",
"p": "vim::VisualPaste",
+ "s": "vim::Substitute",
+ "~": "vim::ChangeCase",
"r": [
"vim::PushOperator",
"Replace"
- ]
+ ],
+ "> >": "editor::Indent",
+ "< <": "editor::Outdent"
}
},
{
diff --git a/assets/settings/default.json b/assets/settings/default.json
index bd73bcbf08..c69d8089bc 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -57,37 +57,37 @@
"show_whitespaces": "selection",
// Scrollbar related settings
"scrollbar": {
- // When to show the scrollbar in the editor.
- // This setting can take four values:
- //
- // 1. Show the scrollbar if there's important information or
- // follow the system's configured behavior (default):
- // "auto"
- // 2. Match the system's configured behavior:
- // "system"
- // 3. Always show the scrollbar:
- // "always"
- // 4. Never show the scrollbar:
- // "never"
- "show": "auto",
- // Whether to show git diff indicators in the scrollbar.
- "git_diff": true
+ // When to show the scrollbar in the editor.
+ // This setting can take four values:
+ //
+ // 1. Show the scrollbar if there's important information or
+ // follow the system's configured behavior (default):
+ // "auto"
+ // 2. Match the system's configured behavior:
+ // "system"
+ // 3. Always show the scrollbar:
+ // "always"
+ // 4. Never show the scrollbar:
+ // "never"
+ "show": "auto",
+ // Whether to show git diff indicators in the scrollbar.
+ "git_diff": true
},
"project_panel": {
- // Whether to show the git status in the project panel.
- "git_status": true,
- // Where to dock project panel. Can be 'left' or 'right'.
- "dock": "left",
- // Default width of the project panel.
- "default_width": 240
+ // Whether to show the git status in the project panel.
+ "git_status": true,
+ // Where to dock project panel. Can be 'left' or 'right'.
+ "dock": "left",
+ // Default width of the project panel.
+ "default_width": 240
},
"assistant": {
- // Where to dock the assistant. Can be 'left', 'right' or 'bottom'.
- "dock": "right",
- // Default width when the assistant is docked to the left or right.
- "default_width": 450,
- // Default height when the assistant is docked to the bottom.
- "default_height": 320
+ // Where to dock the assistant. Can be 'left', 'right' or 'bottom'.
+ "dock": "right",
+ // Default width when the assistant is docked to the left or right.
+ "default_width": 640,
+ // Default height when the assistant is docked to the bottom.
+ "default_height": 320
},
// Whether the screen sharing icon is shown in the os status bar.
"show_call_status_icon": true,
diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 9172b84f3c..8b46d7cfc5 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -321,7 +321,7 @@ impl View for ActivityIndicator {
let mut element = MouseEventHandler::::new(0, cx, |state, cx| {
let theme = &theme::current(cx).workspace.status_bar.lsp_status;
let style = if state.hovered() && on_click.is_some() {
- theme.hover.as_ref().unwrap_or(&theme.default)
+ theme.hovered.as_ref().unwrap_or(&theme.default)
} else {
&theme.default
};
diff --git a/crates/ai/Cargo.toml b/crates/ai/Cargo.toml
index 7f8954bb21..013565e14f 100644
--- a/crates/ai/Cargo.toml
+++ b/crates/ai/Cargo.toml
@@ -22,9 +22,10 @@ util = { path = "../util" }
workspace = { path = "../workspace" }
anyhow.workspace = true
-chrono = "0.4"
+chrono = { version = "0.4", features = ["serde"] }
futures.workspace = true
isahc.workspace = true
+regex.workspace = true
schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
@@ -33,3 +34,4 @@ tiktoken-rs = "0.4"
[dev-dependencies]
editor = { path = "../editor", features = ["test-support"] }
+project = { path = "../project", features = ["test-support"] }
diff --git a/crates/ai/src/ai.rs b/crates/ai/src/ai.rs
index b3b62c6a24..812fb05121 100644
--- a/crates/ai/src/ai.rs
+++ b/crates/ai/src/ai.rs
@@ -1,10 +1,22 @@
pub mod assistant;
mod assistant_settings;
+use anyhow::Result;
pub use assistant::AssistantPanel;
+use chrono::{DateTime, Local};
+use collections::HashMap;
+use fs::Fs;
+use futures::StreamExt;
use gpui::AppContext;
+use regex::Regex;
use serde::{Deserialize, Serialize};
-use std::fmt::{self, Display};
+use std::{
+ cmp::Reverse,
+ fmt::{self, Display},
+ path::PathBuf,
+ sync::Arc,
+};
+use util::paths::CONVERSATIONS_DIR;
// Data types for chat completion requests
#[derive(Debug, Serialize)]
@@ -14,6 +26,84 @@ struct OpenAIRequest {
stream: bool,
}
+#[derive(
+ Copy, Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize,
+)]
+struct MessageId(usize);
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+struct MessageMetadata {
+ role: Role,
+ sent_at: DateTime,
+ status: MessageStatus,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+enum MessageStatus {
+ Pending,
+ Done,
+ Error(Arc),
+}
+
+#[derive(Serialize, Deserialize)]
+struct SavedMessage {
+ id: MessageId,
+ start: usize,
+}
+
+#[derive(Serialize, Deserialize)]
+struct SavedConversation {
+ zed: String,
+ version: String,
+ text: String,
+ messages: Vec,
+ message_metadata: HashMap,
+ summary: String,
+ model: String,
+}
+
+impl SavedConversation {
+ const VERSION: &'static str = "0.1.0";
+}
+
+struct SavedConversationMetadata {
+ title: String,
+ path: PathBuf,
+ mtime: chrono::DateTime,
+}
+
+impl SavedConversationMetadata {
+ pub async fn list(fs: Arc) -> Result> {
+ fs.create_dir(&CONVERSATIONS_DIR).await?;
+
+ let mut paths = fs.read_dir(&CONVERSATIONS_DIR).await?;
+ let mut conversations = Vec::::new();
+ while let Some(path) = paths.next().await {
+ let path = path?;
+
+ let pattern = r" - \d+.zed.json$";
+ let re = Regex::new(pattern).unwrap();
+
+ let metadata = fs.metadata(&path).await?;
+ if let Some((file_name, metadata)) = path
+ .file_name()
+ .and_then(|name| name.to_str())
+ .zip(metadata)
+ {
+ let title = re.replace(file_name, "");
+ conversations.push(Self {
+ title: title.into_owned(),
+ path,
+ mtime: metadata.mtime.into(),
+ });
+ }
+ }
+ conversations.sort_unstable_by_key(|conversation| Reverse(conversation.mtime));
+
+ Ok(conversations)
+ }
+}
+
#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
struct RequestMessage {
role: Role,
diff --git a/crates/ai/src/assistant.rs b/crates/ai/src/assistant.rs
index ce816f147b..9ca54e661a 100644
--- a/crates/ai/src/assistant.rs
+++ b/crates/ai/src/assistant.rs
@@ -1,6 +1,7 @@
use crate::{
assistant_settings::{AssistantDockPosition, AssistantSettings},
- OpenAIRequest, OpenAIResponseStreamEvent, RequestMessage, Role,
+ MessageId, MessageMetadata, MessageStatus, OpenAIRequest, OpenAIResponseStreamEvent,
+ RequestMessage, Role, SavedConversation, SavedConversationMetadata, SavedMessage,
};
use anyhow::{anyhow, Result};
use chrono::{DateTime, Local};
@@ -23,17 +24,26 @@ use gpui::{
};
use isahc::{http::StatusCode, Request, RequestExt};
use language::{language_settings::SoftWrap, Buffer, LanguageRegistry, ToOffset as _};
+use search::BufferSearchBar;
use serde::Deserialize;
use settings::SettingsStore;
use std::{
- borrow::Cow, cell::RefCell, cmp, fmt::Write, io, iter, ops::Range, rc::Rc, sync::Arc,
+ cell::RefCell,
+ cmp, env,
+ fmt::Write,
+ io, iter,
+ ops::Range,
+ path::{Path, PathBuf},
+ rc::Rc,
+ sync::Arc,
time::Duration,
};
-use util::{channel::ReleaseChannel, post_inc, truncate_and_trailoff, ResultExt, TryFutureExt};
+use theme::AssistantStyle;
+use util::{paths::CONVERSATIONS_DIR, post_inc, ResultExt, TryFutureExt};
use workspace::{
dock::{DockPosition, Panel},
- item::Item,
- pane, Pane, Workspace,
+ searchable::Direction,
+ Save, ToggleZoom, Toolbar, Workspace,
};
const OPENAI_API_URL: &'static str = "https://api.openai.com/v1";
@@ -41,41 +51,39 @@ const OPENAI_API_URL: &'static str = "https://api.openai.com/v1";
actions!(
assistant,
[
- NewContext,
+ NewConversation,
Assist,
Split,
CycleMessageRole,
QuoteSelection,
ToggleFocus,
- ResetKey
+ ResetKey,
]
);
pub fn init(cx: &mut AppContext) {
- if *util::channel::RELEASE_CHANNEL == ReleaseChannel::Stable {
- cx.update_default_global::(move |filter, _cx| {
- filter.filtered_namespaces.insert("assistant");
- });
- }
-
settings::register::(cx);
cx.add_action(
- |workspace: &mut Workspace, _: &NewContext, cx: &mut ViewContext| {
- if let Some(this) = workspace.panel::(cx) {
- this.update(cx, |this, cx| this.add_context(cx))
- }
-
- workspace.focus_panel::(cx);
+ |this: &mut AssistantPanel,
+ _: &workspace::NewFile,
+ cx: &mut ViewContext| {
+ this.new_conversation(cx);
},
);
- cx.add_action(AssistantEditor::assist);
- cx.capture_action(AssistantEditor::cancel_last_assist);
- cx.add_action(AssistantEditor::quote_selection);
- cx.capture_action(AssistantEditor::copy);
- cx.capture_action(AssistantEditor::split);
- cx.capture_action(AssistantEditor::cycle_message_role);
+ cx.add_action(ConversationEditor::assist);
+ cx.capture_action(ConversationEditor::cancel_last_assist);
+ cx.capture_action(ConversationEditor::save);
+ cx.add_action(ConversationEditor::quote_selection);
+ cx.capture_action(ConversationEditor::copy);
+ cx.add_action(ConversationEditor::split);
+ cx.capture_action(ConversationEditor::cycle_message_role);
cx.add_action(AssistantPanel::save_api_key);
cx.add_action(AssistantPanel::reset_api_key);
+ cx.add_action(AssistantPanel::toggle_zoom);
+ cx.add_action(AssistantPanel::deploy);
+ cx.add_action(AssistantPanel::select_next_match);
+ cx.add_action(AssistantPanel::select_prev_match);
+ cx.add_action(AssistantPanel::handle_editor_cancel);
cx.add_action(
|workspace: &mut Workspace, _: &ToggleFocus, cx: &mut ViewContext| {
workspace.toggle_panel_focus::(cx);
@@ -83,6 +91,7 @@ pub fn init(cx: &mut AppContext) {
);
}
+#[derive(Debug)]
pub enum AssistantPanelEvent {
ZoomIn,
ZoomOut,
@@ -92,15 +101,24 @@ pub enum AssistantPanelEvent {
}
pub struct AssistantPanel {
+ workspace: WeakViewHandle,
width: Option,
height: Option,
- pane: ViewHandle,
+ active_editor_index: Option,
+ prev_active_editor_index: Option,
+ editors: Vec>,
+ saved_conversations: Vec,
+ saved_conversations_list_state: UniformListState,
+ zoomed: bool,
+ has_focus: bool,
+ toolbar: ViewHandle,
api_key: Rc>>,
api_key_editor: Option>,
has_read_credentials: bool,
languages: Arc,
fs: Arc,
subscriptions: Vec,
+ _watch_saved_conversations: Task>,
}
impl AssistantPanel {
@@ -109,66 +127,51 @@ impl AssistantPanel {
cx: AsyncAppContext,
) -> Task>> {
cx.spawn(|mut cx| async move {
+ let fs = workspace.read_with(&cx, |workspace, _| workspace.app_state().fs.clone())?;
+ let saved_conversations = SavedConversationMetadata::list(fs.clone())
+ .await
+ .log_err()
+ .unwrap_or_default();
+
// TODO: deserialize state.
+ let workspace_handle = workspace.clone();
workspace.update(&mut cx, |workspace, cx| {
cx.add_view::(|cx| {
- let weak_self = cx.weak_handle();
- let pane = cx.add_view(|cx| {
- let mut pane = Pane::new(
- workspace.weak_handle(),
- workspace.project().clone(),
- workspace.app_state().background_actions,
- Default::default(),
- cx,
- );
- pane.set_can_split(false, cx);
- pane.set_can_navigate(false, cx);
- pane.on_can_drop(move |_, _| false);
- pane.set_render_tab_bar_buttons(cx, move |pane, cx| {
- let weak_self = weak_self.clone();
- Flex::row()
- .with_child(Pane::render_tab_bar_button(
- 0,
- "icons/plus_12.svg",
- false,
- Some(("New Context".into(), Some(Box::new(NewContext)))),
- cx,
- move |_, cx| {
- let weak_self = weak_self.clone();
- cx.window_context().defer(move |cx| {
- if let Some(this) = weak_self.upgrade(cx) {
- this.update(cx, |this, cx| this.add_context(cx));
- }
- })
- },
- None,
- ))
- .with_child(Pane::render_tab_bar_button(
- 1,
- if pane.is_zoomed() {
- "icons/minimize_8.svg"
- } else {
- "icons/maximize_8.svg"
- },
- pane.is_zoomed(),
- Some((
- "Toggle Zoom".into(),
- Some(Box::new(workspace::ToggleZoom)),
- )),
- cx,
- move |pane, cx| pane.toggle_zoom(&Default::default(), cx),
- None,
- ))
- .into_any()
- });
- let buffer_search_bar = cx.add_view(search::BufferSearchBar::new);
- pane.toolbar()
- .update(cx, |toolbar, cx| toolbar.add_item(buffer_search_bar, cx));
- pane
+ const CONVERSATION_WATCH_DURATION: Duration = Duration::from_millis(100);
+ let _watch_saved_conversations = cx.spawn(move |this, mut cx| async move {
+ let mut events = fs
+ .watch(&CONVERSATIONS_DIR, CONVERSATION_WATCH_DURATION)
+ .await;
+ while events.next().await.is_some() {
+ let saved_conversations = SavedConversationMetadata::list(fs.clone())
+ .await
+ .log_err()
+ .unwrap_or_default();
+ this.update(&mut cx, |this, _| {
+ this.saved_conversations = saved_conversations
+ })
+ .ok();
+ }
+
+ anyhow::Ok(())
});
+ let toolbar = cx.add_view(|cx| {
+ let mut toolbar = Toolbar::new(None);
+ toolbar.set_can_navigate(false, cx);
+ toolbar.add_item(cx.add_view(|cx| BufferSearchBar::new(cx)), cx);
+ toolbar
+ });
let mut this = Self {
- pane,
+ workspace: workspace_handle,
+ active_editor_index: Default::default(),
+ prev_active_editor_index: Default::default(),
+ editors: Default::default(),
+ saved_conversations,
+ saved_conversations_list_state: Default::default(),
+ zoomed: false,
+ has_focus: false,
+ toolbar,
api_key: Rc::new(RefCell::new(None)),
api_key_editor: None,
has_read_credentials: false,
@@ -177,20 +180,18 @@ impl AssistantPanel {
width: None,
height: None,
subscriptions: Default::default(),
+ _watch_saved_conversations,
};
let mut old_dock_position = this.position(cx);
- this.subscriptions = vec![
- cx.observe(&this.pane, |_, _, cx| cx.notify()),
- cx.subscribe(&this.pane, Self::handle_pane_event),
- cx.observe_global::(move |this, cx| {
+ this.subscriptions =
+ vec![cx.observe_global::(move |this, cx| {
let new_dock_position = this.position(cx);
if new_dock_position != old_dock_position {
old_dock_position = new_dock_position;
cx.emit(AssistantPanelEvent::DockPositionChanged);
}
- }),
- ];
+ })];
this
})
@@ -198,40 +199,64 @@ impl AssistantPanel {
})
}
- fn handle_pane_event(
- &mut self,
- _pane: ViewHandle,
- event: &pane::Event,
- cx: &mut ViewContext,
- ) {
- match event {
- pane::Event::ZoomIn => cx.emit(AssistantPanelEvent::ZoomIn),
- pane::Event::ZoomOut => cx.emit(AssistantPanelEvent::ZoomOut),
- pane::Event::Focus => cx.emit(AssistantPanelEvent::Focus),
- pane::Event::Remove => cx.emit(AssistantPanelEvent::Close),
- _ => {}
- }
- }
-
- fn add_context(&mut self, cx: &mut ViewContext) {
- let focus = self.has_focus(cx);
- let editor = cx
- .add_view(|cx| AssistantEditor::new(self.api_key.clone(), self.languages.clone(), cx));
- self.subscriptions
- .push(cx.subscribe(&editor, Self::handle_assistant_editor_event));
- self.pane.update(cx, |pane, cx| {
- pane.add_item(Box::new(editor), true, focus, None, cx)
+ fn new_conversation(&mut self, cx: &mut ViewContext) -> ViewHandle {
+ let editor = cx.add_view(|cx| {
+ ConversationEditor::new(
+ self.api_key.clone(),
+ self.languages.clone(),
+ self.fs.clone(),
+ cx,
+ )
});
+ self.add_conversation(editor.clone(), cx);
+ editor
}
- fn handle_assistant_editor_event(
+ fn add_conversation(
&mut self,
- _: ViewHandle,
- event: &AssistantEditorEvent,
+ editor: ViewHandle,
+ cx: &mut ViewContext,
+ ) {
+ self.subscriptions
+ .push(cx.subscribe(&editor, Self::handle_conversation_editor_event));
+
+ let conversation = editor.read(cx).conversation.clone();
+ self.subscriptions
+ .push(cx.observe(&conversation, |_, _, cx| cx.notify()));
+
+ let index = self.editors.len();
+ self.editors.push(editor);
+ self.set_active_editor_index(Some(index), cx);
+ }
+
+ fn set_active_editor_index(&mut self, index: Option, cx: &mut ViewContext) {
+ self.prev_active_editor_index = self.active_editor_index;
+ self.active_editor_index = index;
+ if let Some(editor) = self.active_editor() {
+ let editor = editor.read(cx).editor.clone();
+ self.toolbar.update(cx, |toolbar, cx| {
+ toolbar.set_active_item(Some(&editor), cx);
+ });
+ if self.has_focus(cx) {
+ cx.focus(&editor);
+ }
+ } else {
+ self.toolbar.update(cx, |toolbar, cx| {
+ toolbar.set_active_item(None, cx);
+ });
+ }
+
+ cx.notify();
+ }
+
+ fn handle_conversation_editor_event(
+ &mut self,
+ _: ViewHandle,
+ event: &ConversationEditorEvent,
cx: &mut ViewContext,
) {
match event {
- AssistantEditorEvent::TabContentChanged => self.pane.update(cx, |_, cx| cx.notify()),
+ ConversationEditorEvent::TabContentChanged => cx.notify(),
}
}
@@ -262,6 +287,287 @@ impl AssistantPanel {
cx.focus_self();
cx.notify();
}
+
+ fn toggle_zoom(&mut self, _: &workspace::ToggleZoom, cx: &mut ViewContext) {
+ if self.zoomed {
+ cx.emit(AssistantPanelEvent::ZoomOut)
+ } else {
+ cx.emit(AssistantPanelEvent::ZoomIn)
+ }
+ }
+
+ fn deploy(&mut self, action: &search::buffer_search::Deploy, cx: &mut ViewContext) {
+ if let Some(search_bar) = self.toolbar.read(cx).item_of_type::() {
+ if search_bar.update(cx, |search_bar, cx| search_bar.show(action.focus, true, cx)) {
+ return;
+ }
+ }
+ cx.propagate_action();
+ }
+
+ fn handle_editor_cancel(&mut self, _: &editor::Cancel, cx: &mut ViewContext) {
+ if let Some(search_bar) = self.toolbar.read(cx).item_of_type::() {
+ if !search_bar.read(cx).is_dismissed() {
+ search_bar.update(cx, |search_bar, cx| {
+ search_bar.dismiss(&Default::default(), cx)
+ });
+ return;
+ }
+ }
+ cx.propagate_action();
+ }
+
+ fn select_next_match(&mut self, _: &search::SelectNextMatch, cx: &mut ViewContext) {
+ if let Some(search_bar) = self.toolbar.read(cx).item_of_type::() {
+ search_bar.update(cx, |bar, cx| bar.select_match(Direction::Next, cx));
+ }
+ }
+
+ fn select_prev_match(&mut self, _: &search::SelectPrevMatch, cx: &mut ViewContext) {
+ if let Some(search_bar) = self.toolbar.read(cx).item_of_type::() {
+ search_bar.update(cx, |bar, cx| bar.select_match(Direction::Prev, cx));
+ }
+ }
+
+ fn active_editor(&self) -> Option<&ViewHandle> {
+ self.editors.get(self.active_editor_index?)
+ }
+
+ fn render_hamburger_button(cx: &mut ViewContext) -> impl Element {
+ enum History {}
+ let theme = theme::current(cx);
+ let tooltip_style = theme::current(cx).tooltip.clone();
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = theme.assistant.hamburger_button.style_for(state);
+ Svg::for_style(style.icon.clone())
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
+ if this.active_editor().is_some() {
+ this.set_active_editor_index(None, cx);
+ } else {
+ this.set_active_editor_index(this.prev_active_editor_index, cx);
+ }
+ })
+ .with_tooltip::(1, "History".into(), None, tooltip_style, cx)
+ }
+
+ fn render_editor_tools(&self, cx: &mut ViewContext) -> Vec> {
+ if self.active_editor().is_some() {
+ vec![
+ Self::render_split_button(cx).into_any(),
+ Self::render_quote_button(cx).into_any(),
+ Self::render_assist_button(cx).into_any(),
+ ]
+ } else {
+ Default::default()
+ }
+ }
+
+ fn render_split_button(cx: &mut ViewContext) -> impl Element {
+ let theme = theme::current(cx);
+ let tooltip_style = theme::current(cx).tooltip.clone();
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = theme.assistant.split_button.style_for(state);
+ Svg::for_style(style.icon.clone())
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
+ if let Some(active_editor) = this.active_editor() {
+ active_editor.update(cx, |editor, cx| editor.split(&Default::default(), cx));
+ }
+ })
+ .with_tooltip::(
+ 1,
+ "Split Message".into(),
+ Some(Box::new(Split)),
+ tooltip_style,
+ cx,
+ )
+ }
+
+ fn render_assist_button(cx: &mut ViewContext) -> impl Element {
+ let theme = theme::current(cx);
+ let tooltip_style = theme::current(cx).tooltip.clone();
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = theme.assistant.assist_button.style_for(state);
+ Svg::for_style(style.icon.clone())
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
+ if let Some(active_editor) = this.active_editor() {
+ active_editor.update(cx, |editor, cx| editor.assist(&Default::default(), cx));
+ }
+ })
+ .with_tooltip::(
+ 1,
+ "Assist".into(),
+ Some(Box::new(Assist)),
+ tooltip_style,
+ cx,
+ )
+ }
+
+ fn render_quote_button(cx: &mut ViewContext) -> impl Element {
+ let theme = theme::current(cx);
+ let tooltip_style = theme::current(cx).tooltip.clone();
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = theme.assistant.quote_button.style_for(state);
+ Svg::for_style(style.icon.clone())
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
+ if let Some(workspace) = this.workspace.upgrade(cx) {
+ cx.window_context().defer(move |cx| {
+ workspace.update(cx, |workspace, cx| {
+ ConversationEditor::quote_selection(workspace, &Default::default(), cx)
+ });
+ });
+ }
+ })
+ .with_tooltip::(
+ 1,
+ "Quote Selection".into(),
+ Some(Box::new(QuoteSelection)),
+ tooltip_style,
+ cx,
+ )
+ }
+
+ fn render_plus_button(cx: &mut ViewContext) -> impl Element {
+ let theme = theme::current(cx);
+ let tooltip_style = theme::current(cx).tooltip.clone();
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = theme.assistant.plus_button.style_for(state);
+ Svg::for_style(style.icon.clone())
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
+ this.new_conversation(cx);
+ })
+ .with_tooltip::(
+ 1,
+ "New Conversation".into(),
+ Some(Box::new(NewConversation)),
+ tooltip_style,
+ cx,
+ )
+ }
+
+ fn render_zoom_button(&self, cx: &mut ViewContext) -> impl Element {
+ enum ToggleZoomButton {}
+
+ let theme = theme::current(cx);
+ let tooltip_style = theme::current(cx).tooltip.clone();
+ let style = if self.zoomed {
+ &theme.assistant.zoom_out_button
+ } else {
+ &theme.assistant.zoom_in_button
+ };
+
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = style.style_for(state);
+ Svg::for_style(style.icon.clone())
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, |_, this, cx| {
+ this.toggle_zoom(&ToggleZoom, cx);
+ })
+ .with_tooltip::(
+ 0,
+ if self.zoomed {
+ "Zoom Out".into()
+ } else {
+ "Zoom In".into()
+ },
+ Some(Box::new(ToggleZoom)),
+ tooltip_style,
+ cx,
+ )
+ }
+
+ fn render_saved_conversation(
+ &mut self,
+ index: usize,
+ cx: &mut ViewContext,
+ ) -> impl Element {
+ let conversation = &self.saved_conversations[index];
+ let path = conversation.path.clone();
+ MouseEventHandler::::new(index, cx, move |state, cx| {
+ let style = &theme::current(cx).assistant.saved_conversation;
+ Flex::row()
+ .with_child(
+ Label::new(
+ conversation.mtime.format("%F %I:%M%p").to_string(),
+ style.saved_at.text.clone(),
+ )
+ .aligned()
+ .contained()
+ .with_style(style.saved_at.container),
+ )
+ .with_child(
+ Label::new(conversation.title.clone(), style.title.text.clone())
+ .aligned()
+ .contained()
+ .with_style(style.title.container),
+ )
+ .contained()
+ .with_style(*style.container.style_for(state))
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, move |_, this, cx| {
+ this.open_conversation(path.clone(), cx)
+ .detach_and_log_err(cx)
+ })
+ }
+
+ fn open_conversation(&mut self, path: PathBuf, cx: &mut ViewContext) -> Task> {
+ if let Some(ix) = self.editor_index_for_path(&path, cx) {
+ self.set_active_editor_index(Some(ix), cx);
+ return Task::ready(Ok(()));
+ }
+
+ let fs = self.fs.clone();
+ let api_key = self.api_key.clone();
+ let languages = self.languages.clone();
+ cx.spawn(|this, mut cx| async move {
+ let saved_conversation = fs.load(&path).await?;
+ let saved_conversation = serde_json::from_str(&saved_conversation)?;
+ let conversation = cx.add_model(|cx| {
+ Conversation::deserialize(saved_conversation, path.clone(), api_key, languages, cx)
+ });
+ this.update(&mut cx, |this, cx| {
+ // If, by the time we've loaded the conversation, the user has already opened
+ // the same conversation, we don't want to open it again.
+ if let Some(ix) = this.editor_index_for_path(&path, cx) {
+ this.set_active_editor_index(Some(ix), cx);
+ } else {
+ let editor = cx
+ .add_view(|cx| ConversationEditor::for_conversation(conversation, fs, cx));
+ this.add_conversation(editor, cx);
+ }
+ })?;
+ Ok(())
+ })
+ }
+
+ fn editor_index_for_path(&self, path: &Path, cx: &AppContext) -> Option {
+ self.editors
+ .iter()
+ .position(|editor| editor.read(cx).conversation.read(cx).path.as_deref() == Some(path))
+ }
}
fn build_api_key_editor(cx: &mut ViewContext) -> ViewHandle {
@@ -285,7 +591,8 @@ impl View for AssistantPanel {
}
fn render(&mut self, cx: &mut ViewContext) -> AnyElement {
- let style = &theme::current(cx).assistant;
+ let theme = &theme::current(cx);
+ let style = &theme.assistant;
if let Some(api_key_editor) = self.api_key_editor.as_ref() {
Flex::column()
.with_child(
@@ -306,19 +613,81 @@ impl View for AssistantPanel {
.aligned()
.into_any()
} else {
- ChildView::new(&self.pane, cx).into_any()
+ let title = self.active_editor().map(|editor| {
+ Label::new(editor.read(cx).title(cx), style.title.text.clone())
+ .contained()
+ .with_style(style.title.container)
+ .aligned()
+ .left()
+ .flex(1., false)
+ });
+ let mut header = Flex::row()
+ .with_child(Self::render_hamburger_button(cx).aligned())
+ .with_children(title);
+ if self.has_focus {
+ header.add_children(
+ self.render_editor_tools(cx)
+ .into_iter()
+ .map(|tool| tool.aligned().flex_float()),
+ );
+ header.add_child(Self::render_plus_button(cx).aligned().flex_float());
+ header.add_child(self.render_zoom_button(cx).aligned());
+ }
+
+ Flex::column()
+ .with_child(
+ header
+ .contained()
+ .with_style(theme.workspace.tab_bar.container)
+ .expanded()
+ .constrained()
+ .with_height(theme.workspace.tab_bar.height),
+ )
+ .with_children(if self.toolbar.read(cx).hidden() {
+ None
+ } else {
+ Some(ChildView::new(&self.toolbar, cx).expanded())
+ })
+ .with_child(if let Some(editor) = self.active_editor() {
+ ChildView::new(editor, cx).flex(1., true).into_any()
+ } else {
+ UniformList::new(
+ self.saved_conversations_list_state.clone(),
+ self.saved_conversations.len(),
+ cx,
+ |this, range, items, cx| {
+ for ix in range {
+ items.push(this.render_saved_conversation(ix, cx).into_any());
+ }
+ },
+ )
+ .flex(1., true)
+ .into_any()
+ })
+ .into_any()
}
}
fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext) {
+ self.has_focus = true;
+ self.toolbar
+ .update(cx, |toolbar, cx| toolbar.focus_changed(true, cx));
+ cx.notify();
if cx.is_self_focused() {
- if let Some(api_key_editor) = self.api_key_editor.as_ref() {
+ if let Some(editor) = self.active_editor() {
+ cx.focus(editor);
+ } else if let Some(api_key_editor) = self.api_key_editor.as_ref() {
cx.focus(api_key_editor);
- } else {
- cx.focus(&self.pane);
}
}
}
+
+ fn focus_out(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext) {
+ self.has_focus = false;
+ self.toolbar
+ .update(cx, |toolbar, cx| toolbar.focus_changed(false, cx));
+ cx.notify();
+ }
}
impl Panel for AssistantPanel {
@@ -371,19 +740,22 @@ impl Panel for AssistantPanel {
matches!(event, AssistantPanelEvent::ZoomOut)
}
- fn is_zoomed(&self, cx: &WindowContext) -> bool {
- self.pane.read(cx).is_zoomed()
+ fn is_zoomed(&self, _: &WindowContext) -> bool {
+ self.zoomed
}
fn set_zoomed(&mut self, zoomed: bool, cx: &mut ViewContext) {
- self.pane.update(cx, |pane, cx| pane.set_zoomed(zoomed, cx));
+ self.zoomed = zoomed;
+ cx.notify();
}
fn set_active(&mut self, active: bool, cx: &mut ViewContext) {
if active {
if self.api_key.borrow().is_none() && !self.has_read_credentials {
self.has_read_credentials = true;
- let api_key = if let Some((_, api_key)) = cx
+ let api_key = if let Ok(api_key) = env::var("OPENAI_API_KEY") {
+ Some(api_key)
+ } else if let Some((_, api_key)) = cx
.platform()
.read_credentials(OPENAI_API_URL)
.log_err()
@@ -401,8 +773,8 @@ impl Panel for AssistantPanel {
}
}
- if self.pane.read(cx).items_len() == 0 {
- self.add_context(cx);
+ if self.editors.is_empty() {
+ self.new_conversation(cx);
}
}
}
@@ -427,12 +799,8 @@ impl Panel for AssistantPanel {
matches!(event, AssistantPanelEvent::Close)
}
- fn has_focus(&self, cx: &WindowContext) -> bool {
- self.pane.read(cx).has_focus()
- || self
- .api_key_editor
- .as_ref()
- .map_or(false, |editor| editor.is_focused(cx))
+ fn has_focus(&self, _: &WindowContext) -> bool {
+ self.has_focus
}
fn is_focus_event(event: &Self::Event) -> bool {
@@ -440,18 +808,24 @@ impl Panel for AssistantPanel {
}
}
-enum AssistantEvent {
+enum ConversationEvent {
MessagesEdited,
SummaryChanged,
StreamedCompletion,
}
-struct Assistant {
+#[derive(Default)]
+struct Summary {
+ text: String,
+ done: bool,
+}
+
+struct Conversation {
buffer: ModelHandle,
message_anchors: Vec,
messages_metadata: HashMap,
next_message_id: MessageId,
- summary: Option,
+ summary: Option,
pending_summary: Task>,
completion_count: usize,
pending_completions: Vec,
@@ -460,14 +834,16 @@ struct Assistant {
max_token_count: usize,
pending_token_count: Task>,
api_key: Rc>>,
+ pending_save: Task>,
+ path: Option,
_subscriptions: Vec,
}
-impl Entity for Assistant {
- type Event = AssistantEvent;
+impl Entity for Conversation {
+ type Event = ConversationEvent;
}
-impl Assistant {
+impl Conversation {
fn new(
api_key: Rc>>,
language_registry: Arc,
@@ -505,6 +881,8 @@ impl Assistant {
pending_token_count: Task::ready(None),
model: model.into(),
_subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
+ pending_save: Task::ready(Ok(())),
+ path: None,
api_key,
buffer,
};
@@ -526,6 +904,88 @@ impl Assistant {
this
}
+ fn serialize(&self, cx: &AppContext) -> SavedConversation {
+ SavedConversation {
+ zed: "conversation".into(),
+ version: SavedConversation::VERSION.into(),
+ text: self.buffer.read(cx).text(),
+ message_metadata: self.messages_metadata.clone(),
+ messages: self
+ .messages(cx)
+ .map(|message| SavedMessage {
+ id: message.id,
+ start: message.offset_range.start,
+ })
+ .collect(),
+ summary: self
+ .summary
+ .as_ref()
+ .map(|summary| summary.text.clone())
+ .unwrap_or_default(),
+ model: self.model.clone(),
+ }
+ }
+
+ fn deserialize(
+ saved_conversation: SavedConversation,
+ path: PathBuf,
+ api_key: Rc>>,
+ language_registry: Arc,
+ cx: &mut ModelContext,
+ ) -> Self {
+ let model = saved_conversation.model;
+ let markdown = language_registry.language_for_name("Markdown");
+ let mut message_anchors = Vec::new();
+ let mut next_message_id = MessageId(0);
+ let buffer = cx.add_model(|cx| {
+ let mut buffer = Buffer::new(0, saved_conversation.text, cx);
+ for message in saved_conversation.messages {
+ message_anchors.push(MessageAnchor {
+ id: message.id,
+ start: buffer.anchor_before(message.start),
+ });
+ next_message_id = cmp::max(next_message_id, MessageId(message.id.0 + 1));
+ }
+ buffer.set_language_registry(language_registry);
+ cx.spawn_weak(|buffer, mut cx| async move {
+ let markdown = markdown.await?;
+ let buffer = buffer
+ .upgrade(&cx)
+ .ok_or_else(|| anyhow!("buffer was dropped"))?;
+ buffer.update(&mut cx, |buffer, cx| {
+ buffer.set_language(Some(markdown), cx)
+ });
+ anyhow::Ok(())
+ })
+ .detach_and_log_err(cx);
+ buffer
+ });
+
+ let mut this = Self {
+ message_anchors,
+ messages_metadata: saved_conversation.message_metadata,
+ next_message_id,
+ summary: Some(Summary {
+ text: saved_conversation.summary,
+ done: true,
+ }),
+ pending_summary: Task::ready(None),
+ completion_count: Default::default(),
+ pending_completions: Default::default(),
+ token_count: None,
+ max_token_count: tiktoken_rs::model::get_context_size(&model),
+ pending_token_count: Task::ready(None),
+ model,
+ _subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
+ pending_save: Task::ready(Ok(())),
+ path: Some(path),
+ api_key,
+ buffer,
+ };
+ this.count_remaining_tokens(cx);
+ this
+ }
+
fn handle_buffer_event(
&mut self,
_: ModelHandle,
@@ -535,7 +995,7 @@ impl Assistant {
match event {
language::Event::Edited => {
self.count_remaining_tokens(cx);
- cx.emit(AssistantEvent::MessagesEdited);
+ cx.emit(ConversationEvent::MessagesEdited);
}
_ => {}
}
@@ -552,7 +1012,11 @@ impl Assistant {
Role::Assistant => "assistant".into(),
Role::System => "system".into(),
},
- content: self.buffer.read(cx).text_for_range(message.range).collect(),
+ content: self
+ .buffer
+ .read(cx)
+ .text_for_range(message.offset_range)
+ .collect(),
name: None,
})
})
@@ -567,7 +1031,7 @@ impl Assistant {
.await?;
this.upgrade(&cx)
- .ok_or_else(|| anyhow!("assistant was dropped"))?
+ .ok_or_else(|| anyhow!("conversation was dropped"))?
.update(&mut cx, |this, cx| {
this.max_token_count = tiktoken_rs::model::get_context_size(&this.model);
this.token_count = Some(token_count);
@@ -596,6 +1060,14 @@ impl Assistant {
) -> Vec {
let mut user_messages = Vec::new();
let mut tasks = Vec::new();
+
+ let last_message_id = self.message_anchors.iter().rev().find_map(|message| {
+ message
+ .start
+ .is_valid(self.buffer.read(cx))
+ .then_some(message.id)
+ });
+
for selected_message_id in selected_messages {
let selected_message_role =
if let Some(metadata) = self.messages_metadata.get(&selected_message_id) {
@@ -658,6 +1130,19 @@ impl Assistant {
)
.unwrap();
+ // Queue up the user's next reply
+ if Some(selected_message_id) == last_message_id {
+ let user_message = self
+ .insert_message_after(
+ assistant_message.id,
+ Role::User,
+ MessageStatus::Done,
+ cx,
+ )
+ .unwrap();
+ user_messages.push(user_message);
+ }
+
tasks.push(cx.spawn_weak({
|this, mut cx| async move {
let assistant_message_id = assistant_message.id;
@@ -668,7 +1153,7 @@ impl Assistant {
let mut message = message?;
if let Some(choice) = message.choices.pop() {
this.upgrade(&cx)
- .ok_or_else(|| anyhow!("assistant was dropped"))?
+ .ok_or_else(|| anyhow!("conversation was dropped"))?
.update(&mut cx, |this, cx| {
let text: Arc = choice.delta.content?.into();
let message_ix = this.message_anchors.iter().position(
@@ -686,7 +1171,7 @@ impl Assistant {
});
buffer.edit([(offset..offset, text)], None, cx);
});
- cx.emit(AssistantEvent::StreamedCompletion);
+ cx.emit(ConversationEvent::StreamedCompletion);
Some(())
});
@@ -695,7 +1180,7 @@ impl Assistant {
}
this.upgrade(&cx)
- .ok_or_else(|| anyhow!("assistant was dropped"))?
+ .ok_or_else(|| anyhow!("conversation was dropped"))?
.update(&mut cx, |this, cx| {
this.pending_completions.retain(|completion| {
completion.id != this.completion_count
@@ -749,7 +1234,7 @@ impl Assistant {
for id in ids {
if let Some(metadata) = self.messages_metadata.get_mut(&id) {
metadata.role.cycle();
- cx.emit(AssistantEvent::MessagesEdited);
+ cx.emit(ConversationEvent::MessagesEdited);
cx.notify();
}
}
@@ -767,10 +1252,19 @@ impl Assistant {
.iter()
.position(|message| message.id == message_id)
{
+ // Find the next valid message after the one we were given.
+ let mut next_message_ix = prev_message_ix + 1;
+ while let Some(next_message) = self.message_anchors.get(next_message_ix) {
+ if next_message.start.is_valid(self.buffer.read(cx)) {
+ break;
+ }
+ next_message_ix += 1;
+ }
+
let start = self.buffer.update(cx, |buffer, cx| {
- let offset = self.message_anchors[prev_message_ix + 1..]
- .iter()
- .find(|message| message.start.is_valid(buffer))
+ let offset = self
+ .message_anchors
+ .get(next_message_ix)
.map_or(buffer.len(), |message| message.start.to_offset(buffer) - 1);
buffer.edit([(offset..offset, "\n")], None, cx);
buffer.anchor_before(offset + 1)
@@ -780,7 +1274,7 @@ impl Assistant {
start,
};
self.message_anchors
- .insert(prev_message_ix + 1, message.clone());
+ .insert(next_message_ix, message.clone());
self.messages_metadata.insert(
message.id,
MessageMetadata {
@@ -789,7 +1283,7 @@ impl Assistant {
status,
},
);
- cx.emit(AssistantEvent::MessagesEdited);
+ cx.emit(ConversationEvent::MessagesEdited);
Some(message)
} else {
None
@@ -805,7 +1299,7 @@ impl Assistant {
let end_message = self.message_for_offset(range.end, cx);
if let Some((start_message, end_message)) = start_message.zip(end_message) {
// Prevent splitting when range spans multiple messages.
- if start_message.index != end_message.index {
+ if start_message.id != end_message.id {
return (None, None);
}
@@ -814,7 +1308,8 @@ impl Assistant {
let mut edited_buffer = false;
let mut suffix_start = None;
- if range.start > message.range.start && range.end < message.range.end - 1 {
+ if range.start > message.offset_range.start && range.end < message.offset_range.end - 1
+ {
if self.buffer.read(cx).chars_at(range.end).next() == Some('\n') {
suffix_start = Some(range.end + 1);
} else if self.buffer.read(cx).reversed_chars_at(range.end).next() == Some('\n') {
@@ -839,7 +1334,7 @@ impl Assistant {
};
self.message_anchors
- .insert(message.index + 1, suffix.clone());
+ .insert(message.index_range.end + 1, suffix.clone());
self.messages_metadata.insert(
suffix.id,
MessageMetadata {
@@ -849,52 +1344,55 @@ impl Assistant {
},
);
- let new_messages = if range.start == range.end || range.start == message.range.start {
- (None, Some(suffix))
- } else {
- let mut prefix_end = None;
- if range.start > message.range.start && range.end < message.range.end - 1 {
- if self.buffer.read(cx).chars_at(range.start).next() == Some('\n') {
- prefix_end = Some(range.start + 1);
- } else if self.buffer.read(cx).reversed_chars_at(range.start).next()
- == Some('\n')
- {
- prefix_end = Some(range.start);
- }
- }
-
- let selection = if let Some(prefix_end) = prefix_end {
- cx.emit(AssistantEvent::MessagesEdited);
- MessageAnchor {
- id: MessageId(post_inc(&mut self.next_message_id.0)),
- start: self.buffer.read(cx).anchor_before(prefix_end),
- }
+ let new_messages =
+ if range.start == range.end || range.start == message.offset_range.start {
+ (None, Some(suffix))
} else {
- self.buffer.update(cx, |buffer, cx| {
- buffer.edit([(range.start..range.start, "\n")], None, cx)
- });
- edited_buffer = true;
- MessageAnchor {
- id: MessageId(post_inc(&mut self.next_message_id.0)),
- start: self.buffer.read(cx).anchor_before(range.end + 1),
+ let mut prefix_end = None;
+ if range.start > message.offset_range.start
+ && range.end < message.offset_range.end - 1
+ {
+ if self.buffer.read(cx).chars_at(range.start).next() == Some('\n') {
+ prefix_end = Some(range.start + 1);
+ } else if self.buffer.read(cx).reversed_chars_at(range.start).next()
+ == Some('\n')
+ {
+ prefix_end = Some(range.start);
+ }
}
+
+ let selection = if let Some(prefix_end) = prefix_end {
+ cx.emit(ConversationEvent::MessagesEdited);
+ MessageAnchor {
+ id: MessageId(post_inc(&mut self.next_message_id.0)),
+ start: self.buffer.read(cx).anchor_before(prefix_end),
+ }
+ } else {
+ self.buffer.update(cx, |buffer, cx| {
+ buffer.edit([(range.start..range.start, "\n")], None, cx)
+ });
+ edited_buffer = true;
+ MessageAnchor {
+ id: MessageId(post_inc(&mut self.next_message_id.0)),
+ start: self.buffer.read(cx).anchor_before(range.end + 1),
+ }
+ };
+
+ self.message_anchors
+ .insert(message.index_range.end + 1, selection.clone());
+ self.messages_metadata.insert(
+ selection.id,
+ MessageMetadata {
+ role,
+ sent_at: Local::now(),
+ status: MessageStatus::Done,
+ },
+ );
+ (Some(selection), Some(suffix))
};
- self.message_anchors
- .insert(message.index + 1, selection.clone());
- self.messages_metadata.insert(
- selection.id,
- MessageMetadata {
- role,
- sent_at: Local::now(),
- status: MessageStatus::Done,
- },
- );
- (Some(selection), Some(suffix))
- };
-
if !edited_buffer {
- cx.emit(AssistantEvent::MessagesEdited);
+ cx.emit(ConversationEvent::MessagesEdited);
}
new_messages
} else {
@@ -932,12 +1430,22 @@ impl Assistant {
if let Some(choice) = message.choices.pop() {
let text = choice.delta.content.unwrap_or_default();
this.update(&mut cx, |this, cx| {
- this.summary.get_or_insert(String::new()).push_str(&text);
- cx.emit(AssistantEvent::SummaryChanged);
+ this.summary
+ .get_or_insert(Default::default())
+ .text
+ .push_str(&text);
+ cx.emit(ConversationEvent::SummaryChanged);
});
}
}
+ this.update(&mut cx, |this, cx| {
+ if let Some(summary) = this.summary.as_mut() {
+ summary.done = true;
+ cx.emit(ConversationEvent::SummaryChanged);
+ }
+ });
+
anyhow::Ok(())
}
.log_err()
@@ -957,21 +1465,21 @@ impl Assistant {
) -> Vec {
let mut result = Vec::new();
- let buffer_len = self.buffer.read(cx).len();
let mut messages = self.messages(cx).peekable();
let mut offsets = offsets.into_iter().peekable();
+ let mut current_message = messages.next();
while let Some(offset) = offsets.next() {
- // Skip messages that start after the offset.
- while messages.peek().map_or(false, |message| {
- message.range.end < offset || (message.range.end == offset && offset < buffer_len)
+ // Locate the message that contains the offset.
+ while current_message.as_ref().map_or(false, |message| {
+ !message.offset_range.contains(&offset) && messages.peek().is_some()
}) {
- messages.next();
+ current_message = messages.next();
}
- let Some(message) = messages.peek() else { continue };
+ let Some(message) = current_message.as_ref() else { break };
// Skip offsets that are in the same message.
while offsets.peek().map_or(false, |offset| {
- message.range.contains(offset) || message.range.end == buffer_len
+ message.offset_range.contains(offset) || messages.peek().is_none()
}) {
offsets.next();
}
@@ -985,15 +1493,17 @@ impl Assistant {
let buffer = self.buffer.read(cx);
let mut message_anchors = self.message_anchors.iter().enumerate().peekable();
iter::from_fn(move || {
- while let Some((ix, message_anchor)) = message_anchors.next() {
+ while let Some((start_ix, message_anchor)) = message_anchors.next() {
let metadata = self.messages_metadata.get(&message_anchor.id)?;
let message_start = message_anchor.start.to_offset(buffer);
let mut message_end = None;
+ let mut end_ix = start_ix;
while let Some((_, next_message)) = message_anchors.peek() {
if next_message.start.is_valid(buffer) {
message_end = Some(next_message.start);
break;
} else {
+ end_ix += 1;
message_anchors.next();
}
}
@@ -1001,8 +1511,8 @@ impl Assistant {
.unwrap_or(language::Anchor::MAX)
.to_offset(buffer);
return Some(Message {
- index: ix,
- range: message_start..message_end,
+ index_range: start_ix..end_ix,
+ offset_range: message_start..message_end,
id: message_anchor.id,
anchor: message_anchor.start,
role: metadata.role,
@@ -1013,6 +1523,63 @@ impl Assistant {
None
})
}
+
+ fn save(
+ &mut self,
+ debounce: Option,
+ fs: Arc,
+ cx: &mut ModelContext,
+ ) {
+ self.pending_save = cx.spawn(|this, mut cx| async move {
+ if let Some(debounce) = debounce {
+ cx.background().timer(debounce).await;
+ }
+
+ let (old_path, summary) = this.read_with(&cx, |this, _| {
+ let path = this.path.clone();
+ let summary = if let Some(summary) = this.summary.as_ref() {
+ if summary.done {
+ Some(summary.text.clone())
+ } else {
+ None
+ }
+ } else {
+ None
+ };
+ (path, summary)
+ });
+
+ if let Some(summary) = summary {
+ let conversation = this.read_with(&cx, |this, cx| this.serialize(cx));
+ let path = if let Some(old_path) = old_path {
+ old_path
+ } else {
+ let mut discriminant = 1;
+ let mut new_path;
+ loop {
+ new_path = CONVERSATIONS_DIR.join(&format!(
+ "{} - {}.zed.json",
+ summary.trim(),
+ discriminant
+ ));
+ if fs.is_file(&new_path).await {
+ discriminant += 1;
+ } else {
+ break;
+ }
+ }
+ new_path
+ };
+
+ fs.create_dir(CONVERSATIONS_DIR.as_ref()).await?;
+ fs.atomic_write(path.clone(), serde_json::to_string(&conversation).unwrap())
+ .await?;
+ this.update(&mut cx, |this, _| this.path = Some(path));
+ }
+
+ Ok(())
+ });
+ }
}
struct PendingCompletion {
@@ -1020,7 +1587,7 @@ struct PendingCompletion {
_tasks: Vec>,
}
-enum AssistantEditorEvent {
+enum ConversationEditorEvent {
TabContentChanged,
}
@@ -1030,39 +1597,50 @@ struct ScrollPosition {
cursor: Anchor,
}
-struct AssistantEditor {
- assistant: ModelHandle,
+struct ConversationEditor {
+ conversation: ModelHandle,
+ fs: Arc,
editor: ViewHandle,
blocks: HashSet,
scroll_position: Option,
_subscriptions: Vec,
}
-impl AssistantEditor {
+impl ConversationEditor {
fn new(
api_key: Rc>>,
language_registry: Arc,
+ fs: Arc,
+ cx: &mut ViewContext,
+ ) -> Self {
+ let conversation = cx.add_model(|cx| Conversation::new(api_key, language_registry, cx));
+ Self::for_conversation(conversation, fs, cx)
+ }
+
+ fn for_conversation(
+ conversation: ModelHandle,
+ fs: Arc,
cx: &mut ViewContext,
) -> Self {
- let assistant = cx.add_model(|cx| Assistant::new(api_key, language_registry, cx));
let editor = cx.add_view(|cx| {
- let mut editor = Editor::for_buffer(assistant.read(cx).buffer.clone(), None, cx);
+ let mut editor = Editor::for_buffer(conversation.read(cx).buffer.clone(), None, cx);
editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
editor.set_show_gutter(false, cx);
editor
});
let _subscriptions = vec![
- cx.observe(&assistant, |_, _, cx| cx.notify()),
- cx.subscribe(&assistant, Self::handle_assistant_event),
+ cx.observe(&conversation, |_, _, cx| cx.notify()),
+ cx.subscribe(&conversation, Self::handle_conversation_event),
cx.subscribe(&editor, Self::handle_editor_event),
];
let mut this = Self {
- assistant,
+ conversation,
editor,
blocks: Default::default(),
scroll_position: None,
+ fs,
_subscriptions,
};
this.update_message_headers(cx);
@@ -1072,20 +1650,20 @@ impl AssistantEditor {
fn assist(&mut self, _: &Assist, cx: &mut ViewContext) {
let cursors = self.cursors(cx);
- let user_messages = self.assistant.update(cx, |assistant, cx| {
- let selected_messages = assistant
+ let user_messages = self.conversation.update(cx, |conversation, cx| {
+ let selected_messages = conversation
.messages_for_offsets(cursors, cx)
.into_iter()
.map(|message| message.id)
.collect();
- assistant.assist(selected_messages, cx)
+ conversation.assist(selected_messages, cx)
});
let new_selections = user_messages
.iter()
.map(|message| {
let cursor = message
.start
- .to_offset(self.assistant.read(cx).buffer.read(cx));
+ .to_offset(self.conversation.read(cx).buffer.read(cx));
cursor..cursor
})
.collect::>();
@@ -1097,13 +1675,15 @@ impl AssistantEditor {
|selections| selections.select_ranges(new_selections),
);
});
+ // Avoid scrolling to the new cursor position so the assistant's output is stable.
+ cx.defer(|this, _| this.scroll_position = None);
}
}
fn cancel_last_assist(&mut self, _: &editor::Cancel, cx: &mut ViewContext) {
if !self
- .assistant
- .update(cx, |assistant, _| assistant.cancel_last_assist())
+ .conversation
+ .update(cx, |conversation, _| conversation.cancel_last_assist())
{
cx.propagate_action();
}
@@ -1111,13 +1691,13 @@ impl AssistantEditor {
fn cycle_message_role(&mut self, _: &CycleMessageRole, cx: &mut ViewContext) {
let cursors = self.cursors(cx);
- self.assistant.update(cx, |assistant, cx| {
- let messages = assistant
+ self.conversation.update(cx, |conversation, cx| {
+ let messages = conversation
.messages_for_offsets(cursors, cx)
.into_iter()
.map(|message| message.id)
.collect();
- assistant.cycle_message_roles(messages, cx)
+ conversation.cycle_message_roles(messages, cx)
});
}
@@ -1129,18 +1709,26 @@ impl AssistantEditor {
.collect()
}
- fn handle_assistant_event(
+ fn handle_conversation_event(
&mut self,
- _: ModelHandle,
- event: &AssistantEvent,
+ _: ModelHandle,
+ event: &ConversationEvent,
cx: &mut ViewContext,
) {
match event {
- AssistantEvent::MessagesEdited => self.update_message_headers(cx),
- AssistantEvent::SummaryChanged => {
- cx.emit(AssistantEditorEvent::TabContentChanged);
+ ConversationEvent::MessagesEdited => {
+ self.update_message_headers(cx);
+ self.conversation.update(cx, |conversation, cx| {
+ conversation.save(Some(Duration::from_millis(500)), self.fs.clone(), cx);
+ });
}
- AssistantEvent::StreamedCompletion => {
+ ConversationEvent::SummaryChanged => {
+ cx.emit(ConversationEditorEvent::TabContentChanged);
+ self.conversation.update(cx, |conversation, cx| {
+ conversation.save(None, self.fs.clone(), cx);
+ });
+ }
+ ConversationEvent::StreamedCompletion => {
self.editor.update(cx, |editor, cx| {
if let Some(scroll_position) = self.scroll_position {
let snapshot = editor.snapshot(cx);
@@ -1210,7 +1798,7 @@ impl AssistantEditor {
let excerpt_id = *buffer.as_singleton().unwrap().0;
let old_blocks = std::mem::take(&mut self.blocks);
let new_blocks = self
- .assistant
+ .conversation
.read(cx)
.messages(cx)
.map(|message| BlockProperties {
@@ -1218,7 +1806,7 @@ impl AssistantEditor {
height: 2,
style: BlockStyle::Sticky,
render: Arc::new({
- let assistant = self.assistant.clone();
+ let conversation = self.conversation.clone();
// let metadata = message.metadata.clone();
// let message = message.clone();
move |cx| {
@@ -1233,19 +1821,19 @@ impl AssistantEditor {
cx,
|state, _| match message.role {
Role::User => {
- let style = style.user_sender.style_for(state, false);
+ let style = style.user_sender.style_for(state);
Label::new("You", style.text.clone())
.contained()
.with_style(style.container)
}
Role::Assistant => {
- let style = style.assistant_sender.style_for(state, false);
+ let style = style.assistant_sender.style_for(state);
Label::new("Assistant", style.text.clone())
.contained()
.with_style(style.container)
}
Role::System => {
- let style = style.system_sender.style_for(state, false);
+ let style = style.system_sender.style_for(state);
Label::new("System", style.text.clone())
.contained()
.with_style(style.container)
@@ -1254,10 +1842,10 @@ impl AssistantEditor {
)
.with_cursor_style(CursorStyle::PointingHand)
.on_down(MouseButton::Left, {
- let assistant = assistant.clone();
+ let conversation = conversation.clone();
move |_, _, cx| {
- assistant.update(cx, |assistant, cx| {
- assistant.cycle_message_roles(
+ conversation.update(cx, |conversation, cx| {
+ conversation.cycle_message_roles(
HashSet::from_iter(Some(message_id)),
cx,
)
@@ -1301,7 +1889,7 @@ impl AssistantEditor {
.aligned()
.left()
.contained()
- .with_style(style.header)
+ .with_style(style.message_header)
.into_any()
}
}),
@@ -1362,41 +1950,36 @@ impl AssistantEditor {
if let Some(text) = text {
panel.update(cx, |panel, cx| {
- if let Some(assistant) = panel
- .pane
- .read(cx)
- .active_item()
- .and_then(|item| item.downcast::())
- .ok_or_else(|| anyhow!("no active context"))
- .log_err()
- {
- assistant.update(cx, |assistant, cx| {
- assistant
- .editor
- .update(cx, |editor, cx| editor.insert(&text, cx))
- });
- }
+ let conversation = panel
+ .active_editor()
+ .cloned()
+ .unwrap_or_else(|| panel.new_conversation(cx));
+ conversation.update(cx, |conversation, cx| {
+ conversation
+ .editor
+ .update(cx, |editor, cx| editor.insert(&text, cx))
+ });
});
}
}
fn copy(&mut self, _: &editor::Copy, cx: &mut ViewContext) {
let editor = self.editor.read(cx);
- let assistant = self.assistant.read(cx);
+ let conversation = self.conversation.read(cx);
if editor.selections.count() == 1 {
let selection = editor.selections.newest::(cx);
let mut copied_text = String::new();
let mut spanned_messages = 0;
- for message in assistant.messages(cx) {
- if message.range.start >= selection.range().end {
+ for message in conversation.messages(cx) {
+ if message.offset_range.start >= selection.range().end {
break;
- } else if message.range.end >= selection.range().start {
- let range = cmp::max(message.range.start, selection.range().start)
- ..cmp::min(message.range.end, selection.range().end);
+ } else if message.offset_range.end >= selection.range().start {
+ let range = cmp::max(message.offset_range.start, selection.range().start)
+ ..cmp::min(message.offset_range.end, selection.range().end);
if !range.is_empty() {
spanned_messages += 1;
write!(&mut copied_text, "## {}\n\n", message.role).unwrap();
- for chunk in assistant.buffer.read(cx).text_for_range(range) {
+ for chunk in conversation.buffer.read(cx).text_for_range(range) {
copied_text.push_str(&chunk);
}
copied_text.push('\n');
@@ -1415,65 +1998,93 @@ impl AssistantEditor {
}
fn split(&mut self, _: &Split, cx: &mut ViewContext) {
- self.assistant.update(cx, |assistant, cx| {
+ self.conversation.update(cx, |conversation, cx| {
let selections = self.editor.read(cx).selections.disjoint_anchors();
for selection in selections.into_iter() {
let buffer = self.editor.read(cx).buffer().read(cx).snapshot(cx);
let range = selection
.map(|endpoint| endpoint.to_offset(&buffer))
.range();
- assistant.split_message(range, cx);
+ conversation.split_message(range, cx);
}
});
}
+ fn save(&mut self, _: &Save, cx: &mut ViewContext) {
+ self.conversation.update(cx, |conversation, cx| {
+ conversation.save(None, self.fs.clone(), cx)
+ });
+ }
+
fn cycle_model(&mut self, cx: &mut ViewContext) {
- self.assistant.update(cx, |assistant, cx| {
- let new_model = match assistant.model.as_str() {
+ self.conversation.update(cx, |conversation, cx| {
+ let new_model = match conversation.model.as_str() {
"gpt-4-0613" => "gpt-3.5-turbo-0613",
_ => "gpt-4-0613",
};
- assistant.set_model(new_model.into(), cx);
+ conversation.set_model(new_model.into(), cx);
});
}
fn title(&self, cx: &AppContext) -> String {
- self.assistant
+ self.conversation
.read(cx)
.summary
- .clone()
- .unwrap_or_else(|| "New Context".into())
- }
-}
-
-impl Entity for AssistantEditor {
- type Event = AssistantEditorEvent;
-}
-
-impl View for AssistantEditor {
- fn ui_name() -> &'static str {
- "AssistantEditor"
+ .as_ref()
+ .map(|summary| summary.text.clone())
+ .unwrap_or_else(|| "New Conversation".into())
}
- fn render(&mut self, cx: &mut ViewContext) -> AnyElement {
+ fn render_current_model(
+ &self,
+ style: &AssistantStyle,
+ cx: &mut ViewContext,
+ ) -> impl Element {
enum Model {}
- let theme = &theme::current(cx).assistant;
- let assistant = &self.assistant.read(cx);
- let model = assistant.model.clone();
- let remaining_tokens = assistant.remaining_tokens().map(|remaining_tokens| {
- let remaining_tokens_style = if remaining_tokens <= 0 {
- &theme.no_remaining_tokens
- } else {
- &theme.remaining_tokens
- };
+
+ MouseEventHandler::::new(0, cx, |state, cx| {
+ let style = style.model.style_for(state);
+ Label::new(self.conversation.read(cx).model.clone(), style.text.clone())
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, |_, this, cx| this.cycle_model(cx))
+ }
+
+ fn render_remaining_tokens(
+ &self,
+ style: &AssistantStyle,
+ cx: &mut ViewContext,
+ ) -> Option> {
+ let remaining_tokens = self.conversation.read(cx).remaining_tokens()?;
+ let remaining_tokens_style = if remaining_tokens <= 0 {
+ &style.no_remaining_tokens
+ } else {
+ &style.remaining_tokens
+ };
+ Some(
Label::new(
remaining_tokens.to_string(),
remaining_tokens_style.text.clone(),
)
.contained()
- .with_style(remaining_tokens_style.container)
- });
+ .with_style(remaining_tokens_style.container),
+ )
+ }
+}
+impl Entity for ConversationEditor {
+ type Event = ConversationEditorEvent;
+}
+
+impl View for ConversationEditor {
+ fn ui_name() -> &'static str {
+ "ConversationEditor"
+ }
+
+ fn render(&mut self, cx: &mut ViewContext) -> AnyElement {
+ let theme = &theme::current(cx).assistant;
Stack::new()
.with_child(
ChildView::new(&self.editor, cx)
@@ -1482,19 +2093,8 @@ impl View for AssistantEditor {
)
.with_child(
Flex::row()
- .with_child(
- MouseEventHandler::::new(0, cx, |state, _| {
- let style = theme.model.style_for(state, false);
- Label::new(model, style.text.clone())
- .contained()
- .with_style(style.container)
- })
- .with_cursor_style(CursorStyle::PointingHand)
- .on_click(MouseButton::Left, |_, this, cx| this.cycle_model(cx)),
- )
- .with_children(remaining_tokens)
- .contained()
- .with_style(theme.model_info_container)
+ .with_child(self.render_current_model(theme, cx))
+ .with_children(self.render_remaining_tokens(theme, cx))
.aligned()
.top()
.right(),
@@ -1509,56 +2109,16 @@ impl View for AssistantEditor {
}
}
-impl Item for AssistantEditor {
- fn tab_content(
- &self,
- _: Option,
- style: &theme::Tab,
- cx: &gpui::AppContext,
- ) -> AnyElement {
- let title = truncate_and_trailoff(&self.title(cx), editor::MAX_TAB_TITLE_LEN);
- Label::new(title, style.label.clone()).into_any()
- }
-
- fn tab_tooltip_text(&self, cx: &AppContext) -> Option> {
- Some(self.title(cx).into())
- }
-
- fn as_searchable(
- &self,
- _: &ViewHandle,
- ) -> Option> {
- Some(Box::new(self.editor.clone()))
- }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Hash)]
-struct MessageId(usize);
-
#[derive(Clone, Debug)]
struct MessageAnchor {
id: MessageId,
start: language::Anchor,
}
-#[derive(Clone, Debug)]
-struct MessageMetadata {
- role: Role,
- sent_at: DateTime,
- status: MessageStatus,
-}
-
-#[derive(Clone, Debug)]
-enum MessageStatus {
- Pending,
- Done,
- Error(Arc),
-}
-
#[derive(Clone, Debug)]
pub struct Message {
- range: Range,
- index: usize,
+ offset_range: Range,
+ index_range: Range,
id: MessageId,
anchor: language::Anchor,
role: Role,
@@ -1569,10 +2129,10 @@ pub struct Message {
impl Message {
fn to_open_ai_message(&self, buffer: &Buffer) -> RequestMessage {
let mut content = format!("[Message {}]\n", self.id.0).to_string();
- content.extend(buffer.text_for_range(self.range.clone()));
+ content.extend(buffer.text_for_range(self.offset_range.clone()));
RequestMessage {
role: self.role,
- content,
+ content: content.trim_end().into(),
}
}
}
@@ -1666,27 +2226,28 @@ async fn stream_completion(
#[cfg(test)]
mod tests {
use super::*;
+ use crate::MessageId;
use gpui::AppContext;
#[gpui::test]
fn test_inserting_and_removing_messages(cx: &mut AppContext) {
let registry = Arc::new(LanguageRegistry::test());
- let assistant = cx.add_model(|cx| Assistant::new(Default::default(), registry, cx));
- let buffer = assistant.read(cx).buffer.clone();
+ let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
+ let buffer = conversation.read(cx).buffer.clone();
- let message_1 = assistant.read(cx).message_anchors[0].clone();
+ let message_1 = conversation.read(cx).message_anchors[0].clone();
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![(message_1.id, Role::User, 0..0)]
);
- let message_2 = assistant.update(cx, |assistant, cx| {
- assistant
+ let message_2 = conversation.update(cx, |conversation, cx| {
+ conversation
.insert_message_after(message_1.id, Role::Assistant, MessageStatus::Done, cx)
.unwrap()
});
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..1),
(message_2.id, Role::Assistant, 1..1)
@@ -1697,20 +2258,20 @@ mod tests {
buffer.edit([(0..0, "1"), (1..1, "2")], None, cx)
});
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..2),
(message_2.id, Role::Assistant, 2..3)
]
);
- let message_3 = assistant.update(cx, |assistant, cx| {
- assistant
+ let message_3 = conversation.update(cx, |conversation, cx| {
+ conversation
.insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
.unwrap()
});
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..2),
(message_2.id, Role::Assistant, 2..4),
@@ -1718,13 +2279,13 @@ mod tests {
]
);
- let message_4 = assistant.update(cx, |assistant, cx| {
- assistant
+ let message_4 = conversation.update(cx, |conversation, cx| {
+ conversation
.insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
.unwrap()
});
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..2),
(message_2.id, Role::Assistant, 2..4),
@@ -1737,7 +2298,7 @@ mod tests {
buffer.edit([(4..4, "C"), (5..5, "D")], None, cx)
});
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..2),
(message_2.id, Role::Assistant, 2..4),
@@ -1749,7 +2310,7 @@ mod tests {
// Deleting across message boundaries merges the messages.
buffer.update(cx, |buffer, cx| buffer.edit([(1..4, "")], None, cx));
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..3),
(message_3.id, Role::User, 3..4),
@@ -1759,7 +2320,7 @@ mod tests {
// Undoing the deletion should also undo the merge.
buffer.update(cx, |buffer, cx| buffer.undo(cx));
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..2),
(message_2.id, Role::Assistant, 2..4),
@@ -1771,7 +2332,7 @@ mod tests {
// Redoing the deletion should also redo the merge.
buffer.update(cx, |buffer, cx| buffer.redo(cx));
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..3),
(message_3.id, Role::User, 3..4),
@@ -1779,13 +2340,13 @@ mod tests {
);
// Ensure we can still insert after a merged message.
- let message_5 = assistant.update(cx, |assistant, cx| {
- assistant
+ let message_5 = conversation.update(cx, |conversation, cx| {
+ conversation
.insert_message_after(message_1.id, Role::System, MessageStatus::Done, cx)
.unwrap()
});
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..3),
(message_5.id, Role::System, 3..4),
@@ -1797,12 +2358,12 @@ mod tests {
#[gpui::test]
fn test_message_splitting(cx: &mut AppContext) {
let registry = Arc::new(LanguageRegistry::test());
- let assistant = cx.add_model(|cx| Assistant::new(Default::default(), registry, cx));
- let buffer = assistant.read(cx).buffer.clone();
+ let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
+ let buffer = conversation.read(cx).buffer.clone();
- let message_1 = assistant.read(cx).message_anchors[0].clone();
+ let message_1 = conversation.read(cx).message_anchors[0].clone();
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![(message_1.id, Role::User, 0..0)]
);
@@ -1811,13 +2372,13 @@ mod tests {
});
let (_, message_2) =
- assistant.update(cx, |assistant, cx| assistant.split_message(3..3, cx));
+ conversation.update(cx, |conversation, cx| conversation.split_message(3..3, cx));
let message_2 = message_2.unwrap();
// We recycle newlines in the middle of a split message
assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc\nddd\n");
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..4),
(message_2.id, Role::User, 4..16),
@@ -1825,13 +2386,13 @@ mod tests {
);
let (_, message_3) =
- assistant.update(cx, |assistant, cx| assistant.split_message(3..3, cx));
+ conversation.update(cx, |conversation, cx| conversation.split_message(3..3, cx));
let message_3 = message_3.unwrap();
// We don't recycle newlines at the end of a split message
assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\nccc\nddd\n");
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..4),
(message_3.id, Role::User, 4..5),
@@ -1840,11 +2401,11 @@ mod tests {
);
let (_, message_4) =
- assistant.update(cx, |assistant, cx| assistant.split_message(9..9, cx));
+ conversation.update(cx, |conversation, cx| conversation.split_message(9..9, cx));
let message_4 = message_4.unwrap();
assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\nccc\nddd\n");
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..4),
(message_3.id, Role::User, 4..5),
@@ -1854,11 +2415,11 @@ mod tests {
);
let (_, message_5) =
- assistant.update(cx, |assistant, cx| assistant.split_message(9..9, cx));
+ conversation.update(cx, |conversation, cx| conversation.split_message(9..9, cx));
let message_5 = message_5.unwrap();
assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\n\nccc\nddd\n");
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..4),
(message_3.id, Role::User, 4..5),
@@ -1868,13 +2429,14 @@ mod tests {
]
);
- let (message_6, message_7) =
- assistant.update(cx, |assistant, cx| assistant.split_message(14..16, cx));
+ let (message_6, message_7) = conversation.update(cx, |conversation, cx| {
+ conversation.split_message(14..16, cx)
+ });
let message_6 = message_6.unwrap();
let message_7 = message_7.unwrap();
assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\n\nccc\ndd\nd\n");
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..4),
(message_3.id, Role::User, 4..5),
@@ -1890,33 +2452,33 @@ mod tests {
#[gpui::test]
fn test_messages_for_offsets(cx: &mut AppContext) {
let registry = Arc::new(LanguageRegistry::test());
- let assistant = cx.add_model(|cx| Assistant::new(Default::default(), registry, cx));
- let buffer = assistant.read(cx).buffer.clone();
+ let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
+ let buffer = conversation.read(cx).buffer.clone();
- let message_1 = assistant.read(cx).message_anchors[0].clone();
+ let message_1 = conversation.read(cx).message_anchors[0].clone();
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![(message_1.id, Role::User, 0..0)]
);
buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "aaa")], None, cx));
- let message_2 = assistant
- .update(cx, |assistant, cx| {
- assistant.insert_message_after(message_1.id, Role::User, MessageStatus::Done, cx)
+ let message_2 = conversation
+ .update(cx, |conversation, cx| {
+ conversation.insert_message_after(message_1.id, Role::User, MessageStatus::Done, cx)
})
.unwrap();
buffer.update(cx, |buffer, cx| buffer.edit([(4..4, "bbb")], None, cx));
- let message_3 = assistant
- .update(cx, |assistant, cx| {
- assistant.insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
+ let message_3 = conversation
+ .update(cx, |conversation, cx| {
+ conversation.insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
})
.unwrap();
buffer.update(cx, |buffer, cx| buffer.edit([(8..8, "ccc")], None, cx));
assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc");
assert_eq!(
- messages(&assistant, cx),
+ messages(&conversation, cx),
vec![
(message_1.id, Role::User, 0..4),
(message_2.id, Role::User, 4..8),
@@ -1925,20 +2487,40 @@ mod tests {
);
assert_eq!(
- message_ids_for_offsets(&assistant, &[0, 4, 9], cx),
+ message_ids_for_offsets(&conversation, &[0, 4, 9], cx),
[message_1.id, message_2.id, message_3.id]
);
assert_eq!(
- message_ids_for_offsets(&assistant, &[0, 1, 11], cx),
+ message_ids_for_offsets(&conversation, &[0, 1, 11], cx),
[message_1.id, message_3.id]
);
+ let message_4 = conversation
+ .update(cx, |conversation, cx| {
+ conversation.insert_message_after(message_3.id, Role::User, MessageStatus::Done, cx)
+ })
+ .unwrap();
+ assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc\n");
+ assert_eq!(
+ messages(&conversation, cx),
+ vec![
+ (message_1.id, Role::User, 0..4),
+ (message_2.id, Role::User, 4..8),
+ (message_3.id, Role::User, 8..12),
+ (message_4.id, Role::User, 12..12)
+ ]
+ );
+ assert_eq!(
+ message_ids_for_offsets(&conversation, &[0, 4, 8, 12], cx),
+ [message_1.id, message_2.id, message_3.id, message_4.id]
+ );
+
fn message_ids_for_offsets(
- assistant: &ModelHandle,
+ conversation: &ModelHandle,
offsets: &[usize],
cx: &AppContext,
) -> Vec {
- assistant
+ conversation
.read(cx)
.messages_for_offsets(offsets.iter().copied(), cx)
.into_iter()
@@ -1947,14 +2529,72 @@ mod tests {
}
}
+ #[gpui::test]
+ fn test_serialization(cx: &mut AppContext) {
+ let registry = Arc::new(LanguageRegistry::test());
+ let conversation =
+ cx.add_model(|cx| Conversation::new(Default::default(), registry.clone(), cx));
+ let buffer = conversation.read(cx).buffer.clone();
+ let message_0 = conversation.read(cx).message_anchors[0].id;
+ let message_1 = conversation.update(cx, |conversation, cx| {
+ conversation
+ .insert_message_after(message_0, Role::Assistant, MessageStatus::Done, cx)
+ .unwrap()
+ });
+ let message_2 = conversation.update(cx, |conversation, cx| {
+ conversation
+ .insert_message_after(message_1.id, Role::System, MessageStatus::Done, cx)
+ .unwrap()
+ });
+ buffer.update(cx, |buffer, cx| {
+ buffer.edit([(0..0, "a"), (1..1, "b\nc")], None, cx);
+ buffer.finalize_last_transaction();
+ });
+ let _message_3 = conversation.update(cx, |conversation, cx| {
+ conversation
+ .insert_message_after(message_2.id, Role::System, MessageStatus::Done, cx)
+ .unwrap()
+ });
+ buffer.update(cx, |buffer, cx| buffer.undo(cx));
+ assert_eq!(buffer.read(cx).text(), "a\nb\nc\n");
+ assert_eq!(
+ messages(&conversation, cx),
+ [
+ (message_0, Role::User, 0..2),
+ (message_1.id, Role::Assistant, 2..6),
+ (message_2.id, Role::System, 6..6),
+ ]
+ );
+
+ let deserialized_conversation = cx.add_model(|cx| {
+ Conversation::deserialize(
+ conversation.read(cx).serialize(cx),
+ Default::default(),
+ Default::default(),
+ registry.clone(),
+ cx,
+ )
+ });
+ let deserialized_buffer = deserialized_conversation.read(cx).buffer.clone();
+ assert_eq!(deserialized_buffer.read(cx).text(), "a\nb\nc\n");
+ assert_eq!(
+ messages(&deserialized_conversation, cx),
+ [
+ (message_0, Role::User, 0..2),
+ (message_1.id, Role::Assistant, 2..6),
+ (message_2.id, Role::System, 6..6),
+ ]
+ );
+ }
+
fn messages(
- assistant: &ModelHandle,
+ conversation: &ModelHandle,
cx: &AppContext,
) -> Vec<(MessageId, Role, Range)> {
- assistant
+ conversation
.read(cx)
.messages(cx)
- .map(|message| (message.id, message.role, message.range))
+ .map(|message| (message.id, message.role, message.offset_range))
.collect()
}
}
diff --git a/crates/auto_update/src/update_notification.rs b/crates/auto_update/src/update_notification.rs
index 6f31df614d..cd2e53905d 100644
--- a/crates/auto_update/src/update_notification.rs
+++ b/crates/auto_update/src/update_notification.rs
@@ -49,7 +49,7 @@ impl View for UpdateNotification {
)
.with_child(
MouseEventHandler::::new(0, cx, |state, _| {
- let style = theme.dismiss_button.style_for(state, false);
+ let style = theme.dismiss_button.style_for(state);
Svg::new("icons/x_mark_8.svg")
.with_color(style.color)
.constrained()
@@ -74,7 +74,7 @@ impl View for UpdateNotification {
),
)
.with_child({
- let style = theme.action_message.style_for(state, false);
+ let style = theme.action_message.style_for(state);
Text::new("View the release notes", style.text.clone())
.contained()
.with_style(style.container)
diff --git a/crates/breadcrumbs/src/breadcrumbs.rs b/crates/breadcrumbs/src/breadcrumbs.rs
index 906d70abb7..433dbed29b 100644
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -83,7 +83,7 @@ impl View for Breadcrumbs {
}
MouseEventHandler::::new(0, cx, |state, _| {
- let style = style.style_for(state, false);
+ let style = style.style_for(state);
crumbs.with_style(style.container)
})
.on_click(MouseButton::Left, |_, this, cx| {
diff --git a/crates/call/src/participant.rs b/crates/call/src/participant.rs
index 4b9e7ba034..e7858869ce 100644
--- a/crates/call/src/participant.rs
+++ b/crates/call/src/participant.rs
@@ -3,6 +3,7 @@ use client::{proto, User};
use collections::HashMap;
use gpui::WeakModelHandle;
pub use live_kit_client::Frame;
+use live_kit_client::RemoteAudioTrack;
use project::Project;
use std::{fmt, sync::Arc};
@@ -42,7 +43,10 @@ pub struct RemoteParticipant {
pub peer_id: proto::PeerId,
pub projects: Vec,
pub location: ParticipantLocation,
- pub tracks: HashMap>,
+ pub muted: bool,
+ pub speaking: bool,
+ pub video_tracks: HashMap>,
+ pub audio_tracks: HashMap>,
}
#[derive(Clone)]
diff --git a/crates/call/src/room.rs b/crates/call/src/room.rs
index 775342359f..da298f9ca2 100644
--- a/crates/call/src/room.rs
+++ b/crates/call/src/room.rs
@@ -12,7 +12,10 @@ use fs::Fs;
use futures::{FutureExt, StreamExt};
use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task, WeakModelHandle};
use language::LanguageRegistry;
-use live_kit_client::{LocalTrackPublication, LocalVideoTrack, RemoteVideoTrackUpdate};
+use live_kit_client::{
+ LocalAudioTrack, LocalTrackPublication, LocalVideoTrack, RemoteAudioTrackUpdate,
+ RemoteVideoTrackUpdate,
+};
use postage::stream::Stream;
use project::Project;
use std::{future::Future, mem, pin::Pin, sync::Arc, time::Duration};
@@ -28,6 +31,9 @@ pub enum Event {
RemoteVideoTracksChanged {
participant_id: proto::PeerId,
},
+ RemoteAudioTracksChanged {
+ participant_id: proto::PeerId,
+ },
RemoteProjectShared {
owner: Arc,
project_id: u64,
@@ -112,9 +118,9 @@ impl Room {
}
});
- let mut track_changes = room.remote_video_track_updates();
- let _maintain_tracks = cx.spawn_weak(|this, mut cx| async move {
- while let Some(track_change) = track_changes.next().await {
+ let mut track_video_changes = room.remote_video_track_updates();
+ let _maintain_video_tracks = cx.spawn_weak(|this, mut cx| async move {
+ while let Some(track_change) = track_video_changes.next().await {
let this = if let Some(this) = this.upgrade(&cx) {
this
} else {
@@ -127,16 +133,41 @@ impl Room {
}
});
- cx.foreground()
- .spawn(room.connect(&connection_info.server_url, &connection_info.token))
- .detach_and_log_err(cx);
+ let mut track_audio_changes = room.remote_audio_track_updates();
+ let _maintain_audio_tracks = cx.spawn_weak(|this, mut cx| async move {
+ while let Some(track_change) = track_audio_changes.next().await {
+ let this = if let Some(this) = this.upgrade(&cx) {
+ this
+ } else {
+ break;
+ };
+
+ this.update(&mut cx, |this, cx| {
+ this.remote_audio_track_updated(track_change, cx).log_err()
+ });
+ }
+ });
+
+ let connect = room.connect(&connection_info.server_url, &connection_info.token);
+ cx.spawn(|this, mut cx| async move {
+ connect.await?;
+ this.update(&mut cx, |this, cx| this.share_microphone(cx))
+ .await?;
+
+ anyhow::Ok(())
+ })
+ .detach_and_log_err(cx);
Some(LiveKitRoom {
room,
- screen_track: ScreenTrack::None,
+ screen_track: LocalTrack::None,
+ microphone_track: LocalTrack::None,
next_publish_id: 0,
+ muted_by_user: false,
+ deafened: false,
+ speaking: false,
_maintain_room,
- _maintain_tracks,
+ _maintain_tracks: [_maintain_video_tracks, _maintain_audio_tracks],
})
} else {
None
@@ -618,20 +649,32 @@ impl Room {
peer_id,
projects: participant.projects,
location,
- tracks: Default::default(),
+ muted: false,
+ speaking: false,
+ video_tracks: Default::default(),
+ audio_tracks: Default::default(),
},
);
if let Some(live_kit) = this.live_kit.as_ref() {
- let tracks =
+ let video_tracks =
live_kit.room.remote_video_tracks(&user.id.to_string());
- for track in tracks {
+ let audio_tracks =
+ live_kit.room.remote_audio_tracks(&user.id.to_string());
+ for track in video_tracks {
this.remote_video_track_updated(
RemoteVideoTrackUpdate::Subscribed(track),
cx,
)
.log_err();
}
+ for track in audio_tracks {
+ this.remote_audio_track_updated(
+ RemoteAudioTrackUpdate::Subscribed(track),
+ cx,
+ )
+ .log_err();
+ }
}
}
}
@@ -706,7 +749,7 @@ impl Room {
.remote_participants
.get_mut(&user_id)
.ok_or_else(|| anyhow!("subscribed to track by unknown participant"))?;
- participant.tracks.insert(
+ participant.video_tracks.insert(
track_id.clone(),
Arc::new(RemoteVideoTrack {
live_kit_track: track,
@@ -725,7 +768,7 @@ impl Room {
.remote_participants
.get_mut(&user_id)
.ok_or_else(|| anyhow!("unsubscribed from track by unknown participant"))?;
- participant.tracks.remove(&track_id);
+ participant.video_tracks.remove(&track_id);
cx.emit(Event::RemoteVideoTracksChanged {
participant_id: participant.peer_id,
});
@@ -736,6 +779,84 @@ impl Room {
Ok(())
}
+ fn remote_audio_track_updated(
+ &mut self,
+ change: RemoteAudioTrackUpdate,
+ cx: &mut ModelContext,
+ ) -> Result<()> {
+ match change {
+ RemoteAudioTrackUpdate::ActiveSpeakersChanged { speakers } => {
+ let mut speaker_ids = speakers
+ .into_iter()
+ .filter_map(|speaker_sid| speaker_sid.parse().ok())
+ .collect::>();
+ speaker_ids.sort_unstable();
+ for (sid, participant) in &mut self.remote_participants {
+ if let Ok(_) = speaker_ids.binary_search(sid) {
+ participant.speaking = true;
+ } else {
+ participant.speaking = false;
+ }
+ }
+ if let Some(id) = self.client.user_id() {
+ if let Some(room) = &mut self.live_kit {
+ if let Ok(_) = speaker_ids.binary_search(&id) {
+ room.speaking = true;
+ } else {
+ room.speaking = false;
+ }
+ }
+ }
+ cx.notify();
+ }
+ RemoteAudioTrackUpdate::MuteChanged { track_id, muted } => {
+ for participant in &mut self.remote_participants.values_mut() {
+ let mut found = false;
+ for track in participant.audio_tracks.values() {
+ if track.sid() == track_id {
+ found = true;
+ break;
+ }
+ }
+ if found {
+ participant.muted = muted;
+ break;
+ }
+ }
+ cx.notify();
+ }
+ RemoteAudioTrackUpdate::Subscribed(track) => {
+ let user_id = track.publisher_id().parse()?;
+ let track_id = track.sid().to_string();
+ let participant = self
+ .remote_participants
+ .get_mut(&user_id)
+ .ok_or_else(|| anyhow!("subscribed to track by unknown participant"))?;
+ participant.audio_tracks.insert(track_id.clone(), track);
+ cx.emit(Event::RemoteAudioTracksChanged {
+ participant_id: participant.peer_id,
+ });
+ }
+ RemoteAudioTrackUpdate::Unsubscribed {
+ publisher_id,
+ track_id,
+ } => {
+ let user_id = publisher_id.parse()?;
+ let participant = self
+ .remote_participants
+ .get_mut(&user_id)
+ .ok_or_else(|| anyhow!("unsubscribed from track by unknown participant"))?;
+ participant.audio_tracks.remove(&track_id);
+ cx.emit(Event::RemoteAudioTracksChanged {
+ participant_id: participant.peer_id,
+ });
+ }
+ }
+
+ cx.notify();
+ Ok(())
+ }
+
fn check_invariants(&self) {
#[cfg(any(test, feature = "test-support"))]
{
@@ -908,7 +1029,116 @@ impl Room {
pub fn is_screen_sharing(&self) -> bool {
self.live_kit.as_ref().map_or(false, |live_kit| {
- !matches!(live_kit.screen_track, ScreenTrack::None)
+ !matches!(live_kit.screen_track, LocalTrack::None)
+ })
+ }
+
+ pub fn is_sharing_mic(&self) -> bool {
+ self.live_kit.as_ref().map_or(false, |live_kit| {
+ !matches!(live_kit.microphone_track, LocalTrack::None)
+ })
+ }
+
+ pub fn is_muted(&self) -> bool {
+ self.live_kit
+ .as_ref()
+ .and_then(|live_kit| match &live_kit.microphone_track {
+ LocalTrack::None => None,
+ LocalTrack::Pending { muted, .. } => Some(*muted),
+ LocalTrack::Published { muted, .. } => Some(*muted),
+ })
+ .unwrap_or(false)
+ }
+
+ pub fn is_speaking(&self) -> bool {
+ self.live_kit
+ .as_ref()
+ .map_or(false, |live_kit| live_kit.speaking)
+ }
+
+ pub fn is_deafened(&self) -> Option {
+ self.live_kit.as_ref().map(|live_kit| live_kit.deafened)
+ }
+
+ pub fn share_microphone(&mut self, cx: &mut ModelContext) -> Task> {
+ if self.status.is_offline() {
+ return Task::ready(Err(anyhow!("room is offline")));
+ } else if self.is_sharing_mic() {
+ return Task::ready(Err(anyhow!("microphone was already shared")));
+ }
+
+ let publish_id = if let Some(live_kit) = self.live_kit.as_mut() {
+ let publish_id = post_inc(&mut live_kit.next_publish_id);
+ live_kit.microphone_track = LocalTrack::Pending {
+ publish_id,
+ muted: false,
+ };
+ cx.notify();
+ publish_id
+ } else {
+ return Task::ready(Err(anyhow!("live-kit was not initialized")));
+ };
+
+ cx.spawn_weak(|this, mut cx| async move {
+ let publish_track = async {
+ let track = LocalAudioTrack::create();
+ this.upgrade(&cx)
+ .ok_or_else(|| anyhow!("room was dropped"))?
+ .read_with(&cx, |this, _| {
+ this.live_kit
+ .as_ref()
+ .map(|live_kit| live_kit.room.publish_audio_track(&track))
+ })
+ .ok_or_else(|| anyhow!("live-kit was not initialized"))?
+ .await
+ };
+
+ let publication = publish_track.await;
+ this.upgrade(&cx)
+ .ok_or_else(|| anyhow!("room was dropped"))?
+ .update(&mut cx, |this, cx| {
+ let live_kit = this
+ .live_kit
+ .as_mut()
+ .ok_or_else(|| anyhow!("live-kit was not initialized"))?;
+
+ let (canceled, muted) = if let LocalTrack::Pending {
+ publish_id: cur_publish_id,
+ muted,
+ } = &live_kit.microphone_track
+ {
+ (*cur_publish_id != publish_id, *muted)
+ } else {
+ (true, false)
+ };
+
+ match publication {
+ Ok(publication) => {
+ if canceled {
+ live_kit.room.unpublish_track(publication);
+ } else {
+ if muted {
+ cx.background().spawn(publication.set_mute(muted)).detach();
+ }
+ live_kit.microphone_track = LocalTrack::Published {
+ track_publication: publication,
+ muted,
+ };
+ cx.notify();
+ }
+ Ok(())
+ }
+ Err(error) => {
+ if canceled {
+ Ok(())
+ } else {
+ live_kit.microphone_track = LocalTrack::None;
+ cx.notify();
+ Err(error)
+ }
+ }
+ }
+ })
})
}
@@ -921,7 +1151,10 @@ impl Room {
let (displays, publish_id) = if let Some(live_kit) = self.live_kit.as_mut() {
let publish_id = post_inc(&mut live_kit.next_publish_id);
- live_kit.screen_track = ScreenTrack::Pending { publish_id };
+ live_kit.screen_track = LocalTrack::Pending {
+ publish_id,
+ muted: false,
+ };
cx.notify();
(live_kit.room.display_sources(), publish_id)
} else {
@@ -955,13 +1188,14 @@ impl Room {
.as_mut()
.ok_or_else(|| anyhow!("live-kit was not initialized"))?;
- let canceled = if let ScreenTrack::Pending {
+ let (canceled, muted) = if let LocalTrack::Pending {
publish_id: cur_publish_id,
+ muted,
} = &live_kit.screen_track
{
- *cur_publish_id != publish_id
+ (*cur_publish_id != publish_id, *muted)
} else {
- true
+ (true, false)
};
match publication {
@@ -969,7 +1203,13 @@ impl Room {
if canceled {
live_kit.room.unpublish_track(publication);
} else {
- live_kit.screen_track = ScreenTrack::Published(publication);
+ if muted {
+ cx.background().spawn(publication.set_mute(muted)).detach();
+ }
+ live_kit.screen_track = LocalTrack::Published {
+ track_publication: publication,
+ muted,
+ };
cx.notify();
}
Ok(())
@@ -978,7 +1218,7 @@ impl Room {
if canceled {
Ok(())
} else {
- live_kit.screen_track = ScreenTrack::None;
+ live_kit.screen_track = LocalTrack::None;
cx.notify();
Err(error)
}
@@ -987,6 +1227,77 @@ impl Room {
})
})
}
+ fn set_mute(
+ live_kit: &mut LiveKitRoom,
+ should_mute: bool,
+ cx: &mut ModelContext,
+ ) -> Result>> {
+ if !should_mute {
+ // clear user muting state.
+ live_kit.muted_by_user = false;
+ }
+ match &mut live_kit.microphone_track {
+ LocalTrack::None => Err(anyhow!("microphone was not shared")),
+ LocalTrack::Pending { muted, .. } => {
+ *muted = should_mute;
+ cx.notify();
+ Ok(Task::Ready(Some(Ok(()))))
+ }
+ LocalTrack::Published {
+ track_publication,
+ muted,
+ } => {
+ *muted = should_mute;
+ cx.notify();
+ Ok(cx.background().spawn(track_publication.set_mute(*muted)))
+ }
+ }
+ }
+ pub fn toggle_mute(&mut self, cx: &mut ModelContext) -> Result>> {
+ let should_mute = !self.is_muted();
+ if let Some(live_kit) = self.live_kit.as_mut() {
+ let ret = Self::set_mute(live_kit, should_mute, cx);
+ live_kit.muted_by_user = should_mute;
+ ret
+ } else {
+ Err(anyhow!("LiveKit not started"))
+ }
+ }
+
+ pub fn toggle_deafen(&mut self, cx: &mut ModelContext) -> Result>> {
+ if let Some(live_kit) = self.live_kit.as_mut() {
+ (*live_kit).deafened = !live_kit.deafened;
+
+ let mut tasks = Vec::with_capacity(self.remote_participants.len());
+ // Context notification is sent within set_mute itself.
+ let mut mute_task = None;
+ // When deafening, mute user's mic as well.
+ // When undeafening, unmute user's mic unless it was manually muted prior to deafening.
+ if live_kit.deafened || !live_kit.muted_by_user {
+ mute_task = Some(Self::set_mute(live_kit, live_kit.deafened, cx)?);
+ };
+ for participant in self.remote_participants.values() {
+ for track in live_kit
+ .room
+ .remote_audio_track_publications(&participant.user.id.to_string())
+ {
+ tasks.push(cx.foreground().spawn(track.set_enabled(!live_kit.deafened)));
+ }
+ }
+
+ Ok(cx.foreground().spawn(async move {
+ if let Some(mute_task) = mute_task {
+ mute_task.await?;
+ }
+ for task in tasks {
+ task.await?;
+ }
+ Ok(())
+ }))
+ } else {
+ Err(anyhow!("LiveKit not started"))
+ }
+ }
pub fn unshare_screen(&mut self, cx: &mut ModelContext) -> Result<()> {
if self.status.is_offline() {
@@ -998,13 +1309,15 @@ impl Room {
.as_mut()
.ok_or_else(|| anyhow!("live-kit was not initialized"))?;
match mem::take(&mut live_kit.screen_track) {
- ScreenTrack::None => Err(anyhow!("screen was not shared")),
- ScreenTrack::Pending { .. } => {
+ LocalTrack::None => Err(anyhow!("screen was not shared")),
+ LocalTrack::Pending { .. } => {
cx.notify();
Ok(())
}
- ScreenTrack::Published(track) => {
- live_kit.room.unpublish_track(track);
+ LocalTrack::Published {
+ track_publication, ..
+ } => {
+ live_kit.room.unpublish_track(track_publication);
cx.notify();
Ok(())
}
@@ -1023,19 +1336,30 @@ impl Room {
struct LiveKitRoom {
room: Arc,
- screen_track: ScreenTrack,
+ screen_track: LocalTrack,
+ microphone_track: LocalTrack,
+ /// Tracks whether we're currently in a muted state due to auto-mute from deafening or manual mute performed by user.
+ muted_by_user: bool,
+ deafened: bool,
+ speaking: bool,
next_publish_id: usize,
_maintain_room: Task<()>,
- _maintain_tracks: Task<()>,
+ _maintain_tracks: [Task<()>; 2],
}
-enum ScreenTrack {
+enum LocalTrack {
None,
- Pending { publish_id: usize },
- Published(LocalTrackPublication),
+ Pending {
+ publish_id: usize,
+ muted: bool,
+ },
+ Published {
+ track_publication: LocalTrackPublication,
+ muted: bool,
+ },
}
-impl Default for ScreenTrack {
+impl Default for LocalTrack {
fn default() -> Self {
Self::None
}
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 6a6a91b485..9c4e187dbc 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -1,5 +1,4 @@
use crate::{TelemetrySettings, ZED_SECRET_CLIENT_TOKEN, ZED_SERVER_URL};
-use db::kvp::KEY_VALUE_STORE;
use gpui::{executor::Background, serde_json, AppContext, Task};
use lazy_static::lazy_static;
use parking_lot::Mutex;
@@ -8,7 +7,6 @@ use std::{env, io::Write, mem, path::PathBuf, sync::Arc, time::Duration};
use tempfile::NamedTempFile;
use util::http::HttpClient;
use util::{channel::ReleaseChannel, TryFutureExt};
-use uuid::Uuid;
pub struct Telemetry {
http_client: Arc,
@@ -120,39 +118,15 @@ impl Telemetry {
Some(self.state.lock().log_file.as_ref()?.path().to_path_buf())
}
- pub fn start(self: &Arc) {
- let this = self.clone();
- self.executor
- .spawn(
- async move {
- let installation_id =
- if let Ok(Some(installation_id)) = KEY_VALUE_STORE.read_kvp("device_id") {
- installation_id
- } else {
- let installation_id = Uuid::new_v4().to_string();
- KEY_VALUE_STORE
- .write_kvp("device_id".to_string(), installation_id.clone())
- .await?;
- installation_id
- };
+ pub fn start(self: &Arc, installation_id: Option) {
+ let mut state = self.state.lock();
+ state.installation_id = installation_id.map(|id| id.into());
+ let has_clickhouse_events = !state.clickhouse_events_queue.is_empty();
+ drop(state);
- let installation_id: Arc = installation_id.into();
- let mut state = this.state.lock();
- state.installation_id = Some(installation_id.clone());
-
- let has_clickhouse_events = !state.clickhouse_events_queue.is_empty();
-
- drop(state);
-
- if has_clickhouse_events {
- this.flush_clickhouse_events();
- }
-
- anyhow::Ok(())
- }
- .log_err(),
- )
- .detach();
+ if has_clickhouse_events {
+ self.flush_clickhouse_events();
+ }
}
/// This method takes the entire TelemetrySettings struct in order to force client code
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 27545a652d..a87234ded7 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo "]
default-run = "collab"
edition = "2021"
name = "collab"
-version = "0.14.2"
+version = "0.15.0"
publish = false
[[bin]]
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 595d841d07..c690b6148a 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -74,6 +74,7 @@ CREATE TABLE "worktree_entries" (
"mtime_seconds" INTEGER NOT NULL,
"mtime_nanos" INTEGER NOT NULL,
"is_symlink" BOOL NOT NULL,
+ "is_external" BOOL NOT NULL,
"is_ignored" BOOL NOT NULL,
"is_deleted" BOOL NOT NULL,
"git_status" INTEGER,
diff --git a/crates/collab/migrations/20230616134535_add_is_external_to_worktree_entries.sql b/crates/collab/migrations/20230616134535_add_is_external_to_worktree_entries.sql
new file mode 100644
index 0000000000..e4348af0cc
--- /dev/null
+++ b/crates/collab/migrations/20230616134535_add_is_external_to_worktree_entries.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "worktree_entries"
+ADD "is_external" BOOL NOT NULL DEFAULT FALSE;
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 7e2c376bc2..208da22efe 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -1539,6 +1539,7 @@ impl Database {
}),
is_symlink: db_entry.is_symlink,
is_ignored: db_entry.is_ignored,
+ is_external: db_entry.is_external,
git_status: db_entry.git_status.map(|status| status as i32),
});
}
@@ -2349,6 +2350,7 @@ impl Database {
mtime_nanos: ActiveValue::set(mtime.nanos as i32),
is_symlink: ActiveValue::set(entry.is_symlink),
is_ignored: ActiveValue::set(entry.is_ignored),
+ is_external: ActiveValue::set(entry.is_external),
git_status: ActiveValue::set(entry.git_status.map(|status| status as i64)),
is_deleted: ActiveValue::set(false),
scan_id: ActiveValue::set(update.scan_id as i64),
@@ -2705,6 +2707,7 @@ impl Database {
}),
is_symlink: db_entry.is_symlink,
is_ignored: db_entry.is_ignored,
+ is_external: db_entry.is_external,
git_status: db_entry.git_status.map(|status| status as i32),
});
}
diff --git a/crates/collab/src/db/worktree_entry.rs b/crates/collab/src/db/worktree_entry.rs
index f2df808ee3..cf5090ab6d 100644
--- a/crates/collab/src/db/worktree_entry.rs
+++ b/crates/collab/src/db/worktree_entry.rs
@@ -18,6 +18,7 @@ pub struct Model {
pub git_status: Option,
pub is_symlink: bool,
pub is_ignored: bool,
+ pub is_external: bool,
pub is_deleted: bool,
pub scan_id: i64,
}
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 8d210513c2..a5be6e7d62 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -224,6 +224,7 @@ impl Server {
.add_request_handler(forward_project_request::)
.add_request_handler(forward_project_request::)
.add_request_handler(forward_project_request::)
+ .add_request_handler(forward_project_request::)
.add_request_handler(forward_project_request::)
.add_message_handler(create_buffer_for_peer)
.add_request_handler(update_buffer)
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 92b63478cb..3ddef94104 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -257,7 +257,7 @@ async fn test_basic_calls(
room_b.read_with(cx_b, |room, _| {
assert_eq!(
room.remote_participants()[&client_a.user_id().unwrap()]
- .tracks
+ .video_tracks
.len(),
1
);
@@ -274,7 +274,7 @@ async fn test_basic_calls(
room_c.read_with(cx_c, |room, _| {
assert_eq!(
room.remote_participants()[&client_a.user_id().unwrap()]
- .tracks
+ .video_tracks
.len(),
1
);
@@ -1266,6 +1266,27 @@ async fn test_share_project(
let client_b_collaborator = project.collaborators().get(&client_b_peer_id).unwrap();
assert_eq!(client_b_collaborator.replica_id, replica_id_b);
});
+ project_b.read_with(cx_b, |project, cx| {
+ let worktree = project.worktrees(cx).next().unwrap().read(cx);
+ assert_eq!(
+ worktree.paths().map(AsRef::as_ref).collect::>(),
+ [
+ Path::new(".gitignore"),
+ Path::new("a.txt"),
+ Path::new("b.txt"),
+ Path::new("ignored-dir"),
+ ]
+ );
+ });
+
+ project_b
+ .update(cx_b, |project, cx| {
+ let worktree = project.worktrees(cx).next().unwrap();
+ let entry = worktree.read(cx).entry_for_path("ignored-dir").unwrap();
+ project.expand_entry(worktree_id, entry.id, cx).unwrap()
+ })
+ .await
+ .unwrap();
project_b.read_with(cx_b, |project, cx| {
let worktree = project.worktrees(cx).next().unwrap().read(cx);
assert_eq!(
@@ -6993,7 +7014,7 @@ async fn test_join_call_after_screen_was_shared(
room.remote_participants()
.get(&client_a.user_id().unwrap())
.unwrap()
- .tracks
+ .video_tracks
.len(),
1
);
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
index 16cc6b5277..ee410ccba7 100644
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -37,8 +37,10 @@ picker = { path = "../picker" }
project = { path = "../project" }
settings = { path = "../settings" }
theme = { path = "../theme" }
+theme_selector = { path = "../theme_selector" }
util = { path = "../util" }
workspace = { path = "../workspace" }
+zed-actions = {path = "../zed-actions"}
anyhow.workspace = true
futures.workspace = true
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 720a73f477..2ab8928166 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -1,6 +1,7 @@
use crate::{
contact_notification::ContactNotification, contacts_popover, face_pile::FacePile,
- toggle_screen_sharing, ToggleScreenSharing,
+ toggle_deafen, toggle_mute, toggle_screen_sharing, LeaveCall, ToggleDeafen, ToggleMute,
+ ToggleScreenSharing,
};
use call::{ActiveCall, ParticipantLocation, Room};
use client::{proto::PeerId, Client, ContactEventKind, SignIn, SignOut, User, UserStore};
@@ -17,13 +18,13 @@ use gpui::{
AppContext, Entity, ImageData, LayoutContext, ModelHandle, SceneBuilder, Subscription, View,
ViewContext, ViewHandle, WeakViewHandle,
};
-use project::Project;
+use project::{Project, RepositoryEntry};
use std::{ops::Range, sync::Arc};
use theme::{AvatarStyle, Theme};
use util::ResultExt;
use workspace::{FollowNextCollaborator, Workspace};
-const MAX_TITLE_LENGTH: usize = 75;
+// const MAX_TITLE_LENGTH: usize = 75;
actions!(
collab,
@@ -78,27 +79,34 @@ impl View for CollabTitlebarItem {
let user = self.user_store.read(cx).current_user();
let peer_id = self.client.peer_id();
if let Some(((user, peer_id), room)) = user
+ .as_ref()
.zip(peer_id)
.zip(ActiveCall::global(cx).read(cx).room().cloned())
{
- left_container
- .add_children(self.render_in_call_share_unshare_button(&workspace, &theme, cx));
-
- right_container.add_children(self.render_collaborators(&workspace, &theme, &room, cx));
right_container
- .add_child(self.render_current_user(&workspace, &theme, &user, peer_id, cx));
+ .add_children(self.render_in_call_share_unshare_button(&workspace, &theme, cx));
+ right_container.add_child(self.render_leave_call(&theme, cx));
+ let muted = room.read(cx).is_muted();
+ let speaking = room.read(cx).is_speaking();
+ left_container.add_child(
+ self.render_current_user(&workspace, &theme, &user, peer_id, muted, speaking, cx),
+ );
+ left_container.add_children(self.render_collaborators(&workspace, &theme, &room, cx));
+ right_container.add_child(self.render_toggle_mute(&theme, &room, cx));
+ right_container.add_child(self.render_toggle_deafen(&theme, &room, cx));
right_container.add_child(self.render_toggle_screen_sharing_button(&theme, &room, cx));
}
let status = workspace.read(cx).client().status();
let status = &*status.borrow();
-
if matches!(status, client::Status::Connected { .. }) {
right_container.add_child(self.render_toggle_contacts_button(&theme, cx));
- right_container.add_child(self.render_user_menu_button(&theme, cx));
+ let avatar = user.as_ref().and_then(|user| user.avatar.clone());
+ right_container.add_child(self.render_user_menu_button(&theme, avatar, cx));
} else {
right_container.add_children(self.render_connection_status(status, cx));
right_container.add_child(self.render_sign_in_button(&theme, cx));
+ right_container.add_child(self.render_user_menu_button(&theme, None, cx));
}
Stack::new()
@@ -108,7 +116,6 @@ impl View for CollabTitlebarItem {
.with_child(
right_container.contained().with_background_color(
theme
- .workspace
.titlebar
.container
.background_color
@@ -163,7 +170,6 @@ impl CollabTitlebarItem {
}),
);
- let view_id = cx.view_id();
Self {
workspace: workspace.weak_handle(),
project,
@@ -171,6 +177,7 @@ impl CollabTitlebarItem {
client,
contacts_popover: None,
user_menu: cx.add_view(|cx| {
+ let view_id = cx.view_id();
let mut menu = ContextMenu::new(view_id, cx);
menu.set_position_mode(OverlayPositionMode::Local);
menu
@@ -185,55 +192,45 @@ impl CollabTitlebarItem {
theme: Arc,
cx: &ViewContext,
) -> AnyElement {
- let names_and_branches = project.visible_worktrees(cx).map(|worktree| {
+ let mut names_and_branches = project.visible_worktrees(cx).map(|worktree| {
let worktree = worktree.read(cx);
(worktree.root_name(), worktree.root_git_entry())
});
- fn push_str(buffer: &mut String, index: &mut usize, str: &str) {
- buffer.push_str(str);
- *index += str.chars().count();
- }
-
- let mut indices = Vec::new();
- let mut index = 0;
- let mut title = String::new();
- let mut names_and_branches = names_and_branches.peekable();
- while let Some((name, entry)) = names_and_branches.next() {
- let pre_index = index;
- push_str(&mut title, &mut index, name);
- indices.extend((pre_index..index).into_iter());
- if let Some(branch) = entry.and_then(|entry| entry.branch()) {
- push_str(&mut title, &mut index, "/");
- push_str(&mut title, &mut index, &branch);
- }
- if names_and_branches.peek().is_some() {
- push_str(&mut title, &mut index, ", ");
- if index >= MAX_TITLE_LENGTH {
- title.push_str(" …");
- break;
- }
- }
- }
-
- let text_style = theme.workspace.titlebar.title.clone();
- let item_spacing = theme.workspace.titlebar.item_spacing;
+ let (name, entry) = names_and_branches.next().unwrap_or(("", None));
+ let branch_prepended = entry
+ .as_ref()
+ .and_then(RepositoryEntry::branch)
+ .map(|branch| format!("/{branch}"));
+ let text_style = theme.titlebar.title.clone();
+ let item_spacing = theme.titlebar.item_spacing;
let mut highlight = text_style.clone();
- highlight.color = theme.workspace.titlebar.highlight_color;
+ highlight.color = theme.titlebar.highlight_color;
let style = LabelStyle {
text: text_style,
highlight_text: Some(highlight),
};
-
- Label::new(title, style)
- .with_highlights(indices)
- .contained()
- .with_margin_right(item_spacing)
- .aligned()
- .left()
- .into_any_named("title-with-git-information")
+ let mut ret = Flex::row().with_child(
+ Label::new(name.to_owned(), style.clone())
+ .with_highlights((0..name.len()).into_iter().collect())
+ .contained()
+ .aligned()
+ .left()
+ .into_any_named("title-project-name"),
+ );
+ if let Some(git_branch) = branch_prepended {
+ ret = ret.with_child(
+ Label::new(git_branch, style)
+ .contained()
+ .with_margin_right(item_spacing)
+ .aligned()
+ .left()
+ .into_any_named("title-project-branch"),
+ )
+ }
+ ret.into_any()
}
fn window_activation_changed(&mut self, active: bool, cx: &mut ViewContext) {
@@ -297,45 +294,29 @@ impl CollabTitlebarItem {
}
pub fn toggle_user_menu(&mut self, _: &ToggleUserMenu, cx: &mut ViewContext) {
- let theme = theme::current(cx).clone();
- let avatar_style = theme.workspace.titlebar.leader_avatar.clone();
- let item_style = theme.context_menu.item.disabled_style().clone();
self.user_menu.update(cx, |user_menu, cx| {
- let items = if let Some(user) = self.user_store.read(cx).current_user() {
+ let items = if let Some(_) = self.user_store.read(cx).current_user() {
vec![
- ContextMenuItem::Static(Box::new(move |_| {
- Flex::row()
- .with_children(user.avatar.clone().map(|avatar| {
- Self::render_face(
- avatar,
- avatar_style.clone(),
- Color::transparent_black(),
- )
- }))
- .with_child(Label::new(
- user.github_login.clone(),
- item_style.label.clone(),
- ))
- .contained()
- .with_style(item_style.container)
- .into_any()
- })),
- ContextMenuItem::action("Sign out", SignOut),
+ ContextMenuItem::action("Settings", zed_actions::OpenSettings),
+ ContextMenuItem::action("Theme", theme_selector::Toggle),
+ ContextMenuItem::separator(),
ContextMenuItem::action(
- "Send Feedback",
+ "Share Feedback",
feedback::feedback_editor::GiveFeedback,
),
+ ContextMenuItem::action("Sign out", SignOut),
]
} else {
vec![
- ContextMenuItem::action("Sign in", SignIn),
+ ContextMenuItem::action("Settings", zed_actions::OpenSettings),
+ ContextMenuItem::action("Theme", theme_selector::Toggle),
+ ContextMenuItem::separator(),
ContextMenuItem::action(
- "Send Feedback",
+ "Share Feedback",
feedback::feedback_editor::GiveFeedback,
),
]
};
-
user_menu.show(Default::default(), AnchorCorner::TopRight, items, cx);
});
}
@@ -345,7 +326,7 @@ impl CollabTitlebarItem {
theme: &Theme,
cx: &mut ViewContext,
) -> AnyElement {
- let titlebar = &theme.workspace.titlebar;
+ let titlebar = &theme.titlebar;
let badge = if self
.user_store
@@ -361,8 +342,20 @@ impl CollabTitlebarItem {
.contained()
.with_style(titlebar.toggle_contacts_badge)
.contained()
- .with_margin_left(titlebar.toggle_contacts_button.default.icon_width)
- .with_margin_top(titlebar.toggle_contacts_button.default.icon_width)
+ .with_margin_left(
+ titlebar
+ .toggle_contacts_button
+ .inactive_state()
+ .default
+ .icon_width,
+ )
+ .with_margin_top(
+ titlebar
+ .toggle_contacts_button
+ .inactive_state()
+ .default
+ .icon_width,
+ )
.aligned(),
)
};
@@ -372,8 +365,9 @@ impl CollabTitlebarItem {
MouseEventHandler::::new(0, cx, |state, _| {
let style = titlebar
.toggle_contacts_button
- .style_for(state, self.contacts_popover.is_some());
- Svg::new("icons/user_plus_16.svg")
+ .in_state(self.contacts_popover.is_some())
+ .style_for(state);
+ Svg::new("icons/radix/person.svg")
.with_color(style.color)
.constrained()
.with_width(style.icon_width)
@@ -400,7 +394,6 @@ impl CollabTitlebarItem {
.with_children(self.render_contacts_popover_host(titlebar, cx))
.into_any()
}
-
fn render_toggle_screen_sharing_button(
&self,
theme: &Theme,
@@ -410,16 +403,21 @@ impl CollabTitlebarItem {
let icon;
let tooltip;
if room.read(cx).is_screen_sharing() {
- icon = "icons/enable_screen_sharing_12.svg";
+ icon = "icons/radix/desktop.svg";
tooltip = "Stop Sharing Screen"
} else {
- icon = "icons/disable_screen_sharing_12.svg";
+ icon = "icons/radix/desktop.svg";
tooltip = "Share Screen";
}
- let titlebar = &theme.workspace.titlebar;
+ let active = room.read(cx).is_screen_sharing();
+ let titlebar = &theme.titlebar;
MouseEventHandler::::new(0, cx, |state, _| {
- let style = titlebar.call_control.style_for(state, false);
+ let style = titlebar
+ .screen_share_button
+ .in_state(active)
+ .style_for(state);
+
Svg::new(icon)
.with_color(style.color)
.constrained()
@@ -445,7 +443,141 @@ impl CollabTitlebarItem {
.aligned()
.into_any()
}
+ fn render_toggle_mute(
+ &self,
+ theme: &Theme,
+ room: &ModelHandle,
+ cx: &mut ViewContext,
+ ) -> AnyElement {
+ let icon;
+ let tooltip;
+ let is_muted = room.read(cx).is_muted();
+ if is_muted {
+ icon = "icons/radix/mic-mute.svg";
+ tooltip = "Unmute microphone\nRight click for options";
+ } else {
+ icon = "icons/radix/mic.svg";
+ tooltip = "Mute microphone\nRight click for options";
+ }
+ let titlebar = &theme.titlebar;
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = titlebar
+ .toggle_microphone_button
+ .in_state(is_muted)
+ .style_for(state);
+ let image = Svg::new(icon)
+ .with_color(style.color)
+ .constrained()
+ .with_width(style.icon_width)
+ .aligned()
+ .constrained()
+ .with_width(style.button_width)
+ .with_height(style.button_width)
+ .contained()
+ .with_style(style.container);
+ if let Some(color) = style.container.background_color {
+ image.with_background_color(color)
+ } else {
+ image
+ }
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, move |_, _, cx| {
+ toggle_mute(&Default::default(), cx)
+ })
+ .with_tooltip::(
+ 0,
+ tooltip.into(),
+ Some(Box::new(ToggleMute)),
+ theme.tooltip.clone(),
+ cx,
+ )
+ .aligned()
+ .into_any()
+ }
+ fn render_toggle_deafen(
+ &self,
+ theme: &Theme,
+ room: &ModelHandle,
+ cx: &mut ViewContext,
+ ) -> AnyElement {
+ let icon;
+ let tooltip;
+ let is_deafened = room.read(cx).is_deafened().unwrap_or(false);
+ if is_deafened {
+ icon = "icons/radix/speaker-off.svg";
+ tooltip = "Unmute speakers\nRight click for options";
+ } else {
+ icon = "icons/radix/speaker-loud.svg";
+ tooltip = "Mute speakers\nRight click for options";
+ }
+
+ let titlebar = &theme.titlebar;
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = titlebar
+ .toggle_speakers_button
+ .in_state(is_deafened)
+ .style_for(state);
+ Svg::new(icon)
+ .with_color(style.color)
+ .constrained()
+ .with_width(style.icon_width)
+ .aligned()
+ .constrained()
+ .with_width(style.button_width)
+ .with_height(style.button_width)
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, move |_, _, cx| {
+ toggle_deafen(&Default::default(), cx)
+ })
+ .with_tooltip::(
+ 0,
+ tooltip.into(),
+ Some(Box::new(ToggleDeafen)),
+ theme.tooltip.clone(),
+ cx,
+ )
+ .aligned()
+ .into_any()
+ }
+ fn render_leave_call(&self, theme: &Theme, cx: &mut ViewContext) -> AnyElement {
+ let icon = "icons/radix/exit.svg";
+ let tooltip = "Leave call";
+
+ let titlebar = &theme.titlebar;
+ MouseEventHandler::::new(0, cx, |state, _| {
+ let style = titlebar.leave_call_button.style_for(state);
+ Svg::new(icon)
+ .with_color(style.color)
+ .constrained()
+ .with_width(style.icon_width)
+ .aligned()
+ .constrained()
+ .with_width(style.button_width)
+ .with_height(style.button_width)
+ .contained()
+ .with_style(style.container)
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, move |_, _, cx| {
+ ActiveCall::global(cx)
+ .update(cx, |call, cx| call.hang_up(cx))
+ .detach_and_log_err(cx);
+ })
+ .with_tooltip::(
+ 0,
+ tooltip.into(),
+ Some(Box::new(LeaveCall)),
+ theme.tooltip.clone(),
+ cx,
+ )
+ .aligned()
+ .into_any()
+ }
fn render_in_call_share_unshare_button(
&self,
workspace: &ViewHandle,
@@ -458,14 +590,14 @@ impl CollabTitlebarItem {
}
let is_shared = project.read(cx).is_shared();
- let label = if is_shared { "Unshare" } else { "Share" };
+ let label = if is_shared { "Stop Sharing" } else { "Share" };
let tooltip = if is_shared {
- "Unshare project from call participants"
+ "Stop sharing project with call participants"
} else {
"Share project with call participants"
};
- let titlebar = &theme.workspace.titlebar;
+ let titlebar = &theme.titlebar;
enum ShareUnshare {}
Some(
@@ -473,7 +605,7 @@ impl CollabTitlebarItem {
.with_child(
MouseEventHandler::::new(0, cx, |state, _| {
//TODO: Ensure this button has consistent width for both text variations
- let style = titlebar.share_button.style_for(state, false);
+ let style = titlebar.share_button.inactive_state().style_for(state);
Label::new(label, style.text.clone())
.contained()
.with_style(style.container)
@@ -496,7 +628,7 @@ impl CollabTitlebarItem {
)
.aligned()
.contained()
- .with_margin_left(theme.workspace.titlebar.item_spacing)
+ .with_margin_left(theme.titlebar.item_spacing)
.into_any(),
)
}
@@ -504,24 +636,51 @@ impl CollabTitlebarItem {
fn render_user_menu_button(
&self,
theme: &Theme,
+ avatar: Option>,
cx: &mut ViewContext,
) -> AnyElement {
- let titlebar = &theme.workspace.titlebar;
+ let tooltip = theme.tooltip.clone();
+ let user_menu_button_style = if avatar.is_some() {
+ &theme.titlebar.user_menu.user_menu_button_online
+ } else {
+ &theme.titlebar.user_menu.user_menu_button_offline
+ };
+ let avatar_style = &user_menu_button_style.avatar;
Stack::new()
.with_child(
MouseEventHandler::::new(0, cx, |state, _| {
- let style = titlebar.call_control.style_for(state, false);
- Svg::new("icons/ellipsis_14.svg")
- .with_color(style.color)
- .constrained()
- .with_width(style.icon_width)
+ let style = user_menu_button_style
+ .user_menu
+ .inactive_state()
+ .style_for(state);
+
+ let mut dropdown = Flex::row().align_children_center();
+
+ if let Some(avatar_img) = avatar {
+ dropdown = dropdown.with_child(Self::render_face(
+ avatar_img,
+ *avatar_style,
+ Color::transparent_black(),
+ None,
+ ));
+ };
+
+ dropdown
+ .with_child(
+ Svg::new("icons/caret_down_8.svg")
+ .with_color(user_menu_button_style.icon.color)
+ .constrained()
+ .with_width(user_menu_button_style.icon.width)
+ .contained()
+ .into_any(),
+ )
.aligned()
.constrained()
- .with_width(style.button_width)
- .with_height(style.button_width)
+ .with_height(style.width)
.contained()
.with_style(style.container)
+ .into_any()
})
.with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, this, cx| {
@@ -531,11 +690,10 @@ impl CollabTitlebarItem {
0,
"Toggle user menu".to_owned(),
Some(Box::new(ToggleUserMenu)),
- theme.tooltip.clone(),
+ tooltip,
cx,
)
- .contained()
- .with_margin_left(theme.workspace.titlebar.item_spacing),
+ .contained(),
)
.with_child(
ChildView::new(&self.user_menu, cx)
@@ -547,9 +705,9 @@ impl CollabTitlebarItem {
}
fn render_sign_in_button(&self, theme: &Theme, cx: &mut ViewContext) -> AnyElement {
- let titlebar = &theme.workspace.titlebar;
+ let titlebar = &theme.titlebar;
MouseEventHandler::::new(0, cx, |state, _| {
- let style = titlebar.sign_in_prompt.style_for(state, false);
+ let style = titlebar.sign_in_button.inactive_state().style_for(state);
Label::new("Sign In", style.text.clone())
.contained()
.with_style(style.container)
@@ -611,11 +769,13 @@ impl CollabTitlebarItem {
replica_id,
participant.peer_id,
Some(participant.location),
+ participant.muted,
+ participant.speaking,
workspace,
theme,
cx,
))
- .with_margin_right(theme.workspace.titlebar.face_pile_spacing),
+ .with_margin_right(theme.titlebar.face_pile_spacing),
)
})
.collect()
@@ -627,19 +787,24 @@ impl CollabTitlebarItem {
theme: &Theme,
user: &Arc,
peer_id: PeerId,
+ muted: bool,
+ speaking: bool,
cx: &mut ViewContext,
) -> AnyElement {
let replica_id = workspace.read(cx).project().read(cx).replica_id();
+
Container::new(self.render_face_pile(
user,
Some(replica_id),
peer_id,
None,
+ muted,
+ speaking,
workspace,
theme,
cx,
))
- .with_margin_right(theme.workspace.titlebar.item_spacing)
+ .with_margin_right(theme.titlebar.item_spacing)
.into_any()
}
@@ -649,6 +814,8 @@ impl CollabTitlebarItem {
replica_id: Option,
peer_id: PeerId,
location: Option,
+ muted: bool,
+ speaking: bool,
workspace: &ViewHandle,
theme: &Theme,
cx: &mut ViewContext,
@@ -671,15 +838,23 @@ impl CollabTitlebarItem {
})
.unwrap_or(false);
- let leader_style = theme.workspace.titlebar.leader_avatar;
- let follower_style = theme.workspace.titlebar.follower_avatar;
+ let leader_style = theme.titlebar.leader_avatar;
+ let follower_style = theme.titlebar.follower_avatar;
+
+ let microphone_state = if muted {
+ Some(theme.titlebar.muted)
+ } else if speaking {
+ Some(theme.titlebar.speaking)
+ } else {
+ None
+ };
let mut background_color = theme
- .workspace
.titlebar
.container
.background_color
.unwrap_or_default();
+
if let Some(replica_id) = replica_id {
if followed_by_self {
let selection = theme.editor.replica_selection_style(replica_id).selection;
@@ -690,11 +865,12 @@ impl CollabTitlebarItem {
let mut content = Stack::new()
.with_children(user.avatar.as_ref().map(|avatar| {
- let face_pile = FacePile::new(theme.workspace.titlebar.follower_avatar_overlap)
+ let face_pile = FacePile::new(theme.titlebar.follower_avatar_overlap)
.with_child(Self::render_face(
avatar.clone(),
Self::location_style(workspace, location, leader_style, cx),
background_color,
+ microphone_state,
))
.with_children(
(|| {
@@ -726,6 +902,7 @@ impl CollabTitlebarItem {
avatar.clone(),
follower_style,
background_color,
+ None,
))
}))
})()
@@ -735,7 +912,7 @@ impl CollabTitlebarItem {
let mut container = face_pile
.contained()
- .with_style(theme.workspace.titlebar.leader_selection);
+ .with_style(theme.titlebar.leader_selection);
if let Some(replica_id) = replica_id {
if followed_by_self {
@@ -752,8 +929,8 @@ impl CollabTitlebarItem {
Some(
AvatarRibbon::new(color)
.constrained()
- .with_width(theme.workspace.titlebar.avatar_ribbon.width)
- .with_height(theme.workspace.titlebar.avatar_ribbon.height)
+ .with_width(theme.titlebar.avatar_ribbon.width)
+ .with_height(theme.titlebar.avatar_ribbon.height)
.aligned()
.bottom(),
)
@@ -844,12 +1021,13 @@ impl CollabTitlebarItem {
avatar: Arc,
avatar_style: AvatarStyle,
background_color: Color,
+ microphone_state: Option,
) -> AnyElement {
Image::from_data(avatar)
.with_style(avatar_style.image)
.aligned()
.contained()
- .with_background_color(background_color)
+ .with_background_color(microphone_state.unwrap_or(background_color))
.with_corner_radius(avatar_style.outer_corner_radius)
.constrained()
.with_width(avatar_style.outer_width)
@@ -873,22 +1051,22 @@ impl CollabTitlebarItem {
| client::Status::Reconnecting { .. }
| client::Status::ReconnectionError { .. } => Some(
Svg::new("icons/cloud_slash_12.svg")
- .with_color(theme.workspace.titlebar.offline_icon.color)
+ .with_color(theme.titlebar.offline_icon.color)
.constrained()
- .with_width(theme.workspace.titlebar.offline_icon.width)
+ .with_width(theme.titlebar.offline_icon.width)
.aligned()
.contained()
- .with_style(theme.workspace.titlebar.offline_icon.container)
+ .with_style(theme.titlebar.offline_icon.container)
.into_any(),
),
client::Status::UpgradeRequired => Some(
MouseEventHandler::::new(0, cx, |_, _| {
Label::new(
"Please update Zed to collaborate",
- theme.workspace.titlebar.outdated_warning.text.clone(),
+ theme.titlebar.outdated_warning.text.clone(),
)
.contained()
- .with_style(theme.workspace.titlebar.outdated_warning.container)
+ .with_style(theme.titlebar.outdated_warning.container)
.aligned()
})
.with_cursor_style(CursorStyle::PointingHand)
diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs
index c0734388b1..a809b9c7e6 100644
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -9,13 +9,23 @@ mod notifications;
mod project_shared_notification;
mod sharing_status_indicator;
-use call::ActiveCall;
+use call::{ActiveCall, Room};
pub use collab_titlebar_item::{CollabTitlebarItem, ToggleContactsMenu};
use gpui::{actions, AppContext, Task};
use std::sync::Arc;
+use util::ResultExt;
use workspace::AppState;
-actions!(collab, [ToggleScreenSharing]);
+actions!(
+ collab,
+ [
+ ToggleScreenSharing,
+ ToggleMute,
+ ToggleDeafen,
+ LeaveCall,
+ ShareMicrophone
+ ]
+);
pub fn init(app_state: &Arc