Migrate to MCP v2

Author: poad

example/lambda/index.ts

@@ -1,5 +1,5 @@
 import { Logger } from '@aws-lambda-powertools/logger';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp';
+import { McpServer } from '@modelcontextprotocol/server';
 import { handle } from 'hono/aws-lambda';
 import { z } from 'zod';
 import { createHonoApp } from 'aws-lambda-mcp-server';
@@ -16,7 +16,7 @@ const createMcpServer = () => {
     'say_hello',
     {
       description: 'Greets the user with a friendly message.',
-      inputSchema: { who: z.string() },
+      inputSchema: z.object({ who: z.string() }),
     },
     async ({ who }: { who: string }) => ({
       content: [{

example/package.json

@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@aws-lambda-powertools/logger": "2.34.0",
-    "@modelcontextprotocol/sdk": "1.30.0",
+    "@modelcontextprotocol/server": "2.0.0",
     "aws-cdk-lib": "2.261.0",
     "aws-lambda-mcp-server": "workspace:*",
     "constructs": "10.7.1",

package/package.json

@@ -59,14 +59,16 @@
   "dependencies": {
     "@aws-lambda-powertools/logger": "2.34.0",
     "@hono/mcp": "0.3.1",
-    "@modelcontextprotocol/sdk": "1.30.0",
+    "@modelcontextprotocol/core": "^2.0.0",
+    "@modelcontextprotocol/hono": "^2.0.0",
+    "@modelcontextprotocol/server": "2.0.0",
     "hono": "4.12.31",
     "zod": "4.4.3"
   },
   "peerDependencies": {
     "@aws-lambda-powertools/logger": "^2.34.0",
     "@hono/mcp": "^0.3.1",
-    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@modelcontextprotocol/server": "^2.0.0",
     "hono": "^4.12.31",
     "zod": "^3.25 || ^4.0"
   }

package/src/index.ts

@@ -10,9 +10,9 @@
  */
 
 import { Logger } from '@aws-lambda-powertools/logger';
-import { StreamableHTTPTransport } from '@hono/mcp';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp';
-import { Context, Hono } from 'hono';
+import { McpServer, WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/server';
+import { createMcpHonoApp } from '@modelcontextprotocol/hono';
+import { Context } from 'hono';
 import { BlankEnv, BlankInput } from 'hono/types';
 
 /**
@@ -22,6 +22,15 @@ import { BlankEnv, BlankInput } from 'hono/types';
  */
 const logger = new Logger();
 
+// `@modelcontextprotocol/hono` が c.set('parsedBody', ...) で格納する値の型を
+// Hono の ContextVariableMap に宣言マージで追加する（パッケージ側の型定義に
+// 反映されていないための回避策）
+declare module 'hono' {
+  interface ContextVariableMap {
+    parsedBody: unknown;
+  }
+}
+
 /**
  * 許可されていないHTTPメソッドに対するハンドラーです。
  *
@@ -93,7 +102,7 @@ const handleError = (
  * @returns void
  * @private
  */
-const closeResources = async (server: McpServer, transport: StreamableHTTPTransport) => {
+const closeResources = async (server: McpServer, transport: WebStandardStreamableHTTPServerTransport) => {
   // 両方のクローズを確実に実行（片方が失敗してももう片方を実行）
   const closeResults = await Promise.allSettled([
     transport.close(),
@@ -125,15 +134,15 @@ const closeResources = async (server: McpServer, transport: StreamableHTTPTransp
  * @private
  */
 const handleRequest = async (createMcpServer: () => McpServer, c: Context<BlankEnv, '/mcp', BlankInput>) => {
-  const transport = new StreamableHTTPTransport({
+  const transport = new WebStandardStreamableHTTPServerTransport({
     sessionIdGenerator: undefined, // セッションIDを生成しない（ステートレスモード）
     enableJsonResponse: true,
   });
   const server = createMcpServer();
   try {
     await server.connect(transport);
     logger.trace('MCP リクエストを受信');
-    return await transport.handleRequest(c);
+    return await transport.handleRequest(c.req.raw, { parsedBody: c.get('parsedBody') });
   } catch (error) {
     return handleError(c, error, 'MCP 接続中のエラー:');
   } finally {
@@ -168,7 +177,7 @@ const handleRequest = async (createMcpServer: () => McpServer, c: Context<BlankE
  * ```
  */
 export const createHonoApp = (createMcpServer: () => McpServer) => {
-  const app = new Hono();
+  const app = createMcpHonoApp();
 
   app.post('/mcp', async (c) => {
     return await handleRequest(createMcpServer, c);

pnpm-lock.yaml

@@ -14,6 +14,11 @@ minimumReleaseAgeExclude:
   - pnpm@11.17.0
   - '@modelcontextprotocol/sdk@1.30.0'
   - brace-expansion@5.0.8
+  - '@modelcontextprotocol/codemod@2.0.0'
+  - '@modelcontextprotocol/server@2.0.0'
+  - '@modelcontextprotocol/core@2.0.0'
+  - '@modelcontextprotocol/hono@2.0.0'
+  - '@modelcontextprotocol/node@2.0.0'
 
 overrides:
   brace-expansion@<=5.0.7: ^5.0.8