testdriverai 4.0.22 → 4.0.24

package/README.md

@@ -4,7 +4,7 @@
 
 Next generation autonomous AI agent for end-to-end testing of web & desktop
 
-[Docs](https://docs.testdriver.ai) | [Website](https://testdriver.ai) | [GitHub Action](https://github.com/marketplace/actions/testdriver-ai) | [Join our Discord](https://discord.gg/22RdN6tp)
+[Docs](https://docs.testdriver.ai) | [Website](https://testdriver.ai) | [GitHub Action](https://github.com/marketplace/actions/testdriver-ai) | [Join our Discord](https://discord.gg/a8Cq739VWn)
 
 ----
 

package/index.js

@@ -124,6 +124,8 @@ if (!commandHistory.length) {
 
 const exit = async (failed = true) => {
 
+  await save();
+
   analytics.track('exit', {failed});
 
   // we purposly never resolve this promise so the process will hang
@@ -487,9 +489,8 @@ const firstPrompt = async (text) => {
   // this is how we parse user input
   // notice that the AI is only called if the input is not a command
   rl.on('line', async (input) => {
-
-    let win = await system.activeWin();
-    terminalApp = win?.owner?.name || "";
+    
+    await setTerminalApp();
 
     setTerminalWindowTransparency(true)
     errorCounts = {};
@@ -743,6 +744,18 @@ const promptUser = () => {
   rl.prompt(true);
 }
 
+const setTerminalApp = async () => {
+
+  let win = await system.activeWin();
+  console.log(win)
+  if (process.platform === 'win32') {
+    terminalApp = win?.title || "";
+  } else {
+    terminalApp = win?.owner?.name || "";
+  }
+
+}
+
 const iffy = async (condition, then, otherwise, depth) => {
 
   analytics.track('if', {condition});
@@ -830,8 +843,7 @@ const embed = async (file, depth) => {
 
   }
 
-  let win = await system.activeWin();
-  terminalApp = win?.owner?.name || "";
+  await setTerminalApp();
 
   // should be start of new session
   sessionRes = await sdk.req('session/start', {

package/lib/commands.js

@@ -327,6 +327,12 @@ let commands = {
 
     // remove any modifier keys from the inputKeys array and put them in a new array
     inputKeys.forEach(key => {
+
+      // change command to control on windows
+      if (key === 'command' && process.platform === 'win32') {
+        key = 'control';
+      }
+
       if (modifierKeys.includes(key)) {
         modifierKeysPressed.push(key);
       } else {

package/lib/focus-application.js

@@ -5,26 +5,35 @@ const { platform } = require("./system");
 const scriptPath = path.join(__dirname, "focusWindow.ps1");
 
 // apple script that focuses on a window
-const appleScriptShow = (windowName) => `
+const appleScriptFocus = (windowName) => `
 tell application "System Events" to tell process "${windowName}"
     set frontmost to true
 end tell`;
 
-const appleScriptHide = (windowName) => `
-tell application "System Events" to tell process "${windowName}"
-    set frontmost to false
-end tell`;
+const appleScriptMinMax = (windowName, booleanString) => `
+tell application "${windowName}"
+    set windowList to every window
+    repeat with aWindow in windowList
+        set miniaturized of aWindow to ${booleanString}
+    end repeat
+end tell
+`;
+
+const runPwsh = (appName, method) => {
+  let script = `powershell -ExecutionPolicy Bypass -Command "& { ${scriptPath} '${appName}' '${method}' }"`;
+  return execSync(script, { stdio: "inherit", shell: "powershell" });
+}
 
 async function focusApplication(appName) {
   try {
 
     if (platform() == "mac") {
-      return await execSync(`osascript -e '${appleScriptShow(appName)}'`);
+      return await execSync(`osascript -e '${appleScriptFocus(appName)}'`);
     } else if (platform() == "linux") {
       // TODO: This needs fixing
-      return await execSync(`wmctrl -a '${appName}'`);
+      return
     } else if (platform() == "windows") {
-      return await execSync(`powershell "${scriptPath}" "${appName}" -Action "Show"`);
+      return runPwsh(appName, "Focus");
     }
 
   } catch (error) {
@@ -33,13 +42,14 @@ async function focusApplication(appName) {
 }
 
 async function hideTerminal(appName) {
-
+ 
   try {
     if (platform() == "mac") {
-      return await execSync(`osascript -e '${appleScriptHide(appName)}'`);
+      return await execSync(`osascript -e '${appleScriptMinMax(appName, 'true')}'`);
     } else if (platform() == "linux") {
     } else if (platform() == "windows") {
-      return await execSync(`powershell "${scriptPath}" "${appName}" -Action "Minimize"`);
+      return runPwsh(appName, "Minimize");
+
     }
   } catch (error) {
     console.log(error);
@@ -50,10 +60,10 @@ async function showTerminal(appName) {
   try {
 
     if (platform() == "mac") {
-      return await execSync(`osascript -e '${appleScriptShow(appName)}'`);
+      return await execSync(`osascript -e '${appleScriptMinMax(appName, 'false')}'`);
     } else if (platform() == "linux") {
     } else if (platform() == "windows") {
-      return await execSync(`powershell "${scriptPath}" "${appName}" -Action "Show"`);
+      return runPwsh(appName, "Restore");
     }
 
   } catch (error) {

package/lib/focusWindow.ps1

@@ -1,3 +1,28 @@
+# Check and print each argument
+Write-Host "Number of arguments: $($args.Length)"
+for ($i = 0; $i -lt $args.Length; $i++) {
+    Write-Host "Arg[$i]: $($args[$i])"
+}
+
+# Existing logic
+if ($args.Length -lt 2) {
+    Write-Host "Error: Not enough arguments supplied."
+    Write-Host "Usage: .\ControlWindow.ps1 <WindowTitle> <Action>"
+    Write-Host "Actions: Minimize, Restore, Focus"
+    exit 1
+}
+
+# Check if arguments are passed correctly
+$windowTitle = $args[0]
+$action = $args[1]
+
+# Debug output for arguments
+Write-Host "=== Debugging Arguments ==="
+Write-Host "WindowTitle: '$windowTitle'"
+Write-Host "Action: '$action'"
+Write-Host "==========================="
+
+
 Add-Type @"
     using System;
     using System.Runtime.InteropServices;
@@ -8,50 +33,89 @@ Add-Type @"
         public static extern bool SetForegroundWindow(IntPtr hWnd);
         [DllImport("user32.dll")]
         public static extern bool IsIconic(IntPtr hWnd);
+        [DllImport("user32.dll")]
+        public static extern bool IsZoomed(IntPtr hWnd);
     }
 "@
 
 function Control-Window {
     param(
         [Parameter(Mandatory=$true)]
-        [string]$ProcessName,
+        [string]$WindowTitle,
 
         [Parameter(Mandatory=$true)]
-        [ValidateSet("Minimize", "Show")]
+        [ValidateSet("Minimize", "Restore", "Focus")]
         [string]$Action
     )
 
+    # Debug output to confirm script execution
+    Write-Host "Searching for windows with title containing: '$WindowTitle'"
+
     $processes = Get-Process | Where-Object {
-        $_.MainWindowTitle -and ($_.ProcessName -like "*$ProcessName*" -or $_.MainWindowTitle -like "*$ProcessName*")
+        $_.MainWindowTitle -and $_.MainWindowTitle -like "*$WindowTitle*"
     }
 
     if (-not $processes) {
-        Write-Host "No window found with the name containing '$ProcessName'"
+        Write-Host "No window found with the title containing '$WindowTitle'"
         return
     }
 
     foreach ($proc in $processes) {
         $hwnd = $proc.MainWindowHandle
 
-        if ($Action -eq "Minimize") {
-            # Minimize the window
-            [User32]::ShowWindowAsync($hwnd, 6) | Out-Null # 6 is SW_MINIMIZE
-            Write-Host "Minimized '$($proc.MainWindowTitle)'."
-        }
-        elseif ($Action -eq "Show") {
-            # Check if the window is minimized
-            if ([User32]::IsIconic($hwnd)) {
-                # If minimized, restore the window
-                [User32]::ShowWindowAsync($hwnd, 9) | Out-Null # 9 is SW_RESTORE
-            }
+        # Debug output to show found window
+        Write-Host "Found window: '$($proc.MainWindowTitle)'"
 
-            # Bring the window to the foreground
-            [User32]::SetForegroundWindow($hwnd) | Out-Null
-            Write-Host "Brought '$($proc.MainWindowTitle)' to the foreground."
+        switch ($Action) {
+            "Minimize" {
+                # Minimize the window
+                [User32]::ShowWindowAsync($hwnd, 6) | Out-Null # 6 is SW_MINIMIZE
+                Write-Host "Minimized '$($proc.MainWindowTitle)'"
+            }
+            "Restore" {
+                # Restore the window if minimized
+                if ([User32]::IsIconic($hwnd)) {
+                    [User32]::ShowWindowAsync($hwnd, 9) | Out-Null # 9 is SW_RESTORE
+                }
+                # Bring the window to the foreground
+                [User32]::SetForegroundWindow($hwnd) | Out-Null
+                Write-Host "Restored and brought '$($proc.MainWindowTitle)' to the foreground."
+            }
+            "Focus" {
+                # Check if the window is minimized
+                if ([User32]::IsIconic($hwnd)) {
+                    # If minimized, restore the window
+                    [User32]::ShowWindowAsync($hwnd, 9) | Out-Null # 9 is SW_RESTORE
+                }
+                # Bring the window to the foreground
+                [User32]::SetForegroundWindow($hwnd) | Out-Null
+                Write-Host "Brought '$($proc.MainWindowTitle)' to the foreground."
+            }
         }
     }
 }
 
-# Usage example:
-# Control-Window -ProcessName "notepad" -Action "Minimize"
-# Control-Window -ProcessName "notepad" -Action "Show"
+# Script entry point
+if ($args.Length -eq 2) {
+    $windowTitle = $args[0]
+    $action = $args[1]
+
+    # Debug output for arguments
+    Write-Host "=== Debugging Arguments ==="
+    Write-Host "Raw Args: $($args)"
+    Write-Host "WindowTitle: '$windowTitle'"
+    Write-Host "Action: '$action'"
+    Write-Host "==========================="
+
+    # Validate action parameter
+    if ($action -notin @("Minimize", "Restore", "Focus")) {
+        Write-Host "Invalid action. Valid actions are: Minimize, Restore, Focus."
+        exit 1
+    }
+
+    # Call the Control-Window function with command-line arguments
+    Control-Window -WindowTitle $windowTitle -Action $action
+} else {
+    Write-Host "Usage: .\ControlWindow.ps1 <WindowTitle> <Action>"
+    Write-Host "Actions: Minimize, Restore, Focus"
+}

package/package.json

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