@weapp-vite/mcp 1.4.16 → 1.5.0

package/README.md

@@ -13,6 +13,10 @@
 
 默认通过 `stdio` 运行，适合接入任意 MCP Client，也支持 `streamable-http`。
 
+当前实现基于 MCP TypeScript SDK v2，`stdio` 与 `streamable-http` 都显式支持
+`2026-07-28` 协议版本；旧版 2025-era 客户端仍可通过兼容路径接入。HTTP 模式默认校验
+`Host` 与 `Origin`，建议保持监听在 `127.0.0.1`。
+
 ## 启动
 
 ```bash
@@ -68,6 +72,7 @@ const handle = await startWeappViteMcpServer({
 - `weapp_devtools_host_api`: 调用 `wx.*` API
 - `weapp_devtools_console`: 读取 MCP 会话期间捕获的 console/exception 日志
 - `weapp_runtime_find_node` / `weapp_runtime_find_nodes` / `weapp_runtime_wait_node`: 查询和等待页面元素
+- `weapp_runtime_find_node_by_xpath` / `weapp_runtime_find_nodes_by_xpath`: 通过 XPath 查询页面元素
 - `weapp_runtime_page_state` / `weapp_runtime_update_page_state` / `weapp_runtime_invoke_page`: 操作页面实例
 - `weapp_runtime_tap_node` / `weapp_runtime_input_node`: 操作页面元素
 - `weapp_runtime_component_state` / `weapp_runtime_update_component_state` / `weapp_runtime_invoke_component`: 操作组件实例
@@ -130,5 +135,5 @@ pnpm --filter @weapp-vite/mcp build
 
 ## 相关链接
 
-- MCP SDK: https://github.com/modelcontextprotocol/sdk
+- MCP TypeScript SDK v2: https://github.com/modelcontextprotocol/typescript-sdk
 - 仓库: https://github.com/weapp-vite/weapp-vite

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { DevtoolsRuntimeHooks } from '@weapp-vite/devtools-runtime';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@modelcontextprotocol/server';
 
 declare const MCP_SERVER_NAME = "@weapp-vite/mcp";
 declare const MCP_SERVER_VERSION = "2.0.0";
@@ -161,6 +161,12 @@ interface CreateServerOptions {
     runtimeHooks?: DevtoolsRuntimeHooks;
     workspaceRoot?: string;
 }
+interface WeappViteMcpServerFactory {
+    createServer: () => McpServer;
+    runtimeManager: RuntimeSessionManager;
+    workspaceRoot: string;
+}
+declare function createWeappViteMcpServerFactory(options?: CreateServerOptions): Promise<WeappViteMcpServerFactory>;
 declare function createWeappViteMcpServer(options?: CreateServerOptions): Promise<{
     runtimeManager: RuntimeSessionManager;
     server: McpServer;
@@ -186,7 +192,7 @@ interface McpServerHandle {
     transport: 'stdio' | 'streamable-http';
     close?: () => Promise<void>;
 }
-declare function startStdioServer(options?: CreateServerOptions): Promise<void>;
+declare function startStdioServer(options?: CreateServerOptions): Promise<McpServerHandle>;
 declare function startWeappViteMcpServer(options?: StartMcpServerOptions): Promise<McpServerHandle>;
 
 declare function formatJson(value: unknown): string;
@@ -212,5 +218,5 @@ declare function resolveWorkspaceRoot(start?: string): string;
 declare function assertInsideRoot(root: string, targetPath: string): string;
 declare function resolveSubPath(root: string, relativePath: string): string;
 
-export { DEFAULT_MAX_FILE_CHARS, DEFAULT_MAX_OUTPUT_CHARS, DEFAULT_MAX_RESULTS, DEFAULT_MCP_ENDPOINT, DEFAULT_MCP_HOST, DEFAULT_MCP_PORT, DEFAULT_RUNTIME_REST_ENDPOINT, DEFAULT_TIMEOUT_MS, EXPOSED_PACKAGES, MCP_SERVER_NAME, MCP_SERVER_VERSION, SKIPPED_DIR_NAMES, assertInsideRoot, createWeappViteMcpServer, formatJson, listFilesInDirectory, loadExposedCatalog, loadPackageSummary, normalizeErrorMessage, readFileContent, resolveSubPath, resolveWorkspaceRoot, runCommand, searchTextInDirectory, startStdioServer, startWeappViteMcpServer, toToolError, toToolResult };
-export type { CommandResult, CreateServerOptions, ExposedPackageId, ExposedPackageSummary, McpServerHandle, SearchMatch, StartMcpServerOptions };
+export { DEFAULT_MAX_FILE_CHARS, DEFAULT_MAX_OUTPUT_CHARS, DEFAULT_MAX_RESULTS, DEFAULT_MCP_ENDPOINT, DEFAULT_MCP_HOST, DEFAULT_MCP_PORT, DEFAULT_RUNTIME_REST_ENDPOINT, DEFAULT_TIMEOUT_MS, EXPOSED_PACKAGES, MCP_SERVER_NAME, MCP_SERVER_VERSION, SKIPPED_DIR_NAMES, assertInsideRoot, createWeappViteMcpServer, createWeappViteMcpServerFactory, formatJson, listFilesInDirectory, loadExposedCatalog, loadPackageSummary, normalizeErrorMessage, readFileContent, resolveSubPath, resolveWorkspaceRoot, runCommand, searchTextInDirectory, startStdioServer, startWeappViteMcpServer, toToolError, toToolResult };
+export type { CommandResult, CreateServerOptions, ExposedPackageId, ExposedPackageSummary, McpServerHandle, SearchMatch, StartMcpServerOptions, WeappViteMcpServerFactory };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { DevtoolsRuntimeHooks } from '@weapp-vite/devtools-runtime';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@modelcontextprotocol/server';
 
 declare const MCP_SERVER_NAME = "@weapp-vite/mcp";
 declare const MCP_SERVER_VERSION = "2.0.0";
@@ -161,6 +161,12 @@ interface CreateServerOptions {
     runtimeHooks?: DevtoolsRuntimeHooks;
     workspaceRoot?: string;
 }
+interface WeappViteMcpServerFactory {
+    createServer: () => McpServer;
+    runtimeManager: RuntimeSessionManager;
+    workspaceRoot: string;
+}
+declare function createWeappViteMcpServerFactory(options?: CreateServerOptions): Promise<WeappViteMcpServerFactory>;
 declare function createWeappViteMcpServer(options?: CreateServerOptions): Promise<{
     runtimeManager: RuntimeSessionManager;
     server: McpServer;
@@ -186,7 +192,7 @@ interface McpServerHandle {
     transport: 'stdio' | 'streamable-http';
     close?: () => Promise<void>;
 }
-declare function startStdioServer(options?: CreateServerOptions): Promise<void>;
+declare function startStdioServer(options?: CreateServerOptions): Promise<McpServerHandle>;
 declare function startWeappViteMcpServer(options?: StartMcpServerOptions): Promise<McpServerHandle>;
 
 declare function formatJson(value: unknown): string;
@@ -212,5 +218,5 @@ declare function resolveWorkspaceRoot(start?: string): string;
 declare function assertInsideRoot(root: string, targetPath: string): string;
 declare function resolveSubPath(root: string, relativePath: string): string;
 
-export { DEFAULT_MAX_FILE_CHARS, DEFAULT_MAX_OUTPUT_CHARS, DEFAULT_MAX_RESULTS, DEFAULT_MCP_ENDPOINT, DEFAULT_MCP_HOST, DEFAULT_MCP_PORT, DEFAULT_RUNTIME_REST_ENDPOINT, DEFAULT_TIMEOUT_MS, EXPOSED_PACKAGES, MCP_SERVER_NAME, MCP_SERVER_VERSION, SKIPPED_DIR_NAMES, assertInsideRoot, createWeappViteMcpServer, formatJson, listFilesInDirectory, loadExposedCatalog, loadPackageSummary, normalizeErrorMessage, readFileContent, resolveSubPath, resolveWorkspaceRoot, runCommand, searchTextInDirectory, startStdioServer, startWeappViteMcpServer, toToolError, toToolResult };
-export type { CommandResult, CreateServerOptions, ExposedPackageId, ExposedPackageSummary, McpServerHandle, SearchMatch, StartMcpServerOptions };
+export { DEFAULT_MAX_FILE_CHARS, DEFAULT_MAX_OUTPUT_CHARS, DEFAULT_MAX_RESULTS, DEFAULT_MCP_ENDPOINT, DEFAULT_MCP_HOST, DEFAULT_MCP_PORT, DEFAULT_RUNTIME_REST_ENDPOINT, DEFAULT_TIMEOUT_MS, EXPOSED_PACKAGES, MCP_SERVER_NAME, MCP_SERVER_VERSION, SKIPPED_DIR_NAMES, assertInsideRoot, createWeappViteMcpServer, createWeappViteMcpServerFactory, formatJson, listFilesInDirectory, loadExposedCatalog, loadPackageSummary, normalizeErrorMessage, readFileContent, resolveSubPath, resolveWorkspaceRoot, runCommand, searchTextInDirectory, startStdioServer, startWeappViteMcpServer, toToolError, toToolResult };
+export type { CommandResult, CreateServerOptions, ExposedPackageId, ExposedPackageSummary, McpServerHandle, SearchMatch, StartMcpServerOptions, WeappViteMcpServerFactory };

package/dist/index.mjs

@@ -1,17 +1,16 @@
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-import { Buffer } from 'node:buffer';
-import { randomUUID } from 'node:crypto';
 import http from 'node:http';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import { toNodeHandler, localhostHostValidation, hostHeaderValidation, localhostOriginValidation, originValidation } from '@modelcontextprotocol/node';
+import { ResourceTemplate, McpServer, createMcpHandler } from '@modelcontextprotocol/server';
+import { serveStdio } from '@modelcontextprotocol/server/stdio';
+import { Buffer } from 'node:buffer';
 import fs$1 from 'node:fs/promises';
 import path from 'node:path';
 import { z } from 'zod';
 import { closeSharedMiniProgram, resolveDevtoolsProjectPath, resolveDevtoolsWorkspacePath, acquireSharedMiniProgram, releaseSharedMiniProgram, resolveSharedMiniProgramSessionKey, toDevtoolsSerializableValue } from '@weapp-vite/devtools-runtime';
-import { ResourceTemplate, McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import fs from 'node:fs';
 import { createRequire } from 'node:module';
+import fs from 'node:fs';
 import { spawn } from 'node:child_process';
 
 const MCP_SERVER_NAME = "@weapp-vite/mcp";
@@ -86,118 +85,6 @@ function resolveSubPath(root, relativePath) {
   return assertInsideRoot(root, path.resolve(root, relativePath));
 }
 
-function registerServerPrompts(server, options) {
-  const { packageIds, packageIdSchema } = options;
-  server.registerPrompt("plan-weapp-vite-change", {
-    title: "Plan weapp-vite Change",
-    description: "\u6839\u636E\u53D8\u66F4\u76EE\u6807\u751F\u6210 weapp-vite / wevu \u4FEE\u6539\u8BA1\u5212\u63D0\u793A\u8BCD",
-    argsSchema: {
-      objective: z.string().min(1),
-      focusPackage: packageIdSchema.optional()
-    }
-  }, async ({ objective, focusPackage }) => {
-    const targets = focusPackage ? [focusPackage] : packageIds;
-    return {
-      messages: [
-        {
-          role: "user",
-          content: {
-            type: "text",
-            text: [
-              "\u4F60\u662F weapp-vite monorepo \u7EF4\u62A4\u8005\uFF0C\u8BF7\u7ED9\u51FA\u53EF\u6267\u884C\u7684\u6539\u9020\u8BA1\u5212\u3002",
-              `\u76EE\u6807\uFF1A${objective}`,
-              `\u805A\u7126\u5305\uFF1A${targets.join(", ")}`,
-              "\u8BF7\u5305\u542B\uFF1A\u5F71\u54CD\u9762\u3001\u98CE\u9669\u70B9\u3001\u6D4B\u8BD5\u7B56\u7565\u3001\u56DE\u6EDA\u7B56\u7565\u3002"
-            ].join("\n")
-          }
-        }
-      ]
-    };
-  });
-  server.registerPrompt("debug-wevu-runtime", {
-    title: "Debug wevu Runtime",
-    description: "\u7528\u4E8E\u5B9A\u4F4D wevu runtime \u751F\u547D\u5468\u671F/\u54CD\u5E94\u5F0F\u95EE\u9898\u7684\u6807\u51C6\u63D0\u793A\u8BCD",
-    argsSchema: {
-      symptom: z.string().min(1)
-    }
-  }, async ({ symptom }) => {
-    return {
-      messages: [
-        {
-          role: "user",
-          content: {
-            type: "text",
-            text: [
-              "\u8BF7\u57FA\u4E8E wevu runtime \u4EE3\u7801\u8DEF\u5F84\u8FDB\u884C\u5206\u5C42\u6392\u67E5\uFF1A",
-              "1. \u590D\u73B0\u573A\u666F\u4E0E\u6700\u5C0F\u6837\u4F8B",
-              "2. \u751F\u547D\u5468\u671F\u94A9\u5B50\u89E6\u53D1\u94FE",
-              "3. \u54CD\u5E94\u5F0F\u4E0E setData \u5DEE\u91CF\u540C\u6B65\u94FE",
-              "4. \u5355\u6D4B\u4E0E e2e \u56DE\u5F52\u8865\u4E01",
-              `\u73B0\u8C61\uFF1A${symptom}`
-            ].join("\n")
-          }
-        }
-      ]
-    };
-  });
-  server.registerPrompt("inspect-mini-program-page", {
-    title: "Inspect Mini Program Page",
-    description: "\u8FDE\u63A5\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u5E76\u68C0\u67E5\u5F53\u524D\u5C0F\u7A0B\u5E8F\u9875\u9762\u7684\u6807\u51C6\u6D41\u7A0B",
-    argsSchema: {
-      projectPath: z.string().min(1),
-      pagePath: z.string().optional(),
-      focus: z.string().optional()
-    }
-  }, async ({ projectPath, pagePath, focus }) => {
-    return {
-      messages: [
-        {
-          role: "user",
-          content: {
-            type: "text",
-            text: [
-              "\u8BF7\u6309\u987A\u5E8F\u4F7F\u7528 weapp-vite MCP runtime tools \u68C0\u67E5\u5C0F\u7A0B\u5E8F\u9875\u9762\uFF1A",
-              `1. \u8C03\u7528 weapp_devtools_connect\uFF0CprojectPath=${projectPath}`,
-              pagePath ? `2. \u8C03\u7528 weapp_devtools_route \u8DF3\u8F6C\u5230 ${pagePath}` : "2. \u8C03\u7528 weapp_devtools_active_page \u786E\u8BA4\u5F53\u524D\u9875\u9762",
-              "3. \u8C03\u7528 weapp_devtools_capture \u83B7\u53D6\u622A\u56FE",
-              "4. \u5982\u9700\u68C0\u67E5\u7ED3\u6784\uFF0C\u4F18\u5148\u8C03\u7528 weapp_runtime_find_node/weapp_runtime_find_nodes\uFF0C\u5FC5\u8981\u65F6\u8BBE\u7F6E withWxml=true",
-              "5. \u8C03\u7528 weapp_devtools_console \u68C0\u67E5 console/exception \u65E5\u5FD7",
-              focus ? `\u5173\u6CE8\u70B9\uFF1A${focus}` : "\u5173\u6CE8\u70B9\uFF1A\u9875\u9762\u662F\u5426\u6B63\u786E\u6E32\u67D3\u3001\u662F\u5426\u5B58\u5728\u8FD0\u884C\u65F6\u9519\u8BEF\u3002"
-            ].join("\n")
-          }
-        }
-      ]
-    };
-  });
-  server.registerPrompt("recover-mini-program-connection", {
-    title: "Recover Mini Program Connection",
-    description: "\u6062\u590D\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177 automator \u8FDE\u63A5\u7684\u6807\u51C6\u6D41\u7A0B",
-    argsSchema: {
-      projectPath: z.string().min(1),
-      lastError: z.string().optional()
-    }
-  }, async ({ projectPath, lastError }) => {
-    return {
-      messages: [
-        {
-          role: "user",
-          content: {
-            type: "text",
-            text: [
-              "\u8BF7\u6309\u987A\u5E8F\u6062\u590D weapp-vite MCP runtime \u8FDE\u63A5\uFF1A",
-              `1. \u8C03\u7528 weapp_devtools_connect\uFF0CprojectPath=${projectPath}\uFF0Creconnect=true`,
-              "2. \u5982\u679C\u4ECD\u5931\u8D25\uFF0C\u68C0\u67E5\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u662F\u5426\u5DF2\u5F00\u542F\u670D\u52A1\u7AEF\u53E3\u4E0E\u81EA\u52A8\u5316\u6D4B\u8BD5\u80FD\u529B",
-              "3. \u5982\u679C\u662F\u534F\u8BAE\u8D85\u65F6\uFF0C\u5173\u95ED\u591A\u4F59 DevTools \u7A97\u53E3\u540E\u53EA\u91CD\u8BD5\u4E00\u6B21",
-              "4. \u6062\u590D\u540E\u8C03\u7528 weapp_devtools_active_page \u548C weapp_devtools_console \u786E\u8BA4\u72B6\u6001",
-              lastError ? `\u4E0A\u4E00\u6B21\u9519\u8BEF\uFF1A${lastError}` : "\u4E0A\u4E00\u6B21\u9519\u8BEF\uFF1A\u672A\u63D0\u4F9B\u3002"
-            ].join("\n")
-          }
-        }
-      ]
-    };
-  });
-}
-
 async function pathExists(filePath) {
   try {
     await fs$1.access(filePath);
@@ -309,6 +196,118 @@ async function resolveExposedPackages(workspaceRoot) {
   }).sort((a, b) => a.id.localeCompare(b.id));
 }
 
+function registerServerPrompts(server, options) {
+  const { packageIds, packageIdSchema } = options;
+  server.registerPrompt("plan-weapp-vite-change", {
+    title: "Plan weapp-vite Change",
+    description: "\u6839\u636E\u53D8\u66F4\u76EE\u6807\u751F\u6210 weapp-vite / wevu \u4FEE\u6539\u8BA1\u5212\u63D0\u793A\u8BCD",
+    argsSchema: z.object({
+      objective: z.string().min(1),
+      focusPackage: packageIdSchema.optional()
+    })
+  }, async ({ objective, focusPackage }) => {
+    const targets = focusPackage ? [focusPackage] : packageIds;
+    return {
+      messages: [
+        {
+          role: "user",
+          content: {
+            type: "text",
+            text: [
+              "\u4F60\u662F weapp-vite monorepo \u7EF4\u62A4\u8005\uFF0C\u8BF7\u7ED9\u51FA\u53EF\u6267\u884C\u7684\u6539\u9020\u8BA1\u5212\u3002",
+              `\u76EE\u6807\uFF1A${objective}`,
+              `\u805A\u7126\u5305\uFF1A${targets.join(", ")}`,
+              "\u8BF7\u5305\u542B\uFF1A\u5F71\u54CD\u9762\u3001\u98CE\u9669\u70B9\u3001\u6D4B\u8BD5\u7B56\u7565\u3001\u56DE\u6EDA\u7B56\u7565\u3002"
+            ].join("\n")
+          }
+        }
+      ]
+    };
+  });
+  server.registerPrompt("debug-wevu-runtime", {
+    title: "Debug wevu Runtime",
+    description: "\u7528\u4E8E\u5B9A\u4F4D wevu runtime \u751F\u547D\u5468\u671F/\u54CD\u5E94\u5F0F\u95EE\u9898\u7684\u6807\u51C6\u63D0\u793A\u8BCD",
+    argsSchema: z.object({
+      symptom: z.string().min(1)
+    })
+  }, async ({ symptom }) => {
+    return {
+      messages: [
+        {
+          role: "user",
+          content: {
+            type: "text",
+            text: [
+              "\u8BF7\u57FA\u4E8E wevu runtime \u4EE3\u7801\u8DEF\u5F84\u8FDB\u884C\u5206\u5C42\u6392\u67E5\uFF1A",
+              "1. \u590D\u73B0\u573A\u666F\u4E0E\u6700\u5C0F\u6837\u4F8B",
+              "2. \u751F\u547D\u5468\u671F\u94A9\u5B50\u89E6\u53D1\u94FE",
+              "3. \u54CD\u5E94\u5F0F\u4E0E setData \u5DEE\u91CF\u540C\u6B65\u94FE",
+              "4. \u5355\u6D4B\u4E0E e2e \u56DE\u5F52\u8865\u4E01",
+              `\u73B0\u8C61\uFF1A${symptom}`
+            ].join("\n")
+          }
+        }
+      ]
+    };
+  });
+  server.registerPrompt("inspect-mini-program-page", {
+    title: "Inspect Mini Program Page",
+    description: "\u8FDE\u63A5\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u5E76\u68C0\u67E5\u5F53\u524D\u5C0F\u7A0B\u5E8F\u9875\u9762\u7684\u6807\u51C6\u6D41\u7A0B",
+    argsSchema: z.object({
+      projectPath: z.string().min(1),
+      pagePath: z.string().optional(),
+      focus: z.string().optional()
+    })
+  }, async ({ projectPath, pagePath, focus }) => {
+    return {
+      messages: [
+        {
+          role: "user",
+          content: {
+            type: "text",
+            text: [
+              "\u8BF7\u6309\u987A\u5E8F\u4F7F\u7528 weapp-vite MCP runtime tools \u68C0\u67E5\u5C0F\u7A0B\u5E8F\u9875\u9762\uFF1A",
+              `1. \u8C03\u7528 weapp_devtools_connect\uFF0CprojectPath=${projectPath}`,
+              pagePath ? `2. \u8C03\u7528 weapp_devtools_route \u8DF3\u8F6C\u5230 ${pagePath}` : "2. \u8C03\u7528 weapp_devtools_active_page \u786E\u8BA4\u5F53\u524D\u9875\u9762",
+              "3. \u8C03\u7528 weapp_devtools_capture \u83B7\u53D6\u622A\u56FE",
+              "4. \u5982\u9700\u68C0\u67E5\u7ED3\u6784\uFF0C\u4F18\u5148\u8C03\u7528 weapp_runtime_find_node/weapp_runtime_find_nodes\uFF0C\u5FC5\u8981\u65F6\u8BBE\u7F6E withWxml=true",
+              "5. \u8C03\u7528 weapp_devtools_console \u68C0\u67E5 console/exception \u65E5\u5FD7",
+              focus ? `\u5173\u6CE8\u70B9\uFF1A${focus}` : "\u5173\u6CE8\u70B9\uFF1A\u9875\u9762\u662F\u5426\u6B63\u786E\u6E32\u67D3\u3001\u662F\u5426\u5B58\u5728\u8FD0\u884C\u65F6\u9519\u8BEF\u3002"
+            ].join("\n")
+          }
+        }
+      ]
+    };
+  });
+  server.registerPrompt("recover-mini-program-connection", {
+    title: "Recover Mini Program Connection",
+    description: "\u6062\u590D\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177 automator \u8FDE\u63A5\u7684\u6807\u51C6\u6D41\u7A0B",
+    argsSchema: z.object({
+      projectPath: z.string().min(1),
+      lastError: z.string().optional()
+    })
+  }, async ({ projectPath, lastError }) => {
+    return {
+      messages: [
+        {
+          role: "user",
+          content: {
+            type: "text",
+            text: [
+              "\u8BF7\u6309\u987A\u5E8F\u6062\u590D weapp-vite MCP runtime \u8FDE\u63A5\uFF1A",
+              `1. \u8C03\u7528 weapp_devtools_connect\uFF0CprojectPath=${projectPath}\uFF0Creconnect=true`,
+              "2. \u5982\u679C\u4ECD\u5931\u8D25\uFF0C\u68C0\u67E5\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u662F\u5426\u5DF2\u5F00\u542F\u670D\u52A1\u7AEF\u53E3\u4E0E\u81EA\u52A8\u5316\u6D4B\u8BD5\u80FD\u529B",
+              "3. \u5982\u679C\u662F\u534F\u8BAE\u8D85\u65F6\uFF0C\u5173\u95ED\u591A\u4F59 DevTools \u7A97\u53E3\u540E\u53EA\u91CD\u8BD5\u4E00\u6B21",
+              "4. \u6062\u590D\u540E\u8C03\u7528 weapp_devtools_active_page \u548C weapp_devtools_console \u786E\u8BA4\u72B6\u6001",
+              lastError ? `\u4E0A\u4E00\u6B21\u9519\u8BEF\uFF1A${lastError}` : "\u4E0A\u4E00\u6B21\u9519\u8BEF\uFF1A\u672A\u63D0\u4F9B\u3002"
+            ].join("\n")
+          }
+        }
+      ]
+    };
+  });
+}
+
 async function walkFilesRecursive(root, current, output, maxResults) {
   if (output.length >= maxResults) {
     return;
@@ -538,15 +537,15 @@ async function runWeappViteCliTool(workspaceRoot, input) {
   });
 }
 
-async function registerServerResources(server, options) {
-  const { workspaceRoot, packageIds } = options;
+function registerServerResources(server, options) {
+  const { workspaceRoot, packageIds, exposedPackages } = options;
   server.registerResource("workspace-catalog", "weapp-vite://workspace/catalog", {
     title: "Workspace Catalog",
     description: "weapp-vite / wevu \u5305\u76EE\u5F55\u3001\u7248\u672C\u548C\u811A\u672C\u5217\u8868",
     mimeType: "application/json"
   }, async () => {
-    const catalog2 = await resolveExposedPackages(workspaceRoot);
-    const text = JSON.stringify({ workspaceRoot, packages: catalog2 }, null, 2);
+    const catalog = await resolveExposedPackages(workspaceRoot);
+    const text = JSON.stringify({ workspaceRoot, packages: catalog }, null, 2);
     return {
       contents: [{
         uri: "weapp-vite://workspace/catalog",
@@ -555,8 +554,7 @@ async function registerServerResources(server, options) {
       }]
     };
   });
-  const catalog = await resolveExposedPackages(workspaceRoot);
-  for (const summary of catalog) {
+  for (const summary of exposedPackages) {
     if (summary.docs.readme) {
       const uri = toDocsUri(summary.id, "README.md");
       server.registerResource(`docs-${summary.id}-readme`, uri, {
@@ -624,7 +622,7 @@ async function registerServerResources(server, options) {
 
 const DEFAULT_SCREENSHOT_TIMEOUT = 6e4;
 const SCREENSHOT_RETRY_DELAY = 500;
-z.object({
+const connectionSchema$1 = z.object({
   projectPath: z.string().trim().min(1).describe("\u5C0F\u7A0B\u5E8F\u9879\u76EE\u8DEF\u5F84\uFF1B\u652F\u6301 workspaceRoot \u76F8\u5BF9\u8DEF\u5F84"),
   timeout: z.number().int().positive().optional(),
   port: z.number().int().positive().optional(),
@@ -1022,10 +1020,10 @@ function registerDevtoolsRuntimeTools(server, manager) {
   server.registerTool("weapp_devtools_connect", {
     title: "Ensure Mini Program Connection",
     description: "\u786E\u4FDD\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177 automator \u4F1A\u8BDD\u53EF\u7528\uFF0C\u5E76\u8FD4\u56DE\u5F53\u524D\u9875\u9762\u4E0E\u7CFB\u7EDF\u4FE1\u606F\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...connectionInputSchema,
       reconnect: z.boolean().optional()
-    }
+    })
   }, async ({ reconnect, ...connection }) => {
     try {
       if (reconnect) {
@@ -1051,7 +1049,7 @@ function registerDevtoolsRuntimeTools(server, manager) {
   server.registerTool("weapp_devtools_route", {
     title: "Navigate Mini Program",
     description: "\u5728\u5C0F\u7A0B\u5E8F\u5185\u6267\u884C navigateTo\u3001redirectTo\u3001reLaunch\u3001switchTab \u6216 navigateBack\u3002",
-    inputSchema: navigateSchema
+    inputSchema: z.object(navigateSchema)
   }, async ({ path: pagePath, query, transition = "navigateTo", waitMs, ...connection }) => {
     try {
       const result = await manager.withMiniProgram(connection, async (miniProgram) => {
@@ -1093,10 +1091,10 @@ function registerDevtoolsRuntimeTools(server, manager) {
   server.registerTool("weapp_devtools_active_page", {
     title: "Current Mini Program Page",
     description: "\u83B7\u53D6\u5F53\u524D\u9875\u9762\u8DEF\u5F84\u3001\u67E5\u8BE2\u53C2\u6570\u3001\u5C3A\u5BF8\u3001\u6EDA\u52A8\u4F4D\u7F6E\uFF1B\u53EF\u9009\u8FD4\u56DE\u9875\u9762 data\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...connectionInputSchema,
       withData: z.boolean().optional()
-    }
+    })
   }, async ({ withData, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1121,7 +1119,7 @@ function registerDevtoolsRuntimeTools(server, manager) {
   server.registerTool("weapp_devtools_page_stack", {
     title: "Mini Program Page Stack",
     description: "\u83B7\u53D6\u5F53\u524D\u5C0F\u7A0B\u5E8F\u9875\u9762\u6808\u3002",
-    inputSchema: connectionInputSchema
+    inputSchema: connectionSchema$1
   }, async (connection) => {
     try {
       const result = await manager.withMiniProgram(connection, async (miniProgram) => {
@@ -1139,7 +1137,7 @@ function registerDevtoolsRuntimeTools(server, manager) {
   server.registerTool("weapp_devtools_capture", {
     title: "Mini Program Screenshot",
     description: "\u622A\u53D6\u5F53\u524D\u5C0F\u7A0B\u5E8F\u89C6\u53E3\uFF0C\u8FD4\u56DE base64\uFF0C\u6216\u4FDD\u5B58\u5230 workspaceRoot \u76F8\u5BF9 outputPath\u3002",
-    inputSchema: screenshotSchema
+    inputSchema: z.object(screenshotSchema)
   }, async ({ outputPath, ...connection }) => {
     try {
       const result = await manager.withMiniProgram(connection, async (miniProgram) => {
@@ -1169,7 +1167,7 @@ function registerDevtoolsRuntimeTools(server, manager) {
   server.registerTool("weapp_devtools_host_api", {
     title: "Call wx Method",
     description: "\u8C03\u7528\u5FAE\u4FE1\u5C0F\u7A0B\u5E8F wx API\uFF0C\u4F8B\u5982 wx.pageScrollTo\u3002",
-    inputSchema: hostApiSchema
+    inputSchema: z.object(hostApiSchema)
   }, async ({ method, args, ...connection }) => {
     try {
       const result = await manager.withMiniProgram(connection, async (miniProgram) => {
@@ -1189,9 +1187,9 @@ function registerDevtoolsRuntimeTools(server, manager) {
   server.registerTool("weapp_devtools_console", {
     title: "Get Mini Program Logs",
     description: "\u8BFB\u53D6 MCP \u4F1A\u8BDD\u6355\u83B7\u5230\u7684\u5C0F\u7A0B\u5E8F console/exception \u65E5\u5FD7\uFF1B\u53EF\u9009\u8BFB\u53D6\u540E\u6E05\u7A7A\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       clear: z.boolean().optional()
-    }
+    })
   }, async ({ clear }) => {
     try {
       const logs = manager.getLogs();
@@ -1218,10 +1216,10 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_tap_node", {
     title: "Tap Element",
     description: "\u70B9\u51FB\u9875\u9762\u5143\u7D20\uFF0C\u652F\u6301 selector[index=N]\u3001innerSelector \u548C\u70B9\u51FB\u540E\u7B49\u5F85\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       waitMs: z.number().int().nonnegative().optional()
-    }
+    })
   }, async ({ selector, innerSelector, waitMs, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1244,10 +1242,10 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_input_node", {
     title: "Input Element Text",
     description: "\u5411 input \u6216 textarea \u5143\u7D20\u8F93\u5165\u6587\u672C\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       value: z.union([z.string(), z.number()])
-    }
+    })
   }, async ({ selector, innerSelector, value, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1267,11 +1265,11 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_invoke_component", {
     title: "Call Element Method",
     description: "\u8C03\u7528\u81EA\u5B9A\u4E49\u7EC4\u4EF6\u5143\u7D20\u5B9E\u4F8B\u65B9\u6CD5\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       method: z.string().trim().min(1),
       args: z.array(z.unknown()).optional()
-    }
+    })
   }, async ({ selector, innerSelector, method, args, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1293,10 +1291,10 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_component_state", {
     title: "Get Element Data",
     description: "\u8BFB\u53D6\u81EA\u5B9A\u4E49\u7EC4\u4EF6\u5143\u7D20 data\uFF0C\u53EF\u901A\u8FC7 path \u8BFB\u53D6\u5D4C\u5957\u5B57\u6BB5\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       path: z.string().trim().min(1).optional()
-    }
+    })
   }, async ({ selector, innerSelector, path, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1316,10 +1314,10 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_update_component_state", {
     title: "Set Element Data",
     description: "\u8C03\u7528\u81EA\u5B9A\u4E49\u7EC4\u4EF6\u5143\u7D20 setData \u66F4\u65B0 data\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       data: z.record(z.string(), z.unknown())
-    }
+    })
   }, async ({ selector, innerSelector, data, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1339,11 +1337,11 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_find_child", {
     title: "Get Inner Element",
     description: "\u5728\u5143\u7D20\u8303\u56F4\u5185\u67E5\u8BE2\u5355\u4E2A\u5185\u90E8\u5143\u7D20\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       targetSelector: z.string().trim().min(1),
       withWxml: z.boolean().optional()
-    }
+    })
   }, async ({ selector, innerSelector, targetSelector, withWxml, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1367,11 +1365,11 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_find_children", {
     title: "Get Inner Elements",
     description: "\u5728\u5143\u7D20\u8303\u56F4\u5185\u67E5\u8BE2\u5185\u90E8\u5143\u7D20\u6570\u7EC4\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       targetSelector: z.string().trim().min(1),
       withWxml: z.boolean().optional()
-    }
+    })
   }, async ({ selector, innerSelector, targetSelector, withWxml, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1399,10 +1397,10 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_node_markup", {
     title: "Get Element WXML",
     description: "\u8BFB\u53D6\u5143\u7D20 inner WXML \u6216 outer WXML\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       outer: z.boolean().optional()
-    }
+    })
   }, async ({ selector, innerSelector, outer, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1423,10 +1421,10 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_node_styles", {
     title: "Get Element Styles",
     description: "\u8BFB\u53D6\u5143\u7D20\u6837\u5F0F\u503C\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       names: z.array(z.string().trim().min(1)).min(1)
-    }
+    })
   }, async ({ selector, innerSelector, names, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1448,10 +1446,10 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_node_attrs", {
     title: "Get Element Attributes",
     description: "\u8BFB\u53D6\u5143\u7D20 attribute \u503C\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       names: z.array(z.string().trim().min(1)).min(1)
-    }
+    })
   }, async ({ selector, innerSelector, names, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1473,11 +1471,11 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_scroll_node", {
     title: "Scroll Element",
     description: "\u6EDA\u52A8 scroll-view \u5143\u7D20\u5230\u6307\u5B9A\u4F4D\u7F6E\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...elementSelectorSchema,
       x: z.number(),
       y: z.number()
-    }
+    })
   }, async ({ selector, innerSelector, x, y, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1498,7 +1496,7 @@ function registerRuntimeNodeTools(server, manager) {
   server.registerTool("weapp_runtime_measure_node", {
     title: "Get Element Bounding Rect",
     description: "\u8BFB\u53D6\u5143\u7D20\u89C6\u53E3\u77E9\u5F62\uFF1B\u4F18\u5148\u4F7F\u7528\u5143\u7D20 offset/size\uFF0C\u7F3A\u5931\u65F6\u8FD4\u56DE\u53EF\u7528\u5B57\u6BB5\u3002",
-    inputSchema: elementSelectorSchema
+    inputSchema: z.object(elementSelectorSchema)
   }, async ({ selector, innerSelector, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1544,11 +1542,16 @@ const selectorSchema = {
   innerSelector: z.string().trim().min(1).optional(),
   withWxml: z.boolean().optional()
 };
+const xpathSchema = {
+  ...connectionInputSchema,
+  xpath: z.string().trim().min(1),
+  withWxml: z.boolean().optional()
+};
 function registerRuntimePageTools(server, manager) {
   server.registerTool("weapp_runtime_find_node", {
     title: "Get Page Element",
     description: "\u901A\u8FC7\u9009\u62E9\u5668\u83B7\u53D6\u5F53\u524D\u9875\u9762\u5143\u7D20\u6458\u8981\uFF0C\u652F\u6301 selector[index=N]\u3001innerSelector \u4E0E withWxml\u3002",
-    inputSchema: selectorSchema
+    inputSchema: z.object(selectorSchema)
   }, async ({ selector, innerSelector, withWxml, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1567,11 +1570,11 @@ function registerRuntimePageTools(server, manager) {
   server.registerTool("weapp_runtime_find_nodes", {
     title: "Get Page Elements",
     description: "\u901A\u8FC7\u9009\u62E9\u5668\u83B7\u53D6\u5F53\u524D\u9875\u9762\u5143\u7D20\u6570\u7EC4\u6458\u8981\uFF0C\u652F\u6301 selector[index=N] \u4E0E withWxml\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...connectionInputSchema,
       selector: z.string().trim().min(1),
       withWxml: z.boolean().optional()
-    }
+    })
   }, async ({ selector, withWxml, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1590,15 +1593,58 @@ function registerRuntimePageTools(server, manager) {
       return toToolError(error);
     }
   });
+  server.registerTool("weapp_runtime_find_node_by_xpath", {
+    title: "Get Page Element by XPath",
+    description: "\u901A\u8FC7 XPath \u83B7\u53D6\u5F53\u524D\u9875\u9762\u7B2C\u4E00\u4E2A\u5339\u914D\u5143\u7D20\uFF0C\u9002\u5408\u6309\u6587\u672C\u3001\u5C5E\u6027\u6216\u5C42\u7EA7\u5173\u7CFB\u5B9A\u4F4D\u3002",
+    inputSchema: z.object(xpathSchema)
+  }, async ({ xpath, withWxml, ...connection }) => {
+    try {
+      const result = await manager.withPage(connection, async (page) => {
+        const element = await callRequiredMethod(page, "getElementByXpath", xpath);
+        if (!element) {
+          throw new Error(`XPath \u672A\u627E\u5230\u5143\u7D20: "${xpath}"`);
+        }
+        return {
+          xpath,
+          ...await summarizeElement(element, withWxml)
+        };
+      });
+      return toToolResult(result);
+    } catch (error) {
+      return toToolError(error);
+    }
+  });
+  server.registerTool("weapp_runtime_find_nodes_by_xpath", {
+    title: "Get Page Elements by XPath",
+    description: "\u901A\u8FC7 XPath \u83B7\u53D6\u5F53\u524D\u9875\u9762\u5168\u90E8\u5339\u914D\u5143\u7D20\uFF0C\u9002\u5408\u6279\u91CF\u68C0\u67E5\u7ED3\u6784\u4E0E\u5185\u5BB9\u3002",
+    inputSchema: z.object(xpathSchema)
+  }, async ({ xpath, withWxml, ...connection }) => {
+    try {
+      const result = await manager.withPage(connection, async (page) => {
+        const elements = await callRequiredMethod(page, "getElementsByXpath", xpath);
+        return {
+          xpath,
+          count: elements.length,
+          elements: await Promise.all(elements.map(async (element, index) => ({
+            index,
+            ...await summarizeElement(element, withWxml)
+          })))
+        };
+      });
+      return toToolResult(result);
+    } catch (error) {
+      return toToolError(error);
+    }
+  });
   server.registerTool("weapp_runtime_wait_node", {
     title: "Wait Page Element",
     description: "\u8F6E\u8BE2\u7B49\u5F85\u5143\u7D20\u51FA\u73B0\uFF0C\u652F\u6301 selector[index=N]\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...connectionInputSchema,
       selector: z.string().trim().min(1),
       timeoutMs: z.number().int().positive().optional(),
       intervalMs: z.number().int().positive().optional()
-    }
+    })
   }, async ({ selector, timeoutMs = 5e3, intervalMs = 200, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1625,10 +1671,10 @@ function registerRuntimePageTools(server, manager) {
   server.registerTool("weapp_runtime_wait", {
     title: "Wait Page Timeout",
     description: "\u5728\u5F53\u524D\u9875\u9762\u7B49\u5F85\u6307\u5B9A\u6BEB\u79D2\u6570\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...connectionInputSchema,
       milliseconds: z.number().int().nonnegative()
-    }
+    })
   }, async ({ milliseconds, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1643,10 +1689,10 @@ function registerRuntimePageTools(server, manager) {
   server.registerTool("weapp_runtime_page_state", {
     title: "Get Page Data",
     description: "\u8BFB\u53D6\u5F53\u524D\u9875\u9762 data\uFF0C\u53EF\u901A\u8FC7 path \u8BFB\u53D6\u5D4C\u5957\u5B57\u6BB5\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...connectionInputSchema,
       path: z.string().trim().min(1).optional()
-    }
+    })
   }, async ({ path, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => ({
@@ -1661,11 +1707,11 @@ function registerRuntimePageTools(server, manager) {
   server.registerTool("weapp_runtime_update_page_state", {
     title: "Set Page Data",
     description: "\u8C03\u7528\u5F53\u524D\u9875\u9762 setData \u66F4\u65B0 data\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...connectionInputSchema,
       data: z.record(z.string(), z.unknown()),
       verify: z.boolean().optional()
-    }
+    })
   }, async ({ data, verify, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1683,11 +1729,11 @@ function registerRuntimePageTools(server, manager) {
   server.registerTool("weapp_runtime_invoke_page", {
     title: "Call Page Method",
     description: "\u8C03\u7528\u5F53\u524D\u9875\u9762\u5B9E\u4F8B\u65B9\u6CD5\u3002",
-    inputSchema: {
+    inputSchema: z.object({
       ...connectionInputSchema,
       method: z.string().trim().min(1),
       args: z.array(z.unknown()).optional()
-    }
+    })
   }, async ({ method, args, ...connection }) => {
     try {
       const result = await manager.withPage(connection, async (page) => {
@@ -1739,11 +1785,11 @@ function registerServerTools(server, options) {
   server.registerTool("list_source_files", {
     title: "List Source Files",
     description: "\u5217\u51FA weapp-vite / wevu \u5305\u4E0B\u6307\u5B9A\u76EE\u5F55\u6587\u4EF6\u5217\u8868",
-    inputSchema: {
+    inputSchema: z.object({
       packageId: packageIdSchema,
       directory: z.string().optional().describe("\u5305\u5185\u76F8\u5BF9\u76EE\u5F55\uFF0C\u9ED8\u8BA4 src"),
       maxResults: z.number().int().positive().max(2e3).optional()
-    }
+    })
   }, async ({ packageId, directory, maxResults }) => {
     try {
       const packageRoot = await resolvePackageRoot(workspaceRoot, packageId);
@@ -1761,13 +1807,13 @@ function registerServerTools(server, options) {
   server.registerTool("read_source_file", {
     title: "Read Source File",
     description: "\u8BFB\u53D6 weapp-vite / wevu \u5305\u5185\u6E90\u7801\u6587\u4EF6\uFF0C\u652F\u6301\u884C\u533A\u95F4\u88C1\u526A",
-    inputSchema: {
+    inputSchema: z.object({
       packageId: packageIdSchema,
       filePath: z.string().describe("\u5305\u5185\u76F8\u5BF9\u6587\u4EF6\u8DEF\u5F84"),
       startLine: z.number().int().positive().optional(),
       endLine: z.number().int().positive().optional(),
       maxChars: z.number().int().positive().max(2e5).optional()
-    }
+    })
   }, async ({ packageId, filePath, startLine, endLine, maxChars }) => {
     try {
       const packageRoot = await resolvePackageRoot(workspaceRoot, packageId);
@@ -1791,12 +1837,12 @@ function registerServerTools(server, options) {
   server.registerTool("search_source_code", {
     title: "Search Source Code",
     description: "\u5728 weapp-vite / wevu \u4EE3\u7801\u4E2D\u641C\u7D22\u5173\u952E\u8BCD",
-    inputSchema: {
+    inputSchema: z.object({
       query: z.string().min(1),
       packageId: packageIdSchema.optional(),
       directory: z.string().optional(),
       maxResults: z.number().int().positive().max(2e3).optional()
-    }
+    })
   }, async ({ query, packageId, directory, maxResults }) => {
     try {
       const targetPackageIds = packageId ? [packageId] : packageIds;
@@ -1828,12 +1874,12 @@ function registerServerTools(server, options) {
   server.registerTool("run_package_script", {
     title: "Run Package Script",
     description: "\u5728 weapp-vite / wevu \u5305\u76EE\u5F55\u6267\u884C pnpm script",
-    inputSchema: {
+    inputSchema: z.object({
       packageId: packageIdSchema,
       script: z.string().min(1),
       args: z.array(z.string()).optional(),
       timeoutMs: z.number().int().positive().max(9e5).optional()
-    }
+    })
   }, async ({ packageId, script, args, timeoutMs }) => {
     try {
       const resolvedPackage = await resolveExposedPackage(workspaceRoot, packageId);
@@ -1849,13 +1895,13 @@ function registerServerTools(server, options) {
   server.registerTool("run_weapp_vite_cli", {
     title: "Run weapp-vite CLI",
     description: "\u6267\u884C weapp-vite CLI\uFF08build/dev/open/analyze \u7B49\uFF09",
-    inputSchema: {
+    inputSchema: z.object({
       subCommand: z.string().min(1),
       projectPath: z.string().optional().describe("\u76F8\u5BF9 workspace \u6839\u8DEF\u5F84\uFF0C\u5982 e2e-apps/auto-routes-define-app-json"),
       platform: z.string().optional(),
       args: z.array(z.string()).optional(),
       timeoutMs: z.number().int().positive().max(9e5).optional()
-    }
+    })
   }, async ({ subCommand, projectPath, platform, args, timeoutMs }) => {
     try {
       const result = await runWeappViteCliTool(workspaceRoot, {
@@ -1873,12 +1919,12 @@ function registerServerTools(server, options) {
   server.registerTool("take_weapp_screenshot", {
     title: "Take Weapp Screenshot",
     description: "\u5F53\u7528\u6237\u63D0\u5230\u622A\u56FE\u3001\u9875\u9762\u5FEB\u7167\u3001\u8FD0\u884C\u65F6\u622A\u56FE\u65F6\uFF0C\u4F18\u5148\u8C03\u7528\u6B64\u5DE5\u5177\u6267\u884C weapp-vite screenshot",
-    inputSchema: {
+    inputSchema: z.object({
       projectPath: z.string().describe("\u76F8\u5BF9 workspace \u6839\u8DEF\u5F84\uFF0C\u901A\u5E38\u662F dist/build/mp-weixin \u6216\u5177\u4F53\u5C0F\u7A0B\u5E8F\u9879\u76EE\u76EE\u5F55"),
       page: z.string().optional().describe("\u622A\u56FE\u524D\u5148\u8DF3\u8F6C\u7684\u5C0F\u7A0B\u5E8F\u9875\u9762\u8DEF\u5F84"),
       outputPath: z.string().optional().describe("\u622A\u56FE\u8F93\u51FA\u8DEF\u5F84\uFF0C\u5EFA\u8BAE\u5199\u5165 .tmp/ \u6216\u5DE5\u4F5C\u533A\u76F8\u5BF9\u8DEF\u5F84"),
       timeoutMs: z.number().int().positive().max(9e5).optional()
-    }
+    })
   }, async ({ projectPath, page, outputPath, timeoutMs }) => {
     try {
       const args = ["--json"];
@@ -1908,18 +1954,28 @@ function registerServerTools(server, options) {
   server.registerTool("compare_weapp_screenshot", {
     title: "Compare Weapp Screenshot",
     description: "\u5F53\u7528\u6237\u63D0\u5230\u622A\u56FE\u5BF9\u6BD4\u3001diff\u3001baseline\u3001\u89C6\u89C9\u56DE\u5F52\u3001\u50CF\u7D20\u5BF9\u6BD4\u65F6\uFF0C\u4F18\u5148\u8C03\u7528\u6B64\u5DE5\u5177\u6267\u884C weapp-vite compare",
-    inputSchema: {
+    inputSchema: z.object({
       projectPath: z.string().describe("\u76F8\u5BF9 workspace \u6839\u8DEF\u5F84\uFF0C\u901A\u5E38\u662F dist/build/mp-weixin \u6216\u5177\u4F53\u5C0F\u7A0B\u5E8F\u9879\u76EE\u76EE\u5F55"),
       baselinePath: z.string().describe("\u76F8\u5BF9 workspace \u6839\u8DEF\u5F84\u7684 baseline \u56FE\u7247\u8DEF\u5F84"),
-      page: z.string().optional().describe("\u622A\u56FE\u5BF9\u6BD4\u524D\u5148\u8DF3\u8F6C\u7684\u5C0F\u7A0B\u5E8F\u9875\u9762\u8DEF\u5F84"),
+      page: z.string().optional().describe("\u622A\u56FE\u5BF9\u6BD4\u524D\u5148\u8DF3\u8F6C\u9875\u9762\u8DEF\u5F84"),
       currentOutputPath: z.string().optional().describe("\u5F53\u524D\u622A\u56FE\u8F93\u51FA\u8DEF\u5F84"),
       diffOutputPath: z.string().optional().describe("diff \u56FE\u7247\u8F93\u51FA\u8DEF\u5F84"),
       threshold: z.number().min(0).max(1).optional(),
       maxDiffPixels: z.number().int().min(0).optional(),
       maxDiffRatio: z.number().min(0).max(1).optional(),
       timeoutMs: z.number().int().positive().max(9e5).optional()
-    }
-  }, async ({ projectPath, baselinePath, page, currentOutputPath, diffOutputPath, threshold, maxDiffPixels, maxDiffRatio, timeoutMs }) => {
+    })
+  }, async ({
+    projectPath,
+    baselinePath,
+    page,
+    currentOutputPath,
+    diffOutputPath,
+    threshold,
+    maxDiffPixels,
+    maxDiffRatio,
+    timeoutMs
+  }) => {
     try {
       const args = ["--json", "--baseline", baselinePath];
       if (page) {
@@ -1962,12 +2018,12 @@ function registerServerTools(server, options) {
   server.registerTool("run_repo_command", {
     title: "Run Repo Command",
     description: "\u6267\u884C\u4ED3\u5E93\u7EA7\u547D\u4EE4\uFF08\u652F\u6301 pnpm/node/git/rg\uFF09",
-    inputSchema: {
+    inputSchema: z.object({
       command: z.enum(["pnpm", "node", "git", "rg"]),
       args: z.array(z.string()).optional(),
       cwdRelative: z.string().optional(),
       timeoutMs: z.number().int().positive().max(9e5).optional()
-    }
+    })
   }, async ({ command, args, cwdRelative, timeoutMs }) => {
     try {
       const result = await runCommand(workspaceRoot, command, args ?? [], {
@@ -1983,35 +2039,47 @@ function registerServerTools(server, options) {
 
 const packageIds = Object.keys(EXPOSED_PACKAGES);
 const packageIdSchema = z.enum(packageIds);
-async function createWeappViteMcpServer(options) {
+async function createWeappViteMcpServerFactory(options) {
   const workspaceRoot = resolveWorkspaceRoot(options?.workspaceRoot);
-  const server = new McpServer({
-    name: MCP_SERVER_NAME,
-    version: MCP_SERVER_VERSION
-  });
+  const exposedPackages = await resolveExposedPackages(workspaceRoot);
   const runtimeManager = new RuntimeSessionManager(workspaceRoot, options?.runtimeHooks);
-  registerServerTools(server, {
-    workspaceRoot,
-    packageIds,
-    packageIdSchema
-  });
-  registerRuntimeTools(server, {
-    manager: runtimeManager,
-    runtimeHooks: options?.runtimeHooks,
-    workspaceRoot
-  });
-  registerServerPrompts(server, {
-    packageIds,
-    packageIdSchema
-  });
-  await registerServerResources(server, {
-    workspaceRoot,
-    packageIds
-  });
   return {
     runtimeManager,
-    server,
-    workspaceRoot
+    workspaceRoot,
+    createServer: () => {
+      const server = new McpServer({
+        name: MCP_SERVER_NAME,
+        version: MCP_SERVER_VERSION
+      });
+      registerServerTools(server, {
+        workspaceRoot,
+        packageIds,
+        packageIdSchema
+      });
+      registerRuntimeTools(server, {
+        manager: runtimeManager,
+        runtimeHooks: options?.runtimeHooks,
+        workspaceRoot
+      });
+      registerServerPrompts(server, {
+        packageIds,
+        packageIdSchema
+      });
+      registerServerResources(server, {
+        exposedPackages,
+        workspaceRoot,
+        packageIds
+      });
+      return server;
+    }
+  };
+}
+async function createWeappViteMcpServer(options) {
+  const factory = await createWeappViteMcpServerFactory(options);
+  return {
+    runtimeManager: factory.runtimeManager,
+    server: factory.createServer(),
+    workspaceRoot: factory.workspaceRoot
   };
 }
 
@@ -2365,23 +2433,6 @@ function normalizePort(input) {
   }
   return DEFAULT_MCP_PORT;
 }
-async function parseJsonBody(req) {
-  if (req.method !== "POST") {
-    return void 0;
-  }
-  const chunks = [];
-  for await (const chunk of req) {
-    chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
-  }
-  if (chunks.length === 0) {
-    return void 0;
-  }
-  const raw = Buffer.concat(chunks).toString("utf8").trim();
-  if (!raw) {
-    return void 0;
-  }
-  return JSON.parse(raw);
-}
 function writeJson(res, statusCode, payload) {
   if (res.headersSent) {
     return;
@@ -2396,9 +2447,14 @@ async function startStdioServer(options) {
     process.chdir(options.workspaceRoot);
   }
   try {
-    const { server } = await createWeappViteMcpServer(options);
-    const transport = new StdioServerTransport();
-    await server.connect(transport);
+    const factory = await createWeappViteMcpServerFactory(options);
+    const handle = serveStdio(() => factory.createServer());
+    return {
+      transport: "stdio",
+      close: async () => {
+        await handle.close();
+      }
+    };
   } finally {
     if (options?.workspaceRoot) {
       process.chdir(previousCwd);
@@ -2420,18 +2476,23 @@ async function startStreamableHttpServer(options) {
   const normalizedEndpoint = normalizeEndpoint(endpoint);
   const normalizedPort = normalizePort(port);
   const normalizedRestEndpoint = normalizeRuntimeRestEndpoint(restEndpoint);
-  const { runtimeManager, server: mcpServer } = await createWeappViteMcpServer({ runtimeHooks, workspaceRoot });
-  const transport = new StreamableHTTPServerTransport({
-    sessionIdGenerator: randomUUID
-  });
-  await mcpServer.connect(transport);
+  const factory = await createWeappViteMcpServerFactory({ runtimeHooks, workspaceRoot });
+  const mcpHandler = createMcpHandler(() => factory.createServer(), {
+    legacy: "stateless"
+  });
+  const nodeHandler = toNodeHandler(mcpHandler);
+  const isLoopback = ["127.0.0.1", "localhost", "::1", "[::1]"].includes(host);
+  const validateHost = isLoopback ? localhostHostValidation() : hostHeaderValidation([host]);
+  const validateOrigin = isLoopback ? localhostOriginValidation() : originValidation([host]);
   const httpServer = http.createServer(async (req, res) => {
     try {
-      const hostHeader = req.headers.host ?? `${host}:${normalizedPort}`;
-      const url = new URL(req.url ?? "/", `http://${hostHeader}`);
+      if (!validateHost(req, res) || !validateOrigin(req, res)) {
+        return;
+      }
+      const url = new URL(req.url ?? "/", "http://localhost");
       const handledByRest = await handleRuntimeRestRequest(req, res, {
         endpoint: normalizedRestEndpoint,
-        manager: runtimeManager
+        manager: factory.runtimeManager
       });
       if (handledByRest) {
         return;
@@ -2459,8 +2520,7 @@ async function startStreamableHttpServer(options) {
         });
         return;
       }
