@midscene/web 0.17.4-beta-20250528162713.0 → 0.17.4

package/dist/es/agent.js

@@ -19,10 +19,11 @@ var ScriptPlayer = class {
     this.unnamedResultIndex = 0;
     this.pageAgent = null;
     this.result = {};
+    const target = script.target || script.web || script.android;
     if (ifInBrowser) {
       this.output = void 0;
-    } else if (script.target?.output) {
-      this.output = resolve(process.cwd(), script.target.output);
+    } else if (target?.output) {
+      this.output = resolve(process.cwd(), target.output);
     } else {
       this.output = join(getMidsceneRunSubDir("output"), `${process.pid}.json`);
     }
@@ -106,42 +107,58 @@ var ScriptPlayer = class {
       } else if ("aiQuery" in flowItem) {
         const queryTask = flowItem;
         const prompt = queryTask.aiQuery;
+        const options = {
+          domIncluded: queryTask.domIncluded,
+          screenshotIncluded: queryTask.screenshotIncluded
+        };
         assert(prompt, "missing prompt for aiQuery");
         assert(
           typeof prompt === "string",
           "prompt for aiQuery must be a string"
         );
-        const queryResult = await agent.aiQuery(prompt);
+        const queryResult = await agent.aiQuery(prompt, options);
         this.setResult(queryTask.name, queryResult);
       } else if ("aiNumber" in flowItem) {
         const numberTask = flowItem;
         const prompt = numberTask.aiNumber;
+        const options = {
+          domIncluded: numberTask.domIncluded,
+          screenshotIncluded: numberTask.screenshotIncluded
+        };
         assert(prompt, "missing prompt for number");
         assert(
           typeof prompt === "string",
           "prompt for number must be a string"
         );
-        const numberResult = await agent.aiNumber(prompt);
+        const numberResult = await agent.aiNumber(prompt, options);
         this.setResult(numberTask.name, numberResult);
       } else if ("aiString" in flowItem) {
         const stringTask = flowItem;
         const prompt = stringTask.aiString;
+        const options = {
+          domIncluded: stringTask.domIncluded,
+          screenshotIncluded: stringTask.screenshotIncluded
+        };
         assert(prompt, "missing prompt for string");
         assert(
           typeof prompt === "string",
           "prompt for string must be a string"
         );
-        const stringResult = await agent.aiString(prompt);
+        const stringResult = await agent.aiString(prompt, options);
         this.setResult(stringTask.name, stringResult);
       } else if ("aiBoolean" in flowItem) {
         const booleanTask = flowItem;
         const prompt = booleanTask.aiBoolean;
+        const options = {
+          domIncluded: booleanTask.domIncluded,
+          screenshotIncluded: booleanTask.screenshotIncluded
+        };
         assert(prompt, "missing prompt for boolean");
         assert(
           typeof prompt === "string",
           "prompt for boolean must be a string"
         );
-        const booleanResult = await agent.aiBoolean(prompt);
+        const booleanResult = await agent.aiBoolean(prompt, options);
         this.setResult(booleanTask.name, booleanResult);
       } else if ("aiLocate" in flowItem) {
         const locateTask = flowItem;
@@ -471,7 +488,8 @@ var WebElementInfo = class {
     id,
     attributes,
     indexId,
-    xpaths
+    xpaths,
+    isVisible
   }) {
     this.content = content;
     this.rect = rect;
@@ -484,6 +502,7 @@ var WebElementInfo = class {
     this.attributes = attributes;
     this.indexId = indexId;
     this.xpaths = xpaths;
+    this.isVisible = isVisible;
   }
 };
 
@@ -506,14 +525,15 @@ async function parseContextFromWebPage(page, _opt) {
     })
   ]);
   const webTree = traverseTree(tree, (elementInfo) => {
-    const { rect, id, content, attributes, locator, indexId } = elementInfo;
+    const { rect, id, content, attributes, locator, indexId, isVisible } = elementInfo;
     return new WebElementInfo({
       rect,
       locator,
       id,
       content,
       attributes,
-      indexId
+      indexId,
+      isVisible
     });
   });
   assert3(screenshotBase64, "screenshotBase64 is required");
