@midscene/android 1.9.5-beta-20260611045217.0 → 1.9.5

package/dist/es/cli.mjs

@@ -2,30 +2,28 @@ import * as __rspack_external__midscene_shared_logger_b1dc2426 from "@midscene/s
 import * as __rspack_external_node_fs_5ea92f0c from "node:fs";
 import * as __rspack_external_node_module_ab9f2194 from "node:module";
 import * as __rspack_external_node_path_c5b9b54f from "node:path";
-import * as __rspack_external_node_assert_3e74d44e from "node:assert";
-import * as __rspack_external_node_child_process_27f17141 from "node:child_process";
-import * as __rspack_external__midscene_core_c3cd7634 from "@midscene/core";
-import * as __rspack_external__midscene_core_device_1cfad35b from "@midscene/core/device";
-import * as __rspack_external__midscene_core_utils_9c4af4f4 from "@midscene/core/utils";
-import * as __rspack_external__midscene_shared_env_0c37bb76 from "@midscene/shared/env";
-import * as __rspack_external__midscene_shared_img_758d2833 from "@midscene/shared/img";
-import * as __rspack_external__midscene_shared_utils_b0457388 from "@midscene/shared/utils";
-import * as __rspack_external_appium_adb_724653d6 from "appium-adb";
-import * as __rspack_external__midscene_shared_constants_ab069bca from "@midscene/shared/constants";
-import * as __rspack_external__midscene_shared_timeout_982edd16 from "@midscene/shared/timeout";
-import * as __rspack_external__midscene_core_agent_2b7f9158 from "@midscene/core/agent";
-import * as __rspack_external__midscene_shared_mcp_base_tools_a0c805f3 from "@midscene/shared/mcp/base-tools";
-import * as __rspack_external__midscene_shared_cli_24fbb5ae from "@midscene/shared/cli";
+import { createReportCliCommands, getMidsceneLocationSchema, z } from "@midscene/core";
+import { reportCLIError, runToolsCLI } from "@midscene/shared/cli";
+import { BaseMidsceneTools } from "@midscene/shared/mcp/base-tools";
+import { Agent } from "@midscene/core/agent";
+import { mergeAndNormalizeAppNameMapping, normalizeForComparison, repeat } from "@midscene/shared/utils";
+import node_assert from "node:assert";
+import { execFile } from "node:child_process";
+import { createDefaultMobileActions, defineAction } from "@midscene/core/device";
+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";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
             ScrcpyScreenshotManager: ()=>ScrcpyScreenshotManager,
             o: ()=>DEFAULT_SCRCPY_CONFIG
         });
-        var external_node_fs_ = __webpack_require__("node:fs");
-        var external_node_module_ = __webpack_require__("node:module");
-        var external_node_path_ = __webpack_require__("node:path");
-        var logger_ = __webpack_require__("@midscene/shared/logger");
+        var node_fs__rspack_import_0 = __webpack_require__("node:fs");
+        var node_module__rspack_import_1 = __webpack_require__("node:module");
+        var node_path__rspack_import_2 = __webpack_require__("node:path");
+        var _midscene_shared_logger__rspack_import_3 = __webpack_require__("@midscene/shared/logger");
         function _define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -36,8 +34,8 @@ var __webpack_modules__ = {
             else obj[key] = value;
             return obj;
         }
