@ada-mcp/mcp-server 0.1.17 → 0.1.18

package/README.md

@@ -8,27 +8,27 @@ ADA MCP server package that supports:
 
 ## 标准安装（Cursor / MCP）
 
-请使用 **`@ada-mcp/launcher@0.1.14`** 拉起本包（见 [launcher README](../ada-mcp-launcher/README.md)）：
+请使用 **`@ada-mcp/launcher@0.1.17`** 拉起本包（见 [launcher README](../ada-mcp-launcher/README.md)）：
 
 ```json
 {
   "mcpServers": {
     "ada-mcp": {
       "command": "pnpm",
-      "args": ["dlx", "@ada-mcp/launcher@0.1.14"]
+      "args": ["dlx", "@ada-mcp/launcher@0.1.17"]
     }
   }
 }
 ```
 
-本包版本：**`@ada-mcp/mcp-server@0.1.17`**（由 launcher 默认拉取；依赖锁定 `playwright@1.59.1`）。
+本包版本：**`@ada-mcp/mcp-server@0.1.18`**（由 launcher 默认拉取；依赖锁定 `playwright@1.59.1`）。
 
 直接调试本包（无 launcher 拉包前测速）：
 
 ```bash
-pnpm dlx @ada-mcp/mcp-server@0.1.17
+pnpm dlx @ada-mcp/mcp-server@0.1.18
 # npx 等价：
-npx -y @ada-mcp/mcp-server@0.1.17
+npx -y @ada-mcp/mcp-server@0.1.18
 ```
 
 ## 启动时自动安装依赖（默认仅 Playwright）
@@ -83,27 +83,27 @@ npx -y @ada-mcp/mcp-server@0.1.17
 在标准 `args` 后追加，例如安装全部依赖：
 
 ```json
-"args": ["dlx", "@ada-mcp/launcher@0.1.14", "--install-deps=all"]
+"args": ["dlx", "@ada-mcp/launcher@0.1.17", "--install-deps=all"]
 ```
 
 ## Cursor MCP 配置
 
-**pnpm（推荐）**：`pnpm` + `dlx @ada-mcp/launcher@0.1.14`
+**pnpm（推荐）**：`pnpm` + `dlx @ada-mcp/launcher@0.1.17`
 
-**npx 等价**（`launcher@0.1.7+`）：`npx` + `-y @ada-mcp/launcher@0.1.14`（内层同样 `npx -y` mcp-server，测速逻辑与 pnpm 一致）
+**npx 等价**（`launcher@0.1.7+`）：`npx` + `-y @ada-mcp/launcher@0.1.17`（内层同样 `npx -y` mcp-server，测速逻辑与 pnpm 一致）
 
 ```json
 {
   "mcpServers": {
     "ada-mcp": {
       "command": "npx",
-      "args": ["-y", "@ada-mcp/launcher@0.1.14"]
+      "args": ["-y", "@ada-mcp/launcher@0.1.17"]
     }
   }
 }
 ```
 
-Windows 若找不到 `pnpm`，可将 `command` 改为 `pnpm.cmd` 绝对路径；无 pnpm 时只能直接 `npx -y @ada-mcp/mcp-server@0.1.17`（无 launcher 拉包测速）。
+Windows 若找不到 `pnpm`，可将 `command` 改为 `pnpm.cmd` 绝对路径；无 pnpm 时只能直接 `npx -y @ada-mcp/mcp-server@0.1.18`（无 launcher 拉包测速）。
 
 ## Remote mode
 

package/dist/cli.cjs

