only click HOME if wda doesnt minimize itself

Author: gmegidish

devices/ios.go

@@ -504,9 +504,18 @@ func (d *IOSDevice) StartAgent(config StartAgentConfig) error {
 				return fmt.Errorf("failed to wait for WebDriverAgent: %w", err)
 			}
 
-			// wait 1 second after pressing home, so we make sure wda is in the background
-			_ = d.wdaClient.PressButton("HOME")
-			time.Sleep(1 * time.Second)
+			// check if WebDriverAgent is the active app and press HOME to background it
+			activeApp, err := d.wdaClient.GetActiveAppInfo()
+			if err == nil {
+				utils.Verbose("Active app: %s (%s)", activeApp.Name, activeApp.BundleID)
+
+				// if WDA is in foreground, press HOME to background it
+				if strings.Contains(activeApp.Name, "WebDriverAgent") {
+					utils.Verbose("WebDriverAgent is active, pressing HOME to background it")
+					_ = d.wdaClient.PressButton("HOME")
+					time.Sleep(1 * time.Second)
+				}
+			}
 		}
 	}
 

devices/wda/active-app.go

@@ -0,0 +1,38 @@
+package wda
+
+import "fmt"
+
+// ActiveAppInfo represents information about the currently active application
+type ActiveAppInfo struct {
+	BundleID string `json:"bundleId"`
+	Name     string `json:"name"`
+	ProcessID int   `json:"pid"`
+}
+
+// GetActiveAppInfo returns information about the currently active/foreground application
+// This uses the /wda/activeAppInfo endpoint which doesn't require a session
+func (c *WdaClient) GetActiveAppInfo() (*ActiveAppInfo, error) {
+	response, err := c.GetEndpoint("wda/activeAppInfo")
+	if err != nil {
+		return nil, fmt.Errorf("failed to get active app info: %w", err)
+	}
+
+	// extract value from response
+	value, ok := response["value"].(map[string]interface{})
+	if !ok {
+		return nil, fmt.Errorf("unexpected response format: missing or invalid 'value' field")
+	}
+
+	bundleID, _ := value["bundleId"].(string)
+	name, _ := value["name"].(string)
+	pid := 0
+	if pidFloat, ok := value["pid"].(float64); ok {
+		pid = int(pidFloat)
+	}
+
+	return &ActiveAppInfo{
+		BundleID:  bundleID,
+		Name:      name,
+		ProcessID: pid,
+	}, nil
+}

main.go

@@ -33,7 +33,8 @@ func main() {
 		hook.Shutdown()
 		os.Exit(0)
 	case err := <-done:
-		// normal exit: let WDA and other resources persist
+		// cleanup resources on normal exit
+		hook.Shutdown()
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			os.Exit(1)