refactor: separate server client boundaries

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/cli_wrapper.rs b/tests/cli_wrapper.rs
index efe730ec..93d0161f 100644
--- a/tests/cli_wrapper.rs
+++ b/tests/cli_wrapper.rs
@@ -1021,6 +1021,32 @@ fn status_commands_report_client_and_server_versions() {
         "stdout: {client_stdout}"
     );
 
+    let full_json = run_cli_json(&socket_path, &["status", "--json"]);
+    assert_eq!(full_json["client"]["version"], env!("CARGO_PKG_VERSION"));
+    assert_eq!(full_json["client"]["protocol"], 9);
+    assert_eq!(full_json["server"]["status"], "running");
+    assert_eq!(full_json["server"]["running"], true);
+    assert_eq!(full_json["server"]["compatible"], true);
+    assert_eq!(
+        full_json["server"]["socket"],
+        socket_path.display().to_string()
+    );
+    assert_eq!(full_json["server"]["restart_needed"], false);
+    assert_eq!(full_json["update"]["restart_needed"], false);
+
+    let server_json = run_cli_json(&socket_path, &["status", "server", "--json"]);
+    assert_eq!(server_json["status"], "running");
+    assert_eq!(server_json["version"], env!("CARGO_PKG_VERSION"));
+    assert_eq!(server_json["protocol"], 9);
+    assert_eq!(server_json["compatible"], true);
+
+    let client_json = run_cli_json(&socket_path, &["status", "client", "--json"]);
+    assert_eq!(client_json["version"], env!("CARGO_PKG_VERSION"));
+    assert_eq!(client_json["protocol"], 9);
+    assert!(client_json["binary"]
+        .as_str()
+        .is_some_and(|path| !path.is_empty()));
+
     cleanup_spawned_herdr(herdr, base);
 }
 
@@ -1042,6 +1068,16 @@ fn status_reports_not_running_when_server_socket_is_missing() {
         "stdout: {stdout}"
     );
 
+    let status_json = run_cli_json(&socket_path, &["status", "--json"]);
+    assert_eq!(status_json["server"]["status"], "not_running");
+    assert_eq!(status_json["server"]["running"], false);
+    assert_eq!(
+        status_json["server"]["socket"],
+        socket_path.display().to_string()
+    );
+    assert_eq!(status_json["server"]["restart_needed"], false);
+    assert_eq!(status_json["update"]["restart_needed"], false);
+
     cleanup_test_base(&base);
 }