@midscene/shared 1.7.5-beta-20260420031920.0 → 1.7.5-beta-20260420032657.0

package/dist/es/cli/cli-runner.mjs

@@ -2,7 +2,6 @@ import { existsSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import dotenv from "dotenv";
-import { getKeyAliases, isRecord } from "../key-alias-utils.mjs";
 import { getDebug } from "../logger.mjs";
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -29,36 +28,16 @@ function parseValue(raw) {
 }
 function parseCliArgs(args) {
     const result = {};
-    const setArgValue = (key, value)=>{
-        if (!key.includes('.')) {
-            result[key] = value;
-            return;
-        }
-        const segments = key.split('.');
-        let current = result;
-        for (const segment of segments.slice(0, -1)){
-            const aliases = getKeyAliases(segment);
-            const existing = aliases.map((alias)=>current[alias]);
-            const nestedRecord = existing.find(isRecord);
-            const conflictingScalar = existing.find((entry)=>void 0 !== entry && !isRecord(entry));
-            if (void 0 !== conflictingScalar) throw new CLIError(`Conflicting CLI args: "${segment}" is used both as a value and as a namespace`);
-            const target = nestedRecord ?? {};
-            for (const alias of aliases)current[alias] = target;
-            current = target;
-        }
-        const leafSegment = segments[segments.length - 1];
-        for (const alias of getKeyAliases(leafSegment))current[alias] = value;
-    };
     for(let i = 0; i < args.length; i++){
         const arg = args[i];
         if (!arg.startsWith('--')) continue;
         const body = arg.slice(2);
         const eqIdx = body.indexOf('=');
-        if (eqIdx >= 0) setArgValue(body.slice(0, eqIdx), parseValue(body.slice(eqIdx + 1)));
+        if (eqIdx >= 0) result[body.slice(0, eqIdx)] = parseValue(body.slice(eqIdx + 1));
         else if (args[i + 1] && !args[i + 1].startsWith('--')) {
             i++;
-            setArgValue(body, parseValue(args[i]));
-        } else setArgValue(body, true);
+            result[body] = parseValue(args[i]);
+        } else result[body] = true;
     }
     return result;
 }
@@ -87,32 +66,16 @@ function removePrefix(name, prefix) {
     if (prefix && name.startsWith(prefix)) return name.slice(prefix.length);
     return name;
 }
-function formatCliOptionName(name) {
-    return `--${name}`;
-}
-function getCliOptionDisplay(key, cliOption) {
-    const label = formatCliOptionName(cliOption?.preferredName ?? key);
-    const aliases = [
-        ...new Set(cliOption?.aliases ?? [])
-    ].map((alias)=>formatCliOptionName(alias)).filter((alias)=>alias !== label);
-    return {
-        label,
-        aliases
-    };
-}
 function printCommandHelp(scriptName, cmd) {
     const { def } = cmd;
     console.log(`\nUsage: ${scriptName} ${cmd.name} [options]\n`);
     console.log(def.description);
     const schemaEntries = Object.entries(def.schema);
     if (schemaEntries.length > 0) {
-        const optionWidth = Math.max(22, ...schemaEntries.map(([key])=>getCliOptionDisplay(key, def.cli?.options?.[key]).label.length));
         console.log('\nOptions:');
         for (const [key, zodType] of schemaEntries){
-            const { label, aliases } = getCliOptionDisplay(key, def.cli?.options?.[key]);
             const desc = zodType.description ?? '';
-            const aliasText = aliases.length > 0 ? ` (aliases: ${aliases.join(', ')})` : '';
-            console.log(`  ${label.padEnd(optionWidth)} ${desc}${aliasText}`);
+            console.log(`  --${key.padEnd(20)} ${desc}`);
         }
     }
 }

package/dist/es/mcp/base-tools.mjs

@@ -1,7 +1,5 @@
 import { parseBase64 } from "@midscene/shared/img";
 import { getDebug } from "@midscene/shared/logger";
