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::{
-use rmcp::model::ResourceContents;
+    Annotations, Content, EmbeddedResource, ImageContent, ResourceContents, Role, TextContent,
-use rmcp::model::{Annotations, Content, EmbeddedResource, ImageContent, 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,
+        ToolSchema,
-        ToolAnnotations,
+        ToolAnnotationsSchema,
         ToolInfo,
         PermissionLevel,
         PrincipalType,

ui/desktop/openapi.json

@@ -2881,11 +2881,9 @@
       },
       "Tool": {
         "type": "object",
-        "description": "A tool that can be used by a model.",
         "required": [
-          "name",
+          "inputSchema",
-          "description",
+          "name"
-          "inputSchema"
         ],
         "properties": {
           "annotations": {
@@ -2893,46 +2891,37 @@
               {
                 "$ref": "#/components/schemas/ToolAnnotations"
               }
-            ],
+            ]
-            "nullable": true
           },
           "description": {
-            "type": "string",
+            "type": "string"
-            "description": "A description of what the tool does"
           },
           "inputSchema": {
-            "description": "A JSON Schema object defining the expected parameters for the tool"
+            "type": "object",
+            "additionalProperties": true
           },
           "name": {
-            "type": "string",
+            "type": "string"
-            "description": "The name of the tool"
           }
         }
       },
       "ToolAnnotations": {
         "type": "object",
-        "description": "Additional properties describing a tool to clients.\n\nNOTE: all properties in ToolAnnotations are **hints**.\nThey are not guaranteed to provide a faithful description of\ntool behavior (including descriptive properties like `title`).\n\nClients should never make tool use decisions based on ToolAnnotations\nreceived from untrusted servers.",
         "properties": {
           "destructiveHint": {
-            "type": "boolean",
+            "type": "boolean"
-            "description": "If true, the tool may perform destructive updates to its environment.\nIf false, the tool performs only additive updates.\n\n(This property is meaningful only when `read_only_hint == false`)\n\nDefault: true"
           },
           "idempotentHint": {
-            "type": "boolean",
+            "type": "boolean"
-            "description": "If true, calling the tool repeatedly with the same arguments\nwill have no additional effect on its environment.\n\n(This property is meaningful only when `read_only_hint == false`)\n\nDefault: false"
           },
           "openWorldHint": {
-            "type": "boolean",
+            "type": "boolean"
-            "description": "If true, this tool may interact with an \"open world\" of external\nentities. If false, the tool's domain of interaction is closed.\nFor example, the world of a web search tool is open, whereas that\nof a memory tool is not.\n\nDefault: true"
           },
           "readOnlyHint": {
-            "type": "boolean",
+            "type": "boolean"
-            "description": "If true, the tool does not modify its environment.\n\nDefault: false"
           },
           "title": {
-            "type": "string",
+            "type": "string"
-            "description": "A human-readable title for the tool.",
-            "nullable": true
           }
         }
       },

ui/desktop/src/api/types.gen.ts

@@ -666,73 +666,21 @@ export type ThinkingContent = {
     thinking: string;
 };
 
-/**
- * A tool that can be used by a model.
- */
 export type Tool = {
-    annotations?: ToolAnnotations | null;
+    annotations?: ToolAnnotations;
-    /**
+    description?: string;
-     * A description of what the tool does
+    inputSchema: {
-     */
+        [key: string]: unknown;
-    description: string;
+    };
-    /**
-     * A JSON Schema object defining the expected parameters for the tool
-     */
-    inputSchema: unknown;
-    /**
-     * The name of the tool
-     */
     name: string;
 };
 
-/**
- * Additional properties describing a tool to clients.
- *
- * NOTE: all properties in ToolAnnotations are **hints**.
- * They are not guaranteed to provide a faithful description of
- * tool behavior (including descriptive properties like `title`).
- *
- * Clients should never make tool use decisions based on ToolAnnotations
- * received from untrusted servers.
- */
 export type ToolAnnotations = {
-    /**
-     * If true, the tool may perform destructive updates to its environment.
-     * If false, the tool performs only additive updates.
-     *
-     * (This property is meaningful only when `read_only_hint == false`)
-     *
-     * Default: true
-     */
     destructiveHint?: boolean;
-    /**
-     * If true, calling the tool repeatedly with the same arguments
-     * will have no additional effect on its environment.
-     *
-     * (This property is meaningful only when `read_only_hint == false`)
-     *
-     * Default: false
-     */
     idempotentHint?: boolean;
-    /**
-     * If true, this tool may interact with an "open world" of external
-     * entities. If false, the tool's domain of interaction is closed.
-     * For example, the world of a web search tool is open, whereas that
-     * of a memory tool is not.
-     *
-     * Default: true
-     */
     openWorldHint?: boolean;
-    /**
-     * If true, the tool does not modify its environment.
-     *
-     * Default: false
-     */
     readOnlyHint?: boolean;
-    /**
+    title?: string;
-     * A human-readable title for the tool.
-     */
-    title?: string | null;
 };
 
 export type ToolConfirmationRequest = {