summaryrefslogtreecommitdiff
path: root/src/cli.rs
diff options
context:
space:
mode:
authorakbash <akbash@herdr.dev>2026-07-15 23:43:21 +0300
committerGitHub <noreply@github.com>2026-07-15 23:43:21 +0300
commit600753b47b75898c311ecfb625bd1887031b3475 (patch)
treef4e63d16c62d3efdf7d5a554a54398bc4f66f4d4 /src/cli.rs
parent7767f3ed6453ae573d7414d31cfe982f99a73782 (diff)
fix: guard cli requests against protocol mismatches (#1453)
refs #1435 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: Can Celik <ogulcancelik@gmail.com>
Diffstat (limited to 'src/cli.rs')
-rw-r--r--src/cli.rs37
1 files changed, 36 insertions, 1 deletions
diff --git a/src/cli.rs b/src/cli.rs
index 1ce262b4..e59be830 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -17,6 +17,7 @@ mod integration;
mod notification;
mod pane;
mod plugin;
+mod protocol_guard;
mod runtime;
mod server;
mod spec;
@@ -937,7 +938,9 @@ pub(super) fn wait_for_agent_change(
timeout_message: &str,
) -> std::io::Result<i32> {
let read_timeout = timeout_ms.map(Duration::from_millis);
- let (ack, mut stream) = ApiClient::local()
+ let client = ApiClient::local();
+ ensure_server_protocol_compatible(&client, &request.id)?;
+ let (ack, mut stream) = client
.subscribe_value(&request, read_timeout)
.map_err(api_client_error_to_io)?;
if let Err(err) = crate::api::client::parse_response_value(ack) {
@@ -990,11 +993,43 @@ pub(super) fn send_ok_request(method: Method) -> std::io::Result<i32> {
}
pub(super) fn send_request(request: &Request) -> std::io::Result<serde_json::Value> {
+ let client = ApiClient::local();
+ ensure_server_protocol_compatible(&client, &request.id)?;
+ client
+ .request_value(request)
+ .map_err(api_client_error_to_io)
+}
+
+pub(super) fn send_request_unchecked(request: &Request) -> std::io::Result<serde_json::Value> {
ApiClient::local()
.request_value(request)
.map_err(api_client_error_to_io)
}
+fn ensure_server_protocol_compatible(client: &ApiClient, request_id: &str) -> std::io::Result<()> {
+ let status = client.status().map_err(api_client_error_to_io)?;
+ let server_protocol = status
+ .protocol
+ .ok_or_else(|| std::io::Error::other("server ping did not include a protocol version"))?;
+ let Some(response) = protocol_guard::mismatch_response(
+ request_id,
+ server_protocol,
+ &crate::session::active_restart_after_update_guidance(),
+ ) else {
+ return Ok(());
+ };
+
+ eprintln!(
+ "{}",
+ serde_json::to_string(&response).map_err(std::io::Error::other)?
+ );
+ Err(protocol_guard::reported_error())
+}
+
+pub(crate) fn protocol_mismatch_was_reported(err: &std::io::Error) -> bool {
+ protocol_guard::was_reported(err)
+}
+
fn api_timeout_error(err: &std::io::Error) -> bool {
matches!(
err.kind(),