@midscene/android 1.9.5-beta-20260611045217.0 → 1.9.5

package/dist/lib/cli.js

@@ -8,13 +8,11 @@ var __webpack_modules__ = {
             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 external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_);
-        const constants_namespaceObject = require("@midscene/shared/constants");
-        var logger_ = __webpack_require__("@midscene/shared/logger");
-        const timeout_namespaceObject = require("@midscene/shared/timeout");
+        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 node_path__rspack_import_2_default = /*#__PURE__*/ __webpack_require__.n(node_path__rspack_import_2);
+        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,
@@ -25,8 +23,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;
@@ -67,11 +65,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();
             }
@@ -90,7 +83,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,
@@ -99,6 +97,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;
@@ -120,50 +119,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, timeout_namespaceObject.withTimeout)(AdbScrcpyClient.pushServer(adb, ReadableStream.from((0, external_node_fs_.createReadStream)(serverBinPath))), constants_namespaceObject.SCRCPY_PUSH_TIMEOUT_MS, `Timed out pushing scrcpy server to device after ${Math.round(constants_namespaceObject.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, timeout_namespaceObject.withTimeout)(startPromise, constants_namespaceObject.SCRCPY_START_TIMEOUT_MS, `Timed out starting scrcpy service after ${Math.round(constants_namespaceObject.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)(__rslib_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)(__rslib_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)(__rslib_import_meta_url__);
+                    const dynamicRequire = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__);
                     const ffmpegInstaller = dynamicRequire('@ffmpeg-installer/ffmpeg');
                     debugScrcpy(`Using ffmpeg from npm package: ${ffmpegInstaller.path}`);
                     return ffmpegInstaller.path;
@@ -490,6 +452,45 @@ var __webpack_exports__ = {};
     const base_tools_namespaceObject = require("@midscene/shared/mcp/base-tools");
     const agent_namespaceObject = require("@midscene/core/agent");
     const utils_namespaceObject = require("@midscene/shared/utils");
+    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',
@@ -1835,16 +1836,22 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     const createPlatformActions = (device)=>({
             RunAdbShell: (0, device_namespaceObject.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, device_namespaceObject.defineAction)({
@@ -1914,7 +1921,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         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
                 });
             }
@@ -2052,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.5-beta-20260611045217.0",
+        version: "1.9.5",
         extraCommands: (0, core_namespaceObject.createReportCliCommands)()
     }).catch((e)=>{
         process.exit((0, cli_namespaceObject.reportCLIError)(e));

package/dist/lib/index.js

@@ -8,13 +8,11 @@ var __webpack_modules__ = {
             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 external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_);
-        const constants_namespaceObject = require("@midscene/shared/constants");
-        var logger_ = __webpack_require__("@midscene/shared/logger");
-        const timeout_namespaceObject = require("@midscene/shared/timeout");
+        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 node_path__rspack_import_2_default = /*#__PURE__*/ __webpack_require__.n(node_path__rspack_import_2);
+        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,
@@ -25,8 +23,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;
@@ -67,11 +65,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();
             }
@@ -90,7 +83,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,
@@ -99,6 +97,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;
@@ -120,50 +119,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, timeout_namespaceObject.withTimeout)(AdbScrcpyClient.pushServer(adb, ReadableStream.from((0, external_node_fs_.createReadStream)(serverBinPath))), constants_namespaceObject.SCRCPY_PUSH_TIMEOUT_MS, `Timed out pushing scrcpy server to device after ${Math.round(constants_namespaceObject.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, timeout_namespaceObject.withTimeout)(startPromise, constants_namespaceObject.SCRCPY_START_TIMEOUT_MS, `Timed out starting scrcpy service after ${Math.round(constants_namespaceObject.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)(__rslib_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)(__rslib_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)(__rslib_import_meta_url__);
+                    const dynamicRequire = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__);
                     const ffmpegInstaller = dynamicRequire('@ffmpeg-installer/ffmpeg');
                     debugScrcpy(`Using ffmpeg from npm package: ${ffmpegInstaller.path}`);
                     return ffmpegInstaller.path;
@@ -521,6 +483,45 @@ var __webpack_exports__ = {};
     var logger_ = __webpack_require__("@midscene/shared/logger");
     const shared_utils_namespaceObject = require("@midscene/shared/utils");
     const external_appium_adb_namespaceObject = require("appium-adb");
+    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);
+    }
     var scrcpy_manager = __webpack_require__("./src/scrcpy-manager.ts");
     function _define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