-import { camelToKebab, getKeyAliases } from "../key-alias-utils.mjs";
-import { createNamespacedInitArgSchema, extractNamespacedArgs, sanitizeNamespacedArgs } from "./init-arg-utils.mjs";
 import { generateCommonTools, generateToolsFromActionSpace } from "./tool-generator.mjs";
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -15,45 +13,6 @@ function _define_property(obj, key, value) {
 }
 const debug = getDebug('mcp:base-tools');
 class BaseMidsceneTools {
-    getInitArgKeys() {
-        return this.initArgSpec ? Object.keys(this.initArgSpec.shape) : [];
-    }
-    extractAgentInitParam(args) {
-        if (!this.initArgSpec) return;
-        const extracted = extractNamespacedArgs(args, this.initArgSpec.namespace, this.getInitArgKeys());
-        if (this.initArgSpec.adapt) return this.initArgSpec.adapt(extracted);
-        return extracted;
-    }
-    sanitizeToolArgs(args) {
-        if (!this.initArgSpec) return args;
-        return sanitizeNamespacedArgs(args, this.initArgSpec.namespace, this.getInitArgKeys());
-    }
-    getAgentInitArgSchema() {
-        if (!this.initArgSpec) return {};
-        return createNamespacedInitArgSchema(this.initArgSpec.namespace, this.initArgSpec.shape);
-    }
-    getAgentInitArgCliMetadata() {
-        if (!this.initArgSpec?.cli) return;
-        const options = Object.fromEntries(this.getInitArgKeys().map((key)=>{
-            const canonicalKey = `${this.initArgSpec.namespace}.${key}`;
-            const preferredName = this.initArgSpec.cli?.preferredNames?.[key] ?? (this.initArgSpec.cli?.preferBareKeys ? camelToKebab(key) : canonicalKey);
-            const aliases = new Set(getKeyAliases(canonicalKey));
-            if (this.initArgSpec.cli?.preferBareKeys) for (const alias of getKeyAliases(key))aliases.add(alias);
-            aliases.delete(preferredName);
-            return [
-                canonicalKey,
-                {
-                    preferredName,
-                    aliases: [
-                        ...aliases
-                    ]
-                }
-            ];
-        }));
-        return {
-            options
-        };
-    }
     preparePlatformTools() {
         return [];
     }
@@ -71,8 +30,8 @@ class BaseMidsceneTools {
             await tempDevice.destroy?.();
             debug('Action space from temporary device:', actionSpace.map((a)=>a.name).join(', '));
         }
-        const actionTools = generateToolsFromActionSpace(actionSpace, (args = {})=>this.ensureAgent(this.extractAgentInitParam(args)), (args = {})=>this.sanitizeToolArgs(args), this.getAgentInitArgSchema(), this.getAgentInitArgCliMetadata());
-        const commonTools = generateCommonTools((args = {})=>this.ensureAgent(this.extractAgentInitParam(args)), this.getAgentInitArgSchema(), this.getAgentInitArgCliMetadata());
+        const actionTools = generateToolsFromActionSpace(actionSpace, ()=>this.ensureAgent());
+        const commonTools = generateCommonTools(()=>this.ensureAgent());
         this.toolDefinitions.push(...actionTools, ...commonTools);
         debug('Total tools prepared:', this.toolDefinitions.length);
     }

package/dist/es/mcp/index.mjs

@@ -1,6 +1,5 @@
 export * from "./base-server.mjs";
 export * from "./base-tools.mjs";
-export * from "./init-arg-utils.mjs";
 export * from "./error-formatter.mjs";
 export * from "./tool-generator.mjs";
 export * from "./types.mjs";

package/dist/es/mcp/tool-generator.mjs

@@ -277,30 +277,17 @@ async function captureFailureResult(agent, actionName, errorMessage) {
         };
     }
 }
