@mobilenext/mobile-mcp 0.0.27 → 0.0.28

package/lib/server.js

@@ -111,44 +111,30 @@ const createMcpServer = () => {
         }
     };
     posthog("launch", {}).then();
-    let robot;
     const simulatorManager = new iphone_simulator_1.SimctlManager();
-    const requireRobot = () => {
-        if (!robot) {
-            throw new robot_1.ActionableError("No device selected. Use the mobile_use_device tool to select a device.");
-        }
-    };
-    tool("mobile_use_default_device", "Use the default device. This is a shortcut for mobile_use_device with deviceType=simulator and device=simulator_name", {
-        noParams
-    }, async () => {
+    const getRobotFromDevice = (device) => {
         const iosManager = new ios_1.IosManager();
         const androidManager = new android_1.AndroidDeviceManager();
         const simulators = simulatorManager.listBootedSimulators();
         const androidDevices = androidManager.getConnectedDevices();
         const iosDevices = iosManager.listDevices();
-        const sum = simulators.length + androidDevices.length + iosDevices.length;
-        if (sum === 0) {
-            throw new robot_1.ActionableError("No devices found. Please connect a device and try again.");
-        }
-        else if (sum >= 2) {
-            throw new robot_1.ActionableError("Multiple devices found. Please use the mobile_list_available_devices tool to list available devices and select one.");
-        }
-        // only one device connected, let's find it now
-        if (simulators.length === 1) {
-            robot = simulatorManager.getSimulator(simulators[0].name);
-            return `Selected default device: ${simulators[0].name}`;
+        // Check if it's a simulator
+        const simulator = simulators.find(s => s.name === device);
+        if (simulator) {
+            return simulatorManager.getSimulator(device);
         }
-        else if (androidDevices.length === 1) {
-            robot = new android_1.AndroidRobot(androidDevices[0].deviceId);
-            return `Selected default device: ${androidDevices[0].deviceId}`;
+        // Check if it's an Android device
+        const androidDevice = androidDevices.find(d => d.deviceId === device);
+        if (androidDevice) {
+            return new android_1.AndroidRobot(device);
         }
-        else if (iosDevices.length === 1) {
-            robot = new ios_1.IosRobot(iosDevices[0].deviceId);
-            return `Selected default device: ${iosDevices[0].deviceId}`;
+        // Check if it's an iOS device
+        const iosDevice = iosDevices.find(d => d.deviceId === device);
+        if (iosDevice) {
+            return new ios_1.IosRobot(device);
         }
-        // how did this happen?
-        throw new robot_1.ActionableError("No device selected. Please use the mobile_list_available_devices tool to list available devices and select one.");
-    });
+        throw new robot_1.ActionableError(`Device "${device}" not found. Use the mobile_list_available_devices tool to see available devices.`);
+    };
     tool("mobile_list_available_devices", "List all available devices. This includes both physical devices and simulators. If there is more than one device returned, you need to let the user select one of them.", {
         noParams
     }, async ({}) => {
@@ -176,71 +162,58 @@ const createMcpServer = () => {
         }
         return resp.join("\n");
     });
-    tool("mobile_use_device", "Select a device to use. This can be a simulator or an Android device. Use the list_available_devices tool to get a list of available devices.", {
-        device: zod_1.z.string().describe("The name of the device to select"),
-        deviceType: zod_1.z.enum(["simulator", "ios", "android"]).describe("The type of device to select"),
-    }, async ({ device, deviceType }) => {
-        switch (deviceType) {
-            case "simulator":
-                robot = simulatorManager.getSimulator(device);
-                break;
-            case "ios":
-                robot = new ios_1.IosRobot(device);
-                break;
-            case "android":
-                robot = new android_1.AndroidRobot(device);
-                break;
-        }
-        return `Selected device: ${device}`;
-    });
     tool("mobile_list_apps", "List all the installed apps on the device", {
-        noParams
-    }, async ({}) => {
-        requireRobot();
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you.")
+    }, async ({ device }) => {
+        const robot = getRobotFromDevice(device);
         const result = await robot.listApps();
         return `Found these apps on device: ${result.map(app => `${app.appName} (${app.packageName})`).join(", ")}`;
     });
     tool("mobile_launch_app", "Launch an app on mobile device. Use this to open a specific app. You can find the package name of the app by calling list_apps_on_device.", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         packageName: zod_1.z.string().describe("The package name of the app to launch"),
-    }, async ({ packageName }) => {
-        requireRobot();
+    }, async ({ device, packageName }) => {
+        const robot = getRobotFromDevice(device);
         await robot.launchApp(packageName);
         return `Launched app ${packageName}`;
     });
     tool("mobile_terminate_app", "Stop and terminate an app on mobile device", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         packageName: zod_1.z.string().describe("The package name of the app to terminate"),
-    }, async ({ packageName }) => {
-        requireRobot();
+    }, async ({ device, packageName }) => {
+        const robot = getRobotFromDevice(device);
         await robot.terminateApp(packageName);
         return `Terminated app ${packageName}`;
     });
     tool("mobile_get_screen_size", "Get the screen size of the mobile device in pixels", {
-        noParams
-    }, async ({}) => {
-        requireRobot();
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you.")
+    }, async ({ device }) => {
+        const robot = getRobotFromDevice(device);
         const screenSize = await robot.getScreenSize();
         return `Screen size is ${screenSize.width}x${screenSize.height} pixels`;
     });
     tool("mobile_click_on_screen_at_coordinates", "Click on the screen at given x,y coordinates. If clicking on an element, use the list_elements_on_screen tool to find the coordinates.", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         x: zod_1.z.number().describe("The x coordinate to click on the screen, in pixels"),
         y: zod_1.z.number().describe("The y coordinate to click on the screen, in pixels"),
-    }, async ({ x, y }) => {
-        requireRobot();
+    }, async ({ device, x, y }) => {
+        const robot = getRobotFromDevice(device);
         await robot.tap(x, y);
         return `Clicked on screen at coordinates: ${x}, ${y}`;
     });
     tool("mobile_long_press_on_screen_at_coordinates", "Long press on the screen at given x,y coordinates. If long pressing on an element, use the list_elements_on_screen tool to find the coordinates.", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         x: zod_1.z.number().describe("The x coordinate to long press on the screen, in pixels"),
         y: zod_1.z.number().describe("The y coordinate to long press on the screen, in pixels"),
-    }, async ({ x, y }) => {
-        requireRobot();
+    }, async ({ device, x, y }) => {
+        const robot = getRobotFromDevice(device);
         await robot.longPress(x, y);
         return `Long pressed on screen at coordinates: ${x}, ${y}`;
     });
     tool("mobile_list_elements_on_screen", "List elements on screen and their coordinates, with display text or accessibility label. Do not cache this result.", {
-        noParams
-    }, async ({}) => {
-        requireRobot();
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you.")
+    }, async ({ device }) => {
+        const robot = getRobotFromDevice(device);
         const elements = await robot.getElementsOnScreen();
         const result = elements.map(element => {
             const out = {
@@ -265,26 +238,29 @@ const createMcpServer = () => {
         return `Found these elements on screen: ${JSON.stringify(result)}`;
     });
     tool("mobile_press_button", "Press a button on device", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         button: zod_1.z.string().describe("The button to press. Supported buttons: BACK (android only), HOME, VOLUME_UP, VOLUME_DOWN, ENTER, DPAD_CENTER (android tv only), DPAD_UP (android tv only), DPAD_DOWN (android tv only), DPAD_LEFT (android tv only), DPAD_RIGHT (android tv only)"),
-    }, async ({ button }) => {
-        requireRobot();
+    }, async ({ device, button }) => {
+        const robot = getRobotFromDevice(device);
         await robot.pressButton(button);
         return `Pressed the button: ${button}`;
     });
     tool("mobile_open_url", "Open a URL in browser on device", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         url: zod_1.z.string().describe("The URL to open"),
-    }, async ({ url }) => {
-        requireRobot();
+    }, async ({ device, url }) => {
+        const robot = getRobotFromDevice(device);
         await robot.openUrl(url);
         return `Opened URL: ${url}`;
     });
     tool("swipe_on_screen", "Swipe on the screen", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         direction: zod_1.z.enum(["up", "down", "left", "right"]).describe("The direction to swipe"),
         x: zod_1.z.number().optional().describe("The x coordinate to start the swipe from, in pixels. If not provided, uses center of screen"),
         y: zod_1.z.number().optional().describe("The y coordinate to start the swipe from, in pixels. If not provided, uses center of screen"),
         distance: zod_1.z.number().optional().describe("The distance to swipe in pixels. Defaults to 400 pixels for iOS or 30% of screen dimension for Android"),
-    }, async ({ direction, x, y, distance }) => {
-        requireRobot();
+    }, async ({ device, direction, x, y, distance }) => {
+        const robot = getRobotFromDevice(device);
         if (x !== undefined && y !== undefined) {
             // Use coordinate-based swipe
             await robot.swipeFromCoordinate(x, y, direction, distance);
@@ -298,10 +274,11 @@ const createMcpServer = () => {
         }
     });
     tool("mobile_type_keys", "Type text into the focused element", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         text: zod_1.z.string().describe("The text to type"),
         submit: zod_1.z.boolean().describe("Whether to submit the text. If true, the text will be submitted as if the user pressed the enter key."),
-    }, async ({ text, submit }) => {
-        requireRobot();
+    }, async ({ device, text, submit }) => {
+        const robot = getRobotFromDevice(device);
         await robot.sendKeys(text);
         if (submit) {
             await robot.pressButton("ENTER");
@@ -309,18 +286,19 @@ const createMcpServer = () => {
         return `Typed text: ${text}`;
     });
     tool("mobile_save_screenshot", "Save a screenshot of the mobile device to a file", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         saveTo: zod_1.z.string().describe("The path to save the screenshot to"),
-    }, async ({ saveTo }) => {
-        requireRobot();
+    }, async ({ device, saveTo }) => {
+        const robot = getRobotFromDevice(device);
         const screenshot = await robot.getScreenshot();
         node_fs_1.default.writeFileSync(saveTo, screenshot);
         return `Screenshot saved to: ${saveTo}`;
     });
     server.tool("mobile_take_screenshot", "Take a screenshot of the mobile device. Use this to understand what's on screen, if you need to press an element that is available through view hierarchy then you must list elements on screen instead. Do not cache this result.", {
-        noParams
-    }, async ({}) => {
-        requireRobot();
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you.")
+    }, async ({ device }) => {
         try {
+            const robot = getRobotFromDevice(device);
             const screenSize = await robot.getScreenSize();
             let screenshot = await robot.getScreenshot();
             let mimeType = "image/png";
@@ -356,16 +334,17 @@ const createMcpServer = () => {
         }
     });
     tool("mobile_set_orientation", "Change the screen orientation of the device", {
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you."),
         orientation: zod_1.z.enum(["portrait", "landscape"]).describe("The desired orientation"),
-    }, async ({ orientation }) => {
-        requireRobot();
+    }, async ({ device, orientation }) => {
+        const robot = getRobotFromDevice(device);
         await robot.setOrientation(orientation);
         return `Changed device orientation to ${orientation}`;
     });
     tool("mobile_get_orientation", "Get the current screen orientation of the device", {
-        noParams
-    }, async () => {
-        requireRobot();
+        device: zod_1.z.string().describe("The device identifier to use. Use mobile_list_available_devices to find which devices are available to you.")
+    }, async ({ device }) => {
+        const robot = getRobotFromDevice(device);
         const orientation = await robot.getOrientation();
         return `Current device orientation is ${orientation}`;
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mobilenext/mobile-mcp",
   "mcpName": "io.github.mobile-next/mobile-mcp",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Mobile MCP",
   "repository": {
     "type": "git",