misoai-web 1.0.2 → 1.0.4

package/dist/es/index.js

@@ -88,7 +88,9 @@ var ScriptPlayer = class {
           typeof prompt === "string",
           "prompt for aiAction must be a string"
         );
-        await agent.aiAction(prompt);
+        await agent.aiAction(prompt, {
+          cacheable: actionTask.cacheable
+        });
       } else if ("aiAssert" in flowItem) {
         const assertTask = flowItem;
         const prompt = assertTask.aiAssert;
@@ -290,8 +292,24 @@ function interpolateEnvVars(content) {
   });
 }
 function parseYamlScript(content, filePath, ignoreCheckingTarget) {
-  const interpolatedContent = interpolateEnvVars(content);
-  const obj = yaml2.load(interpolatedContent);
+  let processedContent = content;
+  if (content.indexOf("android") !== -1 && content.match(/deviceId:\s*(\d+)/)) {
+    let matchedDeviceId;
+    processedContent = content.replace(
+      /deviceId:\s*(\d+)/g,
+      (match, deviceId) => {
+        matchedDeviceId = deviceId;
+        return `deviceId: '${deviceId}'`;
+      }
+    );
+    console.warn(
+      `please use string-style deviceId in yaml script, for example: deviceId: "${matchedDeviceId}"`
+    );
+  }
+  const interpolatedContent = interpolateEnvVars(processedContent);
+  const obj = yaml2.load(interpolatedContent, {
+    schema: yaml2.JSON_SCHEMA
+  });
   const pathTip = filePath ? `, failed to load ${filePath}` : "";
   const android = typeof obj.android !== "undefined" ? Object.assign({}, obj.android || {}) : void 0;
   const webConfig = obj.web || obj.target;
@@ -347,7 +365,6 @@ import {
 } from "misoai-core/ai-model";
 import { sleep } from "misoai-core/utils";
 import { NodeType } from "misoai-shared/constants";
-import { getElementInfosScriptContent } from "misoai-shared/fs";
 import { getDebug } from "misoai-shared/logger";
 import { assert as assert4 } from "misoai-shared/utils";
 
@@ -612,16 +629,18 @@ var PageTaskExecutor = class {
       );
       if (info?.id) {
         elementId = info.id;
+      } else {
+        debug(
+          "no element id found for position node, will not update cache",
+          element
+        );
       }
     }
     if (!elementId) {
       return void 0;
     }
     try {
-      const elementInfosScriptContent = getElementInfosScriptContent();
-      const result = await this.page.evaluateJavaScript?.(
-        `${elementInfosScriptContent}midscene_element_inspector.getXpathsById('${elementId}')`
-      );
+      const result = await this.page.getXpathsById(elementId);
       return result;
     } catch (error) {
       debug("getXpathsById error: ", error);
@@ -660,7 +679,7 @@ var PageTaskExecutor = class {
     };
     return taskWithScreenshot;
   }
