propagates appropriate messages

Author: dingfeli

crates/agent/src/agent/mcp/mod.rs

@@ -110,6 +110,7 @@ pub mod types;
 
 use std::collections::HashMap;
 use std::path::PathBuf;
+use std::time::Duration;
 
 use actor::{
     McpServerActor,
@@ -254,8 +255,11 @@ impl McpManagerHandle {
         }
     }
 
-    pub async fn recv(&mut self) -> Result<McpServerActorEvent, RecvError> {
-        self.mcp_main_loop_to_handle_server_event_rx.recv().await
+    pub async fn recv(&mut self) -> Result<McpServerEvent, RecvError> {
+        self.mcp_main_loop_to_handle_server_event_rx
+            .recv()
+            .await
+            .map(|evt| evt.into())
     }
 }
 
@@ -464,3 +468,49 @@ pub enum McpManagerError {
     #[error("{}", .0)]
     Custom(String),
 }
+
+/// MCP events relevant to agent operations.
+/// Provides abstraction over [McpServerActorEvent] to avoid leaking implementation details.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum McpServerEvent {
+    /// The MCP server has launched successfully
+    Initialized {
+        server_name: String,
+        /// Time taken to launch the server
+        serve_duration: Duration,
+        /// Time taken to list all tools.
+        ///
+        /// None if the server does not support tools, or there was an error fetching tools.
+        list_tools_duration: Option<Duration>,
+        /// Time taken to list all prompts
+        ///
+        /// None if the server does not support prompts, or there was an error fetching prompts.
+        list_prompts_duration: Option<Duration>,
+    },
+    /// The MCP server failed to initialize successfully
+    InitializeError { server_name: String, error: String },
+    /// An OAuth authentication request from the MCP server
+    OauthRequest { server_name: String, oauth_url: String },
+}
+
+impl From<McpServerActorEvent> for McpServerEvent {
+    fn from(value: McpServerActorEvent) -> Self {
+        match value {
+            McpServerActorEvent::Initialized {
+                server_name,
+                serve_duration,
+                list_tools_duration,
+                list_prompts_duration,
+            } => Self::Initialized {
+                server_name,
+                serve_duration,
+                list_tools_duration,
+                list_prompts_duration,
+            },
+            McpServerActorEvent::InitializeError { server_name, error } => Self::InitializeError { server_name, error },
+            McpServerActorEvent::OauthRequest { server_name, oauth_url } => {
+                Self::OauthRequest { server_name, oauth_url }
+            },
+        }
+    }
+}

crates/agent/src/agent/mod.rs

@@ -58,7 +58,7 @@ use agent_loop::{
 use chrono::Utc;
 use consts::MAX_RESOURCE_FILE_LENGTH;
 use futures::stream::FuturesUnordered;
-use mcp::actor::McpServerActorEvent;
+use mcp::McpServerEvent;
 use permissions::evaluate_tool_permission;
 use protocol::{
     AgentError,
@@ -494,7 +494,7 @@ impl Agent {
                 evt = self.mcp_manager_handle.recv() => {
                     match evt {
                         Ok(evt) => {
-                            self.handle_mcp_server_actor_events(evt).await;
+                            self.handle_mcp_events(evt).await;
                         },
                         Err(e) => {
                             error!(?e, "mcp manager handle closed");
@@ -1698,11 +1698,9 @@ impl Agent {
         Ok(())
     }
 
-    async fn handle_mcp_server_actor_events(&self, evt: McpServerActorEvent) {
+    async fn handle_mcp_events(&mut self, evt: McpServerEvent) {
         let converted_evt = AgentEvent::Mcp(evt);
-        if let Err(e) = self.agent_event_tx.send(converted_evt) {
-            error!(?e, "failed to emit agent event");
-        }
+        self.agent_event_buf.push(converted_evt);
     }
 }
 

crates/agent/src/agent/protocol.rs

@@ -17,9 +17,11 @@ use super::agent_loop::types::{
     ImageBlock,
     ToolUseBlock,
 };
-use super::mcp::McpManagerError;
-use super::mcp::actor::McpServerActorEvent;
 use super::mcp::types::Prompt;
+use super::mcp::{
+    McpManagerError,
+    McpServerEvent,
+};
 use super::task_executor::TaskExecutorEvent;
 use super::tools::{
     Tool,
@@ -76,7 +78,7 @@ pub enum AgentEvent {
     Internal(InternalEvent),
 
     /// Events from MCP (Model Context Protocol) servers
-    Mcp(McpServerActorEvent),
+    Mcp(McpServerEvent),
 }
 
 impl From<TaskExecutorEvent> for AgentEvent {