@midscene/web 0.16.0 → 0.16.1

package/dist/es/puppeteer.js

@@ -280,8 +280,8 @@ import {
   DEFAULT_WAIT_FOR_NAVIGATION_TIMEOUT,
   DEFAULT_WAIT_FOR_NETWORK_IDLE_TIMEOUT
 } from "@midscene/shared/constants";
-import { vlLocateMode } from "@midscene/shared/env";
-import { getDebug as getDebug3 } from "@midscene/shared/logger";
+import { vlLocateMode as vlLocateMode2 } from "@midscene/shared/env";
+import { getDebug as getDebug4 } from "@midscene/shared/logger";
 import { assert as assert6 } from "@midscene/shared/utils";
 
 // src/common/tasks.ts
@@ -293,6 +293,14 @@ import {
   vlmPlanning
 } from "@midscene/core/ai-model";
 import { sleep } from "@midscene/core/utils";
+import { UITarsModelVersion } from "@midscene/shared/env";
+import { uiTarsModelVersion } from "@midscene/shared/env";
+import { vlLocateMode } from "@midscene/shared/env";
+import {
+  imageInfo,
+  resizeImgBase64 as resizeImgBase642
+} from "@midscene/shared/img";
+import { getDebug as getDebug2 } from "@midscene/shared/logger";
 import { assert as assert4 } from "@midscene/shared/utils";
 
 // src/common/task-cache.ts
@@ -395,7 +403,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");
@@ -407,19 +415,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}`);
     }
   });
 }
@@ -701,6 +709,7 @@ function paramStr(task) {
 }
 
 // src/common/tasks.ts
+var debug2 = getDebug2("page-task-executor");
 var replanningCountLimit = 10;
 var isAndroidPage = (page) => {
   return page.pageType === "android";
@@ -1289,13 +1298,37 @@ var PageTaskExecutor = class {
         };
         executorContext.task.recorder = [recordItem];
         executorContext.task.pageContext = pageContext;
+        let imagePayload = pageContext.screenshotBase64;
+        if (vlLocateMode() === "vlm-ui-tars" && uiTarsModelVersion() === 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",
+              imageInfo,
+              "new width",
+              newWidth,
+              "new height",
+              newHeight
+            );
+            imagePayload = await resizeImgBase642(imagePayload, {
+              width: newWidth,
+              height: newHeight
+            });
+          }
+        }
         this.appendConversationHistory({
           role: "user",
           content: [
             {
               type: "image_url",
               image_url: {
-                url: pageContext.screenshotBase64
+                url: imagePayload
               }
             }
           ]
@@ -1638,9 +1671,9 @@ var PageTaskExecutor = class {
 };
 
 // src/common/plan-builder.ts
-import { getDebug as getDebug2 } from "@midscene/shared/logger";
+import { getDebug as getDebug3 } from "@midscene/shared/logger";
 import { assert as assert5 } from "@midscene/shared/utils";
-var debug2 = getDebug2("plan-builder");
+var debug3 = getDebug3("plan-builder");
 function buildPlans(type, locateParam, param) {
   let returnPlans = [];
   const locatePlan = locateParam ? {
@@ -1702,14 +1735,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 = getDebug3("web-integration");
+var debug4 = getDebug4("web-integration");
 var PageAgent = class {
   constructor(page, opts) {
     /**
@@ -1752,7 +1785,7 @@ var PageAgent = class {
       });
     }
     return await parseContextFromWebPage(this.page, {
-      ignoreMarker: !!vlLocateMode()
+      ignoreMarker: !!vlLocateMode2()
     });
   }
   async setAIActionContext(prompt) {
@@ -1787,7 +1820,7 @@ var PageAgent = class {
       type: "dump",
       generateReport
     });
-    debug3("writeOutActionDumps", this.reportFile);
+    debug4("writeOutActionDumps", this.reportFile);
     if (generateReport && autoPrintReportMsg && this.reportFile) {
       printReportMsg(this.reportFile);
     }
@@ -1891,7 +1924,7 @@ ${errorTask?.errorStack}`);
     return output;
   }
   async aiAction(taskPrompt) {
-    const { output, executor } = await (vlLocateMode() === "vlm-ui-tars" ? this.taskExecutor.actionToGoal(taskPrompt) : this.taskExecutor.action(taskPrompt, this.opts.aiActionContext));
+    const { output, executor } = await (vlLocateMode2() === "vlm-ui-tars" ? this.taskExecutor.actionToGoal(taskPrompt) : this.taskExecutor.action(taskPrompt, this.opts.aiActionContext));
     this.afterTaskRunning(executor);
     return output;
   }
@@ -1974,7 +2007,7 @@ ${errors}`);
 };
 
 // src/puppeteer/index.ts
-import { getDebug as getDebug5 } from "@midscene/shared/logger";
+import { getDebug as getDebug6 } from "@midscene/shared/logger";
 
 // src/puppeteer/page.ts
 import {
@@ -1989,9 +2022,9 @@ import { sleep as sleep2 } from "@midscene/core/utils";
 import { DEFAULT_WAIT_FOR_NAVIGATION_TIMEOUT as DEFAULT_WAIT_FOR_NAVIGATION_TIMEOUT2 } from "@midscene/shared/constants";
 import { treeToList as treeToList2 } from "@midscene/shared/extractor";
 import { getExtraReturnLogic } from "@midscene/shared/fs";
-import { getDebug as getDebug4 } from "@midscene/shared/logger";
+import { getDebug as getDebug5 } from "@midscene/shared/logger";
 import { assert as assert7 } from "@midscene/shared/utils";
-var debugPage = getDebug4("web:page");
+var debugPage = getDebug5("web:page");
 var Page = class {
   constructor(underlyingPage, pageType, opts) {
     this.everMoved = false;
@@ -2274,14 +2307,14 @@ var WebPage = class extends Page {
 
 // src/puppeteer/index.ts
 import { overrideAIConfig } from "@midscene/shared/env";
-var debug4 = getDebug5("puppeteer:agent");
+var debug5 = getDebug6("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);
     }
   }
 };