testdriverai 4.1.43 → 4.1.45

package/agent.js

@@ -202,8 +202,11 @@ if (!commandHistory.length) {
   ];
 }
 
-const exit = async (failed = true) => {
-  await save();
+const exit = async (failed = true, shouldSave = false) => {
+  
+  if (shouldSave) {
+    await save();
+  }
 
   analytics.track("exit", { failed });
 
@@ -641,6 +644,16 @@ const actOnMarkdown = async (content, depth, pushToHistory = false) => {
 // simple function to backfill the chat history with a prompt and
 // then call `promptUser()` to get the user input
 const firstPrompt = async () => {
+
+  // should be start of new session
+  const sessionRes = await sdk.req("session/start", {
+    systemInformationOsInfo: await system.getSystemInformationOsInfo(),
+    mousePosition: await system.getMousePosition(),
+    activeWindow: await system.activeWin(),
+  });
+
+  session.set(sessionRes.data.id);
+
   // readline is what allows us to get user input
   rl = readline.createInterface({
     terminal: true,
@@ -681,7 +694,7 @@ const firstPrompt = async () => {
     if (input.indexOf("/summarize") == 0) {
       await summarize();
     } else if (input.indexOf("/quit") == 0) {
-      await exit();
+      await exit(false, true);
     } else if (input.indexOf("/save") == 0) {
       await save({ filepath: commands[1] });
     } else if (input.indexOf("/undo") == 0) {
@@ -705,7 +718,7 @@ const firstPrompt = async () => {
   // if file exists, load it
   if (fs.existsSync(thisFile)) {
     analytics.track("load");
-    let object = await generator.ymlToHistory(
+    let object = await generator.hydrateFromYML(
       fs.readFileSync(thisFile, "utf-8"),
     );
 
@@ -835,7 +848,7 @@ let save = async ({ filepath = thisFile, silent = false } = {}) => {
   }
 
   // write reply to /tmp/oiResult.log.log
-  let regression = await generator.historyToYml(executionHistory);
+  let regression = await generator.dumpToYML(executionHistory);
   try {
     fs.writeFileSync(filepath, regression);
   } catch (e) {
@@ -862,9 +875,10 @@ ${regression}
 // this will load a regression test from a file location
 // it parses the markdown file and executes the codeblocks exactly as if they were
 // generated by the AI in a single prompt
-let run = async (file, overwrite = false, shouldExit = true) => {
+let run = async (file, shouldSave = false, shouldExit = true) => {
 
   setTerminalWindowTransparency(true);
+  emitter.emit(events.interactive, false);
 
   log.log("info", chalk.cyan(`running ${file}...`));
 
@@ -934,11 +948,12 @@ ${yaml.dump(step)}
     await actOnMarkdown(markdown, 0, true);
   }
 
-  if (overwrite || overwrite == "true") {
+  if (shouldSave || shouldSave == "true") {
     await save({ filepath: file });
   }
 
   setTerminalWindowTransparency(false);
+  emitter.emit(events.interactive, true);
 
   if (shouldExit || shouldExit == "true") {
     await summarize();
@@ -1056,15 +1071,6 @@ const start = async () => {
     console.log("");
   }
 
-  // should be start of new session
-  const sessionRes = await sdk.req("session/start", {
-    systemInformationOsInfo: await system.getSystemInformationOsInfo(),
-    mousePosition: await system.getMousePosition(),
-    activeWindow: await system.activeWin(),
-  });
-
-  session.set(sessionRes.data);
-
   analytics.track("command", { command: thisCommand, file: thisFile });
 
   if (thisCommand == "edit") {

package/lib/commands.js

@@ -160,15 +160,12 @@ const assert = async (assertion, shouldThrow = false, async = false) => {
     return handleAssertResponse(response.data);
   }
 };
-const scroll = async (direction = "down", amount = 300, method = "keyboard") => {
+const scroll = async (direction = "down", amount = 300, method = "mouse") => {
   await redraw.start();
 
   amount = parseInt(amount);
 
   if (method === "mouse") {
-    // after experimenting, 200 is a good default for mouse, mostly as mouse will be called only when the user asks for it
-    // and that happens when keyboard scrolling cannot do things when there's a pop up that needs to be scrolled over and 
-    // pop ups are usually smaller and needs a smaller amount of scrolling
     amount = 200;
   }
 

package/lib/generator.js

@@ -2,6 +2,7 @@
 const yaml = require("js-yaml");
 const chalk = require("chalk");
 const package = require("../package.json");
+const session = require("./session");
 // do the actual parsing
 // this library is very strict
 // note that errors are sent to the AI will it may self-heal
@@ -52,25 +53,30 @@ const jsonToManual = function (json, colors = true) {
   return params;
 };
 
-const historyToYml = async function (inputArray) {
+const dumpToYML = async function (inputArray) {
+
   // use yml dump to convert json to yml
   let yml = await yaml.dump({
     version: package.version,
+    session: session.get(),
     steps: inputArray,
   });
 
   return yml;
 };
 
-const ymlToHistory = async function (yml) {
+const hydrateFromYML = async function (yml) {
   // use yml load to convert yml to json
   let json = await yaml.load(yml);
+
+  session.set(json.session);
+
   return json;
 };
 
 module.exports = {
   manualToYml,
-  historyToYml,
-  ymlToHistory,
+  dumpToYML,
+  hydrateFromYML,
   jsonToManual,
 };

package/lib/sdk.js

@@ -106,7 +106,7 @@ const req = async (path, data, onChunk) => {
     responseType: typeof onChunk === "function" ? "stream" : "json",
     data: {
       ...data,
-      session: session.get()?.id,
+      session: session.get(),
       stream: typeof onChunk === "function",
     },
   };

package/lib/session.js

@@ -5,6 +5,8 @@ module.exports = {
     return session;
   },
   set: (s) => {
-    session = s;
+    if (s) {
+      session = s;
+    }
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "4.1.43",
+  "version": "4.1.45",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "index.js",
   "bin": {