diff --git a/codex-rs/core/src/session/handlers.rs b/codex-rs/core/src/session/handlers.rs index d3a17732f7..857dfbe7ac 100644 --- a/codex-rs/core/src/session/handlers.rs +++ b/codex-rs/core/src/session/handlers.rs @@ -34,6 +34,8 @@ use codex_protocol::protocol::GuardianAssessmentStatus; use codex_protocol::protocol::InterAgentCommunication; use codex_protocol::protocol::McpServerRefreshConfig; use codex_protocol::protocol::McpServerUpdateConfig; +use codex_protocol::protocol::McpStartupCompleteEvent; +use codex_protocol::protocol::McpStartupFailure; use codex_protocol::protocol::Op; use codex_protocol::protocol::RealtimeConversationListVoicesResponseEvent; use codex_protocol::protocol::RealtimeVoicesList; @@ -443,8 +445,23 @@ pub async fn refresh_mcp_server( update: McpServerUpdateConfig, submit_id: String, ) { - if let Err(error) = sess.refresh_mcp_server_now(update, submit_id).await { + let server_name = update.server_name.clone(); + if let Err(error) = sess + .refresh_mcp_server_now(update, submit_id.clone()) + .await + { warn!(error = %error, "failed to refresh MCP server"); + sess.send_event_raw(Event { + id: submit_id, + msg: EventMsg::McpStartupComplete(McpStartupCompleteEvent { + failed: vec![McpStartupFailure { + server: server_name, + error: error.to_string(), + }], + ..Default::default() + }), + }) + .await; } }