@midscene/android 1.9.6-beta-20260615080106.0 → 1.9.6

package/dist/es/cli.mjs

@@ -14,7 +14,6 @@ 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, validateScreenshotBuffer } from "@midscene/shared/img";
 import { ADB as external_appium_adb_ADB } from "appium-adb";
-import { AdbServerClient as adb_AdbServerClient } from "@yume-chan/adb";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
@@ -586,58 +585,6 @@ const defaultAppNameMapping = {
 var external_node_fs_ = __webpack_require__("node:fs");
 var external_node_module_ = __webpack_require__("node:module");
 var external_node_path_ = __webpack_require__("node:path");
-const patchedClients = new WeakSet();
-function isMultiDeviceFeatureError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.includes('more than one device/emulator');
-}
-async function resolveTransportId(client, device) {
-    if (device && 'transportId' in device) return device.transportId;
-    if (device && 'serial' in device) {
-        const devices = await client.getDevices();
-        return devices.find((info)=>info.serial === device.serial)?.transportId;
-    }
-    if (!device) {
-        const devices = await client.getDevices();
-        if (1 !== devices.length) return;
-        return devices[0]?.transportId;
-    }
-}
-async function getDeviceFeaturesByTransportId(client, transportId) {
-    const connection = await client.createConnection(adb_AdbServerClient.formatDeviceService({
-        transportId
-    }, 'features'));
-    try {
-        const featuresString = await connection.readString();
-        const features = featuresString ? featuresString.split(',') : [];
-        return {
-            transportId,
-            features
-        };
-    } finally{
-        await connection.dispose();
-    }
-}
-function installAdbServerClientFeaturesFallback(client) {
-    if (patchedClients.has(client)) return;
-    const getDeviceFeatures = client.getDeviceFeatures.bind(client);
-    client.getDeviceFeatures = async (device)=>{
-        try {
-            return await getDeviceFeatures(device);
-        } catch (error) {
-            if (!isMultiDeviceFeatureError(error)) throw error;
-            let transportId;
-            try {
-                transportId = await resolveTransportId(client, device);
-            } catch  {
-                throw error;
-            }
-            if (void 0 === transportId) throw error;
-            return getDeviceFeaturesByTransportId(client, transportId);
-        }
-    };
-    patchedClients.add(client);
-}
 var scrcpy_manager = __webpack_require__("./src/scrcpy-manager.ts");
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -688,7 +635,6 @@ class ScrcpyDeviceAdapter {
                 host: '127.0.0.1',
                 port: 5037
             }));
-            installAdbServerClientFeaturesFallback(adbClient);
             const adb = new Adb(await adbClient.createTransport({
                 serial: this.deviceId
             }));
