feat: Replace usage of mcp_core Tools/ToolAnnotations in openapi schema (#3649)

crates/goose-server/src/openapi.rs

@@ -11,9 +11,10 @@ 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::tool::{Tool, ToolAnnotations};
-use rmcp::model::ResourceContents;
-use rmcp::model::{Annotations, Content, EmbeddedResource, ImageContent, Role, TextContent};
+use rmcp::model::{
+    Annotations, Content, EmbeddedResource, ImageContent, ResourceContents, Role, TextContent,
+    Tool, ToolAnnotations,
+};
 use utoipa::{OpenApi, ToSchema};
 
 use rmcp::schemars::schema::{InstanceType, SchemaObject, SingleOrVec};
@@ -284,6 +285,8 @@ derive_utoipa!(Content as ContentSchema);
 derive_utoipa!(EmbeddedResource as EmbeddedResourceSchema);
 derive_utoipa!(ImageContent as ImageContentSchema);
 derive_utoipa!(TextContent as TextContentSchema);
+derive_utoipa!(Tool as ToolSchema);
+derive_utoipa!(ToolAnnotations as ToolAnnotationsSchema);
 derive_utoipa!(Annotations as AnnotationsSchema);
 derive_utoipa!(ResourceContents as ResourceContentsSchema);
 
@@ -361,8 +364,8 @@ derive_utoipa!(ResourceContents as ResourceContentsSchema);
         ExtensionConfig,
         ConfigKey,
         Envs,
-        Tool,
-        ToolAnnotations,
+        ToolSchema,
+        ToolAnnotationsSchema,
         ToolInfo,
         PermissionLevel,
         PrincipalType,