vite-plugin-opencode-assistant 1.1.25 → 1.1.26

package/lib/endpoints/mcp-tools.d.ts

@@ -1,6 +1,7 @@
 /**
  * 自定义 DevTools 工具定义
- * 所有工具自动映射到 chrome-devtools-mcp 底层工具
+ * 所有工具（除 devtools_list_pages）必须传入 pageId 参数，
+ * 代理层校验 pageId 是否为项目页面后方可调用 chrome-devtools-mcp。
  */
 export interface CustomTool {
     name: string;

package/lib/endpoints/mcp.cjs

@@ -1,7 +1,21 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -43,18 +57,17 @@ __export(mcp_exports, {
 module.exports = __toCommonJS(mcp_exports);
 var import_shared = require("@vite-plugin-opencode-assistant/shared");
 var import_node = require("@vite-plugin-opencode-assistant/shared/node");
-var import_context = require("../endpoints/context.cjs");
+var import_mcp_chrome = require("../core/mcp-chrome.cjs");
 var import_mcp_tools = require("./mcp-tools.cjs");
 const log = (0, import_node.createLogger)("McpEndpoint");
 function setupMcpEndpoint(server, mcp, getPageContext) {
   server.middlewares.use((req, res, next) => __async(null, null, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c;
     if (!((_a = req.url) == null ? void 0 : _a.startsWith(import_shared.MCP_API_PATH))) return next();
     const url = new URL(req.url, `http://localhost`);
     const token = (_c = url.searchParams.get("token")) != null ? _c : (_b = req.headers["authorization"]) == null ? void 0 : _b.replace(/^Bearer /i, "");
     if (token !== mcp.accessToken) {
-      res.writeHead(401, { "Content-Type": "application/json" });
-      res.end(JSON.stringify({ error: "Unauthorized" }));
+      sendMcpJson(res, 401, { error: "Unauthorized" });
       return;
     }
     res.setHeader("Access-Control-Allow-Origin", "*");
@@ -67,15 +80,7 @@ function setupMcpEndpoint(server, mcp, getPageContext) {
       return;
     }
     if (req.method === "GET") {
-      res.writeHead(200, {
-        "Content-Type": "text/event-stream",
-        "Cache-Control": "no-cache",
-        Connection: "keep-alive",
-        "Mcp-Session-Id": mcp.sessionId
-      });
-      res.write(":ok\n\n");
-      const keepAlive = setInterval(() => res.write(":ping\n\n"), 15e3);
-      req.on("close", () => clearInterval(keepAlive));
+      handleGetSse(req, res, mcp);
       return;
     }
     if (req.method === "DELETE") {
@@ -84,167 +89,186 @@ function setupMcpEndpoint(server, mcp, getPageContext) {
       return;
     }
     if (req.method === "POST") {
-      try {
-        const body = yield readBody(req);
-        if (!body) {
-          res.writeHead(400);
-          res.end("Empty body");
-          return;
-        }
-        const { method, id } = tryParseRequest(body);
-        log.debug("MCP request", { method, body: body.substring(0, 150) });
-        if (method === "tools/list") {
-          res.writeHead(200, {
-            "Content-Type": "application/json",
-            "Mcp-Session-Id": mcp.sessionId
-          });
-          res.end(JSON.stringify({ jsonrpc: "2.0", id, result: { tools: import_mcp_tools.CUSTOM_TOOLS } }));
-          return;
-        }
-        if (method === "tools/call") {
-          const params = tryParseParams(body);
-          const toolName = params == null ? void 0 : params.name;
-          const mapped = toolName != null ? import_mcp_tools.TOOL_MAP[toolName] : void 0;
-          if (!mapped) {
-            res.writeHead(200, {
-              "Content-Type": "application/json",
-              "Mcp-Session-Id": mcp.sessionId
-            });
-            res.end(
-              JSON.stringify({
-                jsonrpc: "2.0",
-                id,
-                error: { code: -32601, message: `Tool not found: ${toolName}` }
-              })
-            );
-            return;
-          }
-          if (toolName === "devtools_list_pages") {
-            const listResult = yield mcp.callChromeDevTool("list_pages", {});
-            const text = (_f = (_e = (_d = listResult == null ? void 0 : listResult.result) == null ? void 0 : _d.content) == null ? void 0 : _e[0]) == null ? void 0 : _f.text;
-            const allPages = text ? (0, import_context.parseListPages)(text) : [];
-            const pc = getPageContext();
-            const projectOrigin = (0, import_context.getProjectOrigin)(pc.url);
-            if (!projectOrigin) {
-              res.writeHead(200, {
-                "Content-Type": "application/json",
-                "Mcp-Session-Id": mcp.sessionId
-              });
-              res.end(
-                JSON.stringify({
-                  jsonrpc: "2.0",
-                  id,
-                  result: {
-                    content: [
-                      { type: "text", text: "\u6682\u65E0\u9879\u76EE\u9875\u9762\uFF0C\u8BF7\u5148\u5728\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00\u672C\u5730\u5F00\u53D1\u9875\u9762" }
-                    ]
-                  }
-                })
-              );
-              return;
-            }
-            const filtered = allPages.filter((p) => p.url.startsWith(projectOrigin));
-            const chromeSelectedPageId = (_g = allPages.find((p) => p.selected)) == null ? void 0 : _g.pageId;
-            const resolved = yield (0, import_context.resolveChromePageId)(
-              mcp,
-              pc.url,
-              pc.title,
-              pc.sessionId,
-              filtered,
-              chromeSelectedPageId
-            );
-            const activePageId = resolved.ok ? resolved.pageId : null;
-            res.writeHead(200, {
-              "Content-Type": "application/json",
-              "Mcp-Session-Id": mcp.sessionId
-            });
-            res.end(
-              JSON.stringify({
-                jsonrpc: "2.0",
-                id,
-                result: {
-                  content: [
-                    {
-                      type: "text",
-                      text: JSON.stringify(
-                        filtered.map((p) => ({
-                          pageId: p.pageId,
-                          url: p.url,
-                          title: p.title,
-                          active: activePageId != null ? p.pageId === activePageId : false,
-                          selected: p.selected
-                        })),
-                        null,
-                        2
-                      )
-                    }
-                  ]
-                }
-              })
-            );
-            return;
-          }
-          if (toolName !== "devtools_select_page") {
-            const checkResult = yield mcp.callChromeDevTool("list_pages", {});
-            const checkText = (_j = (_i = (_h = checkResult == null ? void 0 : checkResult.result) == null ? void 0 : _h.content) == null ? void 0 : _i[0]) == null ? void 0 : _j.text;
-            const checkPages = checkText ? (0, import_context.parseListPages)(checkText) : [];
-            const pc = getPageContext();
-            const origin = (0, import_context.getProjectOrigin)(pc.url);
-            const hasProjectSelected = origin ? checkPages.some((p) => p.selected && p.url.startsWith(origin)) : true;
-            if (!hasProjectSelected) {
-              res.writeHead(200, {
-                "Content-Type": "application/json",
-                "Mcp-Session-Id": mcp.sessionId
-              });
-              res.end(
-                JSON.stringify({
-                  jsonrpc: "2.0",
-                  id,
-                  error: {
-                    code: -32e3,
-                    message: "Chrome DevTools \u5F53\u524D\u672A\u9009\u4E2D\u9879\u76EE\u9875\u9762\uFF0C\u8BF7\u5148\u8C03\u7528 devtools_list_pages \u67E5\u770B\u53EF\u7528\u9875\u9762\uFF0C\u518D\u8C03\u7528 devtools_select_page \u9009\u62E9\u76EE\u6807\u9875\u9762"
-                  }
-                })
-              );
-              return;
-            }
-          }
-          const forwardBody = JSON.stringify({
-            jsonrpc: "2.0",
-            id,
-            method: "tools/call",
-            params: {
-              name: mapped,
-              arguments: (params == null ? void 0 : params.arguments) || {}
-            }
-          });
-          const responseText2 = yield mcp.forward(forwardBody);
-          log.debug("MCP response", { method: toolName, response: responseText2.substring(0, 100) });
-          res.writeHead(200, {
-            "Content-Type": "application/json",
-            "Mcp-Session-Id": mcp.sessionId
-          });
-          res.end(responseText2);
-          return;
-        }
-        const responseText = yield mcp.forward(body);
-        res.writeHead(200, { "Content-Type": "application/json", "Mcp-Session-Id": mcp.sessionId });
-        res.end(responseText);
-      } catch (e) {
-        log.debug("MCP POST error", { error: e.message });
-        res.writeHead(500, { "Content-Type": "application/json" });
-        res.end(
-          JSON.stringify({
-            jsonrpc: "2.0",
-            error: { code: -32603, message: e.message }
-          })
-        );
-      }
+      yield handlePost(req, res, mcp, (0, import_mcp_chrome.getProjectOrigins)(server), getPageContext);
       return;
     }
     next();
   }));
 }
+function handleGetSse(req, res, mcp) {
+  res.writeHead(200, {
+    "Content-Type": "text/event-stream",
+    "Cache-Control": "no-cache",
+    Connection: "keep-alive",
+    "Mcp-Session-Id": mcp.sessionId
+  });
+  res.write(":ok\n\n");
+  const keepAlive = setInterval(() => res.write(":ping\n\n"), 15e3);
+  req.on("close", () => clearInterval(keepAlive));
+}
+function handlePost(req, res, mcp, projectOrigins, getPageContext) {
+  return __async(this, null, function* () {
+    try {
+      const body = yield readBody(req);
+      if (!body) {
+        res.writeHead(400);
+        res.end("Empty body");
+        return;
+      }
+      const { method, id } = tryParseRequest(body);
+      log.debug("MCP request", { method, body: body.substring(0, 150) });
+      switch (method) {
+        case "tools/list":
+          return handleToolsList(res, id, mcp.sessionId);
+        case "tools/call":
+          return handleToolsCall(res, id, body, mcp, projectOrigins, getPageContext);
+        default:
+          return handleForward(res, body, mcp);
+      }
+    } catch (e) {
+      log.debug("MCP POST error", { error: e.message });
+      sendMcpJson(res, 500, {
+        jsonrpc: "2.0",
+        error: { code: -32603, message: e.message }
+      });
+    }
+  });
+}
+function handleToolsList(res, id, sessionId) {
+  sendMcpJson(res, 200, { jsonrpc: "2.0", id, result: { tools: import_mcp_tools.CUSTOM_TOOLS } }, sessionId);
+}
+function handleToolsCall(res, id, body, mcp, projectOrigins, getPageContext) {
+  const params = tryParseParams(body);
+  const toolName = params == null ? void 0 : params.name;
+  const mapped = toolName != null ? import_mcp_tools.TOOL_MAP[toolName] : void 0;
+  if (!mapped) {
+    sendMcpError(res, id, -32601, `Tool not found: ${toolName}`, mcp.sessionId);
+    return;
+  }
+  switch (toolName) {
+    case "devtools_list_pages":
+      return handleListPages(res, id, mcp, projectOrigins, getPageContext);
+    default:
+      return handleDevTool(res, id, mcp, mapped, (params == null ? void 0 : params.arguments) || {}, projectOrigins);
+  }
+}
+function handleListPages(res, id, mcp, projectOrigins, getPageContext) {
+  return __async(this, null, function* () {
+    var _a, _b, _c, _d;
+    const listResult = yield mcp.callChromeDevTool("list_pages", {});
+    const text = (_c = (_b = (_a = listResult == null ? void 0 : listResult.result) == null ? void 0 : _a.content) == null ? void 0 : _b[0]) == null ? void 0 : _c.text;
+    const allPages = text ? (0, import_mcp_chrome.parseListPages)(text) : [];
+    log.debug("Chrome pages", { total: allPages.length, urls: allPages.map((p) => p.url) });
+    log.debug("project origins", { origins: projectOrigins });
+    const filtered = allPages.filter((p) => (0, import_mcp_chrome.isProjectPage)(p.url, projectOrigins));
+    log.debug("filtered pages", { count: filtered.length, pageIds: filtered.map((p) => p.pageId) });
+    if (filtered.length === 0) {
+      sendMcpResult(res, id, "\u6682\u65E0\u9879\u76EE\u9875\u9762\uFF0C\u8BF7\u5148\u5728\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00\u672C\u5730\u5F00\u53D1\u9875\u9762", mcp.sessionId);
+      return;
+    }
+    const pc = getPageContext();
+    const chromeSelectedPageId = (_d = allPages.find((p) => p.selected)) == null ? void 0 : _d.pageId;
+    const resolved = yield (0, import_mcp_chrome.resolveChromePageId)(
+      mcp,
+      pc.url,
+      pc.title,
+      projectOrigins,
+      pc.sessionId,
+      filtered,
+      chromeSelectedPageId
+    );
+    const activePageId = resolved.ok ? resolved.pageId : null;
+    const pageList = filtered.map((p) => ({
+      pageId: p.pageId,
+      url: p.url,
+      title: p.title,
+      active: activePageId != null ? p.pageId === activePageId : false,
+      selected: p.selected
+    }));
+    sendMcpResult(res, id, JSON.stringify(pageList, null, 2), mcp.sessionId);
+  });
+}
+function handleDevTool(res, id, mcp, mapped, args, projectOrigins) {
+  return __async(this, null, function* () {
+    var _a, _b, _c;
+    const pageId = args["pageId"];
+    if (typeof pageId !== "number") {
+      sendMcpError(
+        res,
+        id,
+        -32e3,
+        "\u7F3A\u5C11 pageId \u53C2\u6570\uFF0C\u8BF7\u5148\u8C03\u7528 devtools_list_pages \u83B7\u53D6\u53EF\u7528\u9875\u9762\u5217\u8868",
+        mcp.sessionId
+      );
+      return;
+    }
+    const checkResult = yield mcp.callChromeDevTool("list_pages", {});
+    const checkText = (_c = (_b = (_a = checkResult == null ? void 0 : checkResult.result) == null ? void 0 : _a.content) == null ? void 0 : _b[0]) == null ? void 0 : _c.text;
+    const checkPages = checkText ? (0, import_mcp_chrome.parseListPages)(checkText) : [];
+    const projectPages = checkPages.filter((p) => (0, import_mcp_chrome.isProjectPage)(p.url, projectOrigins));
+    const isValid = projectPages.some((p) => p.pageId === pageId);
+    log.debug("handleDevTool validation", {
+      pageId,
+      totalChromePages: checkPages.length,
+      projectPages: projectPages.length,
+      projectPageIds: projectPages.map((p) => p.pageId),
+      origins: projectOrigins,
+      isValid
+    });
+    if (!isValid) {
+      sendMcpError(res, id, -32e3, "pageId \u65E0\u6548\u6216\u975E\u9879\u76EE\u9875\u9762", mcp.sessionId);
+      return;
+    }
+    yield mcp.callChromeDevTool("select_page", { pageId, bringToFront: false });
+    const forwardArgs = __spreadValues({}, args);
+    delete forwardArgs["pageId"];
+    const forwardBody = JSON.stringify({
+      jsonrpc: "2.0",
+      id,
+      method: "tools/call",
+      params: { name: mapped, arguments: forwardArgs }
+    });
+    const responseText = yield mcp.forward(forwardBody);
+    log.debug("MCP response", { mapped, response: responseText.substring(0, 100) });
+    sendMcpJson(res, 200, responseText, mcp.sessionId);
+  });
+}
+function handleForward(res, body, mcp) {
+  return __async(this, null, function* () {
+    const responseText = yield mcp.forward(body);
+    sendMcpJson(res, 200, responseText, mcp.sessionId);
+  });
+}
+function sendMcpResult(res, id, text, sessionId) {
+  sendMcpJson(
+    res,
+    200,
+    {
+      jsonrpc: "2.0",
+      id,
+      result: { content: [{ type: "text", text }] }
+    },
+    sessionId
+  );
+}
+function sendMcpError(res, id, code, message, sessionId) {
+  sendMcpJson(
+    res,
+    200,
+    {
+      jsonrpc: "2.0",
+      id,
+      error: { code, message }
+    },
+    sessionId
+  );
+}
+function sendMcpJson(res, statusCode, body, sessionId) {
+  const headers = { "Content-Type": "application/json" };
+  if (sessionId) headers["Mcp-Session-Id"] = sessionId;
+  res.writeHead(statusCode, headers);
+  res.end(typeof body === "string" ? body : JSON.stringify(body));
+}
 function readBody(req, maxSize = 1024 * 1024) {
   return new Promise((resolve, reject) => {
     let body = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-opencode-assistant",
-  "version": "1.1.25",
+  "version": "1.1.26",
   "description": "Embed OpenCode Web UI in your Vite dev server for real-time code modification and preview",
   "type": "module",
   "main": "lib/index.cjs",
@@ -38,15 +38,15 @@
     "chrome-devtools-mcp": "^1.6.0",
     "unplugin-vue-inspector": "^3.0.0",
     "execa": "^9.6.1",
-    "@vite-plugin-opencode-assistant/opencode": "1.1.25",
-    "@vite-plugin-opencode-assistant/shared": "1.1.25",
-    "@vite-plugin-opencode-assistant/components": "1.1.25"
+    "@vite-plugin-opencode-assistant/shared": "1.1.26",
+    "@vite-plugin-opencode-assistant/opencode": "1.1.26",
+    "@vite-plugin-opencode-assistant/components": "1.1.26"
   },
   "peerDependencies": {
     "vite": ">=5.0.0"
   },
   "devDependencies": {
-    "@vite-plugin-opencode-assistant/client": "1.1.25"
+    "@vite-plugin-opencode-assistant/client": "1.1.26"
   },
   "scripts": {
     "build": "pagoda-cli build && vite build -c vite.client.config.ts",