Skip to content

Cherrypick/application shell #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soyboyscout wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Cherrypick/application shell #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01eea45
Add cherrypick_ui crate scaffold
soyboyscout Mar 15, 2026
9e23df5
Implement section 02: CherryPick sidebar panel
soyboyscout Mar 15, 2026
fdedfd2
Implement sections 03-04: branch list stub and CherryPick view tab
soyboyscout Mar 15, 2026
8b8cddd
Integrate CherryPick backend crates and wire UI to real git data
soyboyscout Mar 16, 2026
00ace01
Integrate commit graph into CherryPick sidebar via Zed's native GitGraph
soyboyscout Apr 5, 2026
73d7b5e
Merge upstream/main into cherrypick/application-shell
soyboyscout May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 142 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ members = [
"crates/buffer_diff",
"crates/call",
"crates/channel",
"crates/cherrypick_ui",
"crates/cherrypick_pr",
"crates/cherrypick_agent",
"crates/cli",
"crates/client",
"crates/clock",
Expand Down Expand Up @@ -284,6 +287,9 @@ breadcrumbs = { path = "crates/breadcrumbs" }
buffer_diff = { path = "crates/buffer_diff" }
call = { path = "crates/call" }
channel = { path = "crates/channel" }
cherrypick_ui = { path = "crates/cherrypick_ui" }
cherrypick_pr = { path = "crates/cherrypick_pr" }
cherrypick_agent = { path = "crates/cherrypick_agent" }
cli = { path = "crates/cli" }
client = { path = "crates/client" }
clock = { path = "crates/clock" }
Expand Down Expand Up @@ -614,6 +620,7 @@ linkify = "0.10.0"
libwebrtc = "0.3.26"
livekit = { version = "0.7.32", features = ["tokio", "rustls-tls-native-roots"] }
log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
lru = "0.12"
lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "f4dfa89a21ca35cd929b70354b1583fabae325f8" }
mach2 = "0.5"
markup5ever_rcdom = "0.3.0"
Expand All @@ -623,6 +630,7 @@ moka = { version = "0.12.10", features = ["sync"] }
nanoid = "0.4"
nbformat = "1.2.0"
nix = "0.29"
notify = "7"
Copy link

Copilot AI Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The workspace pins notify = "7", but the existing fs crate depends on notify = "8.2.0" directly. This introduces two major versions of notify into the build (see Cargo.lock), increasing compile times and binary size and potentially complicating platform watcher behavior. Prefer aligning on a single notify major version (e.g., update the new crates to notify 8.x and set the workspace dependency accordingly).

Suggested change
notify = "7"
notify = "8.2.0"

Copilot uses AI. Check for mistakes.
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
nucleo = "0.5"
num-format = "0.4.4"
objc = "0.2"
Expand Down Expand Up @@ -699,6 +707,7 @@ rsa = "0.9.6"
runtimelib = { version = "1.4.0", default-features = false, features = [
"async-dispatcher-runtime", "aws-lc-rs"
] }
rusqlite = { version = "0.32", features = ["bundled"] }
rust-embed = { version = "8.11", features = ["include-exclude"] }
rustc-hash = "2.1.0"
rustls = { version = "0.23.26" }
Expand Down Expand Up @@ -733,6 +742,7 @@ sysinfo = "0.37.0"
take-until = "0.2.0"
tempfile = "3.20.0"
thiserror = "2.0.12"
tiktoken-rs = { git = "https://github.com/zed-industries/tiktoken-rs", rev = "2570c4387a8505fb8f1d3f3557454b474f1e8271" }
time = { version = "0.3", features = [
"macros",
"parsing",
Expand All @@ -743,6 +753,7 @@ time = { version = "0.3", features = [
] }
tiny_http = "0.12"
tokio = { version = "1" }
tokio-rusqlite = "0.6"
tokio-socks = { version = "0.5.2", default-features = false, features = [
"futures-io",
"tokio",
Expand Down
32 changes: 32 additions & 0 deletions crates/cherrypick_agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[package]
name = "cherrypick_agent"
version = "0.1.0"
edition.workspace = true
publish.workspace = true
license = "GPL-3.0-or-later"

[lints]
workspace = true

[lib]
path = "src/lib.rs"

[dependencies]
git2.workspace = true
tokio = { workspace = true, features = ["rt", "sync", "macros", "time", "process", "io-util"] }
thiserror.workspace = true
serde.workspace = true
serde_json.workspace = true
reqwest.workspace = true
async-trait.workspace = true
futures.workspace = true
chrono.workspace = true
rusqlite.workspace = true
tokio-rusqlite.workspace = true
tiktoken-rs.workspace = true
notify.workspace = true
sha2.workspace = true

[dev-dependencies]
tempfile.workspace = true
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
Loading