fix: make pane run submit commands atomically

1 files changed, 67 insertions, 1 deletions

diff --git a/tests/cli_wrapper.rs b/tests/cli_wrapper.rs
index dc091e80..97d309a4 100644
--- a/tests/cli_wrapper.rs
+++ b/tests/cli_wrapper.rs
@@ -2,7 +2,7 @@
 
 use std::fs;
 use std::io::{BufRead, BufReader, Write};
-use std::os::unix::net::UnixStream;
+use std::os::unix::net::{UnixListener, UnixStream};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::thread;
@@ -126,6 +126,72 @@ fn send_request(socket_path: &Path, json: &str) -> serde_json::Value {
 }
 
 #[test]
+fn pane_run_sends_one_send_text_request_with_trailing_carriage_return() {
+    let base = unique_test_dir();
+    fs::create_dir_all(&base).unwrap();
+    let socket_path = base.join("herdr.sock");
+    let listener = UnixListener::bind(&socket_path).unwrap();
+
+    let server = thread::spawn(move || {
+        let (mut first_stream, _) = listener.accept().unwrap();
+        let mut first_line = String::new();
+        let mut first_reader = BufReader::new(first_stream.try_clone().unwrap());
+        first_reader.read_line(&mut first_line).unwrap();
+        first_stream
+            .write_all(br#"{"id":"cli:request","result":{"type":"ok"}}"#)
+            .unwrap();
+        first_stream.write_all(b"\n").unwrap();
+        first_stream.flush().unwrap();
+
+        let mut second_line = None;
+        listener.set_nonblocking(true).unwrap();
+        let deadline = Instant::now() + Duration::from_millis(250);
+        while Instant::now() < deadline {
+            match listener.accept() {
+                Ok((mut second_stream, _)) => {
+                    let mut line = String::new();
+                    let mut reader = BufReader::new(second_stream.try_clone().unwrap());
+                    reader.read_line(&mut line).unwrap();
+                    second_stream
+                        .write_all(br#"{"id":"cli:request","result":{"type":"ok"}}"#)
+                        .unwrap();
+                    second_stream.write_all(b"\n").unwrap();
+                    second_stream.flush().unwrap();
+                    second_line = Some(line);
+                    break;
+                }
+                Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => {
+                    thread::sleep(Duration::from_millis(10));
+                }
+                Err(err) => panic!("second accept failed: {err}"),
+            }
+        }
+
+        (first_line, second_line)
+    });
+
+    let run = run_cli(&socket_path, &["pane", "run", "1-1", "echo hello"]);
+    assert!(
+        run.status.success(),
+        "stderr: {}",
+        String::from_utf8_lossy(&run.stderr)
+    );
+
+    let (first_line, second_line) = server.join().unwrap();
+    let first_request: serde_json::Value = serde_json::from_str(&first_line).unwrap();
+    assert_eq!(first_request["method"], "pane.send_text");
+    assert_eq!(first_request["params"]["pane_id"], "1-1");
+    assert_eq!(first_request["params"]["text"], "echo hello\r");
+    assert!(
+        second_line.is_none(),
+        "pane run sent an unexpected second request: {:?}",
+        second_line
+    );
+
+    fs::remove_dir_all(base).unwrap();
+}
+
+#[test]
 fn workspace_and_pane_management_commands_work() {
     let base = unique_test_dir();
     let config_home = base.join("config");