aljaz/goose
1
0
Fork 0
mirror of https://github.com/aljazceru/goose.git synced 2026-02-15 11:34:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: convert GetPromptResult from mcp_core to rmcp version (#3650)

Browse Source
This commit is contained in:
Alex Hancock
2025-07-25 11:16:58 -04:00
committed by GitHub
parent 858d4062bc
commit 31a5f9cbbc
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/goose/src/agents/agent.rs
View File

@@ -43,10 +43,10 @@ use crate::recipe::{Author, Recipe, Response, Settings, SubRecipe};
use crate::scheduler_trait::SchedulerTrait;
use crate::tool_monitor::{ToolCall, ToolMonitor};
use crate::utils::is_token_cancelled;
use mcp_core::{protocol::GetPromptResult, ToolError, ToolResult};
use mcp_core::{ToolError, ToolResult};
use regex::Regex;
use rmcp::model::Tool;
use rmcp::model::{Content, JsonRpcMessage, Prompt};
use rmcp::model::{Content, GetPromptResult, JsonRpcMessage, Prompt};
use serde_json::Value;
use tokio::sync::{mpsc, Mutex, RwLock};
use tokio_util::sync::CancellationToken;

8
crates/goose/src/agents/extension_manager.rs
View File

@@ -2,7 +2,7 @@ use anyhow::Result;
use chrono::{DateTime, TimeZone, Utc};
use futures::stream::{FuturesUnordered, StreamExt};
use futures::{future, FutureExt};
use mcp_core::protocol::GetPromptResult;
use rmcp::model::GetPromptResult;
use std::collections::{HashMap, HashSet};
use std::sync::Arc;
use std::sync::LazyLock;
@@ -832,10 +832,10 @@ mod tests {
use mcp_client::client::Error;
use mcp_client::client::McpClientTrait;
use mcp_core::protocol::{
CallToolResult, GetPromptResult, InitializeResult, ListPromptsResult, ListResourcesResult,
ListToolsResult, ReadResourceResult,
CallToolResult, InitializeResult, ListPromptsResult, ListResourcesResult, ListToolsResult,
ReadResourceResult,
};
use rmcp::model::JsonRpcMessage;
use rmcp::model::{GetPromptResult, JsonRpcMessage};
use serde_json::json;
use tokio::sync::mpsc;

9
crates/mcp-client/src/client.rs
View File

@@ -1,11 +1,10 @@
use mcp_core::protocol::{
CallToolResult, GetPromptResult, Implementation, InitializeResult, ListPromptsResult,
ListResourcesResult, ListToolsResult, ReadResourceResult, ServerCapabilities, METHOD_NOT_FOUND,
CallToolResult, Implementation, InitializeResult, ListPromptsResult, ListResourcesResult,
ListToolsResult, ReadResourceResult, ServerCapabilities, METHOD_NOT_FOUND,
};
use rmcp::model::{
JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse,
JsonRpcVersion2_0, Notification, NumberOrString, Request, RequestId,
GetPromptResult, JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest,
JsonRpcResponse, JsonRpcVersion2_0, Notification, NumberOrString, Request, RequestId,
};
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};

10
crates/mcp-server/src/router.rs
View File

@@ -8,14 +8,14 @@ type PromptFuture = Pin<Box<dyn Future<Output = Result<String, PromptError>> + S
use mcp_core::{
handler::{PromptError, ResourceError, ToolError},
protocol::{
CallToolResult, GetPromptResult, Implementation, InitializeResult, ListPromptsResult,
ListResourcesResult, ListToolsResult, PromptsCapability, ReadResourceResult,
ResourcesCapability, ServerCapabilities, ToolsCapability,
CallToolResult, Implementation, InitializeResult, ListPromptsResult, ListResourcesResult,
ListToolsResult, PromptsCapability, ReadResourceResult, ResourcesCapability,
ServerCapabilities, ToolsCapability,
},
};
use rmcp::model::{
Content, JsonRpcMessage, JsonRpcRequest, JsonRpcResponse, JsonRpcVersion2_0, Prompt,
PromptMessage, PromptMessageRole, RequestId, Resource, ResourceContents,
Content, GetPromptResult, JsonRpcMessage, JsonRpcRequest, JsonRpcResponse, JsonRpcVersion2_0,
Prompt, PromptMessage, PromptMessageRole, RequestId, Resource, ResourceContents,
};
use serde_json::Value;
use tokio::sync::mpsc;