@@ -2098,7 +2044,7 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
 const tools = new AndroidMidsceneTools();
 runToolsCLI(tools, 'midscene-android', {
     stripPrefix: 'android_',
-    version: "1.9.6-beta-20260615080106.0",
+    version: "1.9.6",
     extraCommands: createReportCliCommands()
 }).catch((e)=>{
     process.exit(reportCLIError(e));

package/dist/es/index.mjs

@@ -11,7 +11,6 @@ import { MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT,
 import { createImgBase64ByFormat, validateScreenshotBuffer } from "@midscene/shared/img";
 import { mergeAndNormalizeAppNameMapping, normalizeForComparison, repeat } from "@midscene/shared/utils";
 import { ADB } from "appium-adb";
-import { AdbServerClient as adb_AdbServerClient } from "@yume-chan/adb";
 import { Agent } from "@midscene/core/agent";
 import { BaseMidsceneTools } from "@midscene/shared/mcp/base-tools";
 var __webpack_modules__ = {
@@ -489,58 +488,6 @@ async function runAdbShellStdoutOrThrow(adb, command, options = {}) {
     });
     return getAdbShellStdoutOrThrow(command, output);
 }
-const patchedClients = new WeakSet();
-function isMultiDeviceFeatureError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.includes('more than one device/emulator');
-}
-async function resolveTransportId(client, device) {
-    if (device && 'transportId' in device) return device.transportId;
-    if (device && 'serial' in device) {
-        const devices = await client.getDevices();
-        return devices.find((info)=>info.serial === device.serial)?.transportId;
-    }
-    if (!device) {
-        const devices = await client.getDevices();
-        if (1 !== devices.length) return;
-        return devices[0]?.transportId;
-    }
-}
-async function getDeviceFeaturesByTransportId(client, transportId) {
-    const connection = await client.createConnection(adb_AdbServerClient.formatDeviceService({
-        transportId
-    }, 'features'));
-    try {
-        const featuresString = await connection.readString();
-        const features = featuresString ? featuresString.split(',') : [];
-        return {
-            transportId,
-            features
-        };
-    } finally{
-        await connection.dispose();
-    }
-}
-function installAdbServerClientFeaturesFallback(client) {
-    if (patchedClients.has(client)) return;
-    const getDeviceFeatures = client.getDeviceFeatures.bind(client);
-    client.getDeviceFeatures = async (device)=>{
-        try {
-            return await getDeviceFeatures(device);
-        } catch (error) {
-            if (!isMultiDeviceFeatureError(error)) throw error;
-            let transportId;
-            try {
-                transportId = await resolveTransportId(client, device);
-            } catch  {
-                throw error;
-            }
-            if (void 0 === transportId) throw error;
-            return getDeviceFeaturesByTransportId(client, transportId);
-        }
-    };
-    patchedClients.add(client);
-}
 var scrcpy_manager = __webpack_require__("./src/scrcpy-manager.ts");
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -591,7 +538,6 @@ class ScrcpyDeviceAdapter {
                 host: '127.0.0.1',
                 port: 5037
             }));
-            installAdbServerClientFeaturesFallback(adbClient);
             const adb = new Adb(await adbClient.createTransport({
                 serial: this.deviceId
             }));
@@ -2161,4 +2107,4 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
         });
     }
 }
-export { AndroidAgent, AndroidDevice, AndroidMidsceneTools, ScrcpyDeviceAdapter, agentFromAdbDevice, getConnectedDevices, getConnectedDevicesWithDetails, installAdbServerClientFeaturesFallback, overrideAIConfig };
+export { AndroidAgent, AndroidDevice, AndroidMidsceneTools, ScrcpyDeviceAdapter, agentFromAdbDevice, getConnectedDevices, getConnectedDevicesWithDetails, overrideAIConfig };

package/dist/es/mcp-server.mjs

@@ -13,7 +13,6 @@ 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, validateScreenshotBuffer } from "@midscene/shared/img";
 import { ADB as external_appium_adb_ADB } from "appium-adb";
-import { AdbServerClient as adb_AdbServerClient } from "@yume-chan/adb";
 import { BaseMidsceneTools } from "@midscene/shared/mcp/base-tools";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
@@ -586,58 +585,6 @@ const defaultAppNameMapping = {
 var external_node_fs_ = __webpack_require__("node:fs");
 var external_node_module_ = __webpack_require__("node:module");
 var external_node_path_ = __webpack_require__("node:path");
-const patchedClients = new WeakSet();
-function isMultiDeviceFeatureError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.includes('more than one device/emulator');
-}
-async function resolveTransportId(client, device) {
-    if (device && 'transportId' in device) return device.transportId;
-    if (device && 'serial' in device) {
-        const devices = await client.getDevices();
-        return devices.find((info)=>info.serial === device.serial)?.transportId;
-    }
-    if (!device) {
-        const devices = await client.getDevices();
-        if (1 !== devices.length) return;
-        return devices[0]?.transportId;
-    }
-}
-async function getDeviceFeaturesByTransportId(client, transportId) {
-    const connection = await client.createConnection(adb_AdbServerClient.formatDeviceService({
-        transportId
-    }, 'features'));
-    try {
-        const featuresString = await connection.readString();
-        const features = featuresString ? featuresString.split(',') : [];
-        return {
-            transportId,
-            features
-        };
-    } finally{
-        await connection.dispose();
-    }
-}
-function installAdbServerClientFeaturesFallback(client) {
-    if (patchedClients.has(client)) return;
-    const getDeviceFeatures = client.getDeviceFeatures.bind(client);
-    client.getDeviceFeatures = async (device)=>{
-        try {
-            return await getDeviceFeatures(device);
-        } catch (error) {
-            if (!isMultiDeviceFeatureError(error)) throw error;
-            let transportId;
-            try {
-                transportId = await resolveTransportId(client, device);
-            } catch  {
-                throw error;
-            }
-            if (void 0 === transportId) throw error;
-            return getDeviceFeaturesByTransportId(client, transportId);
-        }
-    };
-    patchedClients.add(client);
-}
 var scrcpy_manager = __webpack_require__("./src/scrcpy-manager.ts");
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -688,7 +635,6 @@ class ScrcpyDeviceAdapter {
                 host: '127.0.0.1',
                 port: 5037
             }));
