@midscene/android 1.5.3 → 1.5.4-beta-20260310084708.0

package/dist/es/cli.mjs

@@ -961,6 +961,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getScreenSize() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getScreenSize: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedSize=${!!this.cachedScreenSize}`);
         if (shouldCache && this.cachedScreenSize) return this.cachedScreenSize;
         const adb = await this.getAdb();
         if ('number' == typeof this.options?.displayId) try {
@@ -1094,6 +1095,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getDisplayOrientation() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getDisplayOrientation: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedOrientation=${null !== this.cachedOrientation}`);
         if (shouldCache && null !== this.cachedOrientation) return this.cachedOrientation;
         const adb = await this.getAdb();
         let orientation = 0;
@@ -1138,6 +1140,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getAdjustScale() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getAdjustScale: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedScale=${!!this.cachedAdjustScale}`);
         if (shouldCache && this.cachedAdjustScale) return this.cachedAdjustScale;
         const physical = await this.getOrientedPhysicalSize();
         const { width: logicalW, height: logicalH } = await this.size();
@@ -1881,7 +1884,8 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
 }
 const tools = new AndroidMidsceneTools();
 runToolsCLI(tools, 'midscene-android', {
-    stripPrefix: 'android_'
+    stripPrefix: 'android_',
+    version: "1.5.4-beta-20260310084708.0"
 }).catch((e)=>{
     if (!(e instanceof CLIError)) console.error(e);
     process.exit(e instanceof CLIError ? e.exitCode : 1);

package/dist/es/index.mjs

@@ -12,6 +12,7 @@ import { createImgBase64ByFormat, isValidImageBuffer } from "@midscene/shared/im
 import { mergeAndNormalizeAppNameMapping, normalizeForComparison, repeat } from "@midscene/shared/utils";
 import { ADB } from "appium-adb";
 import { Agent } from "@midscene/core/agent";
+import { BaseMidsceneTools } from "@midscene/shared/mcp";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
@@ -863,6 +864,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getScreenSize() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getScreenSize: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedSize=${!!this.cachedScreenSize}`);
         if (shouldCache && this.cachedScreenSize) return this.cachedScreenSize;
         const adb = await this.getAdb();
         if ('number' == typeof this.options?.displayId) try {
@@ -996,6 +998,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getDisplayOrientation() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getDisplayOrientation: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedOrientation=${null !== this.cachedOrientation}`);
         if (shouldCache && null !== this.cachedOrientation) return this.cachedOrientation;
         const adb = await this.getAdb();
         let orientation = 0;
@@ -1040,6 +1043,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getAdjustScale() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getAdjustScale: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedScale=${!!this.cachedAdjustScale}`);
         if (shouldCache && this.cachedAdjustScale) return this.cachedAdjustScale;
         const physical = await this.getOrientedPhysicalSize();
         const { width: logicalW, height: logicalH } = await this.size();
@@ -1823,4 +1827,58 @@ async function agentFromAdbDevice(deviceId, opts) {
     await device.connect();
     return new AndroidAgent(device, opts);
 }
