diff --git a/crates/mcp/src/tests.rs b/crates/mcp/src/tests.rs index 14383f021..3b1b71f06 100644 --- a/crates/mcp/src/tests.rs +++ b/crates/mcp/src/tests.rs @@ -708,3 +708,29 @@ fn a_window_argument_routes_tools_to_that_window() { ok(&mut s, "list_windows", json!({})).as_array().unwrap().iter().map(|r| r["title"].as_str().unwrap().to_string()).collect(); assert_eq!(titles, ["Book1:1", "Book2", "Book1:2"]); } + +#[test] +fn stdio_cancel_and_batch_transcript() { + let input = concat!( + "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"initialize\",\"params\":{\"protocolVersion\":\"2025-06-18\"}}\n", + "{\"jsonrpc\":\"2.0\",\"method\":\"notifications/initialized\"}\n", + "{\"jsonrpc\":\"2.0\",\"method\":\"notifications/cancelled\",\"params\":{\"requestId\":1,\"reason\":\"client\"}}\n", + "[]\n", + "[{\"jsonrpc\":\"2.0\",\"method\":\"notifications/cancelled\",\"params\":{\"requestId\":9}}]\n", + "[{\"jsonrpc\":\"2.0\",\"id\":2,\"method\":\"ping\"},{\"jsonrpc\":\"2.0\",\"method\":\"notifications/progress\"}]\n", + "{\"jsonrpc\":\"2.0\",\"id\":3,\"method\":\"ping\",\"params\":{}}\n" + ); + let mut s = server(); + let mut out = Vec::new(); + s.serve(input.as_bytes(), &mut out).unwrap(); + assert!(s.is_initialized()); + + let replies: Vec = std::str::from_utf8(&out).unwrap().lines().map(|l| serde_json::from_str(l).unwrap()).collect(); + assert_eq!(replies.len(), 4, "{replies:?}"); + assert_eq!(replies[0]["id"], 1); + assert_eq!(replies[0]["result"]["serverInfo"]["name"], "gridcraft"); + assert_eq!(replies[1]["id"], Value::Null); + assert_eq!(replies[1]["error"]["code"], -32600); + assert_eq!(replies[2], json!([{"jsonrpc": "2.0", "id": 2, "result": {}}])); + assert_eq!(replies[3], json!({"jsonrpc": "2.0", "id": 3, "result": {}})); +}