-function mergeToolCliMetadata(base, extra) {
-    const options = {
-        ...base?.options ?? {},
-        ...extra?.options ?? {}
-    };
-    return Object.keys(options).length > 0 ? {
-        options
-    } : void 0;
-}
-function generateToolsFromActionSpace(actionSpace, getAgent, sanitizeArgs = (args)=>args, initArgSchema = {}, initArgCliMetadata) {
+function generateToolsFromActionSpace(actionSpace, getAgent) {
     return actionSpace.map((action)=>{
-        const schema = {
-            ...extractActionSchema(action.paramSchema),
-            ...initArgSchema
-        };
+        const schema = extractActionSchema(action.paramSchema);
         return {
             name: action.name,
             description: describeActionForMCP(action),
             schema,
-            cli: initArgCliMetadata,
             handler: async (args)=>{
                 try {
-                    const agent = await getAgent(args);
-                    const normalizedArgs = normalizeActionArgs(sanitizeArgs(args), action.paramSchema);
+                    const agent = await getAgent();
+                    const normalizedArgs = normalizeActionArgs(args, action.paramSchema);
                     let actionResult;
                     try {
                         actionResult = await executeAction(agent, action.name, normalizedArgs);
@@ -319,18 +306,15 @@ function generateToolsFromActionSpace(actionSpace, getAgent, sanitizeArgs = (arg
         };
     });
 }
-function generateCommonTools(getAgent, initArgSchema = {}, initArgCliMetadata) {
+function generateCommonTools(getAgent) {
     return [
         {
             name: 'take_screenshot',
             description: 'Capture screenshot of current page/screen',
-            schema: {
-                ...initArgSchema
-            },
-            cli: initArgCliMetadata,
-            handler: async (args = {})=>{
+            schema: {},
+            handler: async ()=>{
                 try {
-                    const agent = await getAgent(args);
+                    const agent = await getAgent();
                     const screenshot = await agent.page?.screenshotBase64();
                     if (!screenshot) return createErrorResult('Screenshot not available');
                     const { mimeType, body } = parseBase64(screenshot);
@@ -354,14 +338,12 @@ function generateCommonTools(getAgent, initArgSchema = {}, initArgCliMetadata) {
             name: 'act',
             description: 'Execute a natural language action. The AI will plan and perform multi-step operations in a single invocation, useful for transient UI interactions (e.g., Spotlight, dropdown menus) that disappear between separate commands.',
             schema: {
-                prompt: z.string().describe('Natural language description of the action to perform, e.g. "press Command+Space, type Safari, press Enter"'),
-                ...initArgSchema
+                prompt: z.string().describe('Natural language description of the action to perform, e.g. "press Command+Space, type Safari, press Enter"')
             },
-            cli: mergeToolCliMetadata(void 0, initArgCliMetadata),
-            handler: async (args = {})=>{
+            handler: async (args)=>{
                 const prompt = args.prompt;
                 try {
-                    const agent = await getAgent(args);
+                    const agent = await getAgent();
                     if (!agent.aiAction) return createErrorResult('act is not supported by this agent');
                     const result = await agent.aiAction(prompt, {
                         deepThink: false

package/dist/lib/cli/cli-runner.js

@@ -44,7 +44,6 @@ const external_node_os_namespaceObject = require("node:os");
 const external_node_path_namespaceObject = require("node:path");
 const external_dotenv_namespaceObject = require("dotenv");
 var external_dotenv_default = /*#__PURE__*/ __webpack_require__.n(external_dotenv_namespaceObject);
-const external_key_alias_utils_js_namespaceObject = require("../key-alias-utils.js");
 const external_logger_js_namespaceObject = require("../logger.js");
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -71,36 +70,16 @@ function parseValue(raw) {
 }
 function parseCliArgs(args) {
     const result = {};
-    const setArgValue = (key, value)=>{
-        if (!key.includes('.')) {
-            result[key] = value;
-            return;
-        }
-        const segments = key.split('.');
-        let current = result;
-        for (const segment of segments.slice(0, -1)){
-            const aliases = (0, external_key_alias_utils_js_namespaceObject.getKeyAliases)(segment);
-            const existing = aliases.map((alias)=>current[alias]);
-            const nestedRecord = existing.find(external_key_alias_utils_js_namespaceObject.isRecord);
-            const conflictingScalar = existing.find((entry)=>void 0 !== entry && !(0, external_key_alias_utils_js_namespaceObject.isRecord)(entry));
-            if (void 0 !== conflictingScalar) throw new CLIError(`Conflicting CLI args: "${segment}" is used both as a value and as a namespace`);
-            const target = nestedRecord ?? {};
-            for (const alias of aliases)current[alias] = target;
-            current = target;
-        }
-        const leafSegment = segments[segments.length - 1];
-        for (const alias of (0, external_key_alias_utils_js_namespaceObject.getKeyAliases)(leafSegment))current[alias] = value;
-    };
     for(let i = 0; i < args.length; i++){
         const arg = args[i];
         if (!arg.startsWith('--')) continue;
         const body = arg.slice(2);
         const eqIdx = body.indexOf('=');
-        if (eqIdx >= 0) setArgValue(body.slice(0, eqIdx), parseValue(body.slice(eqIdx + 1)));
+        if (eqIdx >= 0) result[body.slice(0, eqIdx)] = parseValue(body.slice(eqIdx + 1));
         else if (args[i + 1] && !args[i + 1].startsWith('--')) {
             i++;
-            setArgValue(body, parseValue(args[i]));
-        } else setArgValue(body, true);
+            result[body] = parseValue(args[i]);
+        } else result[body] = true;
     }
     return result;
 }
@@ -129,32 +108,16 @@ function removePrefix(name, prefix) {
     if (prefix && name.startsWith(prefix)) return name.slice(prefix.length);
     return name;
 }
-function formatCliOptionName(name) {
-    return `--${name}`;
-}
-function getCliOptionDisplay(key, cliOption) {
-    const label = formatCliOptionName(cliOption?.preferredName ?? key);
-    const aliases = [
-        ...new Set(cliOption?.aliases ?? [])
-    ].map((alias)=>formatCliOptionName(alias)).filter((alias)=>alias !== label);
-    return {
-        label,
-        aliases
-    };
-}
 function printCommandHelp(scriptName, cmd) {
     const { def } = cmd;
     console.log(`\nUsage: ${scriptName} ${cmd.name} [options]\n`);
     console.log(def.description);
     const schemaEntries = Object.entries(def.schema);
     if (schemaEntries.length > 0) {
-        const optionWidth = Math.max(22, ...schemaEntries.map(([key])=>getCliOptionDisplay(key, def.cli?.options?.[key]).label.length));
         console.log('\nOptions:');
         for (const [key, zodType] of schemaEntries){
-            const { label, aliases } = getCliOptionDisplay(key, def.cli?.options?.[key]);
             const desc = zodType.description ?? '';
-            const aliasText = aliases.length > 0 ? ` (aliases: ${aliases.join(', ')})` : '';
-            console.log(`  ${label.padEnd(optionWidth)} ${desc}${aliasText}`);
+            console.log(`  --${key.padEnd(20)} ${desc}`);
         }
     }
 }

package/dist/lib/mcp/base-tools.js

@@ -28,8 +28,6 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const img_namespaceObject = require("@midscene/shared/img");
 const logger_namespaceObject = require("@midscene/shared/logger");
-const external_key_alias_utils_js_namespaceObject = require("../key-alias-utils.js");
-const external_init_arg_utils_js_namespaceObject = require("./init-arg-utils.js");
 const external_tool_generator_js_namespaceObject = require("./tool-generator.js");
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -43,45 +41,6 @@ function _define_property(obj, key, value) {
 }
 const debug = (0, logger_namespaceObject.getDebug)('mcp:base-tools');
 class BaseMidsceneTools {
-    getInitArgKeys() {
-        return this.initArgSpec ? Object.keys(this.initArgSpec.shape) : [];
-    }
-    extractAgentInitParam(args) {
-        if (!this.initArgSpec) return;
-        const extracted = (0, external_init_arg_utils_js_namespaceObject.extractNamespacedArgs)(args, this.initArgSpec.namespace, this.getInitArgKeys());
-        if (this.initArgSpec.adapt) return this.initArgSpec.adapt(extracted);
-        return extracted;
-    }
-    sanitizeToolArgs(args) {
-        if (!this.initArgSpec) return args;
-        return (0, external_init_arg_utils_js_namespaceObject.sanitizeNamespacedArgs)(args, this.initArgSpec.namespace, this.getInitArgKeys());
-    }
-    getAgentInitArgSchema() {
-        if (!this.initArgSpec) return {};
-        return (0, external_init_arg_utils_js_namespaceObject.createNamespacedInitArgSchema)(this.initArgSpec.namespace, this.initArgSpec.shape);
-    }
-    getAgentInitArgCliMetadata() {
-        if (!this.initArgSpec?.cli) return;
-        const options = Object.fromEntries(this.getInitArgKeys().map((key)=>{
-            const canonicalKey = `${this.initArgSpec.namespace}.${key}`;
-            const preferredName = this.initArgSpec.cli?.preferredNames?.[key] ?? (this.initArgSpec.cli?.preferBareKeys ? (0, external_key_alias_utils_js_namespaceObject.camelToKebab)(key) : canonicalKey);
-            const aliases = new Set((0, external_key_alias_utils_js_namespaceObject.getKeyAliases)(canonicalKey));
-            if (this.initArgSpec.cli?.preferBareKeys) for (const alias of (0, external_key_alias_utils_js_namespaceObject.getKeyAliases)(key))aliases.add(alias);
-            aliases.delete(preferredName);
-            return [
-                canonicalKey,
-                {
-                    preferredName,
-                    aliases: [
-                        ...aliases
-                    ]
-                }
-            ];
-        }));
-        return {
-            options
-        };
-    }
     preparePlatformTools() {
         return [];
     }
@@ -99,8 +58,8 @@ class BaseMidsceneTools {
             await tempDevice.destroy?.();
             debug('Action space from temporary device:', actionSpace.map((a)=>a.name).join(', '));
         }
-        const actionTools = (0, external_tool_generator_js_namespaceObject.generateToolsFromActionSpace)(actionSpace, (args = {})=>this.ensureAgent(this.extractAgentInitParam(args)), (args = {})=>this.sanitizeToolArgs(args), this.getAgentInitArgSchema(), this.getAgentInitArgCliMetadata());
-        const commonTools = (0, external_tool_generator_js_namespaceObject.generateCommonTools)((args = {})=>this.ensureAgent(this.extractAgentInitParam(args)), this.getAgentInitArgSchema(), this.getAgentInitArgCliMetadata());
+        const actionTools = (0, external_tool_generator_js_namespaceObject.generateToolsFromActionSpace)(actionSpace, ()=>this.ensureAgent());
+        const commonTools = (0, external_tool_generator_js_namespaceObject.generateCommonTools)(()=>this.ensureAgent());
         this.toolDefinitions.push(...actionTools, ...commonTools);
         debug('Total tools prepared:', this.toolDefinitions.length);
     }

package/dist/lib/mcp/index.js

@@ -12,9 +12,6 @@ var __webpack_modules__ = {
     "./error-formatter" (module) {
         module.exports = require("./error-formatter.js");
     },
-    "./init-arg-utils" (module) {
-        module.exports = require("./init-arg-utils.js");
-    },
     "./inject-report-html-plugin" (module) {
         module.exports = require("./inject-report-html-plugin.js");
     },
@@ -79,33 +76,29 @@ var __webpack_exports__ = {};
     var __rspack_reexport = {};
     for(const __rspack_import_key in _base_tools__rspack_import_1)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_base_tools__rspack_import_1[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _init_arg_utils__rspack_import_2 = __webpack_require__("./init-arg-utils");
-    var __rspack_reexport = {};
-    for(const __rspack_import_key in _init_arg_utils__rspack_import_2)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_init_arg_utils__rspack_import_2[__rspack_import_key];
-    __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _error_formatter__rspack_import_3 = __webpack_require__("./error-formatter");
+    var _error_formatter__rspack_import_2 = __webpack_require__("./error-formatter");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _error_formatter__rspack_import_3)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_error_formatter__rspack_import_3[__rspack_import_key];
+    for(const __rspack_import_key in _error_formatter__rspack_import_2)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_error_formatter__rspack_import_2[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _tool_generator__rspack_import_4 = __webpack_require__("./tool-generator");
+    var _tool_generator__rspack_import_3 = __webpack_require__("./tool-generator");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _tool_generator__rspack_import_4)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_tool_generator__rspack_import_4[__rspack_import_key];
+    for(const __rspack_import_key in _tool_generator__rspack_import_3)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_tool_generator__rspack_import_3[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _types__rspack_import_5 = __webpack_require__("./types");
+    var _types__rspack_import_4 = __webpack_require__("./types");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _types__rspack_import_5)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_types__rspack_import_5[__rspack_import_key];
+    for(const __rspack_import_key in _types__rspack_import_4)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_types__rspack_import_4[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _inject_report_html_plugin__rspack_import_6 = __webpack_require__("./inject-report-html-plugin");
+    var _inject_report_html_plugin__rspack_import_5 = __webpack_require__("./inject-report-html-plugin");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _inject_report_html_plugin__rspack_import_6)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_inject_report_html_plugin__rspack_import_6[__rspack_import_key];
+    for(const __rspack_import_key in _inject_report_html_plugin__rspack_import_5)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_inject_report_html_plugin__rspack_import_5[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _launcher_helper__rspack_import_7 = __webpack_require__("./launcher-helper");
+    var _launcher_helper__rspack_import_6 = __webpack_require__("./launcher-helper");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _launcher_helper__rspack_import_7)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_launcher_helper__rspack_import_7[__rspack_import_key];
+    for(const __rspack_import_key in _launcher_helper__rspack_import_6)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_launcher_helper__rspack_import_6[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _chrome_path__rspack_import_8 = __webpack_require__("./chrome-path");
+    var _chrome_path__rspack_import_7 = __webpack_require__("./chrome-path");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _chrome_path__rspack_import_8)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_chrome_path__rspack_import_8[__rspack_import_key];
+    for(const __rspack_import_key in _chrome_path__rspack_import_7)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_chrome_path__rspack_import_7[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
 })();
 for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/lib/mcp/tool-generator.js

@@ -306,30 +306,17 @@ async function captureFailureResult(agent, actionName, errorMessage) {
         };
     }
 }
-function mergeToolCliMetadata(base, extra) {
-    const options = {
-        ...base?.options ?? {},
-        ...extra?.options ?? {}
-    };
-    return Object.keys(options).length > 0 ? {
-        options
-    } : void 0;
-}
-function generateToolsFromActionSpace(actionSpace, getAgent, sanitizeArgs = (args)=>args, initArgSchema = {}, initArgCliMetadata) {
+function generateToolsFromActionSpace(actionSpace, getAgent) {
     return actionSpace.map((action)=>{
-        const schema = {
-            ...extractActionSchema(action.paramSchema),
-            ...initArgSchema
-        };
+        const schema = extractActionSchema(action.paramSchema);
         return {
             name: action.name,
             description: describeActionForMCP(action),
             schema,
-            cli: initArgCliMetadata,
             handler: async (args)=>{
                 try {
-                    const agent = await getAgent(args);
-                    const normalizedArgs = normalizeActionArgs(sanitizeArgs(args), action.paramSchema);
+                    const agent = await getAgent();
+                    const normalizedArgs = normalizeActionArgs(args, action.paramSchema);
                     let actionResult;
                     try {
                         actionResult = await executeAction(agent, action.name, normalizedArgs);
@@ -348,18 +335,15 @@ function generateToolsFromActionSpace(actionSpace, getAgent, sanitizeArgs = (arg
         };
     });
 }
-function generateCommonTools(getAgent, initArgSchema = {}, initArgCliMetadata) {
+function generateCommonTools(getAgent) {
     return [
         {
             name: 'take_screenshot',
             description: 'Capture screenshot of current page/screen',
-            schema: {
-                ...initArgSchema
-            },
-            cli: initArgCliMetadata,
-            handler: async (args = {})=>{
+            schema: {},
+            handler: async ()=>{
                 try {
-                    const agent = await getAgent(args);
+                    const agent = await getAgent();
                     const screenshot = await agent.page?.screenshotBase64();
                     if (!screenshot) return createErrorResult('Screenshot not available');
                     const { mimeType, body } = (0, img_namespaceObject.parseBase64)(screenshot);
@@ -383,14 +367,12 @@ function generateCommonTools(getAgent, initArgSchema = {}, initArgCliMetadata) {
             name: 'act',
             description: 'Execute a natural language action. The AI will plan and perform multi-step operations in a single invocation, useful for transient UI interactions (e.g., Spotlight, dropdown menus) that disappear between separate commands.',
             schema: {
-                prompt: external_zod_namespaceObject.z.string().describe('Natural language description of the action to perform, e.g. "press Command+Space, type Safari, press Enter"'),
-                ...initArgSchema
+                prompt: external_zod_namespaceObject.z.string().describe('Natural language description of the action to perform, e.g. "press Command+Space, type Safari, press Enter"')
             },
-            cli: mergeToolCliMetadata(void 0, initArgCliMetadata),
-            handler: async (args = {})=>{
+            handler: async (args)=>{
                 const prompt = args.prompt;
                 try {
-                    const agent = await getAgent(args);
+                    const agent = await getAgent();
                     if (!agent.aiAction) return createErrorResult('act is not supported by this agent');
                     const result = await agent.aiAction(prompt, {
                         deepThink: false

package/dist/types/cli/cli-runner.d.ts

@@ -19,6 +19,4 @@ export declare class CLIError extends Error {
 export declare function parseValue(raw: string): unknown;
 export declare function parseCliArgs(args: string[]): Record<string, unknown>;
 export declare function removePrefix(name: string, prefix?: string): string;
-type AnyMidsceneTools = BaseMidsceneTools<any, any>;
-export declare function runToolsCLI(tools: AnyMidsceneTools, scriptName: string, options?: CLIRunnerOptions): Promise<void>;
-export {};
+export declare function runToolsCLI(tools: BaseMidsceneTools, scriptName: string, options?: CLIRunnerOptions): Promise<void>;

package/dist/types/mcp/base-tools.d.ts

@@ -1,52 +1,13 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { z } from 'zod';
-import type { BaseAgent, BaseDevice, IMidsceneTools, ToolCliMetadata, ToolDefinition, ToolSchema } from './types';
+import type { BaseAgent, BaseDevice, IMidsceneTools, ToolDefinition } from './types';
 /**
- * Declarative description of a platform's agent init args.
- * Collapses the `extractAgentInitParam` / `sanitizeToolArgs` /
- * `getAgentInitArgSchema` trio into a single data declaration.
+ * Base class for platform-specific MCP tools
+ * Generic type TAgent allows subclasses to use their specific agent types
  */
-export interface InitArgSpec<TInitParam> {
-    /** Arg namespace, e.g. `android`, `ios`. */
-    namespace: string;
-    /** Zod shape describing the init args. Field names drive the MCP schema. */
-    shape: Record<string, z.ZodTypeAny>;
-    /**
-     * Optional CLI presentation hints. These affect `--help` output for
-     * single-platform CLIs but do not alter MCP/YAML protocol keys.
-     */
-    cli?: {
-        /** Prefer bare `--device-id`-style options in platform CLI help output. */
-        preferBareKeys?: boolean;
-        /** Override the displayed option name for specific init arg fields. */
-        preferredNames?: Record<string, string>;
-    };
-    /**
-     * Adapt extracted namespaced args into the concrete `TInitParam` passed to
-     * `ensureAgent`. Defaults to returning the raw extracted record.
-     */
-    adapt?: (extracted: Record<string, unknown> | undefined) => TInitParam | undefined;
-}
-/**
- * Base class for platform-specific MCP tools.
- * @typeParam TAgent - Platform-specific agent type.
- * @typeParam TInitParam - Platform-specific init parameter consumed by
- *   `ensureAgent`. Defaults to `undefined` for platforms that take no args.
- */
-export declare abstract class BaseMidsceneTools<TAgent extends BaseAgent = BaseAgent, TInitParam = unknown> implements IMidsceneTools {
+export declare abstract class BaseMidsceneTools<TAgent extends BaseAgent = BaseAgent> implements IMidsceneTools {
     protected mcpServer?: McpServer;
     protected agent?: TAgent;
     protected toolDefinitions: ToolDefinition[];
-    /**
-     * Declarative init-arg spec. Subclasses that accept CLI/MCP init args should
-     * set this once and get `extractAgentInitParam` / `sanitizeToolArgs` /
-     * `getAgentInitArgSchema` auto-implemented.
-     *
-     * Declared with `declare` so that TS doesn't emit an `Object.defineProperty`
-     * for this field on the base constructor, which would otherwise overwrite
-     * a subclass field initializer under `useDefineForClassFields`.
-     */
-    protected readonly initArgSpec?: InitArgSpec<TInitParam>;
     /**
      * Ensure agent is initialized and ready for use.
      * Must be implemented by subclasses to create platform-specific agent.
@@ -54,25 +15,7 @@ export declare abstract class BaseMidsceneTools<TAgent extends BaseAgent = BaseA
      * @returns Promise resolving to initialized agent instance
      * @throws Error if agent initialization fails
      */
-    protected abstract ensureAgent(initParam?: TInitParam): Promise<TAgent>;
-    private getInitArgKeys;
-    /**
-     * Extract a platform-specific agent init parameter from CLI/MCP tool args.
-     */
-    protected extractAgentInitParam(args: Record<string, unknown>): TInitParam | undefined;
-    /**
-     * Remove platform-specific init args before dispatching a tool payload to the action itself.
-     */
-    protected sanitizeToolArgs(args: Record<string, unknown>): Record<string, unknown>;
-    /**
-     * Expose platform-specific init args on action/common tool schemas.
-     */
-    protected getAgentInitArgSchema(): ToolSchema;
-    /**
-     * Expose CLI-only metadata for platform init args so single-platform help can
-     * show ergonomic bare flags while the underlying schema stays namespaced.
-     */
-    protected getAgentInitArgCliMetadata(): ToolCliMetadata | undefined;
+    protected abstract ensureAgent(initParam?: string): Promise<TAgent>;
     /**
      * Optional: prepare platform-specific tools (e.g., device connection)
      */

package/dist/types/mcp/index.d.ts

@@ -1,6 +1,5 @@
 export * from './base-server';
 export * from './base-tools';
-export * from './init-arg-utils';
 export * from './error-formatter';
 export * from './tool-generator';
 export * from './types';

package/dist/types/mcp/tool-generator.d.ts

@@ -1,10 +1,10 @@
-import type { ActionSpaceItem, BaseAgent, ToolCliMetadata, ToolDefinition, ToolSchema } from './types';
+import type { ActionSpaceItem, BaseAgent, ToolDefinition } from './types';
 /**
  * Converts DeviceAction from actionSpace into MCP ToolDefinition
  * This is the core logic that removes need for hardcoded tool definitions
  */
-export declare function generateToolsFromActionSpace(actionSpace: ActionSpaceItem[], getAgent: (args?: Record<string, unknown>) => Promise<BaseAgent>, sanitizeArgs?: (args: Record<string, unknown>) => Record<string, unknown>, initArgSchema?: ToolSchema, initArgCliMetadata?: ToolCliMetadata): ToolDefinition[];
+export declare function generateToolsFromActionSpace(actionSpace: ActionSpaceItem[], getAgent: () => Promise<BaseAgent>): ToolDefinition[];
 /**
  * Generate common tools (screenshot, act)
  */
-export declare function generateCommonTools(getAgent: (args?: Record<string, unknown>) => Promise<BaseAgent>, initArgSchema?: ToolSchema, initArgCliMetadata?: ToolCliMetadata): ToolDefinition[];
+export declare function generateCommonTools(getAgent: () => Promise<BaseAgent>): ToolDefinition[];

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

@@ -49,13 +49,6 @@ export type ToolHandler<T = Record<string, unknown>> = (args: T) => Promise<Tool
  * Tool schema type using Zod
  */
 export type ToolSchema = Record<string, z.ZodTypeAny>;
-export interface ToolCliOption {
-    preferredName?: string;
-    aliases?: string[];
-}
-export interface ToolCliMetadata {
-    options?: Record<string, ToolCliOption>;
-}
 /**
  * Tool definition for MCP server
  */
@@ -64,7 +57,6 @@ export interface ToolDefinition<T = Record<string, unknown>> {
     description: string;
     schema: ToolSchema;
     handler: ToolHandler<T>;
-    cli?: ToolCliMetadata;
 }
 /**
  * Tool type for mcpKitForAgent return value