feat: refine live config lifecycle

5 files changed, 55 insertions, 55 deletions

diff --git a/tests/client_mode.rs b/tests/client_mode.rs
index 3ee16aea..958b48a3 100644
--- a/tests/client_mode.rs
+++ b/tests/client_mode.rs
@@ -246,8 +246,8 @@ fn client_connects_and_receives_frame() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1, "server should report protocol version 1");
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2, "server should report protocol version 2");
     assert!(
         error.is_none(),
         "handshake should not have error: {:?}",
@@ -326,8 +326,8 @@ fn client_sees_headless_startup_config_diagnostic() {
 
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     stream
@@ -375,8 +375,8 @@ fn client_input_forwarded_to_pane() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Send an Input message containing "echo hello\n".
@@ -429,8 +429,8 @@ fn client_resize_sends_message() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain the initial frame(s).
@@ -486,8 +486,8 @@ fn server_shutdown_sends_message_to_client() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Send SIGINT so the server takes the graceful shutdown path and
@@ -713,8 +713,8 @@ fn client_receives_frame_after_pane_output() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Read the initial frame (server renders immediately on client connect).
@@ -767,8 +767,8 @@ fn navigate_mode_keybind_dispatch_in_server() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frames.
@@ -885,8 +885,8 @@ fn graceful_shutdown_sends_server_shutdown_to_client() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frame(s).
@@ -983,8 +983,8 @@ fn client_receives_notify_on_agent_state_change() {
     // Connect as a client and perform handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frame(s).
diff --git a/tests/cross_area.rs b/tests/cross_area.rs
index 5758fdd2..df2dced1 100644
--- a/tests/cross_area.rs
+++ b/tests/cross_area.rs
@@ -665,7 +665,7 @@ fn cross_area_detach_and_reattach_preserves_state() {
 
     // Local attach (client A).
     let mut client_a = UnixStream::connect(&client_socket).expect("client A should connect");
-    client_handshake(&mut client_a, 1, 100, 30);
+    client_handshake(&mut client_a, 2, 100, 30);
     assert!(wait_for_frame(&mut client_a, Duration::from_secs(2)));
 
     // Use herdr: create a workspace and write output into its pane.
@@ -702,7 +702,7 @@ fn cross_area_detach_and_reattach_preserves_state() {
 
     // Reattach from another terminal/session (client B).
     let mut client_b = UnixStream::connect(&client_socket).expect("client B should connect");
-    client_handshake(&mut client_b, 1, 80, 24);
+    client_handshake(&mut client_b, 2, 80, 24);
     assert!(
         wait_for_frame(&mut client_b, Duration::from_secs(5)),
         "reattached client should receive frame"
@@ -758,7 +758,7 @@ fn cross_area_agent_process_survives_detach_and_reattach() {
     wait_for_socket(&client_socket, Duration::from_secs(10));
 
     let mut client_a = UnixStream::connect(&client_socket).expect("client A should connect");
-    client_handshake(&mut client_a, 1, 100, 30);
+    client_handshake(&mut client_a, 2, 100, 30);
     assert!(wait_for_frame(&mut client_a, Duration::from_secs(2)));
 
     let created = workspace_create(&api_socket, "agent-persist");
@@ -811,7 +811,7 @@ fn cross_area_agent_process_survives_detach_and_reattach() {
 
     // Reattach and ensure client-side state reflects the persisted working status.
     let mut client_b = UnixStream::connect(&client_socket).expect("client B should connect");
-    client_handshake(&mut client_b, 1, 80, 24);
+    client_handshake(&mut client_b, 2, 80, 24);
     let saw_working_on_client =
         wait_for_frame_matching(&mut client_b, Duration::from_secs(5), |frame| {
             frame_contains_text(frame, "working")
@@ -856,7 +856,7 @@ fn cross_area_client_and_api_workspace_views_are_consistent() {
     wait_for_socket(&client_socket, Duration::from_secs(10));
 
     let mut client = UnixStream::connect(&client_socket).expect("client should connect");
-    client_handshake(&mut client, 1, 100, 30);
+    client_handshake(&mut client, 2, 100, 30);
     assert!(wait_for_frame(&mut client, Duration::from_secs(2)));
     drain_server_messages(&mut client, Duration::from_millis(300));
 
@@ -919,9 +919,9 @@ fn cross_area_two_clients_shared_view_and_single_detach_stability() {
     wait_for_socket(&client_socket, Duration::from_secs(10));
 
     let mut client_a = UnixStream::connect(&client_socket).expect("client A should connect");
-    client_handshake(&mut client_a, 1, 110, 30);
+    client_handshake(&mut client_a, 2, 110, 30);
     let mut client_b = UnixStream::connect(&client_socket).expect("client B should connect");
-    client_handshake(&mut client_b, 1, 100, 30);
+    client_handshake(&mut client_b, 2, 100, 30);
 
     assert!(wait_for_frame(&mut client_a, Duration::from_secs(2)));
     assert!(wait_for_frame(&mut client_b, Duration::from_secs(2)));
@@ -1087,7 +1087,7 @@ fn cross_area_server_kill_then_restart_and_reconnect() {
 
     let mut reconnect_client =
         UnixStream::connect(&client_socket).expect("new client should connect after restart");
-    client_handshake(&mut reconnect_client, 1, 80, 24);
+    client_handshake(&mut reconnect_client, 2, 80, 24);
     assert!(
         wait_for_frame(&mut reconnect_client, Duration::from_secs(5)),
         "new client should receive frame after restart"
diff --git a/tests/detach_reattach.rs b/tests/detach_reattach.rs
index 9eda9e36..8c772db5 100644
--- a/tests/detach_reattach.rs
+++ b/tests/detach_reattach.rs
@@ -216,8 +216,8 @@ fn navigate_q_detaches_client_and_server_persists() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frames.
@@ -278,8 +278,8 @@ fn explicit_detach_message_causes_clean_disconnect() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frames.
@@ -337,8 +337,8 @@ fn reattach_after_detach_shows_current_state() {
     // --- Client A ---
     let mut stream_a = UnixStream::connect(&client_socket).expect("client A should connect");
     let (version, error) =
-        client_handshake(&mut stream_a, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream_a, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frames.
@@ -376,8 +376,8 @@ fn reattach_after_detach_shows_current_state() {
     // --- Client B (reattach) ---
     let mut stream_b = UnixStream::connect(&client_socket).expect("client B should connect");
     let (version, error) =
-        client_handshake(&mut stream_b, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream_b, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(
         error.is_none(),
         "reattach handshake should succeed: {:?}",
@@ -456,8 +456,8 @@ fn processes_survive_during_and_after_detach() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frames.
@@ -495,8 +495,8 @@ fn processes_survive_during_and_after_detach() {
     // Reattach — verify we can connect and receive a frame.
     let mut stream_b = UnixStream::connect(&client_socket).expect("should reattach");
     let (version, error) =
-        client_handshake(&mut stream_b, 1, 80, 24).expect("reattach handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream_b, 2, 80, 24).expect("reattach handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Verify the reattached client receives a frame.
@@ -544,8 +544,8 @@ fn server_persists_after_client_connection_drop() {
     // Connect and handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect");
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Drain initial frames.
@@ -571,8 +571,8 @@ fn server_persists_after_client_connection_drop() {
     // Reattach — verify we can connect and handshake again.
     let mut stream_b = UnixStream::connect(&client_socket).expect("should reattach");
     let (version, error) =
-        client_handshake(&mut stream_b, 1, 80, 24).expect("reattach handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream_b, 2, 80, 24).expect("reattach handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "reattach should succeed: {:?}", error);
 
     cleanup_spawned_herdr(spawned, base);
@@ -604,8 +604,8 @@ fn output_accumulated_while_detached_visible_on_reattach() {
     // Connect and handshake client A.
     let mut stream_a = UnixStream::connect(&client_socket).expect("client A should connect");
     let (version, error) =
-        client_handshake(&mut stream_a, 1, 80, 24).expect("handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream_a, 2, 80, 24).expect("handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Detach client A immediately.
@@ -662,8 +662,8 @@ fn output_accumulated_while_detached_visible_on_reattach() {
     // --- Client B (reattach) ---
     let mut stream_b = UnixStream::connect(&client_socket).expect("client B should connect");
     let (version, error) =
-        client_handshake(&mut stream_b, 1, 80, 24).expect("reattach handshake should succeed");
-    assert_eq!(version, 1);
+        client_handshake(&mut stream_b, 2, 80, 24).expect("reattach handshake should succeed");
+    assert_eq!(version, 2);
     assert!(error.is_none(), "{:?}", error);
 
     // Client B should receive a frame with the current state.
diff --git a/tests/multi_client.rs b/tests/multi_client.rs
index 46eca891..062a0f60 100644
--- a/tests/multi_client.rs
+++ b/tests/multi_client.rs
@@ -542,7 +542,7 @@ fn client_handshake(
 
 fn connect_raw_client(client_socket: &Path, cols: u16, rows: u16) -> UnixStream {
     let mut stream = UnixStream::connect(client_socket).expect("should connect to client socket");
-    client_handshake(&mut stream, 1, cols, rows).expect("handshake should succeed");
+    client_handshake(&mut stream, 2, cols, rows).expect("handshake should succeed");
     stream
 }
 
diff --git a/tests/server_headless.rs b/tests/server_headless.rs
index 98ca0b08..19b78e95 100644
--- a/tests/server_headless.rs
+++ b/tests/server_headless.rs
@@ -576,11 +576,11 @@ fn client_handshake_succeeds() {
     // Connect to the client socket and perform a handshake.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
 
-    // Send Hello with version 1, 80 cols, 24 rows.
+    // Send Hello with version 2, 80 cols, 24 rows.
     let (version, error) =
-        client_handshake(&mut stream, 1, 80, 24).expect("handshake should succeed");
+        client_handshake(&mut stream, 2, 80, 24).expect("handshake should succeed");
 
-    assert_eq!(version, 1, "server should report protocol version 1");
+    assert_eq!(version, 2, "server should report protocol version 2");
     assert!(
         error.is_none(),
         "handshake should not have an error: {:?}",
@@ -609,7 +609,7 @@ fn client_handshake_rejects_incompatible_version() {
     let (version, error) = client_handshake(&mut stream, 0, 80, 24)
         .expect("should read Welcome response even on rejection");
 
-    assert_eq!(version, 1, "server should report its version 1");
+    assert_eq!(version, 2, "server should report its version 2");
     assert!(
         error.is_some(),
         "version 0 should be rejected with an error"
@@ -634,10 +634,10 @@ fn client_handshake_clamps_small_terminal_size() {
     // Send Hello with 0x0 terminal size — should be clamped.
     let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
 
-    let (version, error) = client_handshake(&mut stream, 1, 0, 0)
+    let (version, error) = client_handshake(&mut stream, 2, 0, 0)
         .expect("handshake with 0x0 should succeed (server clamps)");
 
-    assert_eq!(version, 1);
+    assert_eq!(version, 2);
     assert!(
         error.is_none(),
         "0x0 size should be accepted (clamped): {:?}",
@@ -697,9 +697,9 @@ fn no_hello_client_closed_within_five_seconds() {
     // Verify the server is still healthy — a proper client can still connect.
     let mut good_stream =
         UnixStream::connect(&client_socket).expect("should connect after no-hello client");
-    let (version, error) = client_handshake(&mut good_stream, 1, 80, 24)
+    let (version, error) = client_handshake(&mut good_stream, 2, 80, 24)
         .expect("proper handshake should still work after no-hello client");
-    assert_eq!(version, 1);
+    assert_eq!(version, 2);
     assert!(error.is_none());
 
     // API should still work.