@mobilenext/mobile-mcp 0.0.33 → 0.0.34

package/lib/android.js

@@ -46,10 +46,19 @@ const getAdbPath = () => {
     if (process.env.ANDROID_HOME) {
         return node_path_1.default.join(process.env.ANDROID_HOME, "platform-tools", "adb");
     }
-    const defaultAndroidSdk = node_path_1.default.join(process.env.HOME || "", "Library", "Android", "sdk", "platform-tools", "adb");
-    if ((0, node_fs_1.existsSync)(defaultAndroidSdk)) {
-        return defaultAndroidSdk;
+    if (process.platform === "win32" && process.env.LOCALAPPDATA) {
+        const windowsAdbPath = node_path_1.default.join(process.env.LOCALAPPDATA, "Android", "Sdk", "platform-tools", "adb.exe");
+        if ((0, node_fs_1.existsSync)(windowsAdbPath)) {
+            return windowsAdbPath;
+        }
+    }
+    if (process.env.HOME) {
+        const defaultAndroidSdk = node_path_1.default.join(process.env.HOME, "Library", "Android", "sdk", "platform-tools", "adb");
+        if ((0, node_fs_1.existsSync)(defaultAndroidSdk)) {
+            return defaultAndroidSdk;
+        }
     }
+    // fallthrough, hope for the best
     return "adb";
 };
 const BUTTON_MAP = {
@@ -77,6 +86,13 @@ class AndroidRobot {
             timeout: TIMEOUT,
         });
     }
+    silentAdb(...args) {
+        return (0, node_child_process_1.execFileSync)(getAdbPath(), ["-s", this.deviceId, ...args], {
+            maxBuffer: MAX_BUFFER_SIZE,
+            timeout: TIMEOUT,
+            stdio: ["pipe", "pipe", "pipe"],
+        });
+    }
     getSystemFeatures() {
         return this.adb("shell", "pm", "list", "features")
             .toString()
@@ -120,7 +136,12 @@ class AndroidRobot {
             .map(line => line.substring("package:".length));
     }
     async launchApp(packageName) {
-        this.adb("shell", "monkey", "-p", packageName, "-c", "android.intent.category.LAUNCHER", "1", "1>/dev/null", "2>/dev/null");
+        try {
+            this.silentAdb("shell", "monkey", "-p", packageName, "-c", "android.intent.category.LAUNCHER", "1");
+        }
+        catch (error) {
+            throw new robot_1.ActionableError(`Failed launching app with package name "${packageName}", please make sure it exists`);
+        }
     }
     async listRunningProcesses() {
         return this.adb("shell", "ps", "-e")

package/lib/mobilecli.js

@@ -7,14 +7,19 @@ const getMobilecliPath = () => {
     if (process.env.MOBILECLI_PATH) {
         return process.env.MOBILECLI_PATH;
     }
+    const arch = process.arch;
     const platform = process.platform;
     let binaryName = "mobilecli";
     switch (platform) {
         case "darwin":
-            binaryName += "-darwin";
+            if (arch === "arm64") {
+                binaryName += "-darwin-arm64";
+            }
+            else {
+                binaryName += "-darwin-amd64";
+            }
             break;
         case "linux":
-            const arch = process.arch;
             if (arch === "arm64") {
                 binaryName += "-linux-arm64";
             }

package/lib/server.js

@@ -56,6 +56,7 @@ const createMcpServer = () => {
                 };
             }
             catch (error) {
+                posthog("tool_failed", { "ToolName": name }).then();
                 if (error instanceof robot_1.ActionableError) {
                     return {
                         content: [{ type: "text", text: `${error.message}. Please fix the issue and try again.` }],
@@ -122,6 +123,11 @@ const createMcpServer = () => {
             return "failed " + error.message;
         }
     };
+    const getMobilecliDevices = () => {
+        const mobilecliPath = (0, mobilecli_1.getMobilecliPath)();
+        const mobilecliOutput = (0, node_child_process_1.execFileSync)(mobilecliPath, ["devices"], { encoding: "utf8" }).toString().trim();
+        return JSON.parse(mobilecliOutput);
+    };
     const mobilecliVersion = getMobilecliVersion();
     posthog("launch", { "MobilecliVersion": mobilecliVersion }).then();
     const simulatorManager = new iphone_simulator_1.SimctlManager();
@@ -160,6 +166,35 @@ const createMcpServer = () => {
         const iosDeviceNames = iosDevices.map(d => d.deviceId);
         const androidTvDevices = androidDevices.filter(d => d.deviceType === "tv").map(d => d.deviceId);
         const androidMobileDevices = androidDevices.filter(d => d.deviceType === "mobile").map(d => d.deviceId);
+        if (true) {
+            // gilm: this is new code to verify first that mobilecli detects more or equal number of devices.
+            // in an attempt to make the smoothest transition from go-ios+xcrun+adb+iproxy+sips+imagemagick+wda to
+            // a single cli tool.
+            const deviceCount = simulators.length + iosDevices.length + androidDevices.length;
+            let mobilecliDeviceCount = 0;
+            try {
+                const response = getMobilecliDevices();
+                if (response.status === "ok" && response.data && response.data.devices) {
+                    mobilecliDeviceCount = response.data.devices.length;
+                }
+            }
+            catch (error) {
+                // if mobilecli fails, we'll just set count to 0
+            }
+            if (deviceCount === mobilecliDeviceCount) {
+                posthog("debug_mobilecli_same_number_of_devices", {
+                    "DeviceCount": deviceCount,
+                    "MobilecliDeviceCount": mobilecliDeviceCount,
+                }).then();
+            }
+            else {
+                posthog("debug_mobilecli_different_number_of_devices", {
+                    "DeviceCount": deviceCount,
+                    "MobilecliDeviceCount": mobilecliDeviceCount,
+                    "DeviceCountDifference": deviceCount - mobilecliDeviceCount,
+                }).then();
+            }
+        }
         const resp = ["Found these devices:"];
         if (simulatorNames.length > 0) {
             resp.push(`iOS simulators: [${simulatorNames.join(",")}]`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mobilenext/mobile-mcp",
   "mcpName": "io.github.mobile-next/mobile-mcp",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "description": "Mobile MCP",
   "repository": {
     "type": "git",
@@ -31,7 +31,7 @@
     "zod-to-json-schema": "3.24.6"
   },
   "optionalDependencies": {
-    "@mobilenext/mobilecli": "0.0.28"
+    "@mobilenext/mobilecli": "0.0.33"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.2.0",