-        const debugScrcpy = (0, logger_.getDebug)('android:scrcpy');
-        const warnScrcpy = (0, logger_.getDebug)('android:scrcpy', {
+        const debugScrcpy = (0, _midscene_shared_logger__rspack_import_3.getDebug)('android:scrcpy');
+        const warnScrcpy = (0, _midscene_shared_logger__rspack_import_3.getDebug)('android:scrcpy', {
             console: true
         });
         const NAL_TYPE_IDR = 5;
@@ -78,11 +76,6 @@ var __webpack_modules__ = {
             return false;
         }
         class ScrcpyScreenshotManager {
-            shouldRetryWithForwardTunnel(error) {
-                const cause = error instanceof Error ? error.cause : void 0;
-                const message = error instanceof Error ? `${error.message}${cause instanceof Error ? ` ${cause.message}` : ''}` : String(error);
-                return /more than one device\/emulator/i.test(message);
-            }
             async validateEnvironment() {
                 await this.ensureFfmpegAvailable();
             }
@@ -101,7 +94,12 @@ var __webpack_modules__ = {
                 try {
                     this.isConnecting = true;
                     debugScrcpy('Starting scrcpy connection...');
-                    this.scrcpyClient = await this.startScrcpy(this.adb, {
+                    const { AdbScrcpyClient, AdbScrcpyOptions3_3_3 } = await import("@yume-chan/adb-scrcpy");
+                    const { ReadableStream } = await import("@yume-chan/stream-extra");
+                    const { DefaultServerPath } = await import("@yume-chan/scrcpy");
+                    const serverBinPath = this.resolveServerBinPath();
+                    await AdbScrcpyClient.pushServer(this.adb, ReadableStream.from((0, node_fs__rspack_import_0.createReadStream)(serverBinPath)));
+                    const scrcpyOptions = new AdbScrcpyOptions3_3_3({
                         audio: false,
                         control: false,
                         maxSize: this.options.maxSize,
@@ -110,6 +108,7 @@ var __webpack_modules__ = {
                         sendFrameMeta: true,
                         videoCodecOptions: 'i-frame-interval=0,bitrate-mode=2'
                     });
+                    this.scrcpyClient = await AdbScrcpyClient.start(this.adb, DefaultServerPath, scrcpyOptions);
                     const videoStreamPromise = this.scrcpyClient.videoStream;
                     if (!videoStreamPromise) throw new Error('Scrcpy client did not provide video stream');
                     this.videoStream = await videoStreamPromise;
@@ -131,50 +130,13 @@ var __webpack_modules__ = {
                     this.isConnecting = false;
                 }
             }
-            async startScrcpyOnce(adb, options = {}, onProgress, tunnelForward = false) {
-                const { AdbScrcpyClient, AdbScrcpyOptions3_3_3 } = await import("@yume-chan/adb-scrcpy");
-                const { ReadableStream } = await import("@yume-chan/stream-extra");
-                const { DefaultServerPath } = await import("@yume-chan/scrcpy");
-                const serverBinPath = this.resolveServerBinPath();
-                onProgress?.('pushing-server');
-                await (0, __rspack_external__midscene_shared_timeout_982edd16.withTimeout)(AdbScrcpyClient.pushServer(adb, ReadableStream.from((0, external_node_fs_.createReadStream)(serverBinPath))), __rspack_external__midscene_shared_constants_ab069bca.SCRCPY_PUSH_TIMEOUT_MS, `Timed out pushing scrcpy server to device after ${Math.round(__rspack_external__midscene_shared_constants_ab069bca.SCRCPY_PUSH_TIMEOUT_MS / 1000)}s`);
-                const scrcpyOptions = new AdbScrcpyOptions3_3_3({
-                    audio: false,
-                    control: true,
-                    maxSize: 1024,
-                    sendFrameMeta: true,
-                    videoBitRate: 2000000,
-                    ...options,
-                    tunnelForward
-                });
-                onProgress?.('starting-service');
-                const startPromise = AdbScrcpyClient.start(adb, DefaultServerPath, scrcpyOptions);
-                return await (0, __rspack_external__midscene_shared_timeout_982edd16.withTimeout)(startPromise, __rspack_external__midscene_shared_constants_ab069bca.SCRCPY_START_TIMEOUT_MS, `Timed out starting scrcpy service after ${Math.round(__rspack_external__midscene_shared_constants_ab069bca.SCRCPY_START_TIMEOUT_MS / 1000)}s`, {
-                    onSettledAfterTimeout: async (lateClient)=>{
-                        try {
-                            await lateClient.close();
-                        } catch (closeError) {
-                            console.error('failed to close late scrcpy client after timeout:', closeError);
-                        }
-                    }
-                });
-            }
-            async startScrcpy(adb, options = {}, onProgress) {
-                try {
-                    return await this.startScrcpyOnce(adb, options, onProgress, false);
-                } catch (error) {
-                    if (!this.shouldRetryWithForwardTunnel(error)) throw error;
-                    warnScrcpy(`Reverse tunnel failed for device ${adb.serial}; retrying scrcpy with forward tunnel: ${error}`);
-                    return await this.startScrcpyOnce(adb, options, onProgress, true);
-                }
-            }
             resolveServerBinPath() {
-                const androidPkgJson = (0, external_node_module_.createRequire)(import.meta.url).resolve('@midscene/android/package.json');
-                return external_node_path_["default"].join(external_node_path_["default"].dirname(androidPkgJson), 'bin', 'scrcpy-server');
+                const androidPkgJson = (0, node_module__rspack_import_1.createRequire)(import.meta.url).resolve('@midscene/android/package.json');
+                return node_path__rspack_import_2["default"].join(node_path__rspack_import_2["default"].dirname(androidPkgJson), 'bin', 'scrcpy-server');
             }
             getFfmpegPath() {
                 try {
-                    const dynamicRequire = (0, external_node_module_.createRequire)(import.meta.url);
+                    const dynamicRequire = (0, node_module__rspack_import_1.createRequire)(import.meta.url);
                     const ffmpegInstaller = dynamicRequire('@ffmpeg-installer/ffmpeg');
                     debugScrcpy(`Using ffmpeg from npm package: ${ffmpegInstaller.path}`);
                     return ffmpegInstaller.path;
@@ -485,6 +447,45 @@ function __webpack_require__(moduleId) {
     __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
 })();
 var logger_ = __webpack_require__("@midscene/shared/logger");
+const EMPTY_ADB_SHELL_STDOUT = '<empty>';
+const MAX_RUN_ADB_SHELL_STDOUT = 200;
+function normalizeShellStream(value) {
+    if (null == value) return '';
+    return String(value);
+}
+function truncateAdbShellStream(output, streamName) {
+    if (output.length <= MAX_RUN_ADB_SHELL_STDOUT) return output;
+    return `${output.slice(0, MAX_RUN_ADB_SHELL_STDOUT)}
+...[${streamName} truncated, ${output.length - MAX_RUN_ADB_SHELL_STDOUT} more characters]`;
+}
+function buildRunAdbShellPlanningFeedback({ command, stdout }) {
+    if ('' === stdout) return;
+    const commandText = 'string' == typeof command && command.length > 0 ? `Command: ${command}\n` : '';
+    return `${commandText}Stdout:
+${stdout}`;
+}
+function buildAdbShellStderrErrorMessage(command, stdout, stderr) {
+    return `RunAdbShell command returned stderr.
+Command: ${command}
+Stderr:
+${truncateAdbShellStream(stderr, 'stderr')}
+Stdout:
+${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
+}
+function getAdbShellStdoutOrThrow(command, output) {
+    if ('string' == typeof output) return output;
+    const stdout = normalizeShellStream(output.stdout);
+    const stderr = normalizeShellStream(output.stderr);
+    if (stderr) throw new Error(buildAdbShellStderrErrorMessage(command, stdout, stderr));
+    return stdout;
+}
+async function runAdbShellStdoutOrThrow(adb, command, options = {}) {
+    const output = await adb.shell(command, {
+        ...options,
+        outputFormat: adb.EXEC_OUTPUT_FORMAT.FULL
+    });
+    return getAdbShellStdoutOrThrow(command, output);
+}
 const defaultAppNameMapping = {
     微信: 'com.tencent.mm',
     QQ: 'com.tencent.mobileqq',
@@ -655,7 +656,7 @@ class ScrcpyDeviceAdapter {
     async screenshotBase64(deviceInfo) {
         const manager = await this.ensureManager(deviceInfo);
         const screenshotBuffer = await manager.getScreenshotJpeg();
-        return (0, __rspack_external__midscene_shared_img_758d2833.createImgBase64ByFormat)('jpeg', screenshotBuffer.toString('base64'));
+        return createImgBase64ByFormat('jpeg', screenshotBuffer.toString('base64'));
     }
     getResolution() {
         return this.manager?.getResolution() ?? null;
@@ -726,7 +727,7 @@ class AndroidDevice {
             input: this.inputPrimitives,
             size: ()=>this.size(),
             sleep: async (timeMs)=>{
-                await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(timeMs);
+                await sleep(timeMs);
             },
             getDefaultAutoDismissKeyboard: ()=>this.options?.autoDismissKeyboard,
             systemActions: {
@@ -745,18 +746,18 @@ class AndroidDevice {
             }
         };
         const defaultActions = [
-            ...(0, __rspack_external__midscene_core_device_1cfad35b.createDefaultMobileActions)(mobileActionContext),
-            (0, __rspack_external__midscene_core_device_1cfad35b.defineAction)({
+            ...createDefaultMobileActions(mobileActionContext),
+            defineAction({
                 name: 'PullGesture',
                 description: 'Trigger pull down to refresh or pull up actions',
-                paramSchema: __rspack_external__midscene_core_c3cd7634.z.object({
-                    direction: __rspack_external__midscene_core_c3cd7634.z["enum"]([
+                paramSchema: z.object({
+                    direction: z["enum"]([
                         'up',
                         'down'
                     ]).describe('The direction to pull'),
-                    distance: __rspack_external__midscene_core_c3cd7634.z.number().optional().describe('The distance to pull (in pixels)'),
-                    duration: __rspack_external__midscene_core_c3cd7634.z.number().optional().describe('The duration of the pull (in milliseconds)'),
-                    locate: (0, __rspack_external__midscene_core_c3cd7634.getMidsceneLocationSchema)().optional().describe('The element to start the pull from (optional)')
+                    distance: z.number().optional().describe('The distance to pull (in pixels)'),
+                    duration: z.number().optional().describe('The duration of the pull (in milliseconds)'),
+                    locate: getMidsceneLocationSchema().optional().describe('The element to start the pull from (optional)')
                 }),
                 sample: {
                     direction: 'down',
@@ -803,7 +804,7 @@ class AndroidDevice {
             else if ('right' === param.direction) await this.scrollRight(param.distance || void 0, startingPoint);
             else throw new Error(`Unknown scroll direction: ${param.direction}`);
             else await this.scrollDown(param?.distance || void 0, startingPoint);
-            await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(500);
+            await sleep(500);
         }
     }
     describe() {
@@ -830,10 +831,10 @@ class AndroidDevice {
             let error = null;
             debugDevice(`Initializing ADB with device ID: ${this.deviceId}`);
             try {
-                const androidAdbPath = this.options?.androidAdbPath || __rspack_external__midscene_shared_env_0c37bb76.globalConfigManager.getEnvConfigValue(__rspack_external__midscene_shared_env_0c37bb76.MIDSCENE_ADB_PATH);
-                const remoteAdbHost = this.options?.remoteAdbHost || __rspack_external__midscene_shared_env_0c37bb76.globalConfigManager.getEnvConfigValue(__rspack_external__midscene_shared_env_0c37bb76.MIDSCENE_ADB_REMOTE_HOST);
-                const remoteAdbPort = this.options?.remoteAdbPort || __rspack_external__midscene_shared_env_0c37bb76.globalConfigManager.getEnvConfigValue(__rspack_external__midscene_shared_env_0c37bb76.MIDSCENE_ADB_REMOTE_PORT);
-                this.adb = new __rspack_external_appium_adb_724653d6.ADB({
+                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 external_appium_adb_ADB({
                     udid: this.deviceId,
                     adbExecTimeout: 60000,
                     executable: androidAdbPath ? {
@@ -907,7 +908,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         this.appNameMapping = mapping;
     }
     resolvePackageName(appName) {
-        const normalizedAppName = (0, __rspack_external__midscene_shared_utils_b0457388.normalizeForComparison)(appName);
+        const normalizedAppName = normalizeForComparison(appName);
         return this.appNameMapping[normalizedAppName];
     }
     async launch(uri) {
@@ -1226,7 +1227,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 screenshotBuffer = await adb.takeScreenshot.call(adb);
                 debugDevice('adb.takeScreenshot completed');
                 try {
-                    (0, __rspack_external__midscene_shared_img_758d2833.validateScreenshotBuffer)(screenshotBuffer, {
+                    validateScreenshotBuffer(screenshotBuffer, {
                         label: 'Screenshot',
                         minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
                     });
@@ -1242,7 +1243,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             }
         } catch (error) {
             debugDevice(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
-            const screenshotPath = (0, __rspack_external__midscene_core_utils_9c4af4f4.getTmpFile)('png');
+            const screenshotPath = getTmpFile('png');
             localScreenshotPath = screenshotPath;
             try {
                 debugDevice('Fallback: taking screenshot via shell screencap');
@@ -1260,14 +1261,14 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 await adb.pull(androidScreenshotPath, screenshotPath);
                 debugDevice(`adb.pull completed, local path: ${screenshotPath}`);
                 screenshotBuffer = await external_node_fs_["default"].promises.readFile(screenshotPath);
-                (0, __rspack_external__midscene_shared_img_758d2833.validateScreenshotBuffer)(screenshotBuffer, {
+                validateScreenshotBuffer(screenshotBuffer, {
                     label: 'Fallback screenshot',
                     minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
                 });
                 debugDevice(`Fallback screenshot validated successfully: ${screenshotBuffer.length} bytes`);
             } finally{
                 const adbPath = adb.executable?.path ?? 'adb';
-                const child = (0, __rspack_external_node_child_process_27f17141.execFile)(adbPath, [
+                const child = execFile(adbPath, [
                     '-s',
                     this.deviceId,
                     'shell',
@@ -1282,7 +1283,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
         if (!screenshotBuffer) throw new Error('Failed to capture screenshot: all methods failed');
         debugDevice('Converting to base64');
-        const result = (0, __rspack_external__midscene_shared_img_758d2833.createImgBase64ByFormat)('png', screenshotBuffer.toString('base64'));
+        const result = createImgBase64ByFormat('png', screenshotBuffer.toString('base64'));
         if (localScreenshotPath) {
             debugDevice(`Deleting local screenshot: ${localScreenshotPath}`);
             (0, external_node_fs_.unlink)(localScreenshotPath, (unlinkError)=>{
@@ -1299,7 +1300,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         });
         await this.ensureYadb();
         const adb = await this.getAdb();
-        const IME_STRATEGY = (this.options?.imeStrategy || __rspack_external__midscene_shared_env_0c37bb76.globalConfigManager.getEnvConfigValue(__rspack_external__midscene_shared_env_0c37bb76.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
+        const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
         if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) await adb.clearTextField(100);
         else await adb.shell(`app_process${this.getDisplayArg()} -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboardClear`);
         if (await adb.isSoftKeyboardPresent()) return;
@@ -1327,12 +1328,12 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 x: start.x,
                 y: Math.round(height)
             };
-            await (0, __rspack_external__midscene_shared_utils_b0457388.repeat)(defaultScrollUntilTimes, ()=>this.dragPoint(start, end, defaultFastScrollDuration));
-            await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(1000);
+            await repeat(defaultScrollUntilTimes, ()=>this.dragPoint(start, end, defaultFastScrollDuration));
+            await sleep(1000);
             return;
         }
-        await (0, __rspack_external__midscene_shared_utils_b0457388.repeat)(defaultScrollUntilTimes, ()=>this.scroll(0, -9999999, defaultFastScrollDuration));
-        await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(1000);
+        await repeat(defaultScrollUntilTimes, ()=>this.scroll(0, -9999999, defaultFastScrollDuration));
+        await sleep(1000);
     }
     async scrollUntilBottom(startPoint) {
         if (startPoint) {
@@ -1344,12 +1345,12 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 x: start.x,
                 y: 0
             };
-            await (0, __rspack_external__midscene_shared_utils_b0457388.repeat)(defaultScrollUntilTimes, ()=>this.dragPoint(start, end, defaultFastScrollDuration));
-            await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(1000);
+            await repeat(defaultScrollUntilTimes, ()=>this.dragPoint(start, end, defaultFastScrollDuration));
+            await sleep(1000);
             return;
         }
-        await (0, __rspack_external__midscene_shared_utils_b0457388.repeat)(defaultScrollUntilTimes, ()=>this.scroll(0, 9999999, defaultFastScrollDuration));
-        await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(1000);
+        await repeat(defaultScrollUntilTimes, ()=>this.scroll(0, 9999999, defaultFastScrollDuration));
+        await sleep(1000);
     }
     async scrollUntilLeft(startPoint) {
         if (startPoint) {
@@ -1362,12 +1363,12 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 x: Math.round(width),
                 y: start.y
             };
-            await (0, __rspack_external__midscene_shared_utils_b0457388.repeat)(defaultScrollUntilTimes, ()=>this.dragPoint(start, end, defaultFastScrollDuration));
-            await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(1000);
+            await repeat(defaultScrollUntilTimes, ()=>this.dragPoint(start, end, defaultFastScrollDuration));
+            await sleep(1000);
             return;
         }
-        await (0, __rspack_external__midscene_shared_utils_b0457388.repeat)(defaultScrollUntilTimes, ()=>this.scroll(-9999999, 0, defaultFastScrollDuration));
-        await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(1000);
+        await repeat(defaultScrollUntilTimes, ()=>this.scroll(-9999999, 0, defaultFastScrollDuration));
+        await sleep(1000);
     }
     async scrollUntilRight(startPoint) {
         if (startPoint) {
@@ -1379,12 +1380,12 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 x: 0,
                 y: start.y
             };
-            await (0, __rspack_external__midscene_shared_utils_b0457388.repeat)(defaultScrollUntilTimes, ()=>this.dragPoint(start, end, defaultFastScrollDuration));
-            await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(1000);
+            await repeat(defaultScrollUntilTimes, ()=>this.dragPoint(start, end, defaultFastScrollDuration));
+            await sleep(1000);
             return;
         }
-        await (0, __rspack_external__midscene_shared_utils_b0457388.repeat)(defaultScrollUntilTimes, ()=>this.scroll(9999999, 0, defaultFastScrollDuration));
-        await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(1000);
+        await repeat(defaultScrollUntilTimes, ()=>this.scroll(9999999, 0, defaultFastScrollDuration));
+        await sleep(1000);
     }
     async scrollUp(distance, startPoint) {
         const { height } = await this.size();
@@ -1469,7 +1470,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     async typeText(text, options) {
         if (!text) return;
         const adb = await this.getAdb();
-        const IME_STRATEGY = (this.options?.imeStrategy || __rspack_external__midscene_shared_env_0c37bb76.globalConfigManager.getEnvConfigValue(__rspack_external__midscene_shared_env_0c37bb76.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
+        const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
         const shouldAutoDismissKeyboard = options?.autoDismissKeyboard ?? this.options?.autoDismissKeyboard ?? true;
         const useYadb = IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text);
         if (useYadb) await this.execYadb(escapeForShell(text));
@@ -1535,7 +1536,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const { x: adjustedX, y: adjustedY } = await this.adjustCoordinates(point.x, point.y);
         const tapCommand = `input${this.getDisplayArg()} tap ${adjustedX} ${adjustedY}`;
         await adb.shell(tapCommand);
-        await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(50);
+        await sleep(50);
         await adb.shell(tapCommand);
     }
     async mouseMove() {
@@ -1646,7 +1647,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             y: start.y + pullDistance
         };
         await this.pullDrag(start, end, duration);
-        await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(200);
+        await sleep(200);
     }
     async pullDrag(from, to, duration) {
         await this.swipePoint(from, to, duration);
@@ -1666,7 +1667,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             y: start.y - pullDistance
         };
         await this.pullDrag(start, end, duration);
-        await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(100);
+        await sleep(100);
     }
     getDisplayArg() {
         return 'number' == typeof this.options?.displayId ? ` -d ${this.options.displayId}` : '';
@@ -1717,7 +1718,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             const startTime = Date.now();
             const intervalMs = 100;
             while(Date.now() - startTime < timeoutMs){
-                await (0, __rspack_external__midscene_core_utils_9c4af4f4.sleep)(intervalMs);
+                await sleep(intervalMs);
                 const currentStatus = await adb.isSoftKeyboardPresent();
                 const isStillShown = 'boolean' == typeof currentStatus ? currentStatus : currentStatus?.isKeyboardShown;
                 if (!isStillShown) {
@@ -1800,7 +1801,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 recentAppsButton: ()=>this.recentApps()
             }
         });
-        (0, __rspack_external_node_assert_3e74d44e["default"])(deviceId, 'deviceId is required for AndroidDevice');
+        node_assert(deviceId, 'deviceId is required for AndroidDevice');
         this.deviceId = deviceId;
         this.options = options;
         this.customActions = options?.customActions;
@@ -1808,31 +1809,37 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
 }
 device_define_property(AndroidDevice, "TAKE_SCREENSHOT_FAIL_THRESHOLD", 3);
 device_define_property(AndroidDevice, "DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE", 1024);
-const runAdbShellParamSchema = __rspack_external__midscene_core_c3cd7634.z.object({
-    command: __rspack_external__midscene_core_c3cd7634.z.string().describe('ADB shell command to execute')
+const runAdbShellParamSchema = z.object({
+    command: z.string().describe('ADB shell command to execute')
 });
-const launchParamSchema = __rspack_external__midscene_core_c3cd7634.z.object({
-    uri: __rspack_external__midscene_core_c3cd7634.z.string().describe('App name, package name, or URL to launch. Prioritize using the exact package name or URL the user has provided. If none provided, use the accurate app name.')
+const launchParamSchema = z.object({
+    uri: z.string().describe('App name, package name, or URL to launch. Prioritize using the exact package name or URL the user has provided. If none provided, use the accurate app name.')
 });
-const terminateParamSchema = __rspack_external__midscene_core_c3cd7634.z.object({
-    uri: __rspack_external__midscene_core_c3cd7634.z.string().describe('Package name or app name to terminate. Use the exact package name, e.g. com.android.settings.')
+const terminateParamSchema = z.object({
+    uri: z.string().describe('Package name or app name to terminate. Use the exact package name, e.g. com.android.settings.')
 });
 const createPlatformActions = (device)=>({
-        RunAdbShell: (0, __rspack_external__midscene_core_device_1cfad35b.defineAction)({
+        RunAdbShell: defineAction({
             name: 'RunAdbShell',
-            description: 'Execute ADB shell command on Android device',
+            description: 'Execute an ADB shell command on the Android device and return the command stdout. Read the returned stdout to decide the next step; the stdout may indicate either success or failure.',
             interfaceAlias: 'runAdbShell',
             paramSchema: runAdbShellParamSchema,
             sample: {
                 command: 'dumpsys window displays | grep -E "mCurrentFocus"'
             },
-            call: async (param)=>{
+            call: async (param, context)=>{
                 if (!param.command || '' === param.command.trim()) throw new Error('RunAdbShell requires a non-empty command parameter');
                 const adb = await device.getAdb();
-                return await adb.shell(param.command);
+                const stdout = await runAdbShellStdoutOrThrow(adb, param.command);
+                const planningFeedback = buildRunAdbShellPlanningFeedback({
+                    command: param.command,
+                    stdout
+                });
+                if (planningFeedback && context?.task) context.task.planningFeedback = planningFeedback;
+                return stdout;
             }
         }),
-        Launch: (0, __rspack_external__midscene_core_device_1cfad35b.defineAction)({
+        Launch: defineAction({
             name: 'Launch',
             description: 'Launch an Android app or URL',
             interfaceAlias: 'launch',
@@ -1845,7 +1852,7 @@ const createPlatformActions = (device)=>({
                 await device.launch(param.uri);
             }
         }),
-        Terminate: (0, __rspack_external__midscene_core_device_1cfad35b.defineAction)({
+        Terminate: defineAction({
             name: 'Terminate',
             description: 'Terminate (force-stop) an Android app by package name',
             interfaceAlias: 'terminate',
@@ -1859,7 +1866,7 @@ const createPlatformActions = (device)=>({
 const debugUtils = (0, logger_.getDebug)('android:utils');
 async function getConnectedDevices() {
     try {
-        const adb = await __rspack_external_appium_adb_724653d6.ADB.createADB({
+        const adb = await external_appium_adb_ADB.createADB({
             adbExecTimeout: 60000
         });
         const devices = await adb.getConnectedDevices();
@@ -1883,7 +1890,7 @@ function agent_define_property(obj, key, value) {
     return obj;
 }
 const debugAgent = (0, logger_.getDebug)('android:agent');
-class AndroidAgent extends __rspack_external__midscene_core_agent_2b7f9158.Agent {
+class AndroidAgent extends Agent {
     async launch(uri) {
         const action = this.wrapActionInActionSpace('Launch');
         return action({
@@ -1899,7 +1906,7 @@ class AndroidAgent extends __rspack_external__midscene_core_agent_2b7f9158.Agent
     async runAdbShell(command, opt) {
         if (opt?.timeout !== void 0) {
             const adb = await this.interface.getAdb();
-            return await adb.shell(command, {
+            return await runAdbShellStdoutOrThrow(adb, command, {
                 timeout: opt.timeout
             });
         }
@@ -1914,7 +1921,7 @@ class AndroidAgent extends __rspack_external__midscene_core_agent_2b7f9158.Agent
     }
     constructor(device, opts){
         super(device, opts), agent_define_property(this, "back", void 0), agent_define_property(this, "home", void 0), agent_define_property(this, "recentApps", void 0), agent_define_property(this, "appNameMapping", void 0);
-        this.appNameMapping = (0, __rspack_external__midscene_shared_utils_b0457388.mergeAndNormalizeAppNameMapping)(defaultAppNameMapping, opts?.appNameMapping);
+        this.appNameMapping = mergeAndNormalizeAppNameMapping(defaultAppNameMapping, opts?.appNameMapping);
         device.setAppNameMapping(this.appNameMapping);
         this.back = this.createActionWrapper('AndroidBackButton');
         this.home = this.createActionWrapper('AndroidHomeButton');
@@ -1943,7 +1950,7 @@ function mcp_tools_define_property(obj, key, value) {
     return obj;
 }
 const debug = (0, logger_.getDebug)('mcp:android-tools');
-class AndroidMidsceneTools extends __rspack_external__midscene_shared_mcp_base_tools_a0c805f3.BaseMidsceneTools {
+class AndroidMidsceneTools extends BaseMidsceneTools {
     getCliReportSessionName() {
         return 'midscene-android';
     }
@@ -2021,8 +2028,8 @@ class AndroidMidsceneTools extends __rspack_external__midscene_shared_mcp_base_t
         super(...args), mcp_tools_define_property(this, "initArgSpec", {
             namespace: 'android',
             shape: {
-                deviceId: __rspack_external__midscene_core_c3cd7634.z.string().optional().describe('Android device ID (from adb devices)'),
-                useScrcpy: __rspack_external__midscene_core_c3cd7634.z.boolean().optional().describe('Enable scrcpy accelerated screenshots')
+                deviceId: z.string().optional().describe('Android device ID (from adb devices)'),
+                useScrcpy: z.boolean().optional().describe('Enable scrcpy accelerated screenshots')
             },
             cli: {
                 preferBareKeys: true
@@ -2035,10 +2042,10 @@ class AndroidMidsceneTools extends __rspack_external__midscene_shared_mcp_base_t
     }
 }
 const tools = new AndroidMidsceneTools();
-(0, __rspack_external__midscene_shared_cli_24fbb5ae.runToolsCLI)(tools, 'midscene-android', {
+runToolsCLI(tools, 'midscene-android', {
     stripPrefix: 'android_',
-    version: "1.9.5-beta-20260611045217.0",
-    extraCommands: (0, __rspack_external__midscene_core_c3cd7634.createReportCliCommands)()
+    version: "1.9.5",
+    extraCommands: createReportCliCommands()
 }).catch((e)=>{
-    process.exit((0, __rspack_external__midscene_shared_cli_24fbb5ae.reportCLIError)(e));
+    process.exit(reportCLIError(e));
 });