Chore: Update rmcp to version 0.5

rig-core/Cargo.toml

@@ -36,7 +36,7 @@ async-stream = { workspace = true }
 mime_guess = { workspace = true }
 base64 = { workspace = true }
 as-any = { workspace = true }
-rmcp = { version = "0.3", optional = true, features = ["client"] }
+rmcp = { version = "0.5", optional = true, features = ["client"] }
 url = { workspace = true }
 
 [dev-dependencies]
@@ -52,7 +52,7 @@ mcp-core-macros = { workspace = true }
 
 # Required for `rmcp` example
 hyper-util = { version = "0.1.14", features = ["service", "server"] }
-rmcp = { version = "0.3", features = [
+rmcp = { version = "0.5", features = [
     "client",
     "reqwest",                                  # required for some strange reason
     "transport-streamable-http-client",

rig-core/src/tool.rs

@@ -432,21 +432,21 @@ pub mod rmcp {
                     .await
                     .map_err(|e| McpToolError(format!("Tool returned an error: {e}")))?;
 
-                if result.is_error.unwrap_or(false) {
-                    if let Some(error) = result.content.first() {
-                        if let Some(raw) = error.as_text() {
-                            return Err(McpToolError(raw.text.clone()).into());
-                        } else {
-                            return Err(McpToolError("Unsuppported error type".to_string()).into());
-                        }
-                    } else {
-                        return Err(McpToolError("No error message returned".to_string()).into());
-                    }
+                if let Some(true) = result.is_error {
+                    let error_msg = result
+                        .content
+                        .as_deref()
+                        .and_then(|errors| errors.first())
+                        .and_then(|error| error.as_text())
+                        .map(|raw| raw.text.as_str())
+                        .unwrap_or("No error message returned");
+                    return Err(McpToolError(error_msg.to_string()).into());
                 };
 
                 Ok(result
                     .content
                     .into_iter()
+                    .flatten()
                     .map(|c| match c.raw {
                         rmcp::model::RawContent::Text(raw) => raw.text,
                         rmcp::model::RawContent::Image(raw) => {
@@ -480,8 +480,7 @@ pub mod rmcp {
                             unimplemented!("Support for audio results from an MCP tool is currently unimplemented. Come back later!")
                         }
                     })
-                    .collect::<Vec<_>>()
-                    .join(""))
+                    .collect::<String>())
             })
         }
     }