-            installAdbServerClientFeaturesFallback(adbClient);
             const adb = new Adb(await adbClient.createTransport({
                 serial: this.deviceId
             }));
@@ -2102,7 +2048,7 @@ class AndroidMCPServer extends BaseMCPServer {
     constructor(toolsManager){
         super({
             name: '@midscene/android-mcp',
-            version: "1.9.6-beta-20260615080106.0",
+            version: "1.9.6",
             description: 'Control the Android device using natural language commands'
         }, toolsManager);
     }

package/dist/lib/cli.js

@@ -600,59 +600,6 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
     const env_namespaceObject = require("@midscene/shared/env");
     const img_namespaceObject = require("@midscene/shared/img");
     const external_appium_adb_namespaceObject = require("appium-adb");
-    const adb_namespaceObject = require("@yume-chan/adb");
-    const patchedClients = new WeakSet();
-    function isMultiDeviceFeatureError(error) {
-        const message = error instanceof Error ? error.message : String(error);
-        return message.includes('more than one device/emulator');
-    }
-    async function resolveTransportId(client, device) {
-        if (device && 'transportId' in device) return device.transportId;
-        if (device && 'serial' in device) {
-            const devices = await client.getDevices();
-            return devices.find((info)=>info.serial === device.serial)?.transportId;
-        }
-        if (!device) {
-            const devices = await client.getDevices();
-            if (1 !== devices.length) return;
-            return devices[0]?.transportId;
-        }
-    }
-    async function getDeviceFeaturesByTransportId(client, transportId) {
-        const connection = await client.createConnection(adb_namespaceObject.AdbServerClient.formatDeviceService({
-            transportId
-        }, 'features'));
-        try {
-            const featuresString = await connection.readString();
-            const features = featuresString ? featuresString.split(',') : [];
-            return {
-                transportId,
-                features
-            };
-        } finally{
-            await connection.dispose();
-        }
-    }
-    function installAdbServerClientFeaturesFallback(client) {
-        if (patchedClients.has(client)) return;
-        const getDeviceFeatures = client.getDeviceFeatures.bind(client);
-        client.getDeviceFeatures = async (device)=>{
-            try {
-                return await getDeviceFeatures(device);
-            } catch (error) {
-                if (!isMultiDeviceFeatureError(error)) throw error;
-                let transportId;
-                try {
-                    transportId = await resolveTransportId(client, device);
-                } catch  {
-                    throw error;
-                }
-                if (void 0 === transportId) throw error;
-                return getDeviceFeaturesByTransportId(client, transportId);
-            }
-        };
-        patchedClients.add(client);
-    }
     var scrcpy_manager = __webpack_require__("./src/scrcpy-manager.ts");
     function _define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
@@ -703,7 +650,6 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
                     host: '127.0.0.1',
                     port: 5037
                 }));
-                installAdbServerClientFeaturesFallback(adbClient);
                 const adb = new Adb(await adbClient.createTransport({
                     serial: this.deviceId
                 }));
