Logs for failing test

Author: gpeal

codex-rs/core/src/mcp_connection_manager.rs

@@ -107,6 +107,9 @@ impl McpClientAdapter {
         params: mcp_types::InitializeRequestParams,
         startup_timeout: Duration,
     ) -> Result<Self> {
+        tracing::error!(
+            "new_stdio_client use_rmcp_client: {use_rmcp_client} program: {program:?} args: {args:?} env: {env:?} params: {params:?} startup_timeout: {startup_timeout:?}"
+        );
         if use_rmcp_client {
             let client = Arc::new(RmcpClient::new_stdio_client(program, args, env).await?);
             client.initialize(params, Some(startup_timeout)).await?;
@@ -173,6 +176,8 @@ impl McpConnectionManager {
             return Ok((Self::default(), ClientStartErrors::default()));
         }
 
+        tracing::error!("new mcp_servers: {mcp_servers:?} use_rmcp_client: {use_rmcp_client}");
+
         // Launch all configured servers concurrently.
         let mut join_set = JoinSet::new();
         let mut errors = ClientStartErrors::new();

codex-rs/core/tests/suite/rmcp_client.rs

@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::time::Duration;
 
 use assert_cmd::cargo::cargo_bin;
 use codex_core::protocol::AskForApproval;
@@ -12,6 +13,7 @@ use core_test_support::responses::mount_sse_once;
 use core_test_support::skip_if_no_network;
 use core_test_support::test_codex::test_codex;
 use core_test_support::wait_for_event;
+use core_test_support::wait_for_event_with_timeout;
 use serde_json::Value;
 use wiremock::matchers::any;
 
@@ -63,7 +65,7 @@ async fn rmcp_tool_call_round_trip() -> anyhow::Result<()> {
                         "MCP_TEST_VALUE".to_string(),
                         expected_env_value.to_string(),
                     )])),
-                    startup_timeout_sec: None,
+                    startup_timeout_sec: Some(Duration::from_secs(10)),
                     tool_timeout_sec: None,
                 },
             );
@@ -88,13 +90,18 @@ async fn rmcp_tool_call_round_trip() -> anyhow::Result<()> {
         })
         .await?;
 
-    eprintln!("waiting for begin event");
-    let begin_event = wait_for_event(&fixture.codex, |ev| {
-        matches!(ev, EventMsg::McpToolCallBegin(_))
-    })
+    eprintln!("waiting for mcp tool call begin event");
+    let begin_event = wait_for_event_with_timeout(
+        &fixture.codex,
+        |ev| {
+            eprintln!("ev: {ev:?}");
+            matches!(ev, EventMsg::McpToolCallBegin(_))
+        },
+        Duration::from_secs(10),
+    )
     .await;
 
-    eprintln!("begin_event: {begin_event:?}");
+    eprintln!("mcp tool call begin event: {begin_event:?}");
     let EventMsg::McpToolCallBegin(begin) = begin_event else {
         unreachable!("event guard guarantees McpToolCallBegin");
     };

codex-rs/rmcp-client/src/bin/rmcp_test_server.rs

@@ -109,7 +109,7 @@ impl ServerHandler for TestToolServer {
 
                 let env_snapshot: HashMap<String, String> = std::env::vars().collect();
                 let structured_content = json!({
-                    "echo": args.message,
+                    "echo": format!("TEST_ECHO: {}", args.message),
                     "env": env_snapshot.get("MCP_TEST_VALUE"),
                 });
 
@@ -130,6 +130,7 @@ impl ServerHandler for TestToolServer {
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    eprintln!("starting rmcp test server");
     // Run the server with STDIO transport. If the client disconnects we simply
     // bubble up the error so the process exits.
     let service = TestToolServer::new();