@midscene/android 1.10.8-beta-20260723115348.0 → 1.10.8

package/dist/es/cli.mjs

@@ -540,45 +540,6 @@ 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',
@@ -707,6 +668,45 @@ async function adb_createAndroidAdb({ adbExecTimeout, deviceId, deviceOptions })
     }
     return new ADB(adbOptions);
 }
+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, {
@@ -963,7 +963,9 @@ class AndroidDevice {
                 }
             })
         ];
-        const platformSpecificActions = Object.values(createPlatformActions(this));
+        const platformActions = createPlatformActions(this);
+        let platformSpecificActions = Object.values(platformActions);
+        if (this.options?.exposeRunAdbShellAction === false) platformSpecificActions = platformSpecificActions.filter((action)=>action !== platformActions.RunAdbShell);
         const customActions = this.customActions || [];
         return [
             ...defaultActions,
@@ -2059,7 +2061,8 @@ ${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 = z.object({
-    command: z.string().describe('ADB shell command to execute')
+    command: z.string().describe('ADB shell command to execute'),
+    timeout: z.number().optional().describe('ADB shell command execution timeout in milliseconds. Only include this parameter when the user explicitly requests a timeout; otherwise, omit it.')
 });
 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.')
@@ -2079,7 +2082,9 @@ const createPlatformActions = (device)=>({
             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();
-                const stdout = await runAdbShellStdoutOrThrow(adb, param.command);
+                const stdout = await runAdbShellStdoutOrThrow(adb, param.command, void 0 === param.timeout ? void 0 : {
+                    timeout: param.timeout
+                });
                 const planningFeedback = buildRunAdbShellPlanningFeedback({
                     command: param.command,
                     stdout
@@ -2157,15 +2162,10 @@ class AndroidAgent extends Agent {
         });
     }
     async runAdbShell(command, opt) {
-        if (opt?.timeout !== void 0) {
-            const adb = await this.interface.getAdb();
-            return await runAdbShellStdoutOrThrow(adb, command, {
-                timeout: opt.timeout
-            });
-        }
         const action = this.wrapActionInActionSpace('RunAdbShell');
         return action({
-            command
+            command,
+            ...opt
         });
     }
     createActionWrapper(name) {
@@ -2312,7 +2312,7 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
 const tools = new AndroidMidsceneTools();
 runToolsCLI(tools, 'midscene-android', {
     stripPrefix: 'android_',
-    version: "1.10.8-beta-20260723115348.0",
+    version: "1.10.8",
     extraCommands: createReportCliCommands()
 }).catch((e)=>{
     process.exit(reportCLIError(e));

package/dist/es/index.mjs

@@ -866,7 +866,9 @@ class AndroidDevice {
                 }
             })
         ];
-        const platformSpecificActions = Object.values(createPlatformActions(this));
+        const platformActions = createPlatformActions(this);
+        let platformSpecificActions = Object.values(platformActions);
+        if (this.options?.exposeRunAdbShellAction === false) platformSpecificActions = platformSpecificActions.filter((action)=>action !== platformActions.RunAdbShell);
         const customActions = this.customActions || [];
         return [
             ...defaultActions,
@@ -1962,7 +1964,8 @@ ${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 = z.object({
-    command: z.string().describe('ADB shell command to execute')
+    command: z.string().describe('ADB shell command to execute'),
+    timeout: z.number().optional().describe('ADB shell command execution timeout in milliseconds. Only include this parameter when the user explicitly requests a timeout; otherwise, omit it.')
 });
 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.')
@@ -1982,7 +1985,9 @@ const createPlatformActions = (device)=>({
             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();
-                const stdout = await runAdbShellStdoutOrThrow(adb, param.command);
+                const stdout = await runAdbShellStdoutOrThrow(adb, param.command, void 0 === param.timeout ? void 0 : {
+                    timeout: param.timeout
+                });
                 const planningFeedback = buildRunAdbShellPlanningFeedback({
                     command: param.command,
                     stdout
@@ -2224,15 +2229,10 @@ class AndroidAgent extends Agent {
         });
     }
     async runAdbShell(command, opt) {
-        if (opt?.timeout !== void 0) {
-            const adb = await this.interface.getAdb();
-            return await runAdbShellStdoutOrThrow(adb, command, {
-                timeout: opt.timeout
-            });
-        }
         const action = this.wrapActionInActionSpace('RunAdbShell');
         return action({
-            command
+            command,
+            ...opt
         });
     }
     createActionWrapper(name) {

package/dist/lib/cli.js

@@ -545,45 +545,6 @@ var __webpack_exports__ = {};
     var logger_ = __webpack_require__("@midscene/shared/logger");
     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',
@@ -722,6 +683,45 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
         }
         return new external_appium_adb_namespaceObject.ADB(adbOptions);
     }
+    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, {
@@ -978,7 +978,9 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
                     }
                 })
             ];
-            const platformSpecificActions = Object.values(createPlatformActions(this));
+            const platformActions = createPlatformActions(this);
+            let platformSpecificActions = Object.values(platformActions);
+            if (this.options?.exposeRunAdbShellAction === false) platformSpecificActions = platformSpecificActions.filter((action)=>action !== platformActions.RunAdbShell);
             const customActions = this.customActions || [];
             return [
                 ...defaultActions,
@@ -2074,7 +2076,8 @@ ${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 = core_namespaceObject.z.object({
-        command: core_namespaceObject.z.string().describe('ADB shell command to execute')
+        command: core_namespaceObject.z.string().describe('ADB shell command to execute'),
+        timeout: core_namespaceObject.z.number().optional().describe('ADB shell command execution timeout in milliseconds. Only include this parameter when the user explicitly requests a timeout; otherwise, omit it.')
     });
     const launchParamSchema = core_namespaceObject.z.object({
         uri: core_namespaceObject.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.')
@@ -2094,7 +2097,9 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 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();
-                    const stdout = await runAdbShellStdoutOrThrow(adb, param.command);
+                    const stdout = await runAdbShellStdoutOrThrow(adb, param.command, void 0 === param.timeout ? void 0 : {
+                        timeout: param.timeout
+                    });
                     const planningFeedback = buildRunAdbShellPlanningFeedback({
                         command: param.command,
                         stdout
@@ -2172,15 +2177,10 @@ ${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 runAdbShellStdoutOrThrow(adb, command, {
-                    timeout: opt.timeout
-                });
-            }
             const action = this.wrapActionInActionSpace('RunAdbShell');
             return action({
-                command
+                command,
+                ...opt
             });
         }
         createActionWrapper(name) {
@@ -2327,7 +2327,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.10.8-beta-20260723115348.0",
+        version: "1.10.8",
         extraCommands: (0, core_namespaceObject.createReportCliCommands)()
     }).catch((e)=>{
         process.exit((0, cli_namespaceObject.reportCLIError)(e));

package/dist/lib/index.js

@@ -899,7 +899,9 @@ ${stdout ? truncateAdbShellStream(stdout, 'stdout') : EMPTY_ADB_SHELL_STDOUT}`;
                     }
                 })
             ];
-            const platformSpecificActions = Object.values(createPlatformActions(this));
+            const platformActions = createPlatformActions(this);
+            let platformSpecificActions = Object.values(platformActions);
+            if (this.options?.exposeRunAdbShellAction === false) platformSpecificActions = platformSpecificActions.filter((action)=>action !== platformActions.RunAdbShell);
             const customActions = this.customActions || [];
             return [
                 ...defaultActions,
@@ -1995,7 +1997,8 @@ ${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 = core_namespaceObject.z.object({
-        command: core_namespaceObject.z.string().describe('ADB shell command to execute')
+        command: core_namespaceObject.z.string().describe('ADB shell command to execute'),
+        timeout: core_namespaceObject.z.number().optional().describe('ADB shell command execution timeout in milliseconds. Only include this parameter when the user explicitly requests a timeout; otherwise, omit it.')
     });
     const launchParamSchema = core_namespaceObject.z.object({
         uri: core_namespaceObject.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.')
@@ -2015,7 +2018,9 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 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();
-                    const stdout = await runAdbShellStdoutOrThrow(adb, param.command);
+                    const stdout = await runAdbShellStdoutOrThrow(adb, param.command, void 0 === param.timeout ? void 0 : {
+                        timeout: param.timeout
+                    });
                     const planningFeedback = buildRunAdbShellPlanningFeedback({
                         command: param.command,
                         stdout
@@ -2258,15 +2263,10 @@ ${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 runAdbShellStdoutOrThrow(adb, command, {
-                    timeout: opt.timeout
-                });
-            }
             const action = this.wrapActionInActionSpace('RunAdbShell');
             return action({
-                command
+                command,
+                ...opt
             });
         }
         createActionWrapper(name) {

package/package.json

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