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

package/dist/es/framework/index.mjs

@@ -6,7 +6,7 @@ import { createHash } from "node:crypto";
 import { ReportMergingTool } from "@midscene/core";
 import { getMidsceneRunSubDir } from "@midscene/shared/common";
 import { getDebug } from "@midscene/shared/logger";
-import { ScriptPlayer, parseYamlScript, resolveWebTarget } from "@midscene/core/yaml";
+import { ScriptPlayer, parseYamlScript } from "@midscene/core/yaml";
 import { buildChromeArgs, buildDownloadBehavior, defaultViewportHeight, defaultViewportWidth, puppeteerAgentForTarget } from "@midscene/web/puppeteer-agent-launcher";
 import lodash_merge from "lodash.merge";
 import puppeteer from "puppeteer";
@@ -2772,10 +2772,9 @@ async function createYamlPlayer(file, script, options) {
     };
     const player = new ScriptPlayer(clonedYamlScript, async ()=>{
         const freeFn = [];
-        const resolvedWebTarget = resolveWebTarget(clonedYamlScript);
-        const webTarget = resolvedWebTarget?.target;
+        const webTarget = clonedYamlScript.web || clonedYamlScript.target;
         const targetCount = [
-            void 0 !== resolvedWebTarget,
+            void 0 !== webTarget,
             void 0 !== clonedYamlScript.android,
             void 0 !== clonedYamlScript.ios,
             void 0 !== clonedYamlScript.harmony,
@@ -2784,17 +2783,17 @@ async function createYamlPlayer(file, script, options) {
         ].filter(Boolean).length;
         if (targetCount > 1) {
             const specifiedTargets = [
-                resolvedWebTarget?.source ?? null,
+                void 0 !== webTarget ? 'web' : 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: page, browser, 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: web, android, ios, harmony, computer, or interface.`);
         }
         if (void 0 !== webTarget) {
-            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.");
+            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.");
             let localServer;
             let urlToVisit;
             if (webTarget.serve) {
@@ -2809,7 +2808,6 @@ async function createYamlPlayer(file, script, options) {
                 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 puppeteer.connect({
                     browserWSEndpoint: webTarget.cdpEndpoint,
@@ -3452,9 +3450,9 @@ class YamlBatchExecutor {
                 setupContext,
                 ...fileContextList
             ] : fileContextList;
-            const needsBrowser = allContexts.some((ctx)=>void 0 !== resolveWebTarget(ctx.executionConfig));
+            const needsBrowser = allContexts.some((ctx)=>Object.keys(ctx.executionConfig.web || ctx.executionConfig.target || {}).length > 0);
             if (needsBrowser && this.config.shareBrowserContext) {
-                const globalWebConfig = resolveWebTarget(this.config.globalConfig ?? {})?.target;
+                const globalWebConfig = this.config.globalConfig?.web;
                 if (globalWebConfig?.cdpEndpoint) browser = await puppeteer.connect({
                     browserWSEndpoint: globalWebConfig.cdpEndpoint,
                     defaultViewport: null,
@@ -3492,7 +3490,7 @@ class YamlBatchExecutor {
             this.results = await this.processResults(executedResults, notExecutedContexts);
         } finally{
             if (browser && !this.config.keepWindow) {
-                const isCdp = !!resolveWebTarget(this.config.globalConfig ?? {})?.target.cdpEndpoint;
+                const isCdp = !!this.config.globalConfig?.web?.cdpEndpoint;
                 if (isCdp) browser.disconnect();
                 else await browser.close();
             }
@@ -3503,6 +3501,20 @@ class YamlBatchExecutor {
     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 = lodash_merge(clonedFileConfig, globalConfig);
         return {
             file,