Skip to content

refactor: take the control surface from the protocol, not the runtime #212

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

Closed
pathscale wants to merge 1 commit into from
Closed

refactor: take the control surface from the protocol, not the runtime #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion apps/gui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ blitz-runtime = [
"dep:blitz-script",
"dep:brotli",
"dep:tauri-runtime-blitz",
"dep:blitz-control-protocol",
"dep:url",
]
# Compile the full diagnostics capability into the binary. The engine-wide
Expand Down Expand Up @@ -101,7 +102,12 @@ tauri = { version = "2", default-features = false, features = ["macos-private-ap
# 0.1.0 the runtime's own feature forwards to `tauri` and `tauri-runtime`, so
# naming it here agrees with that rather than being the only thing holding the
# two sides together.
tauri-runtime-blitz = { version = "^0.3", optional = true, features = ["macos-private-api"] }
# The window runtime. AgencyZero opens one, so this stays; only the control
# surface left it, and that now comes from `blitz-control-protocol` directly.
tauri-runtime-blitz = { version = "^0.4", optional = true, features = ["macos-private-api"] }
# The control surface agents drive AgencyZero through. Default features only:
# the vocabulary and the lifecycle handler, no engine and no transport.
blitz-control-protocol = { version = "^0.5", optional = true, default-features = false }
#
# The engine by version, not by branch. Same move `chuzz` made, for the same
# reasons its manifest records.
Expand Down
10 changes: 5 additions & 5 deletions apps/gui/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2920,8 +2920,8 @@ fn main() {
#[cfg(feature = "blitz-runtime")]
{
let relaunch_handle = app.handle().clone();
tauri_runtime_blitz::set_agent_control_handler(move |request| match request {
tauri_runtime_blitz::control_protocol::AgentControlRequest::Relaunch => {
blitz_control_protocol::lifecycle::set_lifecycle_handler(move |request| match request {
blitz_control_protocol::AgentControlRequest::Relaunch => {
let handle = relaunch_handle.clone();
tauri::async_runtime::spawn(async move {
let state = handle.state::<AppState>();
Expand All @@ -2933,10 +2933,10 @@ fn main() {
);
}
});
tauri_runtime_blitz::control_protocol::DebugResponse::Ack
blitz_control_protocol::DebugResponse::Ack
}
_ => tauri_runtime_blitz::control_protocol::DebugResponse::Error(
tauri_runtime_blitz::control_protocol::DebugError {
_ => blitz_control_protocol::DebugResponse::Error(
blitz_control_protocol::DebugError {
code: "unsupportedEmbedderAction".into(),
message: "AgencyZero delegates only relaunch to its restart Angel"
.into(),
Expand Down
Loading