Replace mcp_core::prompt with rmcp::model types (#3561)

crates/goose/src/agents/agent.rs

@@ -48,8 +48,8 @@ use crate::agents::tool_router_index_manager::ToolRouterIndexManager;
 use crate::agents::tool_vectordb::generate_table_id;
 use crate::agents::types::SessionConfig;
 use crate::agents::types::{FrontendTool, ToolResultReceiver};
-use mcp_core::{prompt::Prompt, protocol::GetPromptResult, tool::Tool, ToolError, ToolResult};
-use rmcp::model::Content;
+use mcp_core::{protocol::GetPromptResult, tool::Tool, ToolError, ToolResult};
+use rmcp::model::{Content, Prompt};
 
 use super::final_output_tool::FinalOutputTool;
 use super::platform_tools;

crates/goose/src/agents/extension_manager.rs

@@ -19,8 +19,8 @@ use crate::config::{Config, ExtensionConfigManager};
 use crate::prompt_template;
 use mcp_client::client::{ClientCapabilities, ClientInfo, McpClient, McpClientTrait};
 use mcp_client::transport::{SseTransport, StdioTransport, StreamableHttpTransport, Transport};
-use mcp_core::{prompt::Prompt, Tool, ToolCall, ToolError};
-use rmcp::model::Content;
+use mcp_core::{Tool, ToolCall, ToolError};
+use rmcp::model::{Content, Prompt};
 use serde_json::Value;
 
 // By default, we set it to Jan 1, 2020 if the resource does not have a timestamp

crates/goose/src/providers/claude_code.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
 use async_trait::async_trait;
+use rmcp::model::Role;
 use serde_json::{json, Value};
 use std::path::PathBuf;
 use std::process::Stdio;
@@ -13,7 +14,6 @@ use crate::config::Config;
 use crate::message::{Message, MessageContent};
 use crate::model::ModelConfig;
 use mcp_core::tool::Tool;
-use mcp_core::Role;
 
 pub const CLAUDE_CODE_DEFAULT_MODEL: &str = "claude-3-5-sonnet-latest";
 pub const CLAUDE_CODE_KNOWN_MODELS: &[&str] = &["sonnet", "opus", "claude-3-5-sonnet-latest"];
@@ -412,7 +412,7 @@ impl ClaudeCodeProvider {
         // Extract the first user message text
         let description = messages
             .iter()
-            .find(|m| m.role == mcp_core::Role::User)
+            .find(|m| m.role == Role::User)
             .and_then(|m| {
                 m.content.iter().find_map(|c| match c {
                     MessageContent::Text(text_content) => Some(&text_content.text),
@@ -437,7 +437,7 @@ impl ClaudeCodeProvider {
 
         let message = Message {
             id: None,
-            role: mcp_core::Role::Assistant,
+            role: Role::Assistant,
             created: chrono::Utc::now().timestamp(),
             content: vec![MessageContent::text(description.clone())],
         };