-  async convertPlanToExecutable(plans) {
+  async convertPlanToExecutable(plans, opts) {
     const tasks = [];
     plans.forEach((plan2) => {
       if (plan2.type === "Locate") {
@@ -670,7 +689,10 @@ var PageTaskExecutor = class {
         const taskFind = {
           type: "Insight",
           subType: "Locate",
-          param: plan2.locate || void 0,
+          param: plan2.locate ? {
+            ...plan2.locate,
+            cacheable: opts?.cacheable
+          } : void 0,
           thought: plan2.thought,
           locate: plan2.locate,
           executor: async (param, taskContext) => {
@@ -707,19 +729,21 @@ var PageTaskExecutor = class {
             let elementFromCache = null;
             try {
               if (xpaths?.length && this.taskCache?.isCacheResultUsed && param?.cacheable !== false) {
-                const elementInfosScriptContent = getElementInfosScriptContent();
-                const element2 = await this.page.evaluateJavaScript?.(
-                  `${elementInfosScriptContent}midscene_element_inspector.getElementInfoByXpath('${xpaths[0]}')`
-                );
-                if (element2?.id) {
-                  elementFromCache = element2;
-                  debug("cache hit, prompt: %s", cachePrompt);
-                  cacheHitFlag = true;
-                  debug(
-                    "found a new new element with same xpath, xpath: %s, id: %s",
-                    xpaths[0],
-                    element2?.id
+                for (let i = 0; i < xpaths.length; i++) {
+                  const element2 = await this.page.getElementInfoByXpath(
+                    xpaths[i]
                   );
+                  if (element2?.id) {
+                    elementFromCache = element2;
+                    debug("cache hit, prompt: %s", cachePrompt);
+                    cacheHitFlag = true;
+                    debug(
+                      "found a new new element with same xpath, xpath: %s, id: %s",
+                      xpaths[i],
+                      element2?.id
+                    );
+                    break;
+                  }
                 }
               }
             } catch (error) {
@@ -732,12 +756,14 @@ var PageTaskExecutor = class {
               context: pageContext
             })).element;
             const aiCost = Date.now() - startTime;
+            let currentXpaths;
             if (element && this.taskCache && !cacheHitFlag && param?.cacheable !== false) {
               const elementXpaths = await this.getElementXpath(
                 pageContext,
                 element
               );
-              if (elementXpaths) {
+              if (elementXpaths?.length) {
+                currentXpaths = elementXpaths;
                 this.taskCache.updateOrAppendCacheRecord(
                   {
                     type: "locate",
@@ -747,7 +773,11 @@ var PageTaskExecutor = class {
                   locateCacheRecord
                 );
               } else {
-                debug("no xpaths found, will not update cache", cachePrompt);
+                debug(
+                  "no xpaths found, will not update cache",
+                  cachePrompt,
+                  elementXpaths
+                );
               }
             }
             if (!element) {
@@ -759,7 +789,9 @@ var PageTaskExecutor = class {
               },
               pageContext,
               cache: {
-                hit: cacheHitFlag
+                hit: cacheHitFlag,
+                originalXpaths: xpaths,
+                currentXpaths
               },
               aiCost
             };
@@ -1127,6 +1159,7 @@ var PageTaskExecutor = class {
           sleep: sleep3
         } = planResult;
         executorContext.task.log = {
+          ...executorContext.task.log || {},
           rawResponse
         };
         executorContext.task.usage = usage;
@@ -1251,11 +1284,11 @@ var PageTaskExecutor = class {
     };
     return task;
   }
-  async runPlans(title, plans) {
+  async runPlans(title, plans, opts) {
     const taskExecutor = new Executor(title, {
       onTaskStart: this.onTaskStartCallback
     });
-    const { tasks } = await this.convertPlanToExecutable(plans);
+    const { tasks } = await this.convertPlanToExecutable(plans, opts);
     await taskExecutor.append(tasks);
     const result = await taskExecutor.flush();
     return {
@@ -1263,7 +1296,7 @@ var PageTaskExecutor = class {
       executor: taskExecutor
     };
   }
-  async action(userPrompt, actionContext) {
+  async action(userPrompt, actionContext, opts) {
     const taskExecutor = new Executor(taskTitleStr("Action", userPrompt), {
       onTaskStart: this.onTaskStartCallback
     });
@@ -1288,7 +1321,7 @@ var PageTaskExecutor = class {
       yamlFlow.push(...planResult.yamlFlow || []);
       let executables;
       try {
-        executables = await this.convertPlanToExecutable(plans);
+        executables = await this.convertPlanToExecutable(plans, opts);
         taskExecutor.append(executables.tasks);
       } catch (error) {
         return this.appendErrorPlan(
@@ -1326,7 +1359,7 @@ var PageTaskExecutor = class {
       executor: taskExecutor
     };
   }
-  async actionToGoal(userPrompt) {
+  async actionToGoal(userPrompt, opts) {
     const taskExecutor = new Executor(taskTitleStr("Action", userPrompt), {
       onTaskStart: this.onTaskStartCallback
     });
@@ -1350,7 +1383,7 @@ var PageTaskExecutor = class {
       yamlFlow.push(...output.yamlFlow || []);
       let executables;
       try {
-        executables = await this.convertPlanToExecutable(plans);
+        executables = await this.convertPlanToExecutable(plans, opts);
         taskExecutor.append(executables.tasks);
       } catch (error) {
         return this.appendErrorPlan(
@@ -1655,7 +1688,7 @@ import yaml3 from "js-yaml";
 import semver from "semver";
 
 // package.json
-var version = "1.0.2";
+var version = "1.0.4";
 
 // src/common/task-cache.ts
 var debug3 = getDebug3("cache");
@@ -1998,9 +2031,9 @@ var PageAgent = class {
   buildDetailedLocateParam(locatePrompt, opt) {
     assert7(locatePrompt, "missing locate prompt");
     if (typeof opt === "object") {
-      const prompt = opt.prompt || locatePrompt;
-      const deepThink = opt.deepThink || false;
-      const cacheable = opt.cacheable || true;
+      const prompt = opt.prompt ?? locatePrompt;
+      const deepThink = opt.deepThink ?? false;
+      const cacheable = opt.cacheable ?? true;
       return {
         prompt,
         deepThink,
@@ -2019,7 +2052,8 @@ var PageAgent = class {
     const plans = buildPlans("Tap", detailedLocateParam);
     const { executor, output } = await this.taskExecutor.runPlans(
       taskTitleStr("Tap", locateParamStr(detailedLocateParam)),
-      plans
+      plans,
+      { cacheable: opt?.cacheable }
     );
     const metadata = this.afterTaskRunning(executor);
     return {
@@ -2035,7 +2069,8 @@ var PageAgent = class {
     const plans = buildPlans("Hover", detailedLocateParam);
     const { executor, output } = await this.taskExecutor.runPlans(
       taskTitleStr("Hover", locateParamStr(detailedLocateParam)),
-      plans
+      plans,
+      { cacheable: opt?.cacheable }
     );
     const metadata = this.afterTaskRunning(executor);
     return {
@@ -2058,7 +2093,8 @@ var PageAgent = class {
     });
     const { executor, output } = await this.taskExecutor.runPlans(
       taskTitleStr("Input", locateParamStr(detailedLocateParam)),
-      plans
+      plans,
+      { cacheable: opt?.cacheable }
     );
     const metadata = this.afterTaskRunning(executor);
     return {
@@ -2074,7 +2110,8 @@ var PageAgent = class {
     });
     const { executor, output } = await this.taskExecutor.runPlans(
       taskTitleStr("KeyboardPress", locateParamStr(detailedLocateParam)),
-      plans
+      plans,
+      { cacheable: opt?.cacheable }
     );
     const metadata = this.afterTaskRunning(executor);
     return {
@@ -2088,7 +2125,8 @@ var PageAgent = class {
     const paramInTitle = locatePrompt ? `${locateParamStr(detailedLocateParam)} - ${scrollParamStr(scrollParam)}` : scrollParamStr(scrollParam);
     const { executor, output } = await this.taskExecutor.runPlans(
       taskTitleStr("Scroll", paramInTitle),
-      plans
+      plans,
+      { cacheable: opt?.cacheable }
     );
     const metadata = this.afterTaskRunning(executor);
     return {
@@ -2097,6 +2135,19 @@ var PageAgent = class {
     };
   }
   async aiAction(taskPrompt, opt) {
+    try {
+      const aiModel = await import("misoai-core/ai-model");
+      const contextStore = aiModel.getContextStore();
+      const processedPrompt = contextStore.replaceAllReferences(taskPrompt, "action");
+      contextStore.addStep({
+        type: "action",
+        summary: `Action: ${processedPrompt}`,
+        prompt: processedPrompt
+      });
+      taskPrompt = processedPrompt;
+    } catch (error) {
+      debug4("Context store not available:", error);
+    }
     const cacheable = opt?.cacheable;
     const isVlmUiTars = vlLocateMode() === "vlm-ui-tars";
     const matchedCache = isVlmUiTars || cacheable === false ? void 0 : this.taskCache?.matchPlanCache(taskPrompt);
@@ -2114,7 +2165,9 @@ var PageAgent = class {
         metadata: metadata2
       };
     }
-    const { output, executor } = await (isVlmUiTars ? this.taskExecutor.actionToGoal(taskPrompt) : this.taskExecutor.action(taskPrompt, this.opts.aiActionContext));
+    const { output, executor } = await (isVlmUiTars ? this.taskExecutor.actionToGoal(taskPrompt, { cacheable }) : this.taskExecutor.action(taskPrompt, this.opts.aiActionContext, {
+      cacheable
+    }));
     if (this.taskCache && output?.yamlFlow && cacheable !== false) {
       const yamlContent = {
         tasks: [
@@ -2141,7 +2194,63 @@ var PageAgent = class {
     };
   }
   async aiQuery(demand) {
-    const { output, executor } = await this.taskExecutor.query(demand);
+    let processedDemand = demand;
+    let storageKey;
+    try {
+      const aiModel = await import("misoai-core/ai-model");
+      const contextStore = aiModel.getContextStore();
+      if (typeof demand === "string") {
+        const storageInstruction = contextStore.parseStorageInstruction(demand);
+        if (storageInstruction) {
+          storageKey = storageInstruction.key;
+          processedDemand = storageInstruction.cleanText;
+          contextStore._pendingAliases = storageInstruction.aliases;
+        } else {
+          const storageMatch = demand.match(/store\s+(?:as\s+)?(\w+)/i);
+          if (storageMatch) {
+            storageKey = storageMatch[1];
+            processedDemand = demand.replace(/,?\s*store\s+(?:as\s+)?\w+/i, "").trim();
+          }
+        }
+      }
+    } catch (error) {
+      debug4("Context store not available:", error);
+    }
+    const { output, executor } = await this.taskExecutor.query(processedDemand);
+    if (storageKey && output) {
+      try {
+        const aiModel = await import("misoai-core/ai-model");
+        const contextStore = aiModel.getContextStore();
+        const pendingAliases = contextStore._pendingAliases;
+        if (pendingAliases) {
+          contextStore.storeDataWithAliases(storageKey, output, pendingAliases, typeof processedDemand === "string" ? processedDemand : JSON.stringify(processedDemand));
+          delete contextStore._pendingAliases;
+        } else {
+          contextStore.storeData(storageKey, output);
+        }
+        contextStore.addStep({
+          type: "query",
+          summary: `Query: ${typeof processedDemand === "string" ? processedDemand : JSON.stringify(processedDemand)} (stored as ${storageKey})`,
+          data: output,
+          prompt: typeof processedDemand === "string" ? processedDemand : JSON.stringify(processedDemand)
+        });
+      } catch (error) {
+        debug4("Failed to store query result:", error);
+      }
+    } else {
+      try {
+        const aiModel = await import("misoai-core/ai-model");
+        const contextStore = aiModel.getContextStore();
+        contextStore.addStep({
+          type: "query",
+          summary: `Query: ${typeof processedDemand === "string" ? processedDemand : JSON.stringify(processedDemand)}`,
+          data: output,
+          prompt: typeof processedDemand === "string" ? processedDemand : JSON.stringify(processedDemand)
+        });
+      } catch (error) {
+        debug4("Failed to add query step:", error);
+      }
+    }
     const metadata = this.afterTaskRunning(executor);
     return {
       result: output,
@@ -2236,7 +2345,8 @@ var PageAgent = class {
     const plans = buildPlans("Locate", detailedLocateParam);
     const { executor, output } = await this.taskExecutor.runPlans(
       taskTitleStr("Locate", locateParamStr(detailedLocateParam)),
-      plans
+      plans,
+      { cacheable: opt?.cacheable }
     );
     const metadata = this.afterTaskRunning(executor);
     const { element } = output;
@@ -2250,6 +2360,19 @@ var PageAgent = class {
     };
   }
   async aiAssert(assertion, msg, opt) {
+    let processedAssertion = assertion;
+    try {
+      const aiModel = await import("misoai-core/ai-model");
+      const contextStore = aiModel.getContextStore();
+      processedAssertion = contextStore.replaceAllReferences(assertion, "assertion");
+      contextStore.addStep({
+        type: "assertion",
+        summary: `Assertion: ${processedAssertion}`,
+        prompt: processedAssertion
+      });
+    } catch (error) {
+      debug4("Context store not available:", error);
+    }
     let currentUrl = "";
     if (this.page.url) {
       try {
@@ -2257,7 +2380,7 @@ var PageAgent = class {
       } catch (e) {
       }
     }
-    const assertionWithContext = currentUrl ? `For the page at URL "${currentUrl}", ${assertion}` : assertion;
+    const assertionWithContext = currentUrl ? `For the page at URL "${currentUrl}", ${processedAssertion}` : processedAssertion;
     const { output, executor } = await this.taskExecutor.assert(assertionWithContext);
     const metadata = this.afterTaskRunning(executor, true);
     if (output && opt?.keepRawResponse) {
@@ -2477,7 +2600,10 @@ ${errors}`);
 import { sleep as sleep2 } from "misoai-core/utils";
 import { DEFAULT_WAIT_FOR_NAVIGATION_TIMEOUT as DEFAULT_WAIT_FOR_NAVIGATION_TIMEOUT2 } from "misoai-shared/constants";
 import { treeToList as treeToList2 } from "misoai-shared/extractor";
-import { getExtraReturnLogic } from "misoai-shared/fs";
+import {
+  getElementInfosScriptContent,
+  getExtraReturnLogic
+} from "misoai-shared/fs";
 import { getDebug as getDebug5 } from "misoai-shared/logger";
 import { assert as assert8 } from "misoai-shared/utils";
 var debugPage = getDebug5("web:page");
@@ -2532,6 +2658,18 @@ var Page = class {
     debugPage("getElementsInfo end");
     return treeToList2(tree);
   }
+  async getXpathsById(id) {
+    const elementInfosScriptContent = getElementInfosScriptContent();
+    return this.evaluateJavaScript(
+      `${elementInfosScriptContent}midscene_element_inspector.getXpathsById('${id}')`
+    );
+  }
+  async getElementInfoByXpath(xpath) {
+    const elementInfosScriptContent = getElementInfosScriptContent();
+    return this.evaluateJavaScript(
+      `${elementInfosScriptContent}midscene_element_inspector.getElementInfoByXpath('${xpath}')`
+    );
+  }
   async getElementsNodeTree() {
     await this.waitForNavigation();
     const scripts = await getExtraReturnLogic(true);