testdriverai 4.1.13 → 4.1.15

package/agent.js

@@ -648,8 +648,7 @@ const firstPrompt = async () => {
     if (!input.trim().length) return promptUser();
 
     emitter.emit(events.interactive, false);
-    await setTerminalApp();
-    // setTerminalWindowTransparency(true);
+    setTerminalWindowTransparency(true);
     errorCounts = {};
 
     // append this to commandHistoryFile
@@ -682,7 +681,7 @@ const firstPrompt = async () => {
       await humanInput(input, true);
     }
 
-    // setTerminalWindowTransparency(false);
+    setTerminalWindowTransparency(false);
     promptUser();
   });
 
@@ -725,6 +724,7 @@ New commands will be appended.
 };
 
 let setTerminalWindowTransparency = async (hide) => {
+
   if (hide) {
     try {
       http
@@ -751,6 +751,7 @@ let setTerminalWindowTransparency = async (hide) => {
     return;
   }
 
+
   try {
     if (hide) {
       if (terminalApp) {
@@ -774,7 +775,6 @@ let summarize = async (error = null) => {
 
   log.log("info", "");
 
-  log.log("info", chalk.cyan("summarizing"));
   log.log("info", chalk.dim("reviewing test..."), true);
 
   // let text = prompts.summarize(tasks, error);
@@ -936,9 +936,9 @@ const promptUser = () => {
   rl.prompt(true);
 };
 
-const setTerminalApp = async () => {
+const setTerminalApp = async (win) => {
+
   if (terminalApp) return;
-  let win = await system.activeWin();
   if (process.platform === "win32") {
     terminalApp = win?.title || "";
   } else {
@@ -998,7 +998,8 @@ const embed = async (file, depth) => {
   log.log("info", `${file} (end)`);
 };
 
-(async () => {
+const start = async () => {
+  
   // console.log(await  system.getPrimaryDisplay());
 
   // @todo add-auth
@@ -1042,7 +1043,6 @@ const embed = async (file, depth) => {
     console.log("");
   }
 
-  await setTerminalApp();
 
   // should be start of new session
   const sessionRes = await sdk.req("session/start", {
@@ -1063,7 +1063,7 @@ const embed = async (file, depth) => {
   } else if (thisCommand == "init") {
     init();
   }
-})();
+};
 
 process.on("uncaughtException", async (err) => {
   analytics.track("uncaughtException", { err });
@@ -1078,3 +1078,8 @@ process.on("unhandledRejection", async (reason, promise) => {
   // Optionally, you might want to exit the process
   await exit(true);
 });
+
+module.exports = {
+  setTerminalApp,
+  start
+};

package/electron/overlay.js

@@ -39,7 +39,10 @@ app.whenReady().then(() => {
     visibleOnFullScreen: true,
   });
   window.loadFile("overlay.html");
-  window.show();
+
+  window.once('ready-to-show', () => {
+    window.showInactive();
+  });
 
   // open developer tools
   // window.webContents.openDevTools();

package/index.js

@@ -1,37 +1,49 @@
 #!/usr/bin/env node
 const config = require("./lib/config.js");
+const system = require("./lib/system.js");
 const { emitter, events } = require("./lib/events.js");
 
-if (!config.TD_OVERLAY) {
-  require("./agent.js");
-} else {
-  // Intercept all stdout and stderr calls (works with console as well)
-  const originalStdoutWrite = process.stdout.write.bind(process.stdout);
-  process.stdout.write = (...args) => {
-    const [data, encoding] = args;
-    emitter.emit(
-      events.terminal.stdout,
-      data.toString(typeof encoding === "string" ? encoding : undefined),
-    );
-    originalStdoutWrite(...args);
-  };
+(async () => {
 
-  const originalStderrWrite = process.stderr.write.bind(process.stderr);
-  process.stderr.write = (...args) => {
-    const [data, encoding] = args;
-    emitter.emit(
-      events.terminal.stderr,
-      data.toString(typeof encoding === "string" ? encoding : undefined),
-    );
-    originalStderrWrite(...args);
-  };
+  let win = await system.activeWin();
 
-  require("./lib/overlay.js")
-    .electronProcessPromise.then(() => {
-      require("./agent.js");
-    })
-    .catch((err) => {
-      console.error(err);
-      process.exit(1);
-    });
-}
+  if (!config.TD_OVERLAY) {
+    let agent = require("./agent.js");
+    agent.setTerminalApp(win);
+    agent.start();
+  } else {
+    // Intercept all stdout and stderr calls (works with console as well)
+    const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+    process.stdout.write = (...args) => {
+      const [data, encoding] = args;
+      emitter.emit(
+        events.terminal.stdout,
+        data.toString(typeof encoding === "string" ? encoding : undefined),
+      );
+      originalStdoutWrite(...args);
+    };
+  
+    const originalStderrWrite = process.stderr.write.bind(process.stderr);
+    process.stderr.write = (...args) => {
+      const [data, encoding] = args;
+      emitter.emit(
+        events.terminal.stderr,
+        data.toString(typeof encoding === "string" ? encoding : undefined),
+      );
+      originalStderrWrite(...args);
+    };
+  
+    require("./lib/overlay.js")
+      .electronProcessPromise.then(() => {
+        let agent = require("./agent.js");
+        agent.setTerminalApp(win);
+        agent.start();
+      })
+      .catch((err) => {
+        console.error(err);
+        process.exit(1);
+      });
+  }
+
+  
+})()

package/lib/config.js

@@ -28,7 +28,7 @@ const config = {
   TD_API_ROOT: "https://api.testdriver.ai",
   TD_DEV: parseValue(process.env["DEV"]),
   TD_PROFILE: false,
-  TD_OVERLAY: true,
+  TD_OVERLAY: true
 };
 
 // Find all env vars starting with TD_

package/lib/focus-application.js

@@ -3,20 +3,25 @@ const path = require("path");
 const { execSync } = require("child_process");
 const { platform } = require("./system");
 const scriptPath = path.join(__dirname, "focusWindow.ps1");
+const robot = require("robotjs");
 
 // apple script that focuses on a window
-const appleScriptFocus = (windowName) => `
+const appleScriptSetFrontmost = (windowName) => `
 tell application "System Events" to tell process "${windowName}"
     set frontmost to true
 end tell`;
 
-const appleScriptMin = (windowName) => `
-tell application "System Events" 
-    set value of attribute "AXMinimized" of every window of application process "${windowName}" to true
-end tell`;
+// const appleScriptAXMinimized = (windowName) => `
+// tell application "System Events" 
+//     set value of attribute "AXMinimized" of every window of application process "${windowName}" to true
+// end tell`;
+
+// const appleScriptActivate = (windowName) => `
+// tell application "${windowName}" to activate
+// `;
 
-const appleScriptMax = (windowName) => `
-tell application "${windowName}" to activate
+const appleScriptOpen = (windowName) => `
+open -a "${windowName}"
 `;
 
 const runPwsh = (appName, method) => {
@@ -27,7 +32,7 @@ const runPwsh = (appName, method) => {
 async function focusApplication(appName) {
   try {
     if (platform() == "mac") {
-      return await execSync(`osascript -e '${appleScriptFocus(appName)}'`);
+      return await execSync(`osascript -e '${appleScriptSetFrontmost(appName)}'`);
     } else if (platform() == "linux") {
       // TODO: This needs fixing
       return;
@@ -42,7 +47,8 @@ async function focusApplication(appName) {
 async function hideTerminal(appName) {
   try {
     if (platform() == "mac") {
-      return await execSync(`osascript -e '${appleScriptMin(appName)}'`);
+      robot.keyTap('m', ['command']);
+      robot.keyToggle('command', 'up')
     } else if (platform() == "windows") {
       return runPwsh(appName, "Minimize");
     }
@@ -54,7 +60,7 @@ async function hideTerminal(appName) {
 async function showTerminal(appName) {
   try {
     if (platform() == "mac") {
-      return await execSync(`osascript -e '${appleScriptMax(appName)}'`);
+      return await execSync(appleScriptOpen(appName));
     } else if (platform() == "windows") {
       return runPwsh(appName, "Restore");
     }

package/lib/overlay.js

@@ -10,7 +10,7 @@ ipc.config.silent = true;
 
 let electronProcess;
 
-console.log("Starting overlay process...");
+console.log("Spawning GUI...");
 
 try {
   // Resolve the path to Electron CLI

package/package.json

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