@ada-mcp/mcp-server 0.1.23 → 0.1.25

package/README.md

@@ -8,27 +8,27 @@ ADA MCP server package that supports:
 
 ## 标准安装（Cursor / MCP）
 
-请使用 **`@ada-mcp/launcher@0.1.19`** 拉起本包（见 [launcher README](../ada-mcp-launcher/README.md)）：
+请使用 **`@ada-mcp/launcher@0.1.24`** 拉起本包（见 [launcher README](../ada-mcp-launcher/README.md)）：
 
 ```json
 {
   "mcpServers": {
     "ada-mcp": {
       "command": "pnpm",
-      "args": ["dlx", "@ada-mcp/launcher@0.1.19"]
+      "args": ["dlx", "@ada-mcp/launcher@0.1.24"]
     }
   }
 }
 ```
 
-本包版本：**`@ada-mcp/mcp-server@0.1.19`**（由 launcher 默认拉取；依赖锁定 `playwright@1.59.1`）。
+本包版本：**`@ada-mcp/mcp-server@0.1.24`**（由 launcher 默认拉取；依赖锁定 `playwright@1.59.1`）。
 
 直接调试本包（无 launcher 拉包前测速）：
 
 ```bash
-pnpm dlx @ada-mcp/mcp-server@0.1.19
+pnpm dlx @ada-mcp/mcp-server@0.1.24
 # npx 等价：
-npx -y @ada-mcp/mcp-server@0.1.19
+npx -y @ada-mcp/mcp-server@0.1.24
 ```
 
 ## 启动时自动安装依赖（默认仅 Playwright）
@@ -51,7 +51,7 @@ npx -y @ada-mcp/mcp-server@0.1.19
 - `ADA_MCP_SKIP_INSTALL_DEPS=1`：跳过自动安装
 - `ADA_MCP_INSTALL_DEPS_FORCE=1`：强制重装
 - `ADA_MCP_GECKODRIVER_VERSION` / `ADA_MCP_CHROMEDRIVER_VERSION`：Selenium 驱动版本
-- `ADA_PLAYWRIGHT_INSTALL_TIMEOUT_MS`：浏览器下载超时（默认 15 分钟）
+- `ADA_PLAYWRIGHT_INSTALL_TIMEOUT_MS`：浏览器下载超时（默认 30 分钟 / 1800000ms）
 - `ADA_INSTALL_STRATEGY_TIMEOUT_MS`：npm 装包超时（默认 2 分钟）
 
 ## 代理与镜像（`0.1.10+` 推荐）
@@ -83,27 +83,27 @@ npx -y @ada-mcp/mcp-server@0.1.19
 在标准 `args` 后追加，例如安装全部依赖：
 
 ```json
-"args": ["dlx", "@ada-mcp/launcher@0.1.19", "--install-deps=all"]
+"args": ["dlx", "@ada-mcp/launcher@0.1.24", "--install-deps=all"]
 ```
 
 ## Cursor MCP 配置
 
-**pnpm（推荐）**：`pnpm` + `dlx @ada-mcp/launcher@0.1.19`
+**pnpm（推荐）**：`pnpm` + `dlx @ada-mcp/launcher@0.1.24`
 
-**npx 等价**（`launcher@0.1.7+`）：`npx` + `-y @ada-mcp/launcher@0.1.19`（内层同样 `npx -y` mcp-server，测速逻辑与 pnpm 一致）
+**npx 等价**（`launcher@0.1.7+`）：`npx` + `-y @ada-mcp/launcher@0.1.24`（内层同样 `npx -y` mcp-server，测速逻辑与 pnpm 一致）
 
 ```json
 {
   "mcpServers": {
     "ada-mcp": {
       "command": "npx",
-      "args": ["-y", "@ada-mcp/launcher@0.1.19"]
+      "args": ["-y", "@ada-mcp/launcher@0.1.24"]
     }
   }
 }
 ```
 
-Windows 若找不到 `pnpm`，可将 `command` 改为 `pnpm.cmd` 绝对路径；无 pnpm 时只能直接 `npx -y @ada-mcp/mcp-server@0.1.19`（无 launcher 拉包测速）。
+Windows 若找不到 `pnpm`，可将 `command` 改为 `pnpm.cmd` 绝对路径；无 pnpm 时只能直接 `npx -y @ada-mcp/mcp-server@0.1.24`（无 launcher 拉包测速）。
 
 ## Remote mode
 

package/dist/cli.cjs