-export { AndroidAgent, AndroidDevice, ScrcpyDeviceAdapter, agentFromAdbDevice, getConnectedDevices, overrideAIConfig };
+const debug = (0, logger_.getDebug)('mcp:android-tools');
+class AndroidMidsceneTools extends BaseMidsceneTools {
+    createTemporaryDevice() {
+        return new AndroidDevice('temp-for-action-space', {});
+    }
+    async ensureAgent(deviceId) {
+        if (this.agent && deviceId) {
+            try {
+                await this.agent.destroy?.();
+            } catch (error) {
+                debug('Failed to destroy agent during cleanup:', error);
+            }
+            this.agent = void 0;
+        }
+        if (this.agent) return this.agent;
+        debug('Creating Android agent with deviceId:', deviceId || 'auto-detect');
+        const agent = await agentFromAdbDevice(deviceId, {
+            autoDismissKeyboard: false
+        });
+        this.agent = agent;
+        return agent;
+    }
+    preparePlatformTools() {
+        return [
+            {
+                name: 'android_connect',
+                description: 'Connect to Android device via ADB. If deviceId not provided, uses the first available device.',
+                schema: {
+                    deviceId: z.string().optional().describe('Android device ID (from adb devices)')
+                },
+                handler: async ({ deviceId })=>{
+                    const agent = await this.ensureAgent(deviceId);
+                    const screenshot = await agent.page.screenshotBase64();
+                    return {
+                        content: [
+                            {
+                                type: 'text',
+                                text: `Connected to Android device${deviceId ? `: ${deviceId}` : ' (auto-detected)'}`
+                            },
+                            ...this.buildScreenshotContent(screenshot)
+                        ],
+                        isError: false
+                    };
+                }
+            },
+            {
+                name: 'android_disconnect',
+                description: 'Disconnect from current Android device and release ADB resources',
+                schema: {},
+                handler: this.createDisconnectHandler('Android device')
+            }
+        ];
+    }
+}
+export { AndroidAgent, AndroidDevice, AndroidMidsceneTools, ScrcpyDeviceAdapter, agentFromAdbDevice, getConnectedDevices, overrideAIConfig };

package/dist/es/mcp-server.mjs

@@ -960,6 +960,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getScreenSize() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getScreenSize: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedSize=${!!this.cachedScreenSize}`);
         if (shouldCache && this.cachedScreenSize) return this.cachedScreenSize;
         const adb = await this.getAdb();
         if ('number' == typeof this.options?.displayId) try {
@@ -1093,6 +1094,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getDisplayOrientation() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getDisplayOrientation: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedOrientation=${null !== this.cachedOrientation}`);
         if (shouldCache && null !== this.cachedOrientation) return this.cachedOrientation;
         const adb = await this.getAdb();
         let orientation = 0;
@@ -1137,6 +1139,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     async getAdjustScale() {
         const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+        debugDevice(`getAdjustScale: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedScale=${!!this.cachedAdjustScale}`);
         if (shouldCache && this.cachedAdjustScale) return this.cachedAdjustScale;
         const physical = await this.getOrientedPhysicalSize();
         const { width: logicalW, height: logicalH } = await this.size();
@@ -1885,7 +1888,7 @@ class AndroidMCPServer extends BaseMCPServer {
     constructor(toolsManager){
         super({
             name: '@midscene/android-mcp',
-            version: __VERSION__,
+            version: "1.5.4-beta-20260310084708.0",
             description: 'Control the Android device using natural language commands'
         }, toolsManager);
     }

package/dist/lib/cli.js

@@ -976,6 +976,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getScreenSize() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getScreenSize: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedSize=${!!this.cachedScreenSize}`);
             if (shouldCache && this.cachedScreenSize) return this.cachedScreenSize;
             const adb = await this.getAdb();
             if ('number' == typeof this.options?.displayId) try {
@@ -1109,6 +1110,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getDisplayOrientation() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getDisplayOrientation: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedOrientation=${null !== this.cachedOrientation}`);
             if (shouldCache && null !== this.cachedOrientation) return this.cachedOrientation;
             const adb = await this.getAdb();
             let orientation = 0;
@@ -1153,6 +1155,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getAdjustScale() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getAdjustScale: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedScale=${!!this.cachedAdjustScale}`);
             if (shouldCache && this.cachedAdjustScale) return this.cachedAdjustScale;
             const physical = await this.getOrientedPhysicalSize();
             const { width: logicalW, height: logicalH } = await this.size();
@@ -1896,7 +1899,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
     const tools = new AndroidMidsceneTools();
     (0, cli_namespaceObject.runToolsCLI)(tools, 'midscene-android', {
-        stripPrefix: 'android_'
+        stripPrefix: 'android_',
+        version: "1.5.4-beta-20260310084708.0"
     }).catch((e)=>{
         if (!(e instanceof cli_namespaceObject.CLIError)) console.error(e);
         process.exit(e instanceof cli_namespaceObject.CLIError ? e.exitCode : 1);

package/dist/lib/index.js

@@ -458,6 +458,7 @@ var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
+        AndroidMidsceneTools: ()=>AndroidMidsceneTools,
         getConnectedDevices: ()=>getConnectedDevices,
         overrideAIConfig: ()=>env_namespaceObject.overrideAIConfig,
         AndroidAgent: ()=>AndroidAgent,
@@ -896,6 +897,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getScreenSize() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getScreenSize: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedSize=${!!this.cachedScreenSize}`);
             if (shouldCache && this.cachedScreenSize) return this.cachedScreenSize;
             const adb = await this.getAdb();
             if ('number' == typeof this.options?.displayId) try {
@@ -1029,6 +1031,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getDisplayOrientation() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getDisplayOrientation: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedOrientation=${null !== this.cachedOrientation}`);
             if (shouldCache && null !== this.cachedOrientation) return this.cachedOrientation;
             const adb = await this.getAdb();
             let orientation = 0;
@@ -1073,6 +1076,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getAdjustScale() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getAdjustScale: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedScale=${!!this.cachedAdjustScale}`);
             if (shouldCache && this.cachedAdjustScale) return this.cachedAdjustScale;
             const physical = await this.getOrientedPhysicalSize();
             const { width: logicalW, height: logicalH } = await this.size();
