@midscene/android 1.6.0 → 1.6.1-beta-20260327104111.0

package/dist/es/cli.mjs

@@ -13,7 +13,7 @@ import { defineAction, defineActionClearInput, defineActionCursorMove, defineAct
 import { getTmpFile, sleep } from "@midscene/core/utils";
 import { MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, globalConfigManager } from "@midscene/shared/env";
 import { createImgBase64ByFormat, isValidImageBuffer } from "@midscene/shared/img";
-import { ADB } from "appium-adb";
+import { ADB as external_appium_adb_ADB } from "appium-adb";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
@@ -870,7 +870,7 @@ class AndroidDevice {
                 const androidAdbPath = this.options?.androidAdbPath || globalConfigManager.getEnvConfigValue(MIDSCENE_ADB_PATH);
                 const remoteAdbHost = this.options?.remoteAdbHost || globalConfigManager.getEnvConfigValue(MIDSCENE_ADB_REMOTE_HOST);
                 const remoteAdbPort = this.options?.remoteAdbPort || globalConfigManager.getEnvConfigValue(MIDSCENE_ADB_REMOTE_PORT);
-                this.adb = new ADB({
+                this.adb = new external_appium_adb_ADB({
                     udid: this.deviceId,
                     adbExecTimeout: 60000,
                     executable: androidAdbPath ? {
@@ -1800,7 +1800,7 @@ const createPlatformActions = (device)=>({
 const debugUtils = (0, logger_.getDebug)('android:utils');
 async function getConnectedDevices() {
     try {
-        const adb = await ADB.createADB({
+        const adb = await external_appium_adb_ADB.createADB({
             adbExecTimeout: 60000
         });
         const devices = await adb.getConnectedDevices();
@@ -1918,7 +1918,7 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
 const tools = new AndroidMidsceneTools();
 runToolsCLI(tools, 'midscene-android', {
     stripPrefix: 'android_',
-    version: "1.6.0"
+    version: "1.6.1-beta-20260327104111.0"
 }).catch((e)=>{
     if (!(e instanceof CLIError)) console.error(e);
     process.exit(e instanceof CLIError ? e.exitCode : 1);

package/dist/es/index.mjs

@@ -1797,6 +1797,38 @@ const defaultAppNameMapping = {
     WhatsApp: 'com.whatsapp'
 };
 const debugUtils = (0, logger_.getDebug)('android:utils');
+const DETAIL_LOOKUP_ADB_TIMEOUT_MS = 8000;
+const DETAIL_LOOKUP_STEP_TIMEOUT_MS = 2000;
+function cleanProp(value) {
+    const normalized = value?.trim();
+    return normalized ? normalized : void 0;
+}
+function parseResolution(stdout) {
+    const overrideSize = stdout.match(/Override size:\s*([^\r\n]+)/);
+    if (overrideSize?.[1]) return overrideSize[1].trim();
+    const physicalSize = stdout.match(/Physical size:\s*([^\r\n]+)/);
+    if (physicalSize?.[1]) return physicalSize[1].trim();
+}
+async function withTimeout(promise, timeoutMs, label) {
+    let timer;
+    try {
+        return await Promise.race([
+            promise,
+            new Promise((_, reject)=>{
+                timer = setTimeout(()=>{
+                    reject(new Error(`${label} timed out after ${timeoutMs}ms`));
+                }, timeoutMs);
+            })
+        ]);
+    } finally{
+        if (timer) clearTimeout(timer);
+    }
+}
+async function createAdbForDetailLookup() {
+    return await ADB.createADB({
+        adbExecTimeout: DETAIL_LOOKUP_ADB_TIMEOUT_MS
+    });
+}
 async function getConnectedDevices() {
     try {
         const adb = await ADB.createADB({
@@ -1812,6 +1844,41 @@ async function getConnectedDevices() {
         });
     }
 }
+async function getConnectedDevicesWithDetails() {
+    const devices = await getConnectedDevices();
+    if (0 === devices.length) return [];
+    return await Promise.all(devices.map(async (device)=>{
+        const detailedDevice = {
+            ...device
+        };
+        try {
+            const adb = await createAdbForDetailLookup();
+            adb.setDeviceId(device.udid);
+            const [modelResult, brandResult, sizeResult, densityResult] = await Promise.allSettled([
+                withTimeout(adb.shell([
+                    'getprop',
+                    'ro.product.model'
+                ]), DETAIL_LOOKUP_STEP_TIMEOUT_MS, `Android model lookup for ${device.udid}`),
+                withTimeout(adb.shell([
+                    'getprop',
+                    'ro.product.brand'
+                ]), DETAIL_LOOKUP_STEP_TIMEOUT_MS, `Android brand lookup for ${device.udid}`),
+                withTimeout(adb.shell([
+                    'wm',
+                    'size'
+                ]), DETAIL_LOOKUP_STEP_TIMEOUT_MS, `Android resolution lookup for ${device.udid}`),
+                withTimeout(adb.getScreenDensity(), DETAIL_LOOKUP_STEP_TIMEOUT_MS, `Android density lookup for ${device.udid}`)
+            ]);
+            if ('fulfilled' === modelResult.status) detailedDevice.model = cleanProp(modelResult.value);
+            if ('fulfilled' === brandResult.status) detailedDevice.brand = cleanProp(brandResult.value);
+            if ('fulfilled' === sizeResult.status) detailedDevice.resolution = parseResolution(sizeResult.value);
+            if ('fulfilled' === densityResult.status && 'number' == typeof densityResult.value) detailedDevice.density = densityResult.value;
+        } catch (error) {
+            debugUtils(`Failed to enrich Android device ${device.udid}:`, error);
+        }
+        return detailedDevice;
+    }));
+}
 function agent_define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -1914,4 +1981,4 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
         ];
     }
 }
-export { AndroidAgent, AndroidDevice, AndroidMidsceneTools, ScrcpyDeviceAdapter, agentFromAdbDevice, getConnectedDevices, overrideAIConfig };
+export { AndroidAgent, AndroidDevice, AndroidMidsceneTools, ScrcpyDeviceAdapter, agentFromAdbDevice, getConnectedDevices, getConnectedDevicesWithDetails, overrideAIConfig };

package/dist/es/mcp-server.mjs

@@ -12,7 +12,7 @@ import { defineAction, defineActionClearInput, defineActionCursorMove, defineAct
 import { getTmpFile, sleep } from "@midscene/core/utils";
 import { MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, globalConfigManager } from "@midscene/shared/env";
 import { createImgBase64ByFormat, isValidImageBuffer } from "@midscene/shared/img";
-import { ADB } from "appium-adb";
+import { ADB as external_appium_adb_ADB } from "appium-adb";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
@@ -869,7 +869,7 @@ class AndroidDevice {
                 const androidAdbPath = this.options?.androidAdbPath || globalConfigManager.getEnvConfigValue(MIDSCENE_ADB_PATH);
                 const remoteAdbHost = this.options?.remoteAdbHost || globalConfigManager.getEnvConfigValue(MIDSCENE_ADB_REMOTE_HOST);
                 const remoteAdbPort = this.options?.remoteAdbPort || globalConfigManager.getEnvConfigValue(MIDSCENE_ADB_REMOTE_PORT);
-                this.adb = new ADB({
+                this.adb = new external_appium_adb_ADB({
                     udid: this.deviceId,
                     adbExecTimeout: 60000,
                     executable: androidAdbPath ? {
@@ -1799,7 +1799,7 @@ const createPlatformActions = (device)=>({
 const debugUtils = (0, logger_.getDebug)('android:utils');
 async function getConnectedDevices() {
     try {
-        const adb = await ADB.createADB({
+        const adb = await external_appium_adb_ADB.createADB({
             adbExecTimeout: 60000
         });
         const devices = await adb.getConnectedDevices();
@@ -1921,7 +1921,7 @@ class AndroidMCPServer extends BaseMCPServer {
     constructor(toolsManager){
         super({
             name: '@midscene/android-mcp',
-            version: "1.6.0",
+            version: "1.6.1-beta-20260327104111.0",
             description: 'Control the Android device using natural language commands'
         }, toolsManager);
     }

package/dist/lib/cli.js

@@ -1933,7 +1933,7 @@ ${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_',
-        version: "1.6.0"
+        version: "1.6.1-beta-20260327104111.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,13 +458,14 @@ var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
-        AndroidMidsceneTools: ()=>AndroidMidsceneTools,
-        getConnectedDevices: ()=>getConnectedDevices,
-        overrideAIConfig: ()=>env_namespaceObject.overrideAIConfig,
         AndroidAgent: ()=>AndroidAgent,
         agentFromAdbDevice: ()=>agentFromAdbDevice,
+        getConnectedDevicesWithDetails: ()=>getConnectedDevicesWithDetails,
         ScrcpyDeviceAdapter: ()=>ScrcpyDeviceAdapter,
-        AndroidDevice: ()=>AndroidDevice
+        AndroidMidsceneTools: ()=>AndroidMidsceneTools,
+        AndroidDevice: ()=>AndroidDevice,
+        overrideAIConfig: ()=>env_namespaceObject.overrideAIConfig,
+        getConnectedDevices: ()=>getConnectedDevices
     });
     const external_node_assert_namespaceObject = require("node:assert");
     var external_node_assert_default = /*#__PURE__*/ __webpack_require__.n(external_node_assert_namespaceObject);
@@ -1831,6 +1832,38 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         WhatsApp: 'com.whatsapp'
     };
     const debugUtils = (0, logger_.getDebug)('android:utils');
+    const DETAIL_LOOKUP_ADB_TIMEOUT_MS = 8000;
+    const DETAIL_LOOKUP_STEP_TIMEOUT_MS = 2000;
+    function cleanProp(value) {
+        const normalized = value?.trim();
+        return normalized ? normalized : void 0;
+    }
+    function parseResolution(stdout) {
+        const overrideSize = stdout.match(/Override size:\s*([^\r\n]+)/);
+        if (overrideSize?.[1]) return overrideSize[1].trim();
+        const physicalSize = stdout.match(/Physical size:\s*([^\r\n]+)/);
+        if (physicalSize?.[1]) return physicalSize[1].trim();
+    }
+    async function withTimeout(promise, timeoutMs, label) {
+        let timer;
+        try {
+            return await Promise.race([
+                promise,
+                new Promise((_, reject)=>{
+                    timer = setTimeout(()=>{
+                        reject(new Error(`${label} timed out after ${timeoutMs}ms`));
+                    }, timeoutMs);
+                })
+            ]);
+        } finally{
+            if (timer) clearTimeout(timer);
+        }
+    }
+    async function createAdbForDetailLookup() {
+        return await external_appium_adb_namespaceObject.ADB.createADB({
+            adbExecTimeout: DETAIL_LOOKUP_ADB_TIMEOUT_MS
+        });
+    }
     async function getConnectedDevices() {
         try {
             const adb = await external_appium_adb_namespaceObject.ADB.createADB({
@@ -1846,6 +1879,41 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             });
         }
     }
+    async function getConnectedDevicesWithDetails() {
+        const devices = await getConnectedDevices();
+        if (0 === devices.length) return [];
+        return await Promise.all(devices.map(async (device)=>{
+            const detailedDevice = {
+                ...device
+            };
+            try {
+                const adb = await createAdbForDetailLookup();
+                adb.setDeviceId(device.udid);
+                const [modelResult, brandResult, sizeResult, densityResult] = await Promise.allSettled([
+                    withTimeout(adb.shell([
+                        'getprop',
+                        'ro.product.model'
+                    ]), DETAIL_LOOKUP_STEP_TIMEOUT_MS, `Android model lookup for ${device.udid}`),
+                    withTimeout(adb.shell([
+                        'getprop',
+                        'ro.product.brand'
+                    ]), DETAIL_LOOKUP_STEP_TIMEOUT_MS, `Android brand lookup for ${device.udid}`),
+                    withTimeout(adb.shell([
+                        'wm',
+                        'size'
+                    ]), DETAIL_LOOKUP_STEP_TIMEOUT_MS, `Android resolution lookup for ${device.udid}`),
+                    withTimeout(adb.getScreenDensity(), DETAIL_LOOKUP_STEP_TIMEOUT_MS, `Android density lookup for ${device.udid}`)
+                ]);
+                if ('fulfilled' === modelResult.status) detailedDevice.model = cleanProp(modelResult.value);
+                if ('fulfilled' === brandResult.status) detailedDevice.brand = cleanProp(brandResult.value);
+                if ('fulfilled' === sizeResult.status) detailedDevice.resolution = parseResolution(sizeResult.value);
+                if ('fulfilled' === densityResult.status && 'number' == typeof densityResult.value) detailedDevice.density = densityResult.value;
+            } catch (error) {
+                debugUtils(`Failed to enrich Android device ${device.udid}:`, error);
+            }
+            return detailedDevice;
+        }));
+    }
     function agent_define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
             value: value,
@@ -1956,6 +2024,7 @@ exports.AndroidMidsceneTools = __webpack_exports__.AndroidMidsceneTools;
 exports.ScrcpyDeviceAdapter = __webpack_exports__.ScrcpyDeviceAdapter;
 exports.agentFromAdbDevice = __webpack_exports__.agentFromAdbDevice;
 exports.getConnectedDevices = __webpack_exports__.getConnectedDevices;
+exports.getConnectedDevicesWithDetails = __webpack_exports__.getConnectedDevicesWithDetails;
 exports.overrideAIConfig = __webpack_exports__.overrideAIConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "AndroidAgent",
@@ -1964,6 +2033,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "ScrcpyDeviceAdapter",
     "agentFromAdbDevice",
     "getConnectedDevices",
+    "getConnectedDevicesWithDetails",
     "overrideAIConfig"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/lib/mcp-server.js

@@ -1952,7 +1952,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         constructor(toolsManager){
             super({
                 name: '@midscene/android-mcp',
-                version: "1.6.0",
+                version: "1.6.1-beta-20260327104111.0",
                 description: 'Control the Android device using natural language commands'
             }, toolsManager);
         }

package/dist/types/index.d.ts

@@ -60,6 +60,13 @@ export declare type AndroidAgentOpt = AgentOpt & {
     appNameMapping?: Record<string, string>;
 };
 
+export declare interface AndroidConnectedDevice extends Device {
+    model?: string;
+    brand?: string;
+    resolution?: string;
+    density?: number;
+}
+
 export declare class AndroidDevice implements AbstractInterface {
     private deviceId;
     private yadbPushed;
@@ -243,6 +250,8 @@ declare interface DevicePhysicalInfo {
 
 export declare function getConnectedDevices(): Promise<Device[]>;
 
+export declare function getConnectedDevicesWithDetails(): Promise<AndroidConnectedDevice[]>;
+
 export { overrideAIConfig }
 
 declare interface ResolvedScrcpyConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "1.6.0",
+  "version": "1.6.1-beta-20260327104111.0",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -41,8 +41,8 @@
     "@yume-chan/stream-extra": "2.1.0",
     "appium-adb": "12.12.1",
     "sharp": "^0.34.3",
-    "@midscene/shared": "1.6.0",
-    "@midscene/core": "1.6.0"
+    "@midscene/core": "1.6.1-beta-20260327104111.0",
+    "@midscene/shared": "1.6.1-beta-20260327104111.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.6.0"
+    "@midscene/playground": "1.6.1-beta-20260327104111.0"
   },
   "license": "MIT",
   "scripts": {