@@ -1757,16 +1758,22 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     const createPlatformActions = (device)=>({
             RunAdbShell: (0, device_namespaceObject.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, device_namespaceObject.defineAction)({
@@ -2000,7 +2007,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         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
                 });
             }

package/dist/lib/mcp-server.js

@@ -8,13 +8,11 @@ var __webpack_modules__ = {
             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 external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_);
-        const constants_namespaceObject = require("@midscene/shared/constants");
-        var logger_ = __webpack_require__("@midscene/shared/logger");
-        const timeout_namespaceObject = require("@midscene/shared/timeout");
+        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 node_path__rspack_import_2_default = /*#__PURE__*/ __webpack_require__.n(node_path__rspack_import_2);
+        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,
@@ -25,8 +23,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;
@@ -67,11 +65,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();
             }
@@ -90,7 +83,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,
@@ -99,6 +97,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;
@@ -120,50 +119,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, timeout_namespaceObject.withTimeout)(AdbScrcpyClient.pushServer(adb, ReadableStream.from((0, external_node_fs_.createReadStream)(serverBinPath))), constants_namespaceObject.SCRCPY_PUSH_TIMEOUT_MS, `Timed out pushing scrcpy server to device after ${Math.round(constants_namespaceObject.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, timeout_namespaceObject.withTimeout)(startPromise, constants_namespaceObject.SCRCPY_START_TIMEOUT_MS, `Timed out starting scrcpy service after ${Math.round(constants_namespaceObject.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)(__rslib_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)(__rslib_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)(__rslib_import_meta_url__);
+                    const dynamicRequire = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__);
                     const ffmpegInstaller = dynamicRequire('@ffmpeg-installer/ffmpeg');
                     debugScrcpy(`Using ffmpeg from npm package: ${ffmpegInstaller.path}`);
                     return ffmpegInstaller.path;
@@ -504,6 +466,45 @@ var __webpack_exports__ = {};
     const agent_namespaceObject = require("@midscene/core/agent");
     var logger_ = __webpack_require__("@midscene/shared/logger");
     const utils_namespaceObject = require("@midscene/shared/utils");
+    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',
@@ -1850,16 +1851,22 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     const createPlatformActions = (device)=>({
             RunAdbShell: (0, device_namespaceObject.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, device_namespaceObject.defineAction)({
@@ -1929,7 +1936,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         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
                 });
             }
@@ -2072,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.5-beta-20260611045217.0",
+                version: "1.9.5",
                 description: 'Control the Android device using natural language commands'
             }, toolsManager);
         }

package/dist/types/index.d.ts

@@ -369,7 +369,6 @@ declare class ScrcpyScreenshotManager {
     private videoResolution;
     private streamReader;
     constructor(adb: Adb, options?: ScrcpyScreenshotOptions);
-    private shouldRetryWithForwardTunnel;
     /**
      * Validate environment prerequisites (ffmpeg, scrcpy-server, etc.)
      * Must be called once after construction, before any screenshot operations.
@@ -380,8 +379,6 @@ declare class ScrcpyScreenshotManager {
      * Ensure scrcpy connection is active
      */
     ensureConnected(): Promise<void>;
-    private startScrcpyOnce;
-    private startScrcpy;
     /**
      * Resolve path to scrcpy server binary
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "1.9.5-beta-20260611045217.0",
+  "version": "1.9.5",
   "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/core": "1.9.5-beta-20260611045217.0",
-    "@midscene/shared": "1.9.5-beta-20260611045217.0"
+    "@midscene/shared": "1.9.5",
+    "@midscene/core": "1.9.5"
   },
   "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.5-beta-20260611045217.0"
+    "@midscene/playground": "1.9.5"
   },
   "license": "MIT",
   "scripts": {