@midscene/android 1.7.5-beta-20260420052829.0 → 1.7.5-beta-20260420061332.0

package/dist/es/cli.mjs

@@ -4,7 +4,7 @@ import * as __rspack_external_node_module_ab9f2194 from "node:module";
 import * as __rspack_external_node_path_c5b9b54f from "node:path";
 import { createReportCliCommands, getMidsceneLocationSchema, z } from "@midscene/core";
 import { CLIError, runToolsCLI } from "@midscene/shared/cli";
-import { BaseMidsceneTools } from "@midscene/shared/mcp/base-tools";
+import { BaseMidsceneTools } from "@midscene/shared/mcp";
 import { Agent } from "@midscene/core/agent";
 import { mergeAndNormalizeAppNameMapping, normalizeForComparison, repeat } from "@midscene/shared/utils";
 import node_assert from "node:assert";
@@ -1929,16 +1929,6 @@ async function agentFromAdbDevice(deviceId, opts) {
     await device.connect();
     return new AndroidAgent(device, opts);
 }
-function mcp_tools_define_property(obj, key, value) {
-    if (key in obj) Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-    });
-    else obj[key] = value;
-    return obj;
-}
 const debug = (0, logger_.getDebug)('mcp:android-tools');
 class AndroidMidsceneTools extends BaseMidsceneTools {
     createTemporaryDevice() {
@@ -1966,10 +1956,10 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
             {
                 name: 'android_connect',
                 description: 'Connect to Android device via ADB. If deviceId not provided, uses the first available device.',
-                schema: this.getAgentInitArgSchema(),
-                cli: this.getAgentInitArgCliMetadata(),
-                handler: async (args)=>{
-                    const deviceId = this.extractAgentInitParam(args);
+                schema: {
+                    deviceId: z.string().optional().describe('Android device ID (from adb devices)')
+                },
+                handler: async ({ deviceId })=>{
                     const agent = await this.ensureAgent(deviceId);
                     const screenshot = await agent.page.screenshotBase64();
                     return {
@@ -1992,23 +1982,11 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
             }
         ];
     }
-    constructor(...args){
-        super(...args), mcp_tools_define_property(this, "initArgSpec", {
-            namespace: 'android',
-            shape: {
-                deviceId: z.string().optional().describe('Android device ID (from adb devices)')
-            },
-            cli: {
-                preferBareKeys: true
-            },
-            adapt: (extracted)=>extracted?.deviceId
-        });
-    }
 }
 const tools = new AndroidMidsceneTools();
 runToolsCLI(tools, 'midscene-android', {
     stripPrefix: 'android_',
-    version: "1.7.5-beta-20260420052829.0",
+    version: "1.7.5-beta-20260420061332.0",
     extraCommands: createReportCliCommands()
 }).catch((e)=>{
     if (!(e instanceof CLIError)) console.error(e);

package/dist/es/index.mjs

@@ -12,7 +12,7 @@ import { createImgBase64ByFormat, isValidImageBuffer } from "@midscene/shared/im
 import { mergeAndNormalizeAppNameMapping, normalizeForComparison, repeat } from "@midscene/shared/utils";
 import { ADB } from "appium-adb";
 import { Agent } from "@midscene/core/agent";
-import { BaseMidsceneTools } from "@midscene/shared/mcp/base-tools";
+import { BaseMidsceneTools } from "@midscene/shared/mcp";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
@@ -1995,16 +1995,6 @@ async function agentFromAdbDevice(deviceId, opts) {
     await device.connect();
     return new AndroidAgent(device, opts);
 }
-function mcp_tools_define_property(obj, key, value) {
-    if (key in obj) Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-    });
-    else obj[key] = value;
-    return obj;
-}
 const debug = (0, logger_.getDebug)('mcp:android-tools');
 class AndroidMidsceneTools extends BaseMidsceneTools {
     createTemporaryDevice() {
@@ -2032,10 +2022,10 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
             {
                 name: 'android_connect',
                 description: 'Connect to Android device via ADB. If deviceId not provided, uses the first available device.',
-                schema: this.getAgentInitArgSchema(),
-                cli: this.getAgentInitArgCliMetadata(),
-                handler: async (args)=>{
-                    const deviceId = this.extractAgentInitParam(args);
+                schema: {
+                    deviceId: z.string().optional().describe('Android device ID (from adb devices)')
+                },
+                handler: async ({ deviceId })=>{
                     const agent = await this.ensureAgent(deviceId);
                     const screenshot = await agent.page.screenshotBase64();
                     return {
@@ -2058,17 +2048,5 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
             }
         ];
     }
-    constructor(...args){
-        super(...args), mcp_tools_define_property(this, "initArgSpec", {
-            namespace: 'android',
-            shape: {
-                deviceId: z.string().optional().describe('Android device ID (from adb devices)')
-            },
-            cli: {
-                preferBareKeys: true
-            },
-            adapt: (extracted)=>extracted?.deviceId
-        });
-    }
 }
 export { AndroidAgent, AndroidDevice, AndroidMidsceneTools, ScrcpyDeviceAdapter, agentFromAdbDevice, getConnectedDevices, getConnectedDevicesWithDetails, overrideAIConfig };

package/dist/es/mcp-server.mjs

@@ -2,7 +2,7 @@ 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 { BaseMCPServer, createMCPServerLauncher } from "@midscene/shared/mcp";
+import { BaseMCPServer, BaseMidsceneTools, createMCPServerLauncher } from "@midscene/shared/mcp";
 import { Agent } from "@midscene/core/agent";
 import { mergeAndNormalizeAppNameMapping, normalizeForComparison, repeat } from "@midscene/shared/utils";
 import node_assert from "node:assert";
@@ -13,7 +13,6 @@ import { getTmpFile, sleep } from "@midscene/core/utils";
 import { MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, globalConfigManager } from "@midscene/shared/env";
 import { createImgBase64ByFormat, isValidImageBuffer } from "@midscene/shared/img";
 import { ADB as external_appium_adb_ADB } from "appium-adb";
-import { BaseMidsceneTools } from "@midscene/shared/mcp/base-tools";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
@@ -1929,16 +1928,6 @@ async function agentFromAdbDevice(deviceId, opts) {
     await device.connect();
     return new AndroidAgent(device, opts);
 }
-function mcp_tools_define_property(obj, key, value) {
-    if (key in obj) Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-    });
-    else obj[key] = value;
-    return obj;
-}
 const debug = (0, logger_.getDebug)('mcp:android-tools');
 class AndroidMidsceneTools extends BaseMidsceneTools {
     createTemporaryDevice() {
@@ -1966,10 +1955,10 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
             {
                 name: 'android_connect',
                 description: 'Connect to Android device via ADB. If deviceId not provided, uses the first available device.',
-                schema: this.getAgentInitArgSchema(),
-                cli: this.getAgentInitArgCliMetadata(),
-                handler: async (args)=>{
-                    const deviceId = this.extractAgentInitParam(args);
+                schema: {
+                    deviceId: z.string().optional().describe('Android device ID (from adb devices)')
+                },
+                handler: async ({ deviceId })=>{
                     const agent = await this.ensureAgent(deviceId);
                     const screenshot = await agent.page.screenshotBase64();
                     return {
@@ -1992,18 +1981,6 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
             }
         ];
     }
-    constructor(...args){
-        super(...args), mcp_tools_define_property(this, "initArgSpec", {
-            namespace: 'android',
-            shape: {
-                deviceId: z.string().optional().describe('Android device ID (from adb devices)')
-            },
-            cli: {
-                preferBareKeys: true
-            },
-            adapt: (extracted)=>extracted?.deviceId
-        });
-    }
 }
 class AndroidMCPServer extends BaseMCPServer {
     createToolsManager() {
@@ -2012,7 +1989,7 @@ class AndroidMCPServer extends BaseMCPServer {
     constructor(toolsManager){
         super({
             name: '@midscene/android-mcp',
-            version: "1.7.5-beta-20260420052829.0",
+            version: "1.7.5-beta-20260420061332.0",
             description: 'Control the Android device using natural language commands'
         }, toolsManager);
     }

package/dist/lib/cli.js

@@ -449,7 +449,7 @@ var __webpack_exports__ = {};
     const core_namespaceObject = require("@midscene/core");
     const cli_namespaceObject = require("@midscene/shared/cli");
     var logger_ = __webpack_require__("@midscene/shared/logger");
-    const base_tools_namespaceObject = require("@midscene/shared/mcp/base-tools");
+    const mcp_namespaceObject = require("@midscene/shared/mcp");
     const agent_namespaceObject = require("@midscene/core/agent");
     const utils_namespaceObject = require("@midscene/shared/utils");
     const defaultAppNameMapping = {
@@ -1944,18 +1944,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         await device.connect();
         return new AndroidAgent(device, opts);
     }
-    function mcp_tools_define_property(obj, key, value) {
-        if (key in obj) Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-        else obj[key] = value;
-        return obj;
-    }
     const debug = (0, logger_.getDebug)('mcp:android-tools');
-    class AndroidMidsceneTools extends base_tools_namespaceObject.BaseMidsceneTools {
+    class AndroidMidsceneTools extends mcp_namespaceObject.BaseMidsceneTools {
         createTemporaryDevice() {
             return new AndroidDevice('temp-for-action-space', {});
         }
@@ -1981,10 +1971,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 {
                     name: 'android_connect',
                     description: 'Connect to Android device via ADB. If deviceId not provided, uses the first available device.',
-                    schema: this.getAgentInitArgSchema(),
-                    cli: this.getAgentInitArgCliMetadata(),
-                    handler: async (args)=>{
-                        const deviceId = this.extractAgentInitParam(args);
+                    schema: {
+                        deviceId: core_namespaceObject.z.string().optional().describe('Android device ID (from adb devices)')
+                    },
+                    handler: async ({ deviceId })=>{
                         const agent = await this.ensureAgent(deviceId);
                         const screenshot = await agent.page.screenshotBase64();
                         return {
@@ -2007,23 +1997,11 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 }
             ];
         }
-        constructor(...args){
-            super(...args), mcp_tools_define_property(this, "initArgSpec", {
-                namespace: 'android',
-                shape: {
-                    deviceId: core_namespaceObject.z.string().optional().describe('Android device ID (from adb devices)')
-                },
-                cli: {
-                    preferBareKeys: true
-                },
-                adapt: (extracted)=>extracted?.deviceId
-            });
-        }
     }
     const tools = new AndroidMidsceneTools();
     (0, cli_namespaceObject.runToolsCLI)(tools, 'midscene-android', {
         stripPrefix: 'android_',
-        version: "1.7.5-beta-20260420052829.0",
+        version: "1.7.5-beta-20260420061332.0",
         extraCommands: (0, core_namespaceObject.createReportCliCommands)()
     }).catch((e)=>{
         if (!(e instanceof cli_namespaceObject.CLIError)) console.error(e);

package/dist/lib/index.js

@@ -2030,19 +2030,9 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         await device.connect();
         return new AndroidAgent(device, opts);
     }
-    const base_tools_namespaceObject = require("@midscene/shared/mcp/base-tools");
-    function mcp_tools_define_property(obj, key, value) {
-        if (key in obj) Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-        else obj[key] = value;
-        return obj;
-    }
+    const mcp_namespaceObject = require("@midscene/shared/mcp");
     const debug = (0, logger_.getDebug)('mcp:android-tools');
-    class AndroidMidsceneTools extends base_tools_namespaceObject.BaseMidsceneTools {
+    class AndroidMidsceneTools extends mcp_namespaceObject.BaseMidsceneTools {
         createTemporaryDevice() {
             return new AndroidDevice('temp-for-action-space', {});
         }
@@ -2068,10 +2058,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 {
                     name: 'android_connect',
                     description: 'Connect to Android device via ADB. If deviceId not provided, uses the first available device.',
-                    schema: this.getAgentInitArgSchema(),
-                    cli: this.getAgentInitArgCliMetadata(),
-                    handler: async (args)=>{
-                        const deviceId = this.extractAgentInitParam(args);
+                    schema: {
+                        deviceId: core_namespaceObject.z.string().optional().describe('Android device ID (from adb devices)')
+                    },
+                    handler: async ({ deviceId })=>{
                         const agent = await this.ensureAgent(deviceId);
                         const screenshot = await agent.page.screenshotBase64();
                         return {
@@ -2094,18 +2084,6 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 }
             ];
         }
-        constructor(...args){
-            super(...args), mcp_tools_define_property(this, "initArgSpec", {
-                namespace: 'android',
-                shape: {
-                    deviceId: core_namespaceObject.z.string().optional().describe('Android device ID (from adb devices)')
-                },
-                cli: {
-                    preferBareKeys: true
-                },
-                adapt: (extracted)=>extracted?.deviceId
-            });
-        }
     }
 })();
 exports.AndroidAgent = __webpack_exports__.AndroidAgent;

package/dist/lib/mcp-server.js

@@ -1959,19 +1959,8 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         await device.connect();
         return new AndroidAgent(device, opts);
     }
-    const base_tools_namespaceObject = require("@midscene/shared/mcp/base-tools");
-    function mcp_tools_define_property(obj, key, value) {
-        if (key in obj) Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-        else obj[key] = value;
-        return obj;
-    }
     const debug = (0, logger_.getDebug)('mcp:android-tools');
-    class AndroidMidsceneTools extends base_tools_namespaceObject.BaseMidsceneTools {
+    class AndroidMidsceneTools extends mcp_namespaceObject.BaseMidsceneTools {
         createTemporaryDevice() {
             return new AndroidDevice('temp-for-action-space', {});
         }
@@ -1997,10 +1986,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 {
                     name: 'android_connect',
                     description: 'Connect to Android device via ADB. If deviceId not provided, uses the first available device.',
-                    schema: this.getAgentInitArgSchema(),
-                    cli: this.getAgentInitArgCliMetadata(),
-                    handler: async (args)=>{
-                        const deviceId = this.extractAgentInitParam(args);
+                    schema: {
+                        deviceId: core_namespaceObject.z.string().optional().describe('Android device ID (from adb devices)')
+                    },
+                    handler: async ({ deviceId })=>{
                         const agent = await this.ensureAgent(deviceId);
                         const screenshot = await agent.page.screenshotBase64();
                         return {
@@ -2023,18 +2012,6 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 }
             ];
         }
-        constructor(...args){
-            super(...args), mcp_tools_define_property(this, "initArgSpec", {
-                namespace: 'android',
-                shape: {
-                    deviceId: core_namespaceObject.z.string().optional().describe('Android device ID (from adb devices)')
-                },
-                cli: {
-                    preferBareKeys: true
-                },
-                adapt: (extracted)=>extracted?.deviceId
-            });
-        }
     }
     class AndroidMCPServer extends mcp_namespaceObject.BaseMCPServer {
         createToolsManager() {
@@ -2043,7 +2020,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         constructor(toolsManager){
             super({
                 name: '@midscene/android-mcp',
-                version: "1.7.5-beta-20260420052829.0",
+                version: "1.7.5-beta-20260420061332.0",
                 description: 'Control the Android device using natural language commands'
             }, toolsManager);
         }

package/dist/types/index.d.ts

@@ -7,16 +7,15 @@ import { Agent } from '@midscene/core/agent';
 import { AgentOpt } from '@midscene/core/agent';
 import { AndroidDeviceInputOpt } from '@midscene/core/device';
 import { AndroidDeviceOpt } from '@midscene/core/device';
-import { BaseMidsceneTools } from '@midscene/shared/mcp/base-tools';
+import { BaseMidsceneTools } from '@midscene/shared/mcp';
 import { Device } from 'appium-adb';
 import { DeviceAction } from '@midscene/core';
 import type { ElementInfo } from '@midscene/shared/extractor';
-import { InitArgSpec } from '@midscene/shared/mcp/base-tools';
 import { InterfaceType } from '@midscene/core';
 import { overrideAIConfig } from '@midscene/shared/env';
 import { Point } from '@midscene/core';
 import { Size } from '@midscene/core';
-import type { ToolDefinition } from '@midscene/shared/mcp/types';
+import { ToolDefinition } from '@midscene/shared/mcp';
 
 declare type ActionArgs<T extends DeviceAction> = [ActionParam<T>] extends [undefined] ? [] : [ActionParam<T>];
 
@@ -238,8 +237,7 @@ export declare class AndroidDevice implements AbstractInterface {
  * Android-specific tools manager
  * Extends BaseMidsceneTools to provide Android ADB device connection tools
  */
-export declare class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent, string> {
-    protected readonly initArgSpec: InitArgSpec<string>;
+export declare class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent> {
     protected createTemporaryDevice(): AndroidDevice;
     protected ensureAgent(deviceId?: string): Promise<AndroidAgent>;
     /**

package/dist/types/mcp-server.d.ts

@@ -7,17 +7,16 @@ import { AgentOpt } from '@midscene/core/agent';
 import { AndroidDeviceInputOpt } from '@midscene/core/device';
 import { AndroidDeviceOpt } from '@midscene/core/device';
 import { BaseMCPServer } from '@midscene/shared/mcp';
-import { BaseMidsceneTools } from '@midscene/shared/mcp/base-tools';
+import { BaseMidsceneTools } from '@midscene/shared/mcp';
 import { DeviceAction } from '@midscene/core';
 import type { ElementInfo } from '@midscene/shared/extractor';
-import { InitArgSpec } from '@midscene/shared/mcp/base-tools';
 import { InterfaceType } from '@midscene/core';
 import { LaunchMCPServerOptions } from '@midscene/shared/mcp';
 import { LaunchMCPServerResult } from '@midscene/shared/mcp';
 import { Point } from '@midscene/core';
 import { Size } from '@midscene/core';
 import { Tool } from '@midscene/shared/mcp';
-import type { ToolDefinition } from '@midscene/shared/mcp/types';
+import { ToolDefinition } from '@midscene/shared/mcp';
 
 declare type ActionArgs<T extends DeviceAction> = [ActionParam<T>] extends [undefined] ? [] : [ActionParam<T>];
 
@@ -239,8 +238,7 @@ export declare class AndroidMCPServer extends BaseMCPServer {
  * Android-specific tools manager
  * Extends BaseMidsceneTools to provide Android ADB device connection tools
  */
-declare class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent, string> {
-    protected readonly initArgSpec: InitArgSpec<string>;
+declare class AndroidMidsceneTools extends BaseMidsceneTools<AndroidAgent> {
     protected createTemporaryDevice(): AndroidDevice;
     protected ensureAgent(deviceId?: string): Promise<AndroidAgent>;
     /**

package/package.json

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