@midscene/cli 1.10.4-beta-20260710100314.0 → 1.10.4-beta-20260710115744.0

package/dist/lib/framework/index.js

@@ -2840,9 +2840,10 @@ var __webpack_exports__ = {};
         };
         const player = new yaml_.ScriptPlayer(clonedYamlScript, async ()=>{
             const freeFn = [];
-            const webTarget = clonedYamlScript.web || clonedYamlScript.target;
+            const resolvedWebTarget = (0, yaml_.resolveWebTarget)(clonedYamlScript);
+            const webTarget = resolvedWebTarget?.target;
             const targetCount = [
-                void 0 !== webTarget,
+                void 0 !== resolvedWebTarget,
                 void 0 !== clonedYamlScript.android,
                 void 0 !== clonedYamlScript.ios,
                 void 0 !== clonedYamlScript.harmony,
@@ -2851,17 +2852,17 @@ var __webpack_exports__ = {};
             ].filter(Boolean).length;
             if (targetCount > 1) {
                 const specifiedTargets = [
-                    void 0 !== webTarget ? 'web' : null,
+                    resolvedWebTarget?.source ?? null,
                     void 0 !== clonedYamlScript.android ? 'android' : null,
                     void 0 !== clonedYamlScript.ios ? 'ios' : null,
                     void 0 !== clonedYamlScript.harmony ? 'harmony' : null,
                     void 0 !== clonedYamlScript.computer ? 'computer' : null,
                     void 0 !== clonedYamlScript.interface ? 'interface' : null
                 ].filter(Boolean);
-                throw new Error(`Only one target type can be specified, but found multiple: ${specifiedTargets.join(', ')}. Please specify only one of: web, android, ios, harmony, computer, or interface.`);
+                throw new Error(`Only one target type can be specified, but found multiple: ${specifiedTargets.join(', ')}. Please specify only one of: page, browser, web, android, ios, harmony, computer, or interface.`);
             }
             if (void 0 !== webTarget) {
-                if (void 0 !== clonedYamlScript.target) console.warn("target is deprecated, please use web instead. See https://midscenejs.com/automate-with-scripts-in-yaml for more information. Sorry for the inconvenience.");
+                if (resolvedWebTarget?.source === 'target') console.warn("target is deprecated, please use page or browser instead. See https://midscenejs.com/automate-with-scripts-in-yaml for more information. Sorry for the inconvenience.");
                 let localServer;
                 let urlToVisit;
                 if (webTarget.serve) {
@@ -2876,6 +2877,7 @@ var __webpack_exports__ = {};
                     webTarget.url = urlToVisit;
                 }
                 if (webTarget.cdpEndpoint && webTarget.bridgeMode) throw new Error('cdpEndpoint and bridgeMode are mutually exclusive. Please specify only one.');
+                if ('browser' === webTarget.mode && webTarget.bridgeMode) throw new Error('[midscene] browser mode does not support bridgeMode. Use page: or web.mode: page for bridge mode.');
                 if (webTarget.cdpEndpoint) {
                     const cdpBrowser = options?.browser ?? await external_puppeteer_default().connect({
                         browserWSEndpoint: webTarget.cdpEndpoint,
@@ -3520,9 +3522,9 @@ var __webpack_exports__ = {};
                     setupContext,
                     ...fileContextList
                 ] : fileContextList;
-                const needsBrowser = allContexts.some((ctx)=>Object.keys(ctx.executionConfig.web || ctx.executionConfig.target || {}).length > 0);
+                const needsBrowser = allContexts.some((ctx)=>void 0 !== (0, yaml_.resolveWebTarget)(ctx.executionConfig));
                 if (needsBrowser && this.config.shareBrowserContext) {
-                    const globalWebConfig = this.config.globalConfig?.web;
+                    const globalWebConfig = (0, yaml_.resolveWebTarget)(this.config.globalConfig ?? {})?.target;
                     if (globalWebConfig?.cdpEndpoint) browser = await external_puppeteer_default().connect({
                         browserWSEndpoint: globalWebConfig.cdpEndpoint,
                         defaultViewport: null,
@@ -3560,7 +3562,7 @@ var __webpack_exports__ = {};
                 this.results = await this.processResults(executedResults, notExecutedContexts);
             } finally{
                 if (browser && !this.config.keepWindow) {
-                    const isCdp = !!this.config.globalConfig?.web?.cdpEndpoint;
+                    const isCdp = !!(0, yaml_.resolveWebTarget)(this.config.globalConfig ?? {})?.target.cdpEndpoint;
                     if (isCdp) browser.disconnect();
                     else await browser.close();
                 }
@@ -3571,20 +3573,6 @@ var __webpack_exports__ = {};
         async createFileContext(file, fileConfig, options) {
             const { globalConfig } = this.config;
             const clonedFileConfig = JSON.parse(JSON.stringify(fileConfig));
-            if (clonedFileConfig.target) {
-                clonedFileConfig.web = {
-                    ...clonedFileConfig.target,
-                    ...clonedFileConfig.web
-                };
-                delete clonedFileConfig.target;
-            }
-            if (globalConfig?.target) {
-                globalConfig.web = {
-                    ...globalConfig.target,
-                    ...globalConfig.web
-                };
-                delete globalConfig.target;
-            }
             const executionConfig = external_lodash_merge_default()(clonedFileConfig, globalConfig);
             return {
                 file,