@@ -2113,7 +2059,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.9.6-beta-20260615080106.0",
+        version: "1.9.6",
         extraCommands: (0, core_namespaceObject.createReportCliCommands)()
     }).catch((e)=>{
         process.exit((0, cli_namespaceObject.reportCLIError)(e));

package/dist/lib/index.js

@@ -465,7 +465,6 @@ var __webpack_exports__ = {};
         AndroidMidsceneTools: ()=>AndroidMidsceneTools,
         AndroidDevice: ()=>AndroidDevice,
         overrideAIConfig: ()=>env_namespaceObject.overrideAIConfig,
-        installAdbServerClientFeaturesFallback: ()=>installAdbServerClientFeaturesFallback,
         getConnectedDevices: ()=>getConnectedDevices
     });
     const external_node_assert_namespaceObject = require("node:assert");
@@ -523,59 +522,6 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
         });
         return getAdbShellStdoutOrThrow(command, output);
     }
-    const adb_namespaceObject = require("@yume-chan/adb");
-    const patchedClients = new WeakSet();
-    function isMultiDeviceFeatureError(error) {
-        const message = error instanceof Error ? error.message : String(error);
-        return message.includes('more than one device/emulator');
-    }
-    async function resolveTransportId(client, device) {
-        if (device && 'transportId' in device) return device.transportId;
-        if (device && 'serial' in device) {
-            const devices = await client.getDevices();
-            return devices.find((info)=>info.serial === device.serial)?.transportId;
-        }
-        if (!device) {
-            const devices = await client.getDevices();
-            if (1 !== devices.length) return;
-            return devices[0]?.transportId;
-        }
-    }
-    async function getDeviceFeaturesByTransportId(client, transportId) {
-        const connection = await client.createConnection(adb_namespaceObject.AdbServerClient.formatDeviceService({
-            transportId
-        }, 'features'));
-        try {
-            const featuresString = await connection.readString();
-            const features = featuresString ? featuresString.split(',') : [];
-            return {
-                transportId,
-                features
-            };
-        } finally{
-            await connection.dispose();
-        }
-    }
-    function installAdbServerClientFeaturesFallback(client) {
-        if (patchedClients.has(client)) return;
-        const getDeviceFeatures = client.getDeviceFeatures.bind(client);
-        client.getDeviceFeatures = async (device)=>{
-            try {
-                return await getDeviceFeatures(device);
-            } catch (error) {
-                if (!isMultiDeviceFeatureError(error)) throw error;
-                let transportId;
-                try {
-                    transportId = await resolveTransportId(client, device);
-                } catch  {
-                    throw error;
-                }
-                if (void 0 === transportId) throw error;
-                return getDeviceFeaturesByTransportId(client, transportId);
-            }
-        };
-        patchedClients.add(client);
-    }
     var scrcpy_manager = __webpack_require__("./src/scrcpy-manager.ts");
     function _define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
@@ -626,7 +572,6 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
                     host: '127.0.0.1',
                     port: 5037
                 }));
-                installAdbServerClientFeaturesFallback(adbClient);
                 const adb = new Adb(await adbClient.createTransport({
                     serial: this.deviceId
                 }));
@@ -2206,7 +2151,6 @@ exports.ScrcpyDeviceAdapter = __webpack_exports__.ScrcpyDeviceAdapter;
 exports.agentFromAdbDevice = __webpack_exports__.agentFromAdbDevice;
 exports.getConnectedDevices = __webpack_exports__.getConnectedDevices;
 exports.getConnectedDevicesWithDetails = __webpack_exports__.getConnectedDevicesWithDetails;
-exports.installAdbServerClientFeaturesFallback = __webpack_exports__.installAdbServerClientFeaturesFallback;
 exports.overrideAIConfig = __webpack_exports__.overrideAIConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "AndroidAgent",
@@ -2216,7 +2160,6 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "agentFromAdbDevice",
     "getConnectedDevices",
     "getConnectedDevicesWithDetails",
-    "installAdbServerClientFeaturesFallback",
     "overrideAIConfig"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/lib/mcp-server.js

@@ -615,59 +615,6 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
     const env_namespaceObject = require("@midscene/shared/env");
     const img_namespaceObject = require("@midscene/shared/img");
     const external_appium_adb_namespaceObject = require("appium-adb");