@@ -1857,9 +1861,65 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         await device.connect();
         return new AndroidAgent(device, opts);
     }
+    const mcp_namespaceObject = require("@midscene/shared/mcp");
+    const debug = (0, logger_.getDebug)('mcp:android-tools');
+    class AndroidMidsceneTools extends mcp_namespaceObject.BaseMidsceneTools {
+        createTemporaryDevice() {
+            return new AndroidDevice('temp-for-action-space', {});
+        }
+        async ensureAgent(deviceId) {
+            if (this.agent && deviceId) {
+                try {
+                    await this.agent.destroy?.();
+                } catch (error) {
+                    debug('Failed to destroy agent during cleanup:', error);
+                }
+                this.agent = void 0;
+            }
+            if (this.agent) return this.agent;
+            debug('Creating Android agent with deviceId:', deviceId || 'auto-detect');
+            const agent = await agentFromAdbDevice(deviceId, {
+                autoDismissKeyboard: false
+            });
+            this.agent = agent;
+            return agent;
+        }
+        preparePlatformTools() {
+            return [
+                {
+                    name: 'android_connect',
+                    description: 'Connect to Android device via ADB. If deviceId not provided, uses the first available device.',
+                    schema: {
+                        deviceId: core_namespaceObject.z.string().optional().describe('Android device ID (from adb devices)')
+                    },
+                    handler: async ({ deviceId })=>{
+                        const agent = await this.ensureAgent(deviceId);
+                        const screenshot = await agent.page.screenshotBase64();
+                        return {
+                            content: [
+                                {
+                                    type: 'text',
+                                    text: `Connected to Android device${deviceId ? `: ${deviceId}` : ' (auto-detected)'}`
+                                },
+                                ...this.buildScreenshotContent(screenshot)
+                            ],
+                            isError: false
+                        };
+                    }
+                },
+                {
+                    name: 'android_disconnect',
+                    description: 'Disconnect from current Android device and release ADB resources',
+                    schema: {},
+                    handler: this.createDisconnectHandler('Android device')
+                }
+            ];
+        }
+    }
 })();
 exports.AndroidAgent = __webpack_exports__.AndroidAgent;
 exports.AndroidDevice = __webpack_exports__.AndroidDevice;
+exports.AndroidMidsceneTools = __webpack_exports__.AndroidMidsceneTools;
 exports.ScrcpyDeviceAdapter = __webpack_exports__.ScrcpyDeviceAdapter;
 exports.agentFromAdbDevice = __webpack_exports__.agentFromAdbDevice;
 exports.getConnectedDevices = __webpack_exports__.getConnectedDevices;
@@ -1867,6 +1927,7 @@ exports.overrideAIConfig = __webpack_exports__.overrideAIConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "AndroidAgent",
     "AndroidDevice",
+    "AndroidMidsceneTools",
     "ScrcpyDeviceAdapter",
     "agentFromAdbDevice",
     "getConnectedDevices",

package/dist/lib/mcp-server.js

