Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/goose/src/agents/agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions crates/goose/src/agents/extension_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
9 changes: 4 additions & 5 deletions crates/mcp-client/src/client.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
10 changes: 5 additions & 5 deletions crates/mcp-server/src/router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading