@midscene/web 0.16.0 → 0.16.1

package/dist/lib/puppeteer.js

@@ -32,7 +32,7 @@ var puppeteer_exports = {};
 __export(puppeteer_exports, {
   PuppeteerAgent: () => PuppeteerAgent,
   PuppeteerWebPage: () => WebPage,
-  overrideAIConfig: () => import_env4.overrideAIConfig
+  overrideAIConfig: () => import_env7.overrideAIConfig
 });
 module.exports = __toCommonJS(puppeteer_exports);
 
@@ -308,14 +308,19 @@ function parseYamlScript(content, filePath, ignoreCheckingTarget) {
 // src/common/agent.ts
 var import_utils11 = require("@midscene/core/utils");
 var import_constants = require("@midscene/shared/constants");
-var import_env3 = require("@midscene/shared/env");
-var import_logger3 = require("@midscene/shared/logger");
+var import_env6 = require("@midscene/shared/env");
+var import_logger4 = require("@midscene/shared/logger");
 var import_utils12 = require("@midscene/shared/utils");
 
 // src/common/tasks.ts
 var import_core = require("@midscene/core");
 var import_ai_model = require("@midscene/core/ai-model");
 var import_utils8 = require("@midscene/core/utils");
+var import_env3 = require("@midscene/shared/env");
+var import_env4 = require("@midscene/shared/env");
+var import_env5 = require("@midscene/shared/env");
+var import_img2 = require("@midscene/shared/img");
+var import_logger2 = require("@midscene/shared/logger");
 var import_utils9 = require("@midscene/shared/utils");
 
 // src/common/task-cache.ts
@@ -418,7 +423,7 @@ function printReportMsg(filepath) {
 function replaceIllegalPathCharsAndSpace(str) {
   return str.replace(/[/\\:*?"<>| ]/g, "-");
 }
-function forceClosePopup(page, debug5) {
+function forceClosePopup(page, debug6) {
   page.on("popup", async (popup) => {
     if (!popup) {
       console.warn("got a popup event, but the popup is not ready yet, skip");
@@ -430,19 +435,19 @@ function forceClosePopup(page, debug5) {
       try {
         await popup.close();
       } catch (error) {
-        debug5(`failed to close popup ${url}, error: ${error}`);
+        debug6(`failed to close popup ${url}, error: ${error}`);
       }
     } else {
-      debug5(`popup is already closed, skip close ${url}`);
+      debug6(`popup is already closed, skip close ${url}`);
     }
     if (!page.isClosed()) {
       try {
         await page.goto(url);
       } catch (error) {
-        debug5(`failed to goto ${url}, error: ${error}`);
+        debug6(`failed to goto ${url}, error: ${error}`);
       }
     } else {
-      debug5(`page is already closed, skip goto ${url}`);
+      debug6(`page is already closed, skip goto ${url}`);
     }
   });
 }
@@ -724,6 +729,7 @@ function paramStr(task) {
 }
 
 // src/common/tasks.ts
+var debug2 = (0, import_logger2.getDebug)("page-task-executor");
 var replanningCountLimit = 10;
 var isAndroidPage = (page) => {
   return page.pageType === "android";
@@ -1312,13 +1318,37 @@ var PageTaskExecutor = class {
         };
         executorContext.task.recorder = [recordItem];
         executorContext.task.pageContext = pageContext;
+        let imagePayload = pageContext.screenshotBase64;
+        if ((0, import_env5.vlLocateMode)() === "vlm-ui-tars" && (0, import_env4.uiTarsModelVersion)() === import_env3.UITarsModelVersion.V1_5) {
+          const size = pageContext.size;
+          debug2("ui-tars-v1.5, will check image size", size);
+          const currentPixels = size.width * size.height;
+          const maxPixels = 16384 * 28 * 28;
+          if (currentPixels > maxPixels) {
+            const resizeFactor = Math.sqrt(maxPixels / currentPixels);
+            const newWidth = Math.floor(size.width * resizeFactor);
+            const newHeight = Math.floor(size.height * resizeFactor);
+            debug2(
+              "resize image",
+              import_img2.imageInfo,
+              "new width",
+              newWidth,
+              "new height",
+              newHeight
+            );
+            imagePayload = await (0, import_img2.resizeImgBase64)(imagePayload, {
+              width: newWidth,
+              height: newHeight
+            });
+          }
+        }
         this.appendConversationHistory({
           role: "user",
           content: [
             {
               type: "image_url",
               image_url: {
-                url: pageContext.screenshotBase64
+                url: imagePayload
               }
             }
           ]
@@ -1661,9 +1691,9 @@ var PageTaskExecutor = class {
 };
 
 // src/common/plan-builder.ts
-var import_logger2 = require("@midscene/shared/logger");
+var import_logger3 = require("@midscene/shared/logger");
 var import_utils10 = require("@midscene/shared/utils");
-var debug2 = (0, import_logger2.getDebug)("plan-builder");
+var debug3 = (0, import_logger3.getDebug)("plan-builder");
 function buildPlans(type, locateParam, param) {
   let returnPlans = [];
   const locatePlan = locateParam ? {
@@ -1725,14 +1755,14 @@ function buildPlans(type, locateParam, param) {
     returnPlans = [sleepPlan];
   }
   if (returnPlans) {
-    debug2("buildPlans", returnPlans);
+    debug3("buildPlans", returnPlans);
     return returnPlans;
   }
   throw new Error(`Not supported type: ${type}`);
 }
 
 // src/common/agent.ts
-var debug3 = (0, import_logger3.getDebug)("web-integration");
+var debug4 = (0, import_logger4.getDebug)("web-integration");
 var PageAgent = class {
   constructor(page, opts) {
     /**
@@ -1775,7 +1805,7 @@ var PageAgent = class {
       });
     }
     return await parseContextFromWebPage(this.page, {
-      ignoreMarker: !!(0, import_env3.vlLocateMode)()
+      ignoreMarker: !!(0, import_env6.vlLocateMode)()
     });
   }
   async setAIActionContext(prompt) {
@@ -1810,7 +1840,7 @@ var PageAgent = class {
       type: "dump",
       generateReport
     });
-    debug3("writeOutActionDumps", this.reportFile);
+    debug4("writeOutActionDumps", this.reportFile);
     if (generateReport && autoPrintReportMsg && this.reportFile) {
       printReportMsg(this.reportFile);
     }
@@ -1914,7 +1944,7 @@ ${errorTask?.errorStack}`);
     return output;
   }
   async aiAction(taskPrompt) {
-    const { output, executor } = await ((0, import_env3.vlLocateMode)() === "vlm-ui-tars" ? this.taskExecutor.actionToGoal(taskPrompt) : this.taskExecutor.action(taskPrompt, this.opts.aiActionContext));
+    const { output, executor } = await ((0, import_env6.vlLocateMode)() === "vlm-ui-tars" ? this.taskExecutor.actionToGoal(taskPrompt) : this.taskExecutor.action(taskPrompt, this.opts.aiActionContext));
     this.afterTaskRunning(executor);
     return output;
   }
@@ -1997,7 +2027,7 @@ ${errors}`);
 };
 
 // src/puppeteer/index.ts
-var import_logger5 = require("@midscene/shared/logger");
+var import_logger6 = require("@midscene/shared/logger");
 
 // src/puppeteer/page.ts
 var import_constants3 = require("@midscene/shared/constants");
@@ -2007,9 +2037,9 @@ var import_utils15 = require("@midscene/core/utils");
 var import_constants2 = require("@midscene/shared/constants");
 var import_extractor2 = require("@midscene/shared/extractor");
 var import_fs2 = require("@midscene/shared/fs");
-var import_logger4 = require("@midscene/shared/logger");
+var import_logger5 = require("@midscene/shared/logger");
 var import_utils16 = require("@midscene/shared/utils");
-var debugPage = (0, import_logger4.getDebug)("web:page");
+var debugPage = (0, import_logger5.getDebug)("web:page");
 var Page = class {
   constructor(underlyingPage, pageType, opts) {
     this.everMoved = false;
@@ -2291,15 +2321,15 @@ var WebPage = class extends Page {
 };
 
 // src/puppeteer/index.ts
-var import_env4 = require("@midscene/shared/env");
-var debug4 = (0, import_logger5.getDebug)("puppeteer:agent");
+var import_env7 = require("@midscene/shared/env");
+var debug5 = (0, import_logger6.getDebug)("puppeteer:agent");
 var PuppeteerAgent = class extends PageAgent {
   constructor(page, opts) {
     const webPage = new WebPage(page);
     super(webPage, opts);
     const { forceSameTabNavigation = true } = opts ?? {};
     if (forceSameTabNavigation) {
-      forceClosePopup(page, debug4);
+      forceClosePopup(page, debug5);
     }
   }
 };