@@ -1405,7 +1425,7 @@ var PageTaskExecutor = class {
       executor: taskExecutor
     };
   }
-  async createTypeQueryTask(type, demand) {
+  async createTypeQueryTask(type, demand, opt) {
     const taskExecutor = new Executor(
       taskTitleStr(
         type,
@@ -1436,7 +1456,10 @@ var PageTaskExecutor = class {
             result: `${type}, ${demand}`
           };
         }
-        const { data, usage } = await this.insight.extract(demandInput);
+        const { data, usage } = await this.insight.extract(
+          demandInput,
+          opt
+        );
         let outputResult = data;
         if (ifTypeRestricted) {
           assert4(data?.result !== void 0, "No result in query data");
@@ -1456,17 +1479,17 @@ var PageTaskExecutor = class {
       executor: taskExecutor
     };
   }
-  async query(demand) {
-    return this.createTypeQueryTask("Query", demand);
+  async query(demand, opt) {
+    return this.createTypeQueryTask("Query", demand, opt);
   }
-  async boolean(prompt) {
-    return this.createTypeQueryTask("Boolean", prompt);
+  async boolean(prompt, opt) {
+    return this.createTypeQueryTask("Boolean", prompt, opt);
   }
-  async number(prompt) {
-    return this.createTypeQueryTask("Number", prompt);
+  async number(prompt, opt) {
+    return this.createTypeQueryTask("Number", prompt, opt);
   }
-  async string(prompt) {
-    return this.createTypeQueryTask("String", prompt);
+  async string(prompt, opt) {
+    return this.createTypeQueryTask("String", prompt, opt);
   }
   async assert(assertion) {
     const description = `assert: ${assertion}`;
@@ -1682,7 +1705,7 @@ import yaml3 from "js-yaml";
 import semver from "semver";
 
 // package.json
-var version = "0.17.4-beta-20250528162713.0";
+var version = "0.17.4";
 
 // src/common/task-cache.ts
 var debug3 = getDebug3("cache");
@@ -1852,6 +1875,10 @@ var includedInRect = (point, rect) => {
   const { left, top, width, height } = rect;
   return x >= left && x <= left + width && y >= top && y <= top + height;
 };
+var defaultInsightExtractOption = {
+  domIncluded: false,
+  screenshotIncluded: true
+};
 var PageAgent = class {
   constructor(page, opts) {
     /**
@@ -1995,7 +2022,8 @@ ${errorTask?.errorStack}`);
     const plans = buildPlans("RightClick", detailedLocateParam);
     const { executor, output } = await this.taskExecutor.runPlans(
       taskTitleStr("RightClick", locateParamStr(detailedLocateParam)),
-      plans
+      plans,
+      { cacheable: opt?.cacheable }
     );
     this.afterTaskRunning(executor);
     return output;
@@ -2100,23 +2128,23 @@ ${errorTask?.errorStack}`);
     this.afterTaskRunning(executor);
     return output;
   }
-  async aiQuery(demand) {
-    const { output, executor } = await this.taskExecutor.query(demand);
+  async aiQuery(demand, opt = defaultInsightExtractOption) {
+    const { output, executor } = await this.taskExecutor.query(demand, opt);
     this.afterTaskRunning(executor);
     return output;
   }
-  async aiBoolean(prompt) {
-    const { output, executor } = await this.taskExecutor.boolean(prompt);
+  async aiBoolean(prompt, opt = defaultInsightExtractOption) {
+    const { output, executor } = await this.taskExecutor.boolean(prompt, opt);
     this.afterTaskRunning(executor);
     return output;
   }
-  async aiNumber(prompt) {
-    const { output, executor } = await this.taskExecutor.number(prompt);
+  async aiNumber(prompt, opt = defaultInsightExtractOption) {
+    const { output, executor } = await this.taskExecutor.number(prompt, opt);
     this.afterTaskRunning(executor);
     return output;
   }
-  async aiString(prompt) {
-    const { output, executor } = await this.taskExecutor.string(prompt);
+  async aiString(prompt, opt = defaultInsightExtractOption) {
+    const { output, executor } = await this.taskExecutor.string(prompt, opt);
     this.afterTaskRunning(executor);
     return output;
   }