testdriverai 6.1.0 → 6.1.1-canary.613bfa3.0

package/agent/events.js

@@ -1,5 +1,4 @@
 const { EventEmitter2 } = require("eventemitter2");
-const { censorSensitiveDataDeep } = require("./lib/censorship");
 
 // Factory function to create a new emitter instance with censoring middleware
 const createEmitter = () => {
@@ -13,14 +12,6 @@ const createEmitter = () => {
     ignoreErrors: false,
   });
 
-  // Override emit to censor sensitive data before emitting
-  const originalEmit = emitter.emit.bind(emitter);
-  emitter.emit = function (event, ...args) {
-    // Censor all arguments passed to emit
-    const censoredArgs = args.map(censorSensitiveDataDeep);
-    return originalEmit(event, ...censoredArgs);
-  };
-
   return emitter;
 };
 
@@ -46,7 +37,7 @@ const events = {
   status: "status",
   log: {
     markdown: {
-      static: "log:markdown:static",
+      static: "log:markdown",
       start: "log:markdown:start",
       chunk: "log:markdown:chunk",
       end: "log:markdown:end",

package/agent/index.js

@@ -63,11 +63,11 @@ class TestDriverAgent extends EventEmitter2 {
     // Derive properties from cliArgs
     const flags = cliArgs.options || {};
     const firstArg = cliArgs.args && cliArgs.args[0];
-    
+
     // All commands (run, edit, generate) use the same pattern:
     // first argument is the main file to work with
     this.thisFile = firstArg || this.config.TD_DEFAULT_TEST_FILE;
-    
+
     this.resultFile = flags.resultFile || null;
     this.newSandbox = flags.newSandbox || false;
     this.healMode = flags.healMode || flags.heal || false;
@@ -91,8 +91,6 @@ class TestDriverAgent extends EventEmitter2 {
       }
     }
 
-
-
     // Create parser instance with this agent's emitter
     this.parser = createParser(this.emitter);
 
@@ -433,6 +431,7 @@ class TestDriverAgent extends EventEmitter2 {
 
     // Log current execution position for debugging
     if (this.sourceMapper.currentFileSourceMap) {
+      this.emitter.emit(events.log.log, "");
       this.emitter.emit(
         events.log.log,
         theme.dim(`${this.sourceMapper.getCurrentPositionDescription()}`),
@@ -490,14 +489,13 @@ class TestDriverAgent extends EventEmitter2 {
         sourcePosition: sourcePosition,
       });
 
-      await this.haveAIResolveError(
+      return await this.haveAIResolveError(
         error,
         yaml.dump({ commands: [yml] }),
         depth,
         true,
         shouldSave,
       );
-      throw error;
     }
   }
 
@@ -894,9 +892,6 @@ commands:
   // it will generate files that contain only "prompts"
   // @todo revit the generate command
   async generate(count = 1) {
-
-    console.log('generate being called with count:', count)
-
     this.emitter.emit(events.log.debug, `generate called with count: ${count}`);
 
     await this.runLifecycle("prerun");
@@ -914,12 +909,12 @@ commands:
     let message = await this.sdk.req(
       "generate",
       {
-        prompt: 'make sure to do a spellcheck',
+        prompt: "make sure to do a spellcheck",
         image,
         mousePosition: mouse,
         activeWindow: activeWindow,
         count,
-        stream: false
+        stream: false,
       },
       (chunk) => {
         if (chunk.type === "data") {
@@ -932,8 +927,6 @@ commands:
 
     let testPrompts = await this.parser.findGenerativePrompts(message.data);
 
-    console.log(testPrompts)
-
     // for each testPrompt
     for (const testPrompt of testPrompts) {
       // with the contents of the testPrompt
@@ -955,9 +948,9 @@ commands:
       const generateDir = path.join(this.workingDir, "testdriver", "generate");
       if (!fs.existsSync(generateDir)) {
         fs.mkdirSync(generateDir);
-        console.log('Created generate directory:', generateDir);
+        console.log("Created generate directory:", generateDir);
       } else {
-        console.log('Generate directory already exists:', generateDir);
+        console.log("Generate directory already exists:", generateDir);
       }
 
       let list = testPrompt.steps;
@@ -967,8 +960,7 @@ commands:
         steps: list,
       });
 
-
-      console.log('writing file', path1, contents)
+      this.emitter.emit(events.log.debug, `writing file ${path1} ${contents}`);
 
       fs.writeFileSync(path1, contents);
     }
@@ -1525,6 +1517,8 @@ ${regression}
   }
 
   async embed(file, depth, pushToHistory) {
+    let inputFile = JSON.parse(JSON.stringify(file));
+
     this.analytics.track("embed", { file });
 
     this.emitter.emit(
@@ -1534,7 +1528,7 @@ ${regression}
 
     depth = depth + 1;
 
-    this.emitter.emit(events.log.log, `${file} (start)`);
+    this.emitter.emit(events.log.log, `${inputFile} (start)`);
 
     // Use the new helper method to resolve file paths relative to testdriver directory
     const currentFilePath = this.sourceMapper.currentFilePath || this.thisFile;
@@ -1587,7 +1581,7 @@ ${regression}
       this.sourceMapper.restoreContext(previousContext);
     }
 
-    this.emitter.emit(events.log.log, `${file} (end)`);
+    this.emitter.emit(events.log.log, `${inputFile} (end)`);
   }
 
   // Returns sandboxId to use (either from file if recent, or null)
@@ -1794,10 +1788,6 @@ ${regression}
       // Start the debugger server as early as possible to ensure event listeners are attached
       if (!debuggerStarted) {
         debuggerStarted = true; // Prevent multiple starts, especially when running test in parallel
-        this.emitter.emit(
-          events.log.narration,
-          theme.green(`Starting debugger server...`),
-        );
         debuggerProcess = await createDebuggerProcess(
           this.config,
           this.emitter,
@@ -1805,6 +1795,7 @@ ${regression}
       }
       this.debuggerUrl = debuggerProcess.url || null; // Store the debugger URL
       this.emitter.emit(events.log.log, `This is beta software!`);
+      this.emitter.emit(events.log.log, ``);
       this.emitter.emit(
         events.log.log,
         theme.yellow(`Join our Discord for help`),
@@ -1813,6 +1804,7 @@ ${regression}
         events.log.log,
         `https://discord.com/invite/cWDFW8DzPm`,
       );
+      this.emitter.emit(events.log.log, ``);
 
       // make testdriver directory if it doesn't exist
       let testdriverFolder = path.join(this.workingDir);
@@ -1826,7 +1818,10 @@ ${regression}
       }
 
       // if the directory for thisFile doesn't exist, create it
-      if (this.cliArgs.command !== "sandbox" && this.cliArgs.command !== "generate") {
+      if (
+        this.cliArgs.command !== "sandbox" &&
+        this.cliArgs.command !== "generate"
+      ) {
         const dir = path.dirname(this.thisFile);
         if (!fs.existsSync(dir)) {
           fs.mkdirSync(dir, { recursive: true });
@@ -1851,7 +1846,10 @@ ${regression}
         await this.sdk.auth();
       }
 
-      if (this.cliArgs.command !== "sandbox" && this.cliArgs.command !== "generate") {
+      if (
+        this.cliArgs.command !== "sandbox" &&
+        this.cliArgs.command !== "generate"
+      ) {
         this.emitter.emit(
           events.log.log,
           theme.dim(`Working on ${this.thisFile}`),
@@ -2045,21 +2043,23 @@ Please check your network connection, TD_API_KEY, or the service status.`,
   }
 
   async runLifecycle(lifecycleName) {
-
-    console.log("Running lifecycle:", lifecycleName);
-
     // Use the current file path from sourceMapper to find the lifecycle directory
     // If sourceMapper doesn't have a current file, use thisFile which should be the file being run
     let currentFilePath = this.sourceMapper.currentFilePath || this.thisFile;
 
-    console.log("Current file path:", currentFilePath);
-    
+    this.emitter.emit(events.log.log, ``);
+    this.emitter.emit(events.log.log, "Running lifecycle: " + lifecycleName);
+
     // If we still don't have a currentFilePath, fall back to the default testdriver directory
     if (!currentFilePath) {
-      currentFilePath = path.join(this.workingDir, "testdriver", "testdriver.yaml");
+      currentFilePath = path.join(
+        this.workingDir,
+        "testdriver",
+        "testdriver.yaml",
+      );
       console.log("No currentFilePath found, using fallback:", currentFilePath);
     }
-    
+
     // Ensure we have an absolute path
     if (currentFilePath && !path.isAbsolute(currentFilePath)) {
       currentFilePath = path.resolve(this.workingDir, currentFilePath);
@@ -2097,7 +2097,7 @@ Please check your network connection, TD_API_KEY, or the service status.`,
       }
     }
 
-    console.log(lifecycleFile)
+    this.emitter.emit(events.log.log, lifecycleFile);
 
     if (lifecycleFile) {
       // Store current source mapping state before running lifecycle file

package/agent/lib/commander.js

@@ -80,21 +80,21 @@ commands:
       // this will actually interpret the command and execute it
       switch (object.command) {
         case "type":
-          emitter.emit(events.log.narration, `typing ${object.text}`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `typing ${object.text}`);
           response = await commands.type(object.text, object.delay);
           break;
         case "press-keys":
+          emitter.emit(events.log.log, generator.jsonToManual(object));
           emitter.emit(
             events.log.narration,
-            `pressing keys ${object.keys.join(",")}`,
+            `pressing keys: ${Array.isArray(object.keys) ? object.keys.join(", ") : object.keys}`,
           );
-          emitter.emit(events.log.log, generator.jsonToManual(object));
           response = await commands["press-keys"](object.keys);
           break;
         case "scroll":
-          emitter.emit(events.log.narration, `scrolling ${object.direction}`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `scrolling ${object.direction}`);
           response = await commands.scroll(
             object.direction,
             object.amount,
@@ -102,21 +102,21 @@ commands:
           );
           break;
         case "wait":
+          emitter.emit(events.log.log, generator.jsonToManual(object));
           emitter.emit(
             events.log.narration,
             `waiting ${object.timeout} seconds`,
           );
-          emitter.emit(events.log.log, generator.jsonToManual(object));
           response = await commands.wait(object.timeout);
           break;
         case "click":
-          emitter.emit(events.log.narration, `${object.action}`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `${object.action}`);
           response = await commands["click"](object.x, object.y, object.action);
           break;
         case "hover":
-          emitter.emit(events.log.narration, `moving mouse`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `moving mouse`);
           response = await commands["hover"](object.x, object.y);
           break;
         case "drag":
@@ -124,11 +124,11 @@ commands:
           response = await commands["drag"](object.x, object.y);
           break;
         case "hover-text":
+          emitter.emit(events.log.log, generator.jsonToManual(object));
           emitter.emit(
             events.log.narration,
             `searching for ${object.description}`,
           );
-          emitter.emit(events.log.log, generator.jsonToManual(object));
           response = await commands["hover-text"](
             object.text,
             object.description,
@@ -138,11 +138,11 @@ commands:
           );
           break;
         case "hover-image":
+          emitter.emit(events.log.log, generator.jsonToManual(object));
           emitter.emit(
             events.log.narration,
             `searching for image of ${object.description}`,
           );
-          emitter.emit(events.log.log, generator.jsonToManual(object));
           response = await commands["hover-image"](
             object.description,
             object.action,
@@ -157,19 +157,19 @@ commands:
           response = await commands["match-image"](object.path, object.action);
           break;
         case "wait-for-image":
+          emitter.emit(events.log.log, generator.jsonToManual(object));
           emitter.emit(
             events.log.narration,
             `waiting for ${object.description}`,
           );
-          emitter.emit(events.log.log, generator.jsonToManual(object));
           response = await commands["wait-for-image"](
             object.description,
             object.timeout,
           );
           break;
         case "wait-for-text":
-          emitter.emit(events.log.narration, `waiting for ${object.text}`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `waiting for ${object.text}`);
           copy.text = "*****";
           response = await commands["wait-for-text"](
             object.text,
@@ -178,8 +178,8 @@ commands:
           );
           break;
         case "scroll-until-text":
-          emitter.emit(events.log.narration, `scrolling until ${object.text}`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `scrolling until ${object.text}`);
           copy.text = "*****";
           response = await commands["scroll-until-text"](
             object.text,
@@ -191,8 +191,8 @@ commands:
           break;
         case "scroll-until-image": {
           const needle = object.description || object.path;
-          emitter.emit(events.log.narration, `scrolling until ${needle}`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `scrolling until ${needle}`);
           response = await commands["scroll-until-image"](
             object.description,
             object.direction,
@@ -203,8 +203,8 @@ commands:
           break;
         }
         case "focus-application":
-          emitter.emit(events.log.narration, `focusing ${object.name}`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `focusing ${object.name}`);
           response = await commands["focus-application"](object.name);
           break;
         case "remember": {
@@ -215,12 +215,12 @@ commands:
           break;
         }
         case "assert":
-          emitter.emit(events.log.narration, `asserting ${object.expect}`);
           emitter.emit(events.log.log, generator.jsonToManual(object));
+          emitter.emit(events.log.narration, `asserting ${object.expect}`);
           response = await commands.assert(object.expect, object.async);
+
           break;
         case "exec":
-          emitter.emit(events.log.narration, `exec`);
           emitter.emit(
             events.log.log,
             generator.jsonToManual({

package/agent/lib/commands.js

@@ -176,7 +176,7 @@ const createCommands = (
     }
 
     const handleAssertResponse = (response) => {
-      emitter.emit(events.log.markdown.static, response);
+      emitter.emit(events.log.log, response);
 
       if (response.indexOf("The task passed") > -1) {
         return true;
@@ -727,14 +727,14 @@ const createCommands = (
             `Command failed with exit code ${result.out.returncode}: ${result.out.stderr}`,
           );
         } else {
-          if (!silent) {
-            emitter.emit(events.log.log, theme.dim(`Command stdout:`), true);
+          if (!silent && result.out?.stdout) {
+            emitter.emit(events.log.log, theme.dim(`stdout:`), true);
             emitter.emit(events.log.log, `${result.out.stdout}`, true);
+          }
 
-            if (result.out.stderr) {
-              emitter.emit(events.log.log, theme.dim(`Command stderr:`), true);
-              emitter.emit(events.log.log, `${result.out.stderr}`, true);
-            }
+          if (!silent && result.out.stderr) {
+            emitter.emit(events.log.log, theme.dim(`stderr:`), true);
+            emitter.emit(events.log.log, `${result.out.stderr}`, true);
           }
 
           return result.out?.stdout?.trim();

package/agent/lib/debugger-server.js

@@ -65,11 +65,6 @@ function createDebuggerServer(config = {}) {
 
       ws.on("close", () => {
         clients.delete(ws);
-
-        // If no clients connected, we can optionally shut down
-        if (clients.size === 0) {
-          console.log("No clients connected, keeping server alive");
-        }
       });
 
       ws.on("error", (error) => {

package/agent/lib/sandbox.js

@@ -23,7 +23,7 @@ const createSandbox = (emitter, analytics) => {
       if (this.socket) {
         this.messageId++;
         message.requestId = `${this.uniqueId}-${this.messageId}`;
-        
+
         // Start timing for this message
         const timingKey = `sandbox-${message.type}`;
         marky.mark(timingKey);

package/agent/lib/source-mapper.js

@@ -263,7 +263,7 @@ class SourceMapper {
     let description = `${fileName}:${(sourcePosition.step.startLine || 0) + 1}`;
 
     if (sourcePosition.command) {
-      description += `:${(sourcePosition.command.startLine || 0) + 1} (${sourcePosition.command.command || "unknown command"})`;
+      description += `:${(sourcePosition.command.startLine || 0) + 1}`;
     } else {
       description += ` (step ${sourcePosition.step.stepIndex + 1})`;
     }