@@ -991,6 +991,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getScreenSize() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getScreenSize: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedSize=${!!this.cachedScreenSize}`);
             if (shouldCache && this.cachedScreenSize) return this.cachedScreenSize;
             const adb = await this.getAdb();
             if ('number' == typeof this.options?.displayId) try {
@@ -1124,6 +1125,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getDisplayOrientation() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getDisplayOrientation: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedOrientation=${null !== this.cachedOrientation}`);
             if (shouldCache && null !== this.cachedOrientation) return this.cachedOrientation;
             const adb = await this.getAdb();
             let orientation = 0;
@@ -1168,6 +1170,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         async getAdjustScale() {
             const shouldCache = !(this.options?.alwaysRefreshScreenInfo ?? false);
+            debugDevice(`getAdjustScale: alwaysRefreshScreenInfo=${this.options?.alwaysRefreshScreenInfo}, shouldCache=${shouldCache}, hasCachedScale=${!!this.cachedAdjustScale}`);
             if (shouldCache && this.cachedAdjustScale) return this.cachedAdjustScale;
             const physical = await this.getOrientedPhysicalSize();
             const { width: logicalW, height: logicalH } = await this.size();
@@ -1916,7 +1919,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         constructor(toolsManager){
             super({
                 name: '@midscene/android-mcp',
-                version: __VERSION__,
+                version: "1.5.4-beta-20260310084708.0",
                 description: 'Control the Android device using natural language commands'
             }, toolsManager);
         }

package/dist/types/index.d.ts

@@ -7,6 +7,7 @@ import { Agent } from '@midscene/core/agent';
 import { AgentOpt } from '@midscene/core/agent';
 import { AndroidDeviceInputOpt } from '@midscene/core/device';
 import { AndroidDeviceOpt } from '@midscene/core/device';
+import { BaseMidsceneTools } from '@midscene/shared/mcp';
 import { Device } from 'appium-adb';
 import { DeviceAction } from '@midscene/core';
 import type { ElementInfo } from '@midscene/shared/extractor';
@@ -14,6 +15,7 @@ import { InterfaceType } from '@midscene/core';
 import { overrideAIConfig } from '@midscene/shared/env';
 import { Point } from '@midscene/core';
 import { Size } from '@midscene/core';
+import { ToolDefinition } from '@midscene/shared/mcp';
 
 declare type ActionArgs<T extends DeviceAction> = [ActionParam<T>] extends [undefined] ? [] : [ActionParam<T>];
 
@@ -212,6 +214,19 @@ export declare class AndroidDevice implements AbstractInterface {
     hideKeyboard(options?: AndroidDeviceInputOpt, timeoutMs?: number): Promise<boolean>;
 }
 
+/**
+ * Android-specific tools manager
+ * Extends BaseMidsceneTools to provide Android ADB device connection tools
+ */
+export declare class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent> {
+    protected createTemporaryDevice(): AndroidDevice;
+    protected ensureAgent(deviceId?: string): Promise<AndroidAgent>;
+    /**
+     * Provide Android-specific platform tools
+     */
+    protected preparePlatformTools(): ToolDefinition[];
+}
+
 declare type DeviceActionAndroidBackButton = DeviceAction<undefined, void>;
 
 declare type DeviceActionAndroidHomeButton = DeviceAction<undefined, void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "1.5.3",
+  "version": "1.5.4-beta-20260310084708.0",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -41,8 +41,8 @@
     "@yume-chan/stream-extra": "^1.0.0",
     "appium-adb": "12.12.1",
     "sharp": "^0.34.3",
-    "@midscene/core": "1.5.3",
-    "@midscene/shared": "1.5.3"
+    "@midscene/core": "1.5.4-beta-20260310084708.0",
+    "@midscene/shared": "1.5.4-beta-20260310084708.0"
   },
   "optionalDependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0"
@@ -56,7 +56,7 @@
     "tsx": "^4.19.2",
     "vitest": "3.0.5",
     "zod": "3.24.3",
-    "@midscene/playground": "1.5.3"
+    "@midscene/playground": "1.5.4-beta-20260310084708.0"
   },
   "license": "MIT",
   "scripts": {