Replace mcp_core::content types with rmcp::model types (#3500)

crates/goose/src/providers/claude_code.rs

@@ -10,7 +10,6 @@ use super::errors::ProviderError;
 use super::utils::emit_debug_trace;
 use crate::message::{Message, MessageContent};
 use crate::model::ModelConfig;
-use mcp_core::content::TextContent;
 use mcp_core::tool::Tool;
 use rmcp::model::Role;
 
@@ -98,7 +97,7 @@ impl ClaudeCodeProvider {
                             // Convert tool result contents to text
                             let content_text = tool_contents
                                 .iter()
-                                .filter_map(|content| content.as_text())
+                                .filter_map(|content| content.as_text().map(|t| t.text.clone()))
                                 .collect::<Vec<_>>()
                                 .join("\n");
 
@@ -214,10 +213,7 @@ impl ClaudeCodeProvider {
             ));
         }
 
-        let message_content = vec![MessageContent::Text(TextContent {
-            text: combined_text,
-            annotations: None,
-        })];
+        let message_content = vec![MessageContent::text(combined_text)];
 
         let response_message = Message::new(
             Role::Assistant,
@@ -356,10 +352,7 @@ impl ClaudeCodeProvider {
         let message = Message::new(
             rmcp::model::Role::Assistant,
             chrono::Utc::now().timestamp(),
-            vec![MessageContent::Text(mcp_core::content::TextContent {
-                text: description.clone(),
-                annotations: None,
-            })],
+            vec![MessageContent::text(description.clone())],
         );
 
         let usage = Usage::default();