@ada-mcp/mcp-server 0.1.21 → 0.1.23

package/dist/cli.cjs

@@ -3940,6 +3940,25 @@ function briefErrorMessage(error2) {
   }
   return String(error2).split(/\r?\n/)[0]?.trim() || String(error2);
 }
+function stripAnsiCodes(text) {
+  return text.replace(/\x1b\[[0-9;]*m/g, "");
+}
+function stripCliErrorPrefix(message) {
+  let t = stripAnsiCodes(message).trim();
+  t = t.replace(/^Error:\s*/i, "");
+  while (/^[×x✖✗❌\u00d7\u2716\u2717]\s*/iu.test(t)) {
+    t = t.replace(/^[×x✖✗❌\u00d7\u2716\u2717]\s*/iu, "");
+  }
+  return t.trim();
+}
+function isAppiumDriverAlreadyInstalledMessage(message) {
+  const raw = stripAnsiCodes(message).trim();
+  return /already installed/i.test(raw) && /driver named/i.test(raw);
+}
+function formatDepsWarnLine(message) {
+  const body = stripCliErrorPrefix(message);
+  return body ? `[deps][warn] ${body}` : "";
+}
 function depsVerboseEnabled() {
   return isTruthyEnv("ADA_DEPS_VERBOSE");
 }
@@ -4173,6 +4192,23 @@ async function probePlaywrightBrowserArtifact(host, browserVersion) {
 function requiredAppiumDrivers(config2) {
   return Array.from(new Set(config2.appium.requiredDrivers ?? []));
 }
+function isMacOsPlatform() {
+  return process.platform === "darwin";
+}
+function filterAppiumDriversForPlatform(drivers, onLogLine) {
+  const out = [];
+  for (const driver of drivers) {
+    const name = driver.toLowerCase().trim();
+    if (name === "xcuitest" && !isMacOsPlatform()) {
+      onLogLine?.(
+        `[appium] \u8DF3\u8FC7 xcuitest\uFF1A\u5F53\u524D\u7CFB\u7EDF\u4E3A ${process.platform}\uFF0CXCUITest \u9A71\u52A8\u4EC5\u652F\u6301 macOS\uFF08\u8BF7\u5728 Mac \u4E0A\u5B89\u88C5 iOS \u81EA\u52A8\u5316\u4F9D\u8D56\uFF09`
+      );
+      continue;
+    }
+    out.push(name);
+  }
+  return Array.from(new Set(out));
+}
 function npmProxyRegistry() {
   return process.env.ADA_NPM_PROXY_REGISTRY ?? DEFAULT_NPM_REGISTRY_CANDIDATES[0];
 }
@@ -4363,7 +4399,18 @@ function structuredLogToHuman(level, payload) {
     return `[deps] \u5305\u5B89\u88C5\u6210\u529F: ${d.strategy}`;
   }
   if (event === "deps.install.strategy.fail") {
-    return `[deps][warn] \u5B89\u88C5\u7B56\u7565\u5931\u8D25 (${d.strategy}): ${d.message}`;
+    const msg = stripCliErrorPrefix(String(d.message ?? ""));
+    if (isAppiumDriverAlreadyInstalledMessage(msg)) {
+      return null;
+    }
+    return `[deps][warn] \u5B89\u88C5\u7B56\u7565\u5931\u8D25 (${d.strategy}): ${msg}`;
+  }
+  if (event === "appium.driver.install.strategy.fail") {
+    const msg = stripCliErrorPrefix(String(d.message ?? ""));
+    if (isAppiumDriverAlreadyInstalledMessage(msg)) {
+      return null;
+    }
+    return `[deps][warn] Appium \u9A71\u52A8\u5B89\u88C5\u5931\u8D25 (${d.strategy}): ${msg}`;
   }
   if (event === "deps.registry.auto-selected") {
     return `[deps] \u9009\u7528 npm \u955C\u50CF: ${d.selected}`;
@@ -4372,8 +4419,12 @@ function structuredLogToHuman(level, payload) {
     return `[playwright] CDN \u6D4B\u901F\u6392\u5E8F: ${Array.isArray(d.ranked) ? d.ranked.join(" -> ") : d.selected}`;
   }
   if (level === "warn" || level === "error") {
-    const msg = d.message ?? d.detail;
-    return `[deps][${level}] ${event}${msg ? `: ${msg}` : ""}`;
+    const raw = String(d.message ?? d.detail ?? "");
+    if (isAppiumDriverAlreadyInstalledMessage(raw)) {
+      return null;
+    }
+    const warn = formatDepsWarnLine(raw);
+    return warn || null;
   }
   if (depsVerboseEnabled()) {
     return `[deps] ${event}${Object.keys(d).length > 0 ? ` ${JSON.stringify(d)}` : ""}`;
@@ -4709,12 +4760,40 @@ 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;
+    let alreadyInstalledWarnLogged = false;
+    const onAppiumDriverLogLine = (line) => {
+      const t = stripAnsiCodes(line).trimEnd();
+      if (!t) {
+        return;
+      }
+      if (isAppiumDriverAlreadyInstalledMessage(t)) {
+        alreadyInstalledSeen = true;
+        if (!alreadyInstalledWarnLogged) {
+          alreadyInstalledWarnLogged = true;
+          const normalized = stripCliErrorPrefix(t);
+          onLogLine?.(`[deps][warn] ${normalized}\u3002\u68C0\u6D4B\u5230\u5B89\u88C5\u540E\u65E0\u9700\u518D\u6B21\u5B89\u88C5${driver}\u3002`);
+        }
+        return;
+      }
+      if (/^Error:\s*/i.test(t)) {
+        const warn = formatDepsWarnLine(t);
+        if (warn) {
+          onLogLine?.(warn);
+        }
+        return;
+      }
+      if (/^dbug\s+Appium/i.test(t)) {
+        return;
+      }
+      onLogLine?.(t);
+    };
     const strategies = [
       {
         name: "npm",
         run: () => runCommand2("npm", installArgs, {
           timeoutMs: installStrategyTimeoutMs(),
-          onLogLine
+          onLogLine: onAppiumDriverLogLine
         })
       },
       {
@@ -4722,7 +4801,7 @@ async function runAppiumDriverInstallWithPriority(config2, driver, onLogLine) {
         run: () => runCommand2("npm", installArgs, {
           env: { npm_config_registry: npmProxy },
           timeoutMs: installStrategyTimeoutMs(),
-          onLogLine
+          onLogLine: onAppiumDriverLogLine
         })
       }
     ];
@@ -4740,12 +4819,7 @@ async function runAppiumDriverInstallWithPriority(config2, driver, onLogLine) {
         progress("appium.driver.install.done", { driver, strategy: strategy.name, target });
         return;
       } catch (error2) {
-        const msg = error2 instanceof Error ? error2.message : String(error2);
-        if (/already installed/i.test(msg) && /driver named/i.test(msg)) {
-          const normalized = msg.replace(/^Error:\s*/i, "").trim();
-          onLogLine?.(
-            `[deps][warn] ${normalized}\u3002\u68C0\u6D4B\u5230\u5B89\u88C5\u540E\u65E0\u9700\u518D\u6B21\u5B89\u88C5 ${driver}\u3002`
-          );
+        if (alreadyInstalledSeen) {
           progress("appium.driver.install.done", { driver, strategy: strategy.name, target });
           return;
         }
@@ -4932,7 +5006,7 @@ async function getInstalledAppiumDrivers() {
   return Array.from(new Set(names));
 }
 async function ensureAppiumDrivers(config2, onLogLine) {
-  const required2 = requiredAppiumDrivers(config2);
+  const required2 = filterAppiumDriversForPlatform(requiredAppiumDrivers(config2), onLogLine);
   if (required2.length === 0) {
     return [];
   }
@@ -5164,7 +5238,10 @@ async function ensureDriverDependenciesImpl(config2, options) {
   onLogLine?.("[deps] \u5F00\u59CB\u68C0\u6D4B / \u5B89\u88C5\u4F9D\u8D56\u2026");
   await ensureNodeEnvironmentForInstall(onLogLine);
   const missing = [];
-  const requestedDrivers = options?.appiumRequiredDriversOverride !== void 0 ? normalizeAppiumDriverTokens(options.appiumRequiredDriversOverride) : resolveRequestedDrivers(config2, only);
+  const requestedDrivers = filterAppiumDriversForPlatform(
+    options?.appiumRequiredDriversOverride !== void 0 ? normalizeAppiumDriverTokens(options.appiumRequiredDriversOverride) : resolveRequestedDrivers(config2, only),
+    onLogLine
+  );
   const needDrivers = requestedDrivers.length > 0;
   const installedPackages = [];
   const installedDrivers = [];
@@ -5346,7 +5423,9 @@ async function getDependencyHealth(config2) {
     }
     if (appiumCliOk) {
       const installed = (await getInstalledAppiumDrivers()).map((x) => x.toLowerCase());
-      const required2 = config2?.appium?.requiredDrivers && config2.appium.requiredDrivers.length > 0 ? config2.appium.requiredDrivers.map((x) => x.toLowerCase()) : ["uiautomator2", "xcuitest", "harmonyos"];
+      const required2 = filterAppiumDriversForPlatform(
+        config2?.appium?.requiredDrivers && config2.appium.requiredDrivers.length > 0 ? config2.appium.requiredDrivers.map((x) => x.toLowerCase()) : ["uiautomator2", "xcuitest", "harmonyos"]
+      );
       missingAppiumDrivers = required2.filter((x) => !installed.includes(x));
       appiumDriversOk = missingAppiumDrivers.length === 0;
     }

package/package.json

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