@@ -3671,7 +3671,132 @@ function playwrightInstallPackageSpec() {
   return `playwright@${fromEnv || PINNED_PLAYWRIGHT_VERSION}`;
 }
 function resolveInstallPackageSpecs(packages) {
-  return packages.map((pkg) => pkg === "playwright" ? playwrightInstallPackageSpec() : pkg);
+  const out = [];
+  for (const pkg of packages) {
+    if (pkg === "playwright") {
+      out.push(playwrightInstallPackageSpec());
+      continue;
+    }
+    if (pkg === "zod") {
+      const fromEnv = process.env.ADA_ZOD_VERSION?.trim();
+      out.push(`zod@${fromEnv || PINNED_ZOD_VERSION}`);
+      continue;
+    }
+    out.push(pkg);
+  }
+  return out;
+}
+function skipConflictRemoval() {
+  const v = process.env.ADA_DEPS_SKIP_CONFLICT_REMOVAL?.trim().toLowerCase();
+  return v === "1" || v === "true" || v === "yes";
+}
+function readInstalledPackageVersion(packageName) {
+  try {
+    const pkgPath = require2.resolve(`${packageName}/package.json`);
+    const raw = (0, import_node_fs.readFileSync)(pkgPath, "utf8");
+    return String(JSON.parse(raw).version ?? "").trim() || void 0;
+  } catch {
+    return void 0;
+  }
+}
+function zodExportsV3Subpath(version2) {
+  try {
+    const pkgPath = require2.resolve("zod/package.json");
+    const raw = (0, import_node_fs.readFileSync)(pkgPath, "utf8");
+    const exportsField = JSON.parse(raw).exports;
+    if (exportsField && "./v3" in exportsField) {
+      return true;
+    }
+  } catch {
+  }
+  const major = Number(version2.split(".")[0]);
+  const minor = Number(version2.split(".")[1]);
+  if (major > 3) {
+    return true;
+  }
+  return major === 3 && minor >= 25;
+}
+function detectWorkspacePackageConflicts(packages) {
+  const conflicts = [];
+  const expectedPlaywright = process.env.ADA_PLAYWRIGHT_VERSION?.trim() || PINNED_PLAYWRIGHT_VERSION;
+  const expectedZod = process.env.ADA_ZOD_VERSION?.trim() || PINNED_ZOD_VERSION;
+  if (packages.includes("playwright") && hasPackage("playwright")) {
+    const installed = readInstalledPackageVersion("playwright");
+    if (installed && installed !== expectedPlaywright) {
+      conflicts.push({
+        name: "playwright",
+        installed,
+        expected: expectedPlaywright,
+        reason: "\u4E0E ADA \u9501\u5B9A\u7684 Playwright \u6D4F\u89C8\u5668\u5305\u7248\u672C\u4E0D\u4E00\u81F4"
+      });
+    }
+  }
+  if (hasPackage("@modelcontextprotocol/sdk") && hasPackage("zod")) {
+    const zodVer = readInstalledPackageVersion("zod");
+    if (zodVer && !zodExportsV3Subpath(zodVer)) {
+      conflicts.push({
+        name: "zod",
+        installed: zodVer,
+        expected: expectedZod,
+        reason: "\u5F53\u524D zod \u4E0D\u652F\u6301 zod/v3\uFF0C\u4E0E @modelcontextprotocol/sdk \u51B2\u7A81"
+      });
+    }
+  }
+  return conflicts;
+}
+function packagesToRemoveForConflicts(conflicts) {
+  const names = /* @__PURE__ */ new Set();
+  for (const c of conflicts) {
+    names.add(c.name);
+    if (c.name === "playwright") {
+      names.add("playwright-core");
+    }
+  }
+  return Array.from(names);
+}
+async function removeWorkspacePackages(names, onLogLine) {
+  const unique = Array.from(new Set(names)).filter(Boolean);
+  if (unique.length === 0) {
+    return true;
+  }
+  const timeoutMs = installStrategyTimeoutMs();
+  const attempts = [
+    { tool: "pnpm", args: ["remove", ...unique] },
+    { tool: "npm", args: ["uninstall", ...unique] }
+  ];
+  for (const { tool, args } of attempts) {
+    try {
+      await runCommand2(tool, args, { timeoutMs, onLogLine });
+      return true;
+    } catch {
+    }
+  }
+  return false;
+}
+async function reconcileWorkspacePackageConflicts(packages, onLogLine) {
+  if (skipConflictRemoval()) {
+    return [];
+  }
+  const conflicts = detectWorkspacePackageConflicts(packages);
+  if (conflicts.length === 0) {
+    return [];
+  }
+  for (const c of conflicts) {
+    onLogLine?.(`[deps] \u68C0\u6D4B\u5230\u51B2\u7A81 ${c.name}@${c.installed}\uFF0C\u76EE\u6807 ${c.expected}\uFF08${c.reason}\uFF09`);
+  }
+  const toRemove = packagesToRemoveForConflicts(conflicts);
+  onLogLine?.(`[deps] \u6B63\u5728\u5378\u8F7D: ${toRemove.join(", ")}`);
+  const removed = await removeWorkspacePackages(toRemove, onLogLine);
+  if (!removed) {
+    onLogLine?.("[deps][warn] \u81EA\u52A8\u5378\u8F7D\u672A\u5B8C\u6210\uFF0C\u8BF7\u624B\u52A8\u6267\u884C: pnpm remove " + toRemove.join(" "));
+  } else {
+    onLogLine?.("[deps] \u51B2\u7A81\u5305\u5DF2\u5378\u8F7D\uFF0C\u5C06\u5B89\u88C5\u9501\u5B9A\u7248\u672C");
+  }
+  const extraInstall = [];
+  if (conflicts.some((c) => c.name === "zod") && hasPackage("@modelcontextprotocol/sdk")) {
+    extraInstall.push("zod");
+  }
+  return extraInstall;
 }
 function shouldUseShell(command) {
   if (process.platform !== "win32") {
@@ -4236,7 +4361,9 @@ async function rankPlaywrightHosts(config2) {
   return ranked.length > 0 ? ranked : [...candidates];
 }
 async function runInstallWithPriority(config2, packages, onLogLine) {
-  const specs = resolveInstallPackageSpecs(packages);
+  const extraFromReconcile = await reconcileWorkspacePackageConflicts(packages, onLogLine);
+  const allPackages = Array.from(/* @__PURE__ */ new Set([...packages, ...extraFromReconcile]));
+  const specs = resolveInstallPackageSpecs(allPackages);
   const npmProxy = await detectBestRegistry(config2, npmProxyRegistry());
   const pnpmProxy = await detectBestRegistry(config2, pnpmProxyRegistry());
   progress("packages.install.start", { packages: specs, npmProxy, pnpmProxy });
@@ -4925,7 +5052,7 @@ async function getDependencyHealth(config2) {
     missingAppiumDrivers
   };
 }
-var import_node_module, import_node_fs, import_node_child_process2, import_promises5, import_node_path5, require2, PINNED_PLAYWRIGHT_VERSION, depsHumanLog, DEFAULT_NPM_REGISTRY_CANDIDATES, detectedBestRegistryByKey, PROGRESS_STEPS, PROGRESS_HUMAN_LABELS, DEFAULT_PLAYWRIGHT_HOST_CANDIDATES, PLAYWRIGHT_HOST_FALLBACK, PW_INSTALL_TARGETS;
+var import_node_module, import_node_fs, import_node_child_process2, import_promises5, import_node_path5, require2, PINNED_PLAYWRIGHT_VERSION, PINNED_ZOD_VERSION, depsHumanLog, DEFAULT_NPM_REGISTRY_CANDIDATES, detectedBestRegistryByKey, PROGRESS_STEPS, PROGRESS_HUMAN_LABELS, DEFAULT_PLAYWRIGHT_HOST_CANDIDATES, PLAYWRIGHT_HOST_FALLBACK, PW_INSTALL_TARGETS;
 var init_dependency_installer = __esm({
   "../ada-agent/src/dependency-installer.ts"() {
     import_node_module = require("node:module");
@@ -4938,6 +5065,7 @@ var init_dependency_installer = __esm({
     init_src2();
     require2 = (0, import_node_module.createRequire)(import_node_path5.default.join(process.cwd(), "package.json"));
     PINNED_PLAYWRIGHT_VERSION = "1.59.1";
+    PINNED_ZOD_VERSION = "3.25.76";
     DEFAULT_NPM_REGISTRY_CANDIDATES = [
       "https://registry.npmmirror.com",
       "https://mirrors.cloud.tencent.com/npm",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ada-mcp/mcp-server",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "ADA MCP server for web/mobile automation (stdio + remote HTTP)",
   "private": false,
   "type": "commonjs",