@midscene/web 0.24.1 → 0.24.2-beta-20250730123854.0

package/dist/es/index.js

@@ -472,6 +472,23 @@ function scrollParamStr(scrollParam) {
   }
   return `${scrollParam.direction || "down"}, ${scrollParam.scrollType || "once"}, ${scrollParam.distance || "distance-not-set"}`;
 }
+function pullParamStr(pullParam) {
+  if (!pullParam) {
+    return "";
+  }
+  const parts = [];
+  parts.push(`direction: ${pullParam.direction || "down"}`);
+  if (pullParam.startPoint) {
+    parts.push(`start: (${pullParam.startPoint.x}, ${pullParam.startPoint.y})`);
+  }
+  if (pullParam.distance) {
+    parts.push(`distance: ${pullParam.distance}`);
+  }
+  if (pullParam.duration) {
+    parts.push(`duration: ${pullParam.duration}ms`);
+  }
+  return parts.join(", ");
+}
 function taskTitleStr(type, prompt) {
   if (prompt) {
     return `${type} - ${prompt}`;
@@ -494,6 +511,8 @@ function paramStr(task) {
       value = `${task?.param?.timeMs}ms`;
     } else if (typeof task?.param?.scrollType === "string") {
       value = scrollParamStr(task?.param);
+    } else if (typeof task?.param?.direction === "string" && task?.subType === "AndroidPull") {
+      value = pullParamStr(task?.param);
     } else if (typeof task?.param?.value !== "undefined") {
       value = task?.param?.value;
     }
@@ -564,7 +583,7 @@ import yaml3 from "js-yaml";
 import semver from "semver";
 
 // package.json
-var version = "0.24.1";
+var version = "0.24.2-beta-20250730123854.0";
 
 // src/common/task-cache.ts
 var DEFAULT_CACHE_MAX_FILENAME_LENGTH = 200;
@@ -708,7 +727,18 @@ cache file: ${cacheFile}`
         mkdirSync2(dir, { recursive: true });
         debug("created cache directory: %s", dir);
       }
-      const yamlData = yaml3.dump(this.cache);
+      const sortedCaches = [...this.cache.caches].sort((a, b) => {
+        if (a.type === "plan" && b.type === "locate")
+          return -1;
+        if (a.type === "locate" && b.type === "plan")
+          return 1;
+        return 0;
+      });
+      const cacheToWrite = {
+        ...this.cache,
+        caches: sortedCaches
+      };
+      const yamlData = yaml3.dump(cacheToWrite);
       writeFileSync2(this.cacheFilePath, yamlData);
       debug("cache flushed to file: %s", this.cacheFilePath);
     } catch (err) {
@@ -925,6 +955,16 @@ var PageTaskExecutor = class {
   }
   async getElementXpath(pageContext, element) {
     let elementId = element?.id;
+    if (element?.isOrderSensitive !== void 0) {
+      const xpaths = await this.page.getXpathsByPoint(
+        {
+          left: element.center[0],
+          top: element.center[1]
+        },
+        element?.isOrderSensitive
+      );
+      return xpaths;
+    }
     if (element?.attributes?.nodeType === NodeType.POSITION) {
       await this.insight.contextRetrieverFn("locate");
       const info = elementByPositionWithElementInfo2(
@@ -1419,6 +1459,51 @@ var PageTaskExecutor = class {
           }
         };
         tasks.push(taskActionAndroidRecentAppsButton);
+      } else if (plan2.type === "AndroidLongPress") {
+        const taskActionAndroidLongPress = {
+          type: "Action",
+          subType: "AndroidLongPress",
+          param: plan2.param,
+          thought: plan2.thought,
+          locate: plan2.locate,
+          executor: async (param) => {
+            assert5(
+              isAndroidPage(this.page),
+              "Cannot use long press on non-Android devices"
+            );
+            const { x, y, duration } = param;
+            await this.page.longPress(x, y, duration);
+          }
+        };
+        tasks.push(taskActionAndroidLongPress);
+      } else if (plan2.type === "AndroidPull") {
+        const taskActionAndroidPull = {
+          type: "Action",
+          subType: "AndroidPull",
+          param: plan2.param,
+          thought: plan2.thought,
+          locate: plan2.locate,
+          executor: async (param) => {
+            assert5(
+              isAndroidPage(this.page),
+              "Cannot use pull action on non-Android devices"
+            );
+            const { direction, startPoint, distance, duration } = param;
+            const convertedStartPoint = startPoint ? { left: startPoint.x, top: startPoint.y } : void 0;
+            if (direction === "down") {
+              await this.page.pullDown(
+                convertedStartPoint,
+                distance,
+                duration
+              );
+            } else if (direction === "up") {
+              await this.page.pullUp(convertedStartPoint, distance, duration);
+            } else {
+              throw new Error(`Unknown pull direction: ${direction}`);
+            }
+          }
+        };
+        tasks.push(taskActionAndroidPull);
       } else {
         throw new Error(`Unknown or unsupported task type: ${plan2.type}`);
       }
@@ -2636,6 +2721,12 @@ var Page = class {
       `${elementInfosScriptContent}midscene_element_inspector.getXpathsById('${id}')`
     );
   }
+  async getXpathsByPoint(point, isOrderSensitive) {
+    const elementInfosScriptContent = getElementInfosScriptContent();
+    return this.evaluateJavaScript(
+      `${elementInfosScriptContent}midscene_element_inspector.getXpathsByPoint({left: ${point.left}, top: ${point.top}}, ${isOrderSensitive})`
+    );
+  }
   async getElementInfoByXpath(xpath) {
     const elementInfosScriptContent = getElementInfosScriptContent();
     return this.evaluateJavaScript(