@@ -3556,7 +3556,7 @@ async function downloadGeckodriver(driversDir, versionInput, onLogLine) {
     downloaded = true;
   } catch (mirrorError) {
     onLogLine?.(
-      `[selenium][warn] ?????????: ${mirrorError instanceof Error ? mirrorError.message : String(mirrorError)}`
+      `[selenium][warn] ??????: ${mirrorError instanceof Error ? mirrorError.message : String(mirrorError)}`
     );
     onLogLine?.(`[selenium] ?? GitHub: ${github}`);
     await downloadToFile(github, archivePath);
@@ -3756,8 +3756,8 @@ var init_src2 = __esm({
       {
         browser: "Firefox",
         platforms: "Windows/Linux/macOS",
-        vendor: "Mozilla / ?????",
-        url: `${DEFAULT_GECKODRIVER_MIRROR}/v0.36.0/?????????????? ${GITHUB_GECKODRIVER_RELEASES}?`
+        vendor: "Mozilla",
+        url: `${DEFAULT_GECKODRIVER_MIRROR}/v0.36.0/????????? ${GITHUB_GECKODRIVER_RELEASES}`
       },
       {
         browser: "Edge",
@@ -5578,15 +5578,60 @@ function isPluginModule(mod) {
   const m = mod.manifest;
   return !!m && typeof m.id === "string" && Array.isArray(m.platforms);
 }
+function entryScriptDir() {
+  const argv1 = process.argv[1]?.trim();
+  if (!argv1) {
+    return void 0;
+  }
+  try {
+    return import_node_path6.default.dirname(import_node_path6.default.resolve(argv1));
+  } catch {
+    return void 0;
+  }
+}
 function resolvePluginDirs(explicitPluginDir) {
-  const fromEnv = process.env.ADA_PLUGIN_DIR?.trim();
-  const execDir = import_node_path6.default.dirname(process.execPath);
+  const ordered = [];
+  const push = (dir) => {
+    const trimmed = dir?.trim();
+    if (!trimmed) {
+      return;
+    }
+    ordered.push(import_node_path6.default.resolve(trimmed));
+  };
+  push(explicitPluginDir);
+  push(process.env.ADA_PLUGIN_DIR);
+  const entryDir = entryScriptDir();
+  if (entryDir) {
+    push(import_node_path6.default.join(entryDir, "plugins"));
+    push(import_node_path6.default.join(entryDir, "..", "plugins"));
+  }
+  if (typeof __filename === "string") {
+    const fromModule = import_node_path6.default.dirname(__filename);
+    push(import_node_path6.default.join(fromModule, "plugins"));
+    push(import_node_path6.default.join(fromModule, "..", "plugins"));
+  }
+  const initCwd = process.env.INIT_CWD?.trim();
+  if (initCwd) {
+    push(import_node_path6.default.join(initCwd, "plugins"));
+    push(import_node_path6.default.join(initCwd, "release", "plugins"));
+  }
   const cwd = process.cwd();
-  return Array.from(
-    new Set(
-      [fromEnv, explicitPluginDir, import_node_path6.default.join(execDir, "plugins"), import_node_path6.default.join(cwd, "plugins"), import_node_path6.default.join(cwd, "release", "plugins")].filter((x) => Boolean(x && x.trim())).map((x) => import_node_path6.default.resolve(x))
-    )
-  );
+  push(import_node_path6.default.join(cwd, "plugins"));
+  push(import_node_path6.default.join(cwd, "release", "plugins"));
+  const seen = /* @__PURE__ */ new Set();
+  return ordered.filter((dir) => {
+    if (seen.has(dir)) {
+      return false;
+    }
+    seen.add(dir);
+    return true;
+  });
+}
+function pluginDirHasModules(pluginDir) {
+  if (!import_node_fs2.default.existsSync(pluginDir)) {
+    return false;
+  }
+  return import_node_fs2.default.readdirSync(pluginDir, { withFileTypes: true }).some((ent) => ent.isFile() && (ent.name.endsWith(".cjs") || ent.name.endsWith(".js")));
 }
 function loadPluginFromModule(requireFn, moduleId) {
   try {
@@ -5612,6 +5657,9 @@ function registerPluginsFromDirectory(host, pluginDir) {
     if (!plugin) {
       continue;
     }
+    if (host.listManifests().some((m) => m.id === plugin.manifest.id)) {
+      continue;
+    }
     host.register(plugin);
     loaded.push(plugin.manifest);
   }
@@ -5631,12 +5679,14 @@ function registerPluginsFromModuleIds(host, moduleIds) {
   return loaded;
 }
 function registerRuntimePlugins(host, options) {
-  const manifests2 = [];
   for (const pluginDir of resolvePluginDirs(options?.pluginDir)) {
-    manifests2.push(...registerPluginsFromDirectory(host, pluginDir));
-  }
-  if (manifests2.length > 0) {
-    return manifests2;
+    if (!pluginDirHasModules(pluginDir)) {
+      continue;
+    }
+    const loaded = registerPluginsFromDirectory(host, pluginDir);
+    if (loaded.length > 0) {
+      return loaded;
+    }
   }
   const fallbackModuleIds = options?.moduleIds?.length ? options.moduleIds : DEFAULT_PLUGIN_MODULE_IDS;
   return registerPluginsFromModuleIds(host, fallbackModuleIds);
@@ -18136,53 +18186,72 @@ var init_streamableHttp = __esm({
 });
 
 // src/executor.ts
-function ensureBundledPluginDir() {
-  if (process.env.ADA_PLUGIN_DIR?.trim()) {
-    return;
-  }
+function resolveBundledPluginDir() {
   const candidates = [];
-  try {
-    const here = import_node_path11.default.dirname((0, import_node_url3.fileURLToPath)(import_meta.url));
-    candidates.push(import_node_path11.default.join(here, "..", "plugins"));
-  } catch {
+  const argv1 = process.argv[1]?.trim();
+  if (argv1) {
+    const entryDir = import_node_path11.default.dirname(import_node_path11.default.resolve(argv1));
+    candidates.push(import_node_path11.default.join(entryDir, "plugins"));
+    candidates.push(import_node_path11.default.join(entryDir, "..", "plugins"));
   }
   const dirname = globalThis.__dirname;
   if (typeof dirname === "string") {
+    candidates.push(import_node_path11.default.join(dirname, "plugins"));
     candidates.push(import_node_path11.default.join(dirname, "..", "plugins"));
   }
+  try {
+    const here = import_node_path11.default.dirname((0, import_node_url3.fileURLToPath)(import_meta.url));
+    candidates.push(import_node_path11.default.join(here, "plugins"));
+    candidates.push(import_node_path11.default.join(here, "..", "plugins"));
+  } catch {
+  }
+  const seen = /* @__PURE__ */ new Set();
   for (const dir of candidates) {
-    if ((0, import_node_fs4.existsSync)(dir)) {
-      process.env.ADA_PLUGIN_DIR = dir;
-      return;
+    const resolved = import_node_path11.default.resolve(dir);
+    if (seen.has(resolved) || !(0, import_node_fs4.existsSync)(resolved)) {
+      continue;
     }
+    seen.add(resolved);
+    return resolved;
   }
+  return void 0;
 }
-function buildPluginHost2() {
-  ensureBundledPluginDir();
+function getPluginHost() {
+  if (sharedHost) {
+    return sharedHost;
+  }
+  const bundledDir = resolveBundledPluginDir();
   const host = new PluginHost();
-  registerRuntimePlugins(host);
+  registerRuntimePlugins(host, bundledDir ? { pluginDir: bundledDir } : void 0);
+  sharedHost = host;
   return host;
 }
+function getExecutor() {
+  if (!sharedExecutor) {
+    sharedExecutor = new TaskExecutor(getPluginHost());
+  }
+  return sharedExecutor;
+}
 async function runCommand3(command) {
-  return sharedExecutor.execute(command);
+  return getExecutor().execute(command);
 }
 async function runTaskset2(commands) {
   const results = [];
   for (const command of commands) {
-    results.push(await sharedExecutor.execute(command));
+    results.push(await runCommand3(command));
   }
   return results;
 }
 function listActiveSessions() {
-  return sharedExecutor.listSessions();
+  return getExecutor().listSessions();
 }
 async function closeSession(platform, sessionId, options) {
-  return sharedExecutor.closeSession(platform, sessionId, options);
+  return getExecutor().closeSession(platform, sessionId, options);
 }
 async function closeAllSessions() {
-  return sharedExecutor.closeAllSessions();
+  return getExecutor().closeAllSessions();
 }
-var import_node_fs4, import_node_path11, import_node_url3, import_meta, manifests, sharedExecutor;
+var import_node_fs4, import_node_path11, import_node_url3, import_meta, sharedHost, sharedExecutor;
 var init_executor = __esm({
   "src/executor.ts"() {
     "use strict";
@@ -18192,8 +18261,8 @@ var init_executor = __esm({
     init_src7();
     init_src4();
     import_meta = {};
-    manifests = registerRuntimePlugins(new PluginHost());
-    sharedExecutor = new TaskExecutor(buildPluginHost2());
+    sharedHost = null;
+    sharedExecutor = null;
   }
 });
 

package/package.json

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

package/plugins/driver-selenium.cjs

@@ -244,8 +244,8 @@ var SELENIUM_DRIVER_MANUAL_DOWNLOAD_REFERENCES = [
   {
     browser: "Firefox",
     platforms: "Windows/Linux/macOS",
-    vendor: "Mozilla / ?????",
-    url: `${DEFAULT_GECKODRIVER_MIRROR}/v0.36.0/?????????????? ${GITHUB_GECKODRIVER_RELEASES}?`
+    vendor: "Mozilla",
+    url: `${DEFAULT_GECKODRIVER_MIRROR}/v0.36.0/????????? ${GITHUB_GECKODRIVER_RELEASES}`
   },
   {
     browser: "Edge",