chore: some type annotation

Author: pietrozullo

packages/mcp-use/src/server/mcp-server.ts

@@ -5,7 +5,7 @@ import type {
   TemplateDefinition,
   ToolDefinition,
 } from './types.js'
-import { McpServer as OfficialMcpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
+import { McpServer as OfficialMcpServer, ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { z } from 'zod'
 import express, { type Express } from 'express'
 import { existsSync, readdirSync } from 'node:fs'
@@ -61,15 +61,7 @@ export class McpServer {
         description: definition.description,
         mimeType: definition.mimeType,
       },
-      async () => ({
-        contents: [
-          {
-            uri: definition.uri,
-            mimeType: definition.mimeType || 'text/plain',
-            text: await definition.fn(),
-          },
-        ],
-      }),
+      definition.fn,
     )
     return this
   }
@@ -78,24 +70,16 @@ export class McpServer {
    * Define a resource template with parameterized URIs
    */
   template(definition: TemplateDefinition): this {
-    // For templates, we'll register them as tools that return resource content
-    const toolName = `template_${definition.uriTemplate.replace(/[^a-z0-9]/gi, '_')}`
-
-    this.server.tool(
-      toolName,
-      definition.description || 'Resource Template',
-      this.createInputSchema(definition.uriTemplate),
-      async (params: any) => {
-        const content = await definition.fn(params as Record<string, string>)
-        return {
-          content: [
-            {
-              type: 'text',
-              text: content,
-            },
-          ],
-        }
+    const template = new ResourceTemplate(definition.uriTemplate, { list: undefined })
+    this.server.resource(
+      definition.name || definition.uriTemplate,
+      template,
+      {
+        name: definition.name,
+        description: definition.description,
+        mimeType: definition.mimeType,
       },
+      definition.fn,
     )
     return this
   }
@@ -130,17 +114,7 @@ export class McpServer {
       argsSchema,
       async (params: any) => {
         const result = await definition.fn(params)
-        return {
-          messages: [
-            {
-              role: 'user',
-              content: {
-                type: 'text',
-                text: result,
-              },
-            },
-          ],
-        }
+        return result
       },
     )
     return this

packages/mcp-use/src/server/types.ts

@@ -1,4 +1,4 @@
-import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js'
+import type { CallToolResult, GetPromptResult, ReadResourceResult } from '@modelcontextprotocol/sdk/types.js'
 export interface ServerConfig {
   name: string
   version: string
@@ -43,7 +43,9 @@ export interface PromptDefinition {
   fn: PromptHandler
 }
 
-export type ResourceHandler = () => Promise<string>
-export type TemplateHandler = (params: Record<string, string>) => Promise<string>
-export type ToolHandler = (params: Record<string, any>) => Promise<CallToolResult>
-export type PromptHandler = (params: Record<string, any>) => Promise<string>
+import type { Variables } from '@modelcontextprotocol/sdk/shared/uriTemplate.js'
+
+export type ResourceHandler = () => Promise<ReadResourceResult>
+export type TemplateHandler = (uri: URL, variables: Variables) => Promise<ReadResourceResult>
+export type ToolHandler<TInput = Record<string, any>> = (params: TInput) => Promise<CallToolResult>
+export type PromptHandler<TInput = Record<string, any>> = (params: TInput) => Promise<GetPromptResult>