diff --git a/jest.config.js b/jest.config.js index f8f621c8..bc6dea4d 100644 --- a/jest.config.js +++ b/jest.config.js @@ -7,10 +7,11 @@ export default { ...defaultEsmPreset, moduleNameMapper: { "^(\\.{1,2}/.*)\\.js$": "$1", - "^pkce-challenge$": "/src/__mocks__/pkce-challenge.ts" + "^pkce-challenge$": "/src/__mocks__/pkce-challenge.ts", + "^standard-json-schema$": "/node_modules/standard-json-schema/cjs/index.js" }, transformIgnorePatterns: [ - "/node_modules/(?!eventsource)/" + "/node_modules/(?!eventsource|standard-json-schema)/" ], testPathIgnorePatterns: ["/node_modules/", "/dist/"], }; diff --git a/package-lock.json b/package-lock.json index cfd8a622..b5d438eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,15 @@ { "name": "@modelcontextprotocol/sdk", - "version": "1.5.0", + "version": "1.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@modelcontextprotocol/sdk", - "version": "1.5.0", + "version": "1.7.0", "license": "MIT", "dependencies": { + "@standard-schema/spec": "^1.0.0", "content-type": "^1.0.5", "cors": "^2.8.5", "eventsource": "^3.0.2", @@ -16,6 +17,7 @@ "express-rate-limit": "^7.5.0", "pkce-challenge": "^4.1.0", "raw-body": "^3.0.0", + "standard-json-schema": "^0.1.1", "zod": "^3.23.8", "zod-to-json-schema": "^3.24.1" }, @@ -518,74 +520,6 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz", - "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz", - "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz", - "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz", - "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, "node_modules/@esbuild/darwin-arm64": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz", @@ -603,346 +537,6 @@ "node": ">=18" } }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz", - "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz", - "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz", - "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz", - "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz", - "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz", - "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz", - "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz", - "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==", - "cpu": [ - "mips64el" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz", - "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz", - "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz", - "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz", - "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz", - "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz", - "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz", - "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz", - "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz", - "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz", - "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz", - "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz", - "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", @@ -1609,6 +1203,12 @@ "@sinonjs/commons": "^3.0.0" } }, + "node_modules/@standard-schema/spec": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz", + "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==", + "license": "MIT" + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -6027,6 +5627,28 @@ "node": ">=8" } }, + "node_modules/standard-json-schema": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/standard-json-schema/-/standard-json-schema-0.1.1.tgz", + "integrity": "sha512-CVAdLnqxWOmAtKx1gMwe1ZjTH0y7xN8wggwlUCblIinxN3iHwXtsrir34BkVsCnGrSS9KjAzgq7dWpVsTuXj8A==", + "license": "Apache-2.0", + "peerDependencies": { + "@valibot/to-json-schema": "^1.0.0", + "effect": "^3.13.12", + "zod-to-json-schema": "^3.24.5" + }, + "peerDependenciesMeta": { + "@valibot/to-json-schema": { + "optional": true + }, + "effect": { + "optional": true + }, + "zod-to-json-schema": { + "optional": true + } + } + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -6620,9 +6242,9 @@ } }, "node_modules/zod-to-json-schema": { - "version": "3.24.1", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.1.tgz", - "integrity": "sha512-3h08nf3Vw3Wl3PK+q3ow/lIil81IT2Oa7YpQyUUDsEWbXveMesdfK1xBd2RhCkynwZndAxixji/7SYJJowr62w==", + "version": "3.24.5", + "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz", + "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==", "license": "ISC", "peerDependencies": { "zod": "^3.24.1" diff --git a/package.json b/package.json index b7641c07..8b43c500 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "client": "tsx src/cli.ts client" }, "dependencies": { + "@standard-schema/spec": "^1.0.0", "content-type": "^1.0.5", "cors": "^2.8.5", "eventsource": "^3.0.2", @@ -53,6 +54,7 @@ "express-rate-limit": "^7.5.0", "pkce-challenge": "^4.1.0", "raw-body": "^3.0.0", + "standard-json-schema": "^0.1.1", "zod": "^3.23.8", "zod-to-json-schema": "^3.24.1" }, diff --git a/src/server/mcp.test.ts b/src/server/mcp.test.ts index 2e91a568..5ada93e9 100644 --- a/src/server/mcp.test.ts +++ b/src/server/mcp.test.ts @@ -145,10 +145,10 @@ describe("tool()", () => { mcpServer.tool( "test", - { + z.object({ name: z.string(), value: z.number(), - }, + }), async ({ name, value }) => ({ content: [ { @@ -244,10 +244,10 @@ describe("tool()", () => { mcpServer.tool( "test", - { + z.object({ name: z.string(), value: z.number(), - }, + }), async ({ name, value }) => ({ content: [ { @@ -397,9 +397,9 @@ describe("tool()", () => { mcpServer.tool( "test", "Test tool", - { + z.object({ input: z.string(), - }, + }), async ({ input }) => ({ content: [ { @@ -1126,10 +1126,10 @@ describe("prompt()", () => { mcpServer.prompt( "test", - { + z.object({ name: z.string(), value: z.string(), - }, + }), async ({ name, value }) => ({ messages: [ { @@ -1228,10 +1228,10 @@ describe("prompt()", () => { mcpServer.prompt( "test", - { + z.object({ name: z.string(), value: z.string().min(3), - }, + }), async ({ name, value }) => ({ messages: [ { @@ -1345,7 +1345,7 @@ describe("prompt()", () => { // This should succeed mcpServer.prompt( "echo", - { message: z.string() }, + z.object({ message: z.string() }), ({ message }) => ({ messages: [{ role: "user", @@ -1386,7 +1386,7 @@ describe("prompt()", () => { // Register a prompt with completion mcpServer.prompt( "echo", - { message: completable(z.string(), () => ["hello", "world"]) }, + z.object({ message: completable(z.string(), () => ["hello", "world"]) }), ({ message }) => ({ messages: [{ role: "user", @@ -1470,9 +1470,9 @@ describe("prompt()", () => { mcpServer.prompt( "test-prompt", - { + z.object({ name: completable(z.string(), () => ["Alice", "Bob", "Charlie"]), - }, + }), async ({ name }) => ({ messages: [ { @@ -1535,11 +1535,11 @@ describe("prompt()", () => { mcpServer.prompt( "test-prompt", - { + z.object({ name: completable(z.string(), (test) => ["Alice", "Bob", "Charlie"].filter((value) => value.startsWith(test)), ), - }, + }), async ({ name }) => ({ messages: [ { diff --git a/src/server/mcp.ts b/src/server/mcp.ts index 8f4a909c..09ceb965 100644 --- a/src/server/mcp.ts +++ b/src/server/mcp.ts @@ -1,16 +1,6 @@ import { Server, ServerOptions } from "./index.js"; -import { zodToJsonSchema } from "zod-to-json-schema"; -import { - z, - ZodRawShape, - ZodObject, - ZodString, - AnyZodObject, - ZodTypeAny, - ZodType, - ZodTypeDef, - ZodOptional, -} from "zod"; +import { toJSONSchema } from "standard-json-schema" +import { StandardSchemaV1 } from "@standard-schema/spec" import { Implementation, Tool, @@ -101,20 +91,18 @@ export class McpServer { this.server.setRequestHandler( ListToolsRequestSchema, - (): ListToolsResult => ({ - tools: Object.entries(this._registeredTools).map( - ([name, tool]): Tool => { + async (): Promise => ({ + tools: await Promise.all(Object.entries(this._registeredTools).map( + async ([name, tool]): Promise => { return { name, description: tool.description, inputSchema: tool.inputSchema - ? (zodToJsonSchema(tool.inputSchema, { - strictUnions: true, - }) as Tool["inputSchema"]) + ? (await toJSONSchema(tool.inputSchema) as Tool["inputSchema"]) : EMPTY_OBJECT_JSON_SCHEMA, }; }, - ), + )), }), ); @@ -130,18 +118,18 @@ export class McpServer { } if (tool.inputSchema) { - const parseResult = await tool.inputSchema.safeParseAsync( + const validateResult = await tool.inputSchema["~standard"].validate( request.params.arguments, ); - if (!parseResult.success) { + if (validateResult.issues) { throw new McpError( ErrorCode.InvalidParams, - `Invalid arguments for tool ${request.params.name}: ${parseResult.error.message}`, + `Invalid arguments for tool ${request.params.name}: ${JSON.stringify(validateResult.issues, null, 2)}`, ); } - const args = parseResult.data; - const cb = tool.callback as ToolCallback; + const args = validateResult.value; + const cb = tool.callback as UnaryToolCallback; try { return await Promise.resolve(cb(args, extra)); } catch (error) { @@ -156,7 +144,7 @@ export class McpServer { }; } } else { - const cb = tool.callback as ToolCallback; + const cb = tool.callback as NullaryToolCallback try { return await Promise.resolve(cb(extra)); } catch (error) { @@ -226,11 +214,13 @@ export class McpServer { return EMPTY_COMPLETION_RESULT; } + // @ts-ignore const field = prompt.argsSchema.shape[request.params.argument.name]; if (!(field instanceof Completable)) { return EMPTY_COMPLETION_RESULT; } + // @ts-ignore const def: CompletableDef = field._def; const suggestions = await def.complete(request.params.argument.value); return createCompletionResult(suggestions); @@ -390,18 +380,18 @@ export class McpServer { this.server.setRequestHandler( ListPromptsRequestSchema, - (): ListPromptsResult => ({ - prompts: Object.entries(this._registeredPrompts).map( - ([name, prompt]): Prompt => { + async (): Promise => ({ + prompts: await Promise.all(Object.entries(this._registeredPrompts).map( + async ([name, prompt]): Promise => { return { name, description: prompt.description, arguments: prompt.argsSchema - ? promptArgumentsFromSchema(prompt.argsSchema) + ? await promptArgumentsFromSchema(prompt.argsSchema) : undefined, }; }, - ), + )), }), ); @@ -417,21 +407,21 @@ export class McpServer { } if (prompt.argsSchema) { - const parseResult = await prompt.argsSchema.safeParseAsync( + const validateResult = await prompt.argsSchema["~standard"].validate( request.params.arguments, ); - if (!parseResult.success) { + if (validateResult.issues) { throw new McpError( ErrorCode.InvalidParams, - `Invalid arguments for prompt ${request.params.name}: ${parseResult.error.message}`, + `Invalid arguments for prompt ${request.params.name}: ${JSON.stringify(validateResult.issues, null, 2)}`, ); } - const args = parseResult.data; - const cb = prompt.callback as PromptCallback; + const args = validateResult.value; + const cb = prompt.callback as UnaryPromptCallback; return await Promise.resolve(cb(args, extra)); } else { - const cb = prompt.callback as PromptCallback; + const cb = prompt.callback as NullaryPromptCallback; return await Promise.resolve(cb(extra)); } }, @@ -518,33 +508,33 @@ export class McpServer { /** * Registers a zero-argument tool `name`, which will run the given function when the client calls it. */ - tool(name: string, cb: ToolCallback): void; + tool(name: string, cb: NullaryToolCallback): void; /** * Registers a zero-argument tool `name` (with a description) which will run the given function when the client calls it. */ - tool(name: string, description: string, cb: ToolCallback): void; + tool(name: string, description: string, cb: NullaryToolCallback): void; /** * Registers a tool `name` accepting the given arguments, which must be an object containing named properties associated with Zod schemas. When the client calls it, the function will be run with the parsed and validated arguments. */ - tool( + tool( name: string, - paramsSchema: Args, - cb: ToolCallback, + paramsSchema: StandardSchemaV1, + cb: UnaryToolCallback, ): void; /** * Registers a tool `name` (with a description) accepting the given arguments, which must be an object containing named properties associated with Zod schemas. When the client calls it, the function will be run with the parsed and validated arguments. */ - tool( + tool( name: string, description: string, - paramsSchema: Args, - cb: ToolCallback, + paramsSchema: StandardSchemaV1, + cb: UnaryToolCallback, ): void; - tool(name: string, ...rest: unknown[]): void { + async tool(name: string, ...rest: unknown[]): Promise { if (this._registeredTools[name]) { throw new Error(`Tool ${name} is already registered`); } @@ -554,16 +544,15 @@ export class McpServer { description = rest.shift() as string; } - let paramsSchema: ZodRawShape | undefined; + let inputSchema: StandardSchemaV1 | undefined if (rest.length > 1) { - paramsSchema = rest.shift() as ZodRawShape; + inputSchema = rest.shift() as StandardSchemaV1; } - const cb = rest[0] as ToolCallback; + const cb = rest[0] as NullaryToolCallback | UnaryToolCallback this._registeredTools[name] = { description, - inputSchema: - paramsSchema === undefined ? undefined : z.object(paramsSchema), + inputSchema, callback: cb, }; @@ -573,30 +562,30 @@ export class McpServer { /** * Registers a zero-argument prompt `name`, which will run the given function when the client calls it. */ - prompt(name: string, cb: PromptCallback): void; + prompt(name: string, cb: NullaryPromptCallback): void; /** * Registers a zero-argument prompt `name` (with a description) which will run the given function when the client calls it. */ - prompt(name: string, description: string, cb: PromptCallback): void; + prompt(name: string, description: string, cb: NullaryPromptCallback): void; /** * Registers a prompt `name` accepting the given arguments, which must be an object containing named properties associated with Zod schemas. When the client calls it, the function will be run with the parsed and validated arguments. */ - prompt( + prompt( name: string, - argsSchema: Args, - cb: PromptCallback, + argsSchema: StandardSchemaV1, + cb: UnaryPromptCallback, ): void; /** * Registers a prompt `name` (with a description) accepting the given arguments, which must be an object containing named properties associated with Zod schemas. When the client calls it, the function will be run with the parsed and validated arguments. */ - prompt( + prompt( name: string, description: string, - argsSchema: Args, - cb: PromptCallback, + argsSchema: StandardSchemaV1, + cb: UnaryPromptCallback, ): void; prompt(name: string, ...rest: unknown[]): void { @@ -609,15 +598,15 @@ export class McpServer { description = rest.shift() as string; } - let argsSchema: PromptArgsRawShape | undefined; + let argsSchema: StandardSchemaV1 | undefined; if (rest.length > 1) { - argsSchema = rest.shift() as PromptArgsRawShape; + argsSchema = rest.shift() as StandardSchemaV1 | undefined; } - const cb = rest[0] as PromptCallback; + const cb = rest[0] as NullaryPromptCallback | UnaryPromptCallback this._registeredPrompts[name] = { description, - argsSchema: argsSchema === undefined ? undefined : z.object(argsSchema), + argsSchema, callback: cb, }; @@ -686,22 +675,23 @@ export class ResourceTemplate { } /** - * Callback for a tool handler registered with Server.tool(). + * Callback for a nullary tool handler registered with Server.tool(). + * + * Parameters include request handler context. + */ +export type NullaryToolCallback = (extra: RequestHandlerExtra) => CallToolResult | Promise; + +/** + * Callback for a unary tool handler registered with Server.tool(). * - * Parameters will include tool arguments, if applicable, as well as other request handler context. + * Parameters include tool arguments and request handler context. */ -export type ToolCallback = - Args extends ZodRawShape - ? ( - args: z.objectOutputType, - extra: RequestHandlerExtra, - ) => CallToolResult | Promise - : (extra: RequestHandlerExtra) => CallToolResult | Promise; +export type UnaryToolCallback = (args: O, extra: RequestHandlerExtra) => CallToolResult | Promise; type RegisteredTool = { description?: string; - inputSchema?: AnyZodObject; - callback: ToolCallback; + inputSchema?: StandardSchemaV1; + callback: NullaryToolCallback | UnaryToolCallback }; const EMPTY_OBJECT_JSON_SCHEMA = { @@ -749,35 +739,31 @@ type RegisteredResourceTemplate = { readCallback: ReadResourceTemplateCallback; }; -type PromptArgsRawShape = { - [k: string]: - | ZodType - | ZodOptional>; -}; +export type NullaryPromptCallback = (extra: RequestHandlerExtra) => GetPromptResult | Promise; -export type PromptCallback< - Args extends undefined | PromptArgsRawShape = undefined, -> = Args extends PromptArgsRawShape - ? ( - args: z.objectOutputType, - extra: RequestHandlerExtra, - ) => GetPromptResult | Promise - : (extra: RequestHandlerExtra) => GetPromptResult | Promise; +export type UnaryPromptCallback = ( + args: O, + extra: RequestHandlerExtra, +) => GetPromptResult | Promise type RegisteredPrompt = { description?: string; - argsSchema?: ZodObject; - callback: PromptCallback; + argsSchema?: StandardSchemaV1 + callback: NullaryPromptCallback | UnaryPromptCallback }; -function promptArgumentsFromSchema( - schema: ZodObject, -): PromptArgument[] { - return Object.entries(schema.shape).map( +async function promptArgumentsFromSchema(schema: StandardSchemaV1): Promise { + const jsonSchema = (await toJSONSchema(schema)) as { + properties: Record + required?: string[] + } + return Object.entries(jsonSchema.properties).map( ([name, field]): PromptArgument => ({ name, - description: field.description, - required: !field.isOptional(), + description: field.description as string, + required: jsonSchema.required?.includes(name), }), ); }