-      const body = await parseJsonBody(req);
-      await transport.handleRequest(req, res, body);
+      await nodeHandler(req, res);
     } catch (error) {
       writeJson(res, 500, {
         jsonrpc: "2.0",
@@ -2490,7 +2550,7 @@ async function startStreamableHttpServer(options) {
   return {
     transport: "streamable-http",
     close: async () => {
-      await transport.close();
+      await mcpHandler.close();
       await new Promise((resolve, reject) => {
         httpServer.close((error) => {
           if (error) {
@@ -2508,10 +2568,7 @@ async function startWeappViteMcpServer(options) {
   if (transport === "streamable-http") {
     return startStreamableHttpServer(options ?? {});
   }
-  await startStdioServer(options);
-  return {
-    transport: "stdio"
-  };
+  return await startStdioServer(options);
 }
 
 function isDirectExecution() {
@@ -2531,4 +2588,4 @@ ${message}
   });
 }
 
-export { DEFAULT_MAX_FILE_CHARS, DEFAULT_MAX_OUTPUT_CHARS, DEFAULT_MAX_RESULTS, DEFAULT_MCP_ENDPOINT, DEFAULT_MCP_HOST, DEFAULT_MCP_PORT, DEFAULT_RUNTIME_REST_ENDPOINT, DEFAULT_TIMEOUT_MS, EXPOSED_PACKAGES, MCP_SERVER_NAME, MCP_SERVER_VERSION, SKIPPED_DIR_NAMES, assertInsideRoot, createWeappViteMcpServer, formatJson, listFilesInDirectory, loadExposedCatalog, loadPackageSummary, normalizeErrorMessage, readFileContent, resolveSubPath, resolveWorkspaceRoot, runCommand, searchTextInDirectory, startStdioServer, startWeappViteMcpServer, toToolError, toToolResult };
+export { DEFAULT_MAX_FILE_CHARS, DEFAULT_MAX_OUTPUT_CHARS, DEFAULT_MAX_RESULTS, DEFAULT_MCP_ENDPOINT, DEFAULT_MCP_HOST, DEFAULT_MCP_PORT, DEFAULT_RUNTIME_REST_ENDPOINT, DEFAULT_TIMEOUT_MS, EXPOSED_PACKAGES, MCP_SERVER_NAME, MCP_SERVER_VERSION, SKIPPED_DIR_NAMES, assertInsideRoot, createWeappViteMcpServer, createWeappViteMcpServerFactory, formatJson, listFilesInDirectory, loadExposedCatalog, loadPackageSummary, normalizeErrorMessage, readFileContent, resolveSubPath, resolveWorkspaceRoot, runCommand, searchTextInDirectory, startStdioServer, startWeappViteMcpServer, toToolError, toToolResult };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/mcp",
   "type": "module",
-  "version": "1.4.16",
+  "version": "1.5.0",
   "description": "mcp",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "ISC",
@@ -31,9 +31,13 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@modelcontextprotocol/node": "^2.0.0",
+    "@modelcontextprotocol/server": "^2.0.0",
     "zod": "^4.4.3",
-    "@weapp-vite/devtools-runtime": "0.4.16"
+    "@weapp-vite/devtools-runtime": "0.4.17"
+  },
+  "devDependencies": {
+    "@modelcontextprotocol/client": "^2.0.0"
   },
   "scripts": {
     "dev": "unbuild --stub",