Remove mcp_macros and unused types

crates/goose-server/src/openapi.rs

@@ -11,7 +11,6 @@ use goose::permission::permission_confirmation::PrincipalType;
 use goose::providers::base::{ConfigKey, ModelInfo, ProviderMetadata};
 use goose::session::info::SessionInfo;
 use goose::session::SessionMetadata;
-use mcp_core::handler::ToolResultSchema;
 use mcp_core::tool::{Tool, ToolAnnotations};
 use rmcp::model::ResourceContents;
 use rmcp::model::{Annotations, Content, EmbeddedResource, ImageContent, Role, TextContent};
@@ -348,7 +347,6 @@ derive_utoipa!(ResourceContents as ResourceContentsSchema);
         TextContentSchema,
         ToolResponse,
         ToolRequest,
-        ToolResultSchema,
         ToolConfirmationRequest,
         ThinkingContent,
         RedactedThinkingContent,

crates/mcp-core/src/handler.rs

@@ -1,11 +1,7 @@
-use async_trait::async_trait;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 #[allow(unused_imports)] // this is used in schema below
 use serde_json::json;
-use serde_json::Value;
 use thiserror::Error;
-use utoipa::ToSchema;
 
 #[non_exhaustive]
 #[derive(Error, Debug, Clone, Deserialize, Serialize, PartialEq)]
@@ -22,18 +18,6 @@ pub enum ToolError {
 
 pub type ToolResult<T> = std::result::Result<T, ToolError>;
 
-// Define schema manually without generics issues
-#[derive(ToSchema)]
-#[schema(example = json!({"success": true, "data": {}}))]
-pub struct ToolResultSchema {
-    #[schema(example = "Operation completed successfully")]
-    pub message: Option<String>,
-    #[schema(example = true)]
-    pub success: bool,
-    #[schema(value_type = Object)]
-    pub data: Option<serde_json::Value>,
-}
-
 #[derive(Error, Debug)]
 pub enum ResourceError {
     #[error("Execution failed: {0}")]
@@ -51,38 +35,3 @@ pub enum PromptError {
     #[error("Prompt not found: {0}")]
     NotFound(String),
 }
-
-/// Trait for implementing MCP tools
-#[async_trait]
-pub trait ToolHandler: Send + Sync + 'static {
-    /// The name of the tool
-    fn name(&self) -> &'static str;
-
-    /// A description of what the tool does
-    fn description(&self) -> &'static str;
-
-    /// JSON schema describing the tool's parameters
-    fn schema(&self) -> Value;
-
-    /// Execute the tool with the given parameters
-    async fn call(&self, params: Value) -> ToolResult<Value>;
-}
-
-/// Trait for implementing MCP resources
-#[async_trait]
-pub trait ResourceTemplateHandler: Send + Sync + 'static {
-    /// The URL template for this resource
-    fn template() -> &'static str;
-
-    /// JSON schema describing the resource parameters
-    fn schema() -> Value;
-
-    /// Get the resource value
-    async fn get(&self, params: Value) -> ToolResult<String>;
-}
-
-/// Helper function to generate JSON schema for a type
-pub fn generate_schema<T: JsonSchema>() -> ToolResult<Value> {
-    let schema = schemars::schema_for!(T);
-    serde_json::to_value(schema).map_err(|e| ToolError::SchemaError(e.to_string()))
-}

crates/mcp-server/Cargo.toml

@@ -10,7 +10,6 @@ workspace = true
 anyhow = "1.0.94"
 thiserror = "1.0"
 mcp-core = { path = "../mcp-core" }
-mcp-macros = { path = "../mcp-macros" }
 rmcp = { workspace = true }
 serde = { version = "1.0.216", features = ["derive"] }
 serde_json = "1.0.133"