From 0a8bd33bc574afd390d744291b50de52f644b6fd Mon Sep 17 00:00:00 2001 From: Ryan Buchmayer Date: Sun, 15 Nov 2026 17:44:42 -0800 Subject: [PATCH] feat: support MCP protocol revision 2026-07-28 via the v2 TypeScript SDK --- package-lock.json | 565 +++++----------------------------------- package.json | 8 +- src/http.config.test.ts | 37 +++ src/http.ts | 33 ++- src/index.ts | 21 +- src/server.test.ts | 4 +- src/server.ts | 123 +++------ src/transport.test.ts | 21 +- 8 files changed, 187 insertions(+), 625 deletions(-) diff --git a/package-lock.json b/package-lock.json index a607cf3c..d4c1b452 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,16 +9,18 @@ "version": "1.4.0", "license": "MIT", "dependencies": { - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/node": "^2.1.1", + "@modelcontextprotocol/server": "^2.3.1", "cors": "^2.8.5", "express": "^4.21.2", "undici": "^6.20.0", - "zod": "^3.25.46" + "zod": "^4.2.0" }, "bin": { "perplexity-mcp": "dist/index.js" }, "devDependencies": { + "@modelcontextprotocol/client": "^2.3.1", "@types/cors": "^2.8.17", "@types/express": "^5.0.0", "@types/node": "^20", @@ -29,7 +31,7 @@ "vitest": "^4.0.5" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/@babel/helper-string-parser": { @@ -574,329 +576,64 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@modelcontextprotocol/sdk": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz", - "integrity": "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==", - "license": "MIT", + "node_modules/@modelcontextprotocol/client": { + "version": "2.4.0", + "resolved": "https://perplexity.firewall.socket.dev/npm/pplx-frontend/@modelcontextprotocol/client/-/client-2.4.0.tgz", + "integrity": "sha512-LgrD2OphHuG12vfKFKz6SOnq7bKHQmhGJIAYdD+MZBn2npHEyry6uD8zvktodtl5CQM85MO0anUyD9JwmUmxww==", + "dev": true, + "license": "Apache-2.0", "dependencies": { - "@hono/node-server": "^1.19.9", - "ajv": "^8.17.1", - "ajv-formats": "^3.0.1", - "content-type": "^1.0.5", - "cors": "^2.8.5", + "@modelcontextprotocol/core": "2.4.0", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", - "eventsource-parser": "^3.0.0", - "express": "^5.2.1", - "express-rate-limit": "^8.2.1", - "hono": "^4.11.4", + "eventsource-parser": "^3.0.8", "jose": "^6.1.3", - "json-schema-typed": "^8.0.2", "pkce-challenge": "^5.0.0", - "raw-body": "^3.0.0", - "zod": "^3.25 || ^4.0", - "zod-to-json-schema": "^3.25.1" + "zod": "^4.2.0" }, "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@cfworker/json-schema": "^4.1.1", - "zod": "^3.25 || ^4.0" - }, - "peerDependenciesMeta": { - "@cfworker/json-schema": { - "optional": true - }, - "zod": { - "optional": false - } + "node": ">=20" } }, - "node_modules/@modelcontextprotocol/sdk/node_modules/accepts": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", - "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", - "license": "MIT", - "dependencies": { - "mime-types": "^3.0.0", - "negotiator": "^1.0.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/body-parser": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", - "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", - "license": "MIT", - "dependencies": { - "bytes": "^3.1.2", - "content-type": "^1.0.5", - "debug": "^4.4.3", - "http-errors": "^2.0.0", - "iconv-lite": "^0.7.0", - "on-finished": "^2.4.1", - "qs": "^6.14.1", - "raw-body": "^3.0.1", - "type-is": "^2.0.1" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/content-disposition": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", - "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/cookie-signature": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", - "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", - "license": "MIT", - "engines": { - "node": ">=6.6.0" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/express": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", - "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", - "license": "MIT", - "dependencies": { - "accepts": "^2.0.0", - "body-parser": "^2.2.1", - "content-disposition": "^1.0.0", - "content-type": "^1.0.5", - "cookie": "^0.7.1", - "cookie-signature": "^1.2.1", - "debug": "^4.4.0", - "depd": "^2.0.0", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "finalhandler": "^2.1.0", - "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "merge-descriptors": "^2.0.0", - "mime-types": "^3.0.0", - "on-finished": "^2.4.1", - "once": "^1.4.0", - "parseurl": "^1.3.3", - "proxy-addr": "^2.0.7", - "qs": "^6.14.0", - "range-parser": "^1.2.1", - "router": "^2.2.0", - "send": "^1.1.0", - "serve-static": "^2.2.0", - "statuses": "^2.0.1", - "type-is": "^2.0.1", - "vary": "^1.1.2" - }, - "engines": { - "node": ">= 18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/finalhandler": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", - "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==", - "license": "MIT", - "dependencies": { - "debug": "^4.4.0", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "on-finished": "^2.4.1", - "parseurl": "^1.3.3", - "statuses": "^2.0.1" - }, - "engines": { - "node": ">= 18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", - "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/iconv-lite": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", - "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/media-typer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", - "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/merge-descriptors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", - "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/mime-db": { - "version": "1.54.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/mime-types": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", - "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", - "license": "MIT", - "dependencies": { - "mime-db": "^1.54.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/negotiator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", - "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/@modelcontextprotocol/sdk/node_modules/send": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", - "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", - "license": "MIT", + "node_modules/@modelcontextprotocol/core": { + "version": "2.4.0", + "resolved": "https://perplexity.firewall.socket.dev/npm/pplx-frontend/@modelcontextprotocol/core/-/core-2.4.0.tgz", + "integrity": "sha512-z8QBKqdfXLPzkLQuG4xp8hrVEMm1PZ1IgxMN2sMbJiFiAKOWXnAzogXn2W4aqIBlP1ea6U5yiqVquvUNM1Cj6Q==", + "license": "Apache-2.0", "dependencies": { - "debug": "^4.4.3", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "fresh": "^2.0.0", - "http-errors": "^2.0.1", - "mime-types": "^3.0.2", - "ms": "^2.1.3", - "on-finished": "^2.4.1", - "range-parser": "^1.2.1", - "statuses": "^2.0.2" + "zod": "^4.2.0" }, "engines": { - "node": ">= 18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" + "node": ">=20" } }, - "node_modules/@modelcontextprotocol/sdk/node_modules/serve-static": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", - "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", - "license": "MIT", + "node_modules/@modelcontextprotocol/node": { + "version": "2.1.2", + "resolved": "https://perplexity.firewall.socket.dev/npm/pplx-frontend/@modelcontextprotocol/node/-/node-2.1.2.tgz", + "integrity": "sha512-IIcIqBpr6NCQQs5DgJTgvbSOAw+3iaR/uquqg+e0nXCdudfjPg/80x0TseUnQx14AUAtE4fsJCEpJKPyb6WPVA==", + "license": "Apache-2.0", "dependencies": { - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "parseurl": "^1.3.3", - "send": "^1.2.0" + "@hono/node-server": "^1.19.9 || ^2.1.3", + "hono": "^4.11.4" }, "engines": { - "node": ">= 18" + "node": ">=20" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" + "peerDependencies": { + "@modelcontextprotocol/server": "^2.4.0" } }, - "node_modules/@modelcontextprotocol/sdk/node_modules/type-is": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", - "license": "MIT", + "node_modules/@modelcontextprotocol/server": { + "version": "2.4.0", + "resolved": "https://perplexity.firewall.socket.dev/npm/pplx-frontend/@modelcontextprotocol/server/-/server-2.4.0.tgz", + "integrity": "sha512-rgR9yxSaAJ+bcsi/XroT/S2AfPiIWloXAnrdfYSCms9ivVju0ishu/wW0J21Ho6+ZOR1r7RyeRbjiRuF87ix5Q==", + "license": "Apache-2.0", "dependencies": { - "content-type": "^1.0.5", - "media-typer": "^1.1.0", - "mime-types": "^3.0.0" + "@modelcontextprotocol/core": "2.4.0", + "zod": "^4.2.0" }, "engines": { - "node": ">= 0.6" + "node": ">=20" } }, "node_modules/@nodelib/fs.scandir": { @@ -1582,39 +1319,6 @@ "node": ">= 0.6" } }, - "node_modules/ajv": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", - "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-formats": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", - "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", - "license": "MIT", - "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -1796,6 +1500,7 @@ "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -1981,6 +1686,7 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz", "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==", + "dev": true, "license": "MIT", "dependencies": { "eventsource-parser": "^3.0.1" @@ -1990,9 +1696,10 @@ } }, "node_modules/eventsource-parser": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz", - "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==", + "version": "3.1.1", + "resolved": "https://perplexity.firewall.socket.dev/npm/pplx-frontend/eventsource-parser/-/eventsource-parser-3.1.1.tgz", + "integrity": "sha512-EKN1vKAMcZ8MlYMpaNuxN6R9yakzH6uajHcHVTqWJzvu5pWw9DyhbP35HH8MVBQ+dZjAfDxk+A8NiR9KWaXiyQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=18.0.0" @@ -2146,30 +1853,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/express-rate-limit": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.3.1.tgz", - "integrity": "sha512-D1dKN+cmyPWuvB+G2SREQDzPY1agpBIcTa9sJxOPMCNeH3gwzhqJRDWCXW3gg0y//+LQ/8j52JbMROWyrKdMdw==", - "license": "MIT", - "dependencies": { - "ip-address": "10.1.0" - }, - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://github.com/sponsors/express-rate-limit" - }, - "peerDependencies": { - "express": ">= 4.11" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "license": "MIT" - }, "node_modules/fast-glob": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", @@ -2187,22 +1870,6 @@ "node": ">=8.6.0" } }, - "node_modules/fast-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", - "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fastify" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fastify" - } - ], - "license": "BSD-3-Clause" - }, "node_modules/fastq": { "version": "1.20.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", @@ -2472,15 +2139,6 @@ "node": ">= 0.10" } }, - "node_modules/ip-address": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", - "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", - "license": "MIT", - "engines": { - "node": ">= 12" - } - }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -2539,12 +2197,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-promise": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", - "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", - "license": "MIT" - }, "node_modules/is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -2559,6 +2211,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, "license": "ISC" }, "node_modules/istanbul-lib-coverage": { @@ -2604,6 +2257,7 @@ "version": "6.1.3", "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz", "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/panva" @@ -2616,18 +2270,6 @@ "dev": true, "license": "MIT" }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "license": "MIT" - }, - "node_modules/json-schema-typed": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz", - "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==", - "license": "BSD-2-Clause" - }, "node_modules/magic-string": { "version": "0.30.21", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", @@ -2881,6 +2523,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, "license": "ISC", "dependencies": { "wrappy": "1" @@ -2909,6 +2552,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -2958,6 +2602,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.1.tgz", "integrity": "sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=16.20.0" @@ -3061,37 +2706,6 @@ "node": ">= 0.6" } }, - "node_modules/raw-body": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", - "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", - "license": "MIT", - "dependencies": { - "bytes": "~3.1.2", - "http-errors": "~2.0.1", - "iconv-lite": "~0.7.0", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/raw-body/node_modules/iconv-lite": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", - "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, "node_modules/rechoir": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", @@ -3104,15 +2718,6 @@ "node": ">= 0.10" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/resolve": { "version": "1.22.11", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", @@ -3200,55 +2805,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/router": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", - "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", - "license": "MIT", - "dependencies": { - "debug": "^4.4.0", - "depd": "^2.0.0", - "is-promise": "^4.0.0", - "parseurl": "^1.3.3", - "path-to-regexp": "^8.0.0" - }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/router/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/router/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/router/node_modules/path-to-regexp": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -3367,6 +2923,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" @@ -3379,6 +2936,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3963,6 +3521,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -3995,25 +3554,17 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, "license": "ISC" }, "node_modules/zod": { - "version": "3.25.76", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz", - "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", + "version": "4.6.7", + "resolved": "https://perplexity.firewall.socket.dev/npm/pplx-frontend/zod/-/zod-4.6.7.tgz", + "integrity": "sha512-g8W2D2kU6a8untc053fX1uVBKzM7yqAxW/3zwk83+6RyF2+SKOuV+c0wBDhUwzV1PaGapmZH+rmcUzPf+3CGwg==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" } - }, - "node_modules/zod-to-json-schema": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz", - "integrity": "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==", - "license": "ISC", - "peerDependencies": { - "zod": "^3.25 || ^4" - } } } } diff --git a/package.json b/package.json index 156270b6..1c779810 100644 --- a/package.json +++ b/package.json @@ -60,13 +60,15 @@ "test:coverage": "vitest run --coverage" }, "dependencies": { - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/node": "^2.1.1", + "@modelcontextprotocol/server": "^2.3.1", "cors": "^2.8.5", "express": "^4.21.2", "undici": "^6.20.0", - "zod": "^3.25.46" + "zod": "^4.2.0" }, "devDependencies": { + "@modelcontextprotocol/client": "^2.3.1", "@types/cors": "^2.8.17", "@types/express": "^5.0.0", "@types/node": "^20", @@ -77,6 +79,6 @@ "vitest": "^4.0.5" }, "engines": { - "node": ">=18" + "node": ">=20" } } diff --git a/src/http.config.test.ts b/src/http.config.test.ts index a0d62053..11eb5f2f 100644 --- a/src/http.config.test.ts +++ b/src/http.config.test.ts @@ -1,5 +1,6 @@ import { describe, it, expect, beforeEach, afterEach, vi } from "vitest"; import type { Server } from "http"; +import { Client, StreamableHTTPClientTransport } from "@modelcontextprotocol/client"; import { createHttpApp, buildAllowedHosts } from "./http.js"; /** @@ -105,6 +106,11 @@ describe("HTTP transport configuration", () => { expect(preflight.headers.get("access-control-allow-origin")).toBe( "https://app.example", ); + // Browser clients on the 2026-07-28 revision send these on every request. + const allowedHeaders = preflight.headers.get("access-control-allow-headers")?.toLowerCase(); + for (const header of ["mcp-protocol-version", "mcp-method", "mcp-name"]) { + expect(allowedHeaders).toContain(header); + } }); it("does not allow a non-allowlisted origin even when others are allowlisted", async () => { @@ -382,6 +388,37 @@ describe("HTTP transport configuration", () => { expect(data.result.tools).toHaveLength(4); }); + it("serves clients that negotiate the 2026-07-28 revision", async () => { + await start(); + + const client = new Client( + { name: "test-client", version: "1.0.0" }, + { versionNegotiation: { mode: "auto" } }, + ); + await client.connect(new StreamableHTTPClientTransport(new URL(`${baseUrl}/mcp`))); + try { + expect(client.getProtocolEra()).toBe("modern"); + const { tools } = await client.listTools(); + expect(tools).toHaveLength(4); + } finally { + await client.close(); + } + }); + + it("keeps serving clients that open with initialize", async () => { + await start(); + + const client = new Client({ name: "test-client", version: "1.0.0" }); + await client.connect(new StreamableHTTPClientTransport(new URL(`${baseUrl}/mcp`))); + try { + expect(client.getProtocolEra()).toBe("legacy"); + const { tools } = await client.listTools(); + expect(tools).toHaveLength(4); + } finally { + await client.close(); + } + }); + it("serves the health endpoint", async () => { await start(); diff --git a/src/http.ts b/src/http.ts index 8c967150..670c2c91 100644 --- a/src/http.ts +++ b/src/http.ts @@ -2,7 +2,12 @@ import express, { type Express } from "express"; import cors from "cors"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { + NodeStreamableHTTPServerTransport, + toNodeHandler, + toWebRequest, +} from "@modelcontextprotocol/node"; +import { createMcpHandler, isLegacyRequest } from "@modelcontextprotocol/server"; import { createPerplexityServer } from "./server.js"; import { logger } from "./logger.js"; @@ -91,7 +96,13 @@ export function createHttpApp(options: HttpAppOptions): Express { return callback(new CorsOriginNotAllowedError(origin)); }, exposedHeaders: ["Mcp-Session-Id", "mcp-protocol-version"], - allowedHeaders: ["Content-Type", "mcp-session-id"], + allowedHeaders: [ + "Content-Type", + "mcp-session-id", + "mcp-protocol-version", + "mcp-method", + "mcp-name", + ], }), ); @@ -124,11 +135,27 @@ export function createHttpApp(options: HttpAppOptions): Express { app.use(express.json()); + // Requests on the 2026-07-28 revision carry their protocol version per + // request; everything else is a 2025-era client and keeps the stateless + // JSON transport below. + const onerror = (error: Error) => { + logger.error("Error handling MCP request", { error: String(error) }); + }; + const modern = toNodeHandler( + createMcpHandler(() => createPerplexityServer(), { legacy: "reject", onerror }), + { onerror }, + ); + app.all("/mcp", async (req, res) => { try { + if (!(await isLegacyRequest(await toWebRequest(req, req.body)))) { + await modern(req, res, req.body); + return; + } + // Stateless mode: a Protocol instance supports one transport, so build // a fresh server + transport pair per request. - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, enableJsonResponse: true, }); diff --git a/src/index.ts b/src/index.ts index d2897f18..9801e234 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; +import { serveStdio } from "@modelcontextprotocol/server/stdio"; import { createPerplexityServer } from "./server.js"; const PERPLEXITY_API_KEY = process.env.PERPLEXITY_API_KEY; @@ -9,19 +9,10 @@ if (!PERPLEXITY_API_KEY) { process.exit(1); } -async function main() { - try { - const server = createPerplexityServer("local-mcp"); - const transport = new StdioServerTransport(); - await server.connect(transport); - } catch (error) { - console.error("Fatal error running server:", error); - process.exit(1); - } -} - -main().catch((error) => { +try { + // One server per connection; the opening exchange picks the protocol revision. + serveStdio(() => createPerplexityServer("local-mcp")); +} catch (error) { console.error("Fatal error running server:", error); process.exit(1); -}); - +} diff --git a/src/server.test.ts b/src/server.test.ts index 66a45f26..b1f6981f 100644 --- a/src/server.test.ts +++ b/src/server.test.ts @@ -370,8 +370,8 @@ describe("Server Utility Functions", () => { describe("createPerplexityServer tools/list schemas", () => { it("advertises JSON Schema 2020-12 on every input and output schema", async () => { vi.stubEnv("PERPLEXITY_API_KEY", "pplx-test"); - const { Client } = await import("@modelcontextprotocol/sdk/client/index.js"); - const { InMemoryTransport } = await import("@modelcontextprotocol/sdk/inMemory.js"); + const { Client } = await import("@modelcontextprotocol/client"); + const { InMemoryTransport } = await import("@modelcontextprotocol/server"); const { createPerplexityServer } = await import("./server.js"); const server = createPerplexityServer(); diff --git a/src/server.ts b/src/server.ts index b6ec9689..eb56ecc8 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1,4 +1,4 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { McpServer, type ServerContext } from "@modelcontextprotocol/server"; import { z } from "zod"; import { fetch as undiciFetch, ProxyAgent } from "undici"; import type { @@ -525,32 +525,24 @@ export async function performSearch( return formatSearchResults(data); } -interface ToolExtra { - signal?: AbortSignal; - _meta?: { progressToken?: string | number }; - sendNotification?: (notification: { - method: string; - params: Record; - }) => Promise; -} - -function buildHooks(extra: ToolExtra | undefined): AgentCallHooks { - const progressToken = extra?._meta?.progressToken; - const sendNotification = extra?.sendNotification; +function buildHooks(ctx: ServerContext): AgentCallHooks { + const progressToken = ctx.mcpReq._meta?.progressToken; let progress = 0; return { - signal: extra?.signal, + signal: ctx.mcpReq.signal, onProgress: - progressToken !== undefined && sendNotification + progressToken !== undefined ? (update) => { - void sendNotification({ - method: "notifications/progress", - params: { - progressToken, - progress: ++progress, - message: update.message, - }, - }).catch(() => {}); + void ctx.mcpReq + .notify({ + method: "notifications/progress", + params: { + progressToken, + progress: ++progress, + message: update.message, + }, + }) + .catch(() => {}); } : undefined, }; @@ -595,22 +587,22 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P const maxTokensPerPageField = z.number().int().positive().max(MAX_SEARCH_TOKENS_PER_PAGE).optional() .describe("Maximum search-context tokens extracted per result page. Overrides the legacy search_context_size per-page budget."); - const responseOutputSchema = { + const responseOutputSchema = z.object({ response: z.string().describe("AI-generated text response with numbered citation references"), - }; + }); // Input schemas - const askAndReasonInputSchema = { + const askAndReasonInputSchema = z.object({ messages: messagesField, search_recency_filter: searchRecencyFilterField, search_domain_filter: searchDomainFilterField, search_context_size: searchContextSizeField, max_tokens: maxTokensField, max_tokens_per_page: maxTokensPerPageField, - }; - const researchInputSchema = { + }); + const researchInputSchema = z.object({ messages: messagesField, - }; + }); server.registerTool( "perplexity_ask", @@ -622,8 +614,8 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P "Supports filtering by recency (hour/day/week/month/year), domain restrictions, and search token budgets. " + "For in-depth multi-source research, use perplexity_research instead. " + "For step-by-step reasoning and analysis, use perplexity_reason instead.", - inputSchema: askAndReasonInputSchema as any, - outputSchema: responseOutputSchema as any, + inputSchema: askAndReasonInputSchema, + outputSchema: responseOutputSchema, annotations: { readOnlyHint: true, openWorldHint: true, @@ -631,7 +623,7 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P destructiveHint: false, }, }, - async (args: any, extra: any) => { + async (args: any, ctx: ServerContext) => { const { messages, search_recency_filter, search_domain_filter, search_context_size, max_tokens, max_tokens_per_page } = args as { messages: Message[]; search_recency_filter?: "hour" | "day" | "week" | "month" | "year"; @@ -653,7 +645,7 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P ASK_PRESET, serviceOrigin, Object.keys(options).length > 0 ? options : undefined, - buildHooks(extra), + buildHooks(ctx), serverOptions?.apiKey, ); return { @@ -673,8 +665,8 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P "Significantly slower than other tools (can take minutes). " + "For quick factual questions, use perplexity_ask instead. " + "For logical analysis and reasoning, use perplexity_reason instead.", - inputSchema: researchInputSchema as any, - outputSchema: responseOutputSchema as any, + inputSchema: researchInputSchema, + outputSchema: responseOutputSchema, annotations: { readOnlyHint: true, openWorldHint: true, @@ -682,7 +674,7 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P destructiveHint: false, }, }, - async (args: any, extra: any) => { + async (args: any, ctx: ServerContext) => { const { messages } = args as { messages: Message[] }; validateMessages(messages, "perplexity_research"); const result = await performAgentResponse( @@ -690,7 +682,7 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P RESEARCH_PRESET, serviceOrigin, undefined, - buildHooks(extra), + buildHooks(ctx), serverOptions?.apiKey, ); return { @@ -710,8 +702,8 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P "Supports filtering by recency (hour/day/week/month/year), domain restrictions, and search token budgets. " + "For quick factual questions, use perplexity_ask instead. " + "For comprehensive multi-source research, use perplexity_research instead.", - inputSchema: askAndReasonInputSchema as any, - outputSchema: responseOutputSchema as any, + inputSchema: askAndReasonInputSchema, + outputSchema: responseOutputSchema, annotations: { readOnlyHint: true, openWorldHint: true, @@ -719,7 +711,7 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P destructiveHint: false, }, }, - async (args: any, extra: any) => { + async (args: any, ctx: ServerContext) => { const { messages, search_recency_filter, search_domain_filter, search_context_size, max_tokens, max_tokens_per_page } = args as { messages: Message[]; search_recency_filter?: "hour" | "day" | "week" | "month" | "year"; @@ -741,7 +733,7 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P REASON_PRESET, serviceOrigin, Object.keys(options).length > 0 ? options : undefined, - buildHooks(extra), + buildHooks(ctx), serverOptions?.apiKey, ); return { @@ -751,7 +743,7 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P } ); - const searchInputSchema = { + const searchInputSchema = z.object({ query: z.string().describe("Search query string"), max_results: z.number().min(1).max(20).optional() .describe("Maximum number of results to return (1-20, default: 10)"), @@ -763,11 +755,11 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P search_domain_filter: searchDomainFilterField, search_type: z.enum(["web", "fast"]).optional() .describe("Search backend. 'web' (default) is the standard web search. 'fast' is lower latency and lower cost; prefer it for routine lookups inside agent loops, and keep 'web' for rare or ambiguous questions."), - }; + }); - const searchOutputSchema = { + const searchOutputSchema = z.object({ results: z.string().describe("Formatted search results, each with title, URL, snippet, and date"), - }; + }); server.registerTool( "perplexity_search", @@ -778,8 +770,8 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P "Returns formatted results (title, URL, snippet, date) with no AI synthesis. " + "Supports recency filters, domain restrictions, and a lower-latency fast search mode. " + "For AI-generated answers with citations, use perplexity_ask instead.", - inputSchema: searchInputSchema as any, - outputSchema: searchOutputSchema as any, + inputSchema: searchInputSchema, + outputSchema: searchOutputSchema, annotations: { readOnlyHint: true, openWorldHint: true, @@ -814,42 +806,5 @@ export function createPerplexityServer(serviceOrigin?: string, serverOptions?: P } ); - advertiseJsonSchema202012(server.server); - return server.server; } - -// The MCP TypeScript SDK stamps draft-07 on tools/list schemas -// (modelcontextprotocol/typescript-sdk#2084); 2020-12-only clients reject -// them. The schemas are valid under both dialects, so only the declared -// dialect needs rewriting. Remove once typescript-sdk#2085 ships. -const JSON_SCHEMA_2020_12 = "https://json-schema.org/draft/2020-12/schema"; - -function advertiseJsonSchema202012(server: McpServer["server"]) { - type ListToolsHandler = (request: unknown, extra: unknown) => Promise<{ - tools: Array<{ - inputSchema?: { $schema?: string }; - outputSchema?: { $schema?: string }; - }>; - }>; - // _requestHandlers is private SDK state; goes away with this shim. - const handlers = (server as unknown as { - _requestHandlers: Map; - })._requestHandlers; - const listTools = handlers.get("tools/list"); - if (!listTools) { - return; - } - handlers.set("tools/list", async (request, extra) => { - const result = await listTools(request, extra); - for (const tool of result.tools ?? []) { - if (tool.inputSchema?.$schema) { - tool.inputSchema.$schema = JSON_SCHEMA_2020_12; - } - if (tool.outputSchema?.$schema) { - tool.outputSchema.$schema = JSON_SCHEMA_2020_12; - } - } - return result; - }); -} diff --git a/src/transport.test.ts b/src/transport.test.ts index 00c61940..7a2dbb4f 100644 --- a/src/transport.test.ts +++ b/src/transport.test.ts @@ -1,9 +1,9 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; import { createPerplexityServer, ASK_PRESET, REASON_PRESET, RESEARCH_PRESET } from "./server.js"; import type { PerplexityServerOptions } from "./types.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"; +import { InMemoryTransport } from "@modelcontextprotocol/server"; +import { Client } from "@modelcontextprotocol/client"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; import express from "express"; import cors from "cors"; import { Server } from "http"; @@ -93,7 +93,7 @@ describe("Transport Integration Tests", () => { // Set up proper MCP endpoint with real transport app.post("/mcp", async (req, res) => { try { - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, enableJsonResponse: true, }); @@ -165,7 +165,7 @@ describe("Transport Integration Tests", () => { // Set up proper MCP endpoint with real transport app.post("/mcp", async (req, res) => { try { - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, enableJsonResponse: true, }); @@ -219,15 +219,15 @@ describe("Transport Integration Tests", () => { expect(data.jsonrpc).toBe("2.0"); expect(data.id).toBe(2); - // McpServer returns tool errors as result.isError, not top-level error - expect(data.result).toBeDefined(); - expect(data.result.isError).toBe(true); - expect(data.result.content[0].text).toContain("not found"); + // An unknown tool is a protocol error, not a tool result. + expect(data.result).toBeUndefined(); + expect(data.error.code).toBe(-32602); + expect(data.error.message).toContain("not found"); }); it("should require proper Accept headers", async () => { app.post("/mcp", async (req, res) => { - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, enableJsonResponse: true, }); @@ -570,7 +570,6 @@ describe("Transport Integration Tests", () => { name: "perplexity_research", arguments: { messages: [{ role: "user", content: "test" }] }, }, - undefined, { onprogress: (p) => { progressMessages.push(p.message);