-    const adb_namespaceObject = require("@yume-chan/adb");
-    const patchedClients = new WeakSet();
-    function isMultiDeviceFeatureError(error) {
-        const message = error instanceof Error ? error.message : String(error);
-        return message.includes('more than one device/emulator');
-    }
-    async function resolveTransportId(client, device) {
-        if (device && 'transportId' in device) return device.transportId;
-        if (device && 'serial' in device) {
-            const devices = await client.getDevices();
-            return devices.find((info)=>info.serial === device.serial)?.transportId;
-        }
-        if (!device) {
-            const devices = await client.getDevices();
-            if (1 !== devices.length) return;
-            return devices[0]?.transportId;
-        }
-    }
-    async function getDeviceFeaturesByTransportId(client, transportId) {
-        const connection = await client.createConnection(adb_namespaceObject.AdbServerClient.formatDeviceService({
-            transportId
-        }, 'features'));
-        try {
-            const featuresString = await connection.readString();
-            const features = featuresString ? featuresString.split(',') : [];
-            return {
-                transportId,
-                features
-            };
-        } finally{
-            await connection.dispose();
-        }
-    }
-    function installAdbServerClientFeaturesFallback(client) {
-        if (patchedClients.has(client)) return;
-        const getDeviceFeatures = client.getDeviceFeatures.bind(client);
-        client.getDeviceFeatures = async (device)=>{
-            try {
-                return await getDeviceFeatures(device);
-            } catch (error) {
-                if (!isMultiDeviceFeatureError(error)) throw error;
-                let transportId;
-                try {
-                    transportId = await resolveTransportId(client, device);
-                } catch  {
-                    throw error;
-                }
-                if (void 0 === transportId) throw error;
-                return getDeviceFeaturesByTransportId(client, transportId);
-            }
-        };
-        patchedClients.add(client);
-    }
     var scrcpy_manager = __webpack_require__("./src/scrcpy-manager.ts");
     function _define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
@@ -718,7 +665,6 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
                     host: '127.0.0.1',
                     port: 5037
                 }));
-                installAdbServerClientFeaturesFallback(adbClient);
                 const adb = new Adb(await adbClient.createTransport({
                     serial: this.deviceId
                 }));
@@ -2133,7 +2079,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         constructor(toolsManager){
             super({
                 name: '@midscene/android-mcp',
-                version: "1.9.6-beta-20260615080106.0",
+                version: "1.9.6",
                 description: 'Control the Android device using natural language commands'
             }, toolsManager);
         }

package/dist/types/index.d.ts

@@ -3,7 +3,6 @@ import type { ActionParam } from '@midscene/core';
 import type { ActionReturn } from '@midscene/core';
 import { ADB } from 'appium-adb';
 import type { Adb } from '@yume-chan/adb';
-import { AdbServerClient } from '@yume-chan/adb';
 import { Agent } from '@midscene/core/agent';
 import { AgentOpt } from '@midscene/core/agent';
 import { AndroidDeviceInputOpt } from '@midscene/core/device';
@@ -277,8 +276,6 @@ export declare function getConnectedDevices(): Promise<Device[]>;
 
 export declare function getConnectedDevicesWithDetails(): Promise<AndroidConnectedDevice[]>;
 
-export declare function installAdbServerClientFeaturesFallback(client: AdbServerClient): void;
-
 export { overrideAIConfig }
 
 declare interface ResolvedScrcpyConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "1.9.6-beta-20260615080106.0",
+  "version": "1.9.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/midscene.git",
@@ -46,8 +46,8 @@
     "@yume-chan/stream-extra": "2.1.0",
     "appium-adb": "12.12.1",
     "sharp": "^0.34.3",
-    "@midscene/shared": "1.9.6-beta-20260615080106.0",
-    "@midscene/core": "1.9.6-beta-20260615080106.0"
+    "@midscene/core": "1.9.6",
+    "@midscene/shared": "1.9.6"
   },
   "optionalDependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0"
@@ -61,7 +61,7 @@
     "undici": "^6.0.0",
     "vitest": "3.0.5",
     "zod": "^3.25.1",
-    "@midscene/playground": "1.9.6-beta-20260615080106.0"
+    "@midscene/playground": "1.9.6"
   },
   "license": "MIT",
   "scripts": {