@ada-mcp/mcp-server 0.1.20 → 0.1.22

package/dist/cli.cjs

@@ -4709,12 +4709,25 @@ async function runAppiumDriverInstallWithPriority(config2, driver, onLogLine) {
   for (const target of uniqueTargets) {
     const installArgs = buildAppiumDriverInstallArgs(target, appiumMajor);
     onLogLine?.(`[appium] \u6267\u884C: npm ${installArgs.join(" ")}`);
+    let alreadyInstalledSeen = false;
+    const onAppiumDriverLogLine = (line) => {
+      const t = line.trimEnd();
+      const normalized = t.replace(/^Error:\s*[×x]?\s*/i, "");
+      if (/A driver named\s+\"uiautomator2\"\s+is already installed/i.test(normalized)) {
+        alreadyInstalledSeen = true;
+        onLogLine?.(
+          `[deps][warn] ${normalized}\u3002\u68C0\u6D4B\u5230\u5B89\u88C5\u540E\u65E0\u9700\u518D\u6B21\u5B89\u88C5${driver}\u3002`
+        );
+        return;
+      }
+      onLogLine?.(t);
+    };
     const strategies = [
       {
         name: "npm",
         run: () => runCommand2("npm", installArgs, {
           timeoutMs: installStrategyTimeoutMs(),
-          onLogLine
+          onLogLine: onAppiumDriverLogLine
         })
       },
       {
@@ -4722,7 +4735,7 @@ async function runAppiumDriverInstallWithPriority(config2, driver, onLogLine) {
         run: () => runCommand2("npm", installArgs, {
           env: { npm_config_registry: npmProxy },
           timeoutMs: installStrategyTimeoutMs(),
-          onLogLine
+          onLogLine: onAppiumDriverLogLine
         })
       }
     ];
@@ -4740,6 +4753,10 @@ async function runAppiumDriverInstallWithPriority(config2, driver, onLogLine) {
         progress("appium.driver.install.done", { driver, strategy: strategy.name, target });
         return;
       } catch (error2) {
+        if (alreadyInstalledSeen) {
+          progress("appium.driver.install.done", { driver, strategy: strategy.name, target });
+          return;
+        }
         lastError = error2;
         depsStructuredLog("warn", {
           event: "appium.driver.install.strategy.fail",
@@ -4753,10 +4770,39 @@ async function runAppiumDriverInstallWithPriority(config2, driver, onLogLine) {
       }
     }
   }
+  if (driver === "uiautomator2") {
+    await tryPipInstallUiautomator2(onLogLine);
+  }
   throw new Error(
     `Appium driver install failed after all strategies (${driver}): ${lastError instanceof Error ? lastError.message : String(lastError)}`
   );
 }
+async function tryPipInstallUiautomator2(onLogLine) {
+  onLogLine?.("[appium][warn] uiautomator2 \u9A71\u52A8\u5B89\u88C5\u5931\u8D25\uFF0C\u5C1D\u8BD5\u4F7F\u7528 pip \u5B89\u88C5 python-uiautomator2\uFF08\u4E0D\u4FDD\u8BC1\u53EF\u66FF\u4EE3 Appium \u9A71\u52A8\uFF09\u2026");
+  const pythonVersion = await runCommandCapture2("python", ["--version"]);
+  if (pythonVersion.code !== 0) {
+    const py3Version = await runCommandCapture2("python3", ["--version"]);
+    if (py3Version.code !== 0) {
+      onLogLine?.("[appium][warn] \u672A\u68C0\u6D4B\u5230 python/python3\uFF0C\u8DF3\u8FC7 pip \u5B89\u88C5 uiautomator2\u3002");
+      return;
+    }
+    await tryPipInstallWithPython("python3", onLogLine);
+    return;
+  }
+  await tryPipInstallWithPython("python", onLogLine);
+}
+async function tryPipInstallWithPython(pythonCmd, onLogLine) {
+  try {
+    onLogLine?.(`[pip] \u68C0\u6D4B\u5230 ${pythonCmd}\uFF0C\u5F00\u59CB\u5B89\u88C5: ${pythonCmd} -m pip install -U uiautomator2`);
+    await runCommand2(pythonCmd, ["-m", "pip", "install", "-U", "uiautomator2"], {
+      timeoutMs: 15 * 6e4,
+      onLogLine
+    });
+    onLogLine?.("[pip] uiautomator2 \u5B89\u88C5\u5B8C\u6210\u3002");
+  } catch (error2) {
+    onLogLine?.(`[pip][warn] uiautomator2 \u5B89\u88C5\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09: ${briefErrorMessage(error2)}`);
+  }
+}
 async function verifyPlaywrightSelfTest(onLogLine) {
   onLogLine?.("[playwright] \u81EA\u68C0\uFF1A\u542F\u52A8 Chromium");
   try {
@@ -32815,11 +32861,24 @@ async function startMcpServer() {
   if (passedArgs.includes("mcp")) {
     console.error('[ADA-MCP] warning: standalone ada-mcp binary does not require "mcp" arg; it is safe to remove.');
   }
+  function tryReadPackageVersion(name) {
+    try {
+      const raw = require(`${name}/package.json`);
+      const v = String(raw?.version ?? "").trim();
+      return v.length > 0 ? v : null;
+    } catch {
+      return null;
+    }
+  }
+  const launcherVersion = tryReadPackageVersion("@ada-mcp/launcher");
+  const selfVersion = tryReadPackageVersion("@ada-mcp/mcp-server");
+  const alignedLauncherVersion = launcherVersion || selfVersion;
+  const launcherSpec = alignedLauncherVersion ? `@ada-mcp/launcher@${alignedLauncherVersion}` : "@ada-mcp/launcher";
   const configHint = {
     mcpServers: {
       "ada-mcp": {
         command: "pnpm",
-        args: ["dlx", "@ada-mcp/launcher@0.1.7"]
+        args: ["dlx", launcherSpec]
       }
     }
   };
@@ -32833,7 +32892,7 @@ async function startMcpServer() {
           ADA_PLAYWRIGHT_HEADLESS: "true",
           ADA_MCP_INSTALL_DEPS: "playwright",
           ADA_INSTALL_STRATEGY_TIMEOUT_MS: "120000",
-          ADA_PLAYWRIGHT_INSTALL_TIMEOUT_MS: "900000"
+          ADA_PLAYWRIGHT_INSTALL_TIMEOUT_MS: "1800000"
         }
       }
     }
@@ -32848,6 +32907,14 @@ async function startMcpServer() {
   };
   console.error("[ADA-MCP] config hint (npm standard):");
   console.error(JSON.stringify(configHint, null, 2));
+  if (selfVersion) {
+    console.error(`[ADA-MCP] package version: @ada-mcp/mcp-server@${selfVersion}`);
+  }
+  if (launcherVersion) {
+    console.error(`[ADA-MCP] launcher version detected: @ada-mcp/launcher@${launcherVersion}`);
+  } else {
+    console.error("[ADA-MCP] launcher version not detected (using tag without version).");
+  }
   console.error("[ADA-MCP] config hint (local binary):");
   console.error(JSON.stringify(binaryHint, null, 2));
   console.error("[ADA-MCP] note: MCP tool names use ada_snake_case (e.g. ada_install_deps, ada_invoke, ada_web_action)");

package/package.json

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