agent-device 0.21.13 → 0.21.14

package/android/ime-helper/dist/agent-device-android-ime-helper-0.21.14.apk.sha256

@@ -0,0 +1 @@
+8a21cd8be9cc7792c51cda50949e2e64c455b9b37e680079182d3d09fabba6d4  agent-device-android-ime-helper-0.21.14.apk

package/android/ime-helper/dist/{agent-device-android-ime-helper-0.21.13.manifest.json → agent-device-android-ime-helper-0.21.14.manifest.json}

@@ -1,10 +1,10 @@
 {
   "name": "android-ime-helper",
-  "version": "0.21.13",
-  "assetName": "agent-device-android-ime-helper-0.21.13.apk",
-  "sha256": "8388dc7a3c3f18aca7322cc50bc4f3ff769d426733746a764f45b56d50a0f267",
+  "version": "0.21.14",
+  "assetName": "agent-device-android-ime-helper-0.21.14.apk",
+  "sha256": "8a21cd8be9cc7792c51cda50949e2e64c455b9b37e680079182d3d09fabba6d4",
   "packageName": "com.callstack.agentdevice.imehelper",
-  "versionCode": 21013,
+  "versionCode": 21014,
   "serviceComponent": "com.callstack.agentdevice.imehelper/.TestInputMethodService",
   "broadcastProtocol": "android-ime-helper-v1"
 }

package/android/snapshot-helper/dist/agent-device-android-snapshot-helper-0.21.14.apk.sha256

@@ -0,0 +1 @@
+2309cff0de9a4f9229d3818e328ab90e192c73f414373415c4882d4de20d6723  agent-device-android-snapshot-helper-0.21.14.apk

package/android/snapshot-helper/dist/{agent-device-android-snapshot-helper-0.21.13.manifest.json → agent-device-android-snapshot-helper-0.21.14.manifest.json}

@@ -1,13 +1,13 @@
 {
   "name": "android-snapshot-helper",
-  "version": "0.21.13",
-  "releaseTag": "v0.21.13",
-  "assetName": "agent-device-android-snapshot-helper-0.21.13.apk",
+  "version": "0.21.14",
+  "releaseTag": "v0.21.14",
+  "assetName": "agent-device-android-snapshot-helper-0.21.14.apk",
   "apkUrl": null,
-  "sha256": "e07b556384093a04be99af068b6493e0b0a66e7e7cf09264da4fe60f75f2d164",
-  "checksumName": "agent-device-android-snapshot-helper-0.21.13.apk.sha256",
+  "sha256": "2309cff0de9a4f9229d3818e328ab90e192c73f414373415c4882d4de20d6723",
+  "checksumName": "agent-device-android-snapshot-helper-0.21.14.apk.sha256",
   "packageName": "com.callstack.agentdevice.snapshothelper",
-  "versionCode": 21013,
+  "versionCode": 21014,
   "instrumentationRunner": "com.callstack.agentdevice.snapshothelper/.SnapshotInstrumentation",
   "minSdk": 23,
   "targetSdk": 36,

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunner/AgentDeviceRunnerApp.m

@@ -295,6 +295,24 @@ static NSTimeInterval AgentDeviceAlertActivationBusyWindow(void) {
     ]];
   }
 
+  if ([NSProcessInfo.processInfo.arguments containsObject:@"--agent-device-crowded-screen"]) {
+    for (NSUInteger row = 0; row < 500; row++) {
+      UILabel *rowLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 60 + (row % 30) * 24, 400, 16)];
+      rowLabel.text = [NSString stringWithFormat:@"Crowded row %lu", (unsigned long)row];
+      rowLabel.accessibilityIdentifier = [NSString stringWithFormat:@"agent-device-crowded-row-%lu", (unsigned long)row];
+      [self.view addSubview:rowLabel];
+    }
+  }
+
+  BOOL markedButton = [NSProcessInfo.processInfo.arguments containsObject:@"--agent-device-dismiss-popup"];
+  if (markedButton || [NSProcessInfo.processInfo.arguments containsObject:@"--agent-device-dismiss-popup-window"]) {
+    UIButton *dismissRegion = [UIButton buttonWithType:UIButtonTypeSystem];
+    dismissRegion.accessibilityIdentifier = markedButton ? @" Dismiss Popup " : @"agent-device-close-popover";
+    [dismissRegion setTitle:@"Close popover" forState:UIControlStateNormal];
+    dismissRegion.frame = CGRectMake(40, 40, 200, 44);
+    [self.view addSubview:dismissRegion];
+  }
+
   if ([NSProcessInfo.processInfo.arguments containsObject:@"--agent-device-selector-read-regression"]) {
     NSString *const duplicateIdentifier = @"agent-device-selector-read-duplicate";
 
@@ -338,6 +356,11 @@ static NSTimeInterval AgentDeviceAlertActivationBusyWindow(void) {
 
   self.window = [[UIWindow alloc] initWithWindowScene:(UIWindowScene *)scene];
   self.window.rootViewController = [[AgentDeviceRunnerViewController alloc] init];
+#if TARGET_OS_IOS
+  if ([NSProcessInfo.processInfo.arguments containsObject:@"--agent-device-dismiss-popup-window"]) {
+    self.window.accessibilityIdentifier = @"Dismiss popup";
+  }
+#endif
   [self.window makeKeyAndVisible];
 }
 

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+AXSnapshotFallback.swift

@@ -217,12 +217,11 @@ extension RunnerTests {
       }
 
       let rootFrame = privateAXRect(root["frame"])
-      let geometry = privateAXSnapshotGeometry(
+      let viewport = privateAXSnapshotViewport(
         app: app,
         bundleId: target.bundleId,
         rootFrame: rootFrame
       )
-      let viewport = geometry.viewport
       let nodes = privateAXAcquisition(
         rawRoot: root,
         hint: hint
@@ -259,8 +258,7 @@ extension RunnerTests {
         customActions: Self.privateAXCustomActionCoverage(
           response[RunnerAXSnapshotCustomActionsKey]
         ),
-        viewport: viewport,
-        interfaceOrientation: geometry.interfaceOrientation
+        viewport: viewport
       )
     #else
       return nil
@@ -277,35 +275,30 @@ extension RunnerTests {
 
 
 
-
-
-  private func privateAXSnapshotGeometry(
+  private func privateAXSnapshotViewport(
     app: XCUIApplication,
     bundleId: String?,
     rootFrame: CGRect
-  ) -> (viewport: CGRect, interfaceOrientation: Int) {
-    let fallback = rootFrame.isEmpty ? CGRect.infinite : rootFrame
+  ) -> SnapshotViewport {
+    let fallback = SnapshotViewport.derived(box: rootFrame)
     guard shouldReadPrivateAXViewportViaXCTest(bundleId: bundleId) else {
-      return (fallback, RunnerInterfaceOrientation.unknown)
+      return fallback
     }
     do {
-      let anchor = try runMainThreadWork(
+      let reported = try runMainThreadWork(
         "private_ax_viewport",
         timeout: 1,
         timeoutError: snapshotMainThreadTimeoutError("reading private AX viewport")
       ) {
-        (
-          viewport: self.safeSnapshotViewport(app: app),
-          interfaceOrientation: self.capturedInterfaceOrientation(app: app)
-        )
+        self.safeSnapshotViewport(app: app, readingOrientation: true)
       }
-      if anchor.viewport.isInfinite || anchor.viewport.isNull || anchor.viewport.isEmpty {
-        return (fallback, RunnerInterfaceOrientation.unknown)
+      if case .missing = reported {
+        return fallback
       }
-      return (anchor.viewport, anchor.interfaceOrientation)
+      return reported
     } catch {
       NSLog("AGENT_DEVICE_RUNNER_PRIVATE_AX_VIEWPORT_FALLBACK=%@", String(describing: error))
-      return (fallback, RunnerInterfaceOrientation.unknown)
+      return fallback
     }
   }
 

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Alert.swift

@@ -161,22 +161,26 @@ extension RunnerTests {
     elements.first { isVisibleElement($0) }
   }
 
+
+
+
+
   private func firstDismissPopupWindow(in app: XCUIApplication) -> XCUIElement? {
-    safeElementsQuery {
-      app.windows.allElementsBoundByIndex
-    }.first { window in
-      if !isVisibleElement(window) { return false }
-      if isDismissPopupMarker(window.label) || isDismissPopupMarker(window.identifier) {
-        return true
-      }
-      return safeElementsQuery {
-        window.descendants(matching: .any).allElementsBoundByIndex
-      }.contains { descendant in
-        isDismissPopupMarker(descendant.label) || isDismissPopupMarker(descendant.identifier)
-      }
-    }
+    firstExistingElement(in: safeElementsQuery {
+      app.windows.containing(Self.dismissPopupMarker).allElementsBoundByIndex
+    })
   }
 
+
+
+  private static let dismissPopupMarkerPattern = #"\s*dismiss popup\s*"#
+  private static let dismissPopupMarker = NSPredicate(
+    format: "label MATCHES[c] %@ OR identifier MATCHES[c] %@",
+    dismissPopupMarkerPattern,
+    dismissPopupMarkerPattern
+  )
+  private static let dismissPopupMarkerText = NSPredicate(format: "SELF MATCHES[c] %@", dismissPopupMarkerPattern)
+
   private func chooseAlertButton(_ buttons: [XCUIElement], action: String) -> XCUIElement? {
     if action == "accept" {
       if let accept = buttons.first(where: { isAcceptButton($0.label) }) {
@@ -285,7 +289,7 @@ extension RunnerTests {
     return hittable
   }
 
-  private func isDismissPopupMarker(_ label: String) -> Bool {
-    label.trimmingCharacters(in: .whitespacesAndNewlines).caseInsensitiveCompare("dismiss popup") == .orderedSame
+  func isDismissPopupMarker(_ text: String) -> Bool {
+    Self.dismissPopupMarkerText.evaluate(with: text)
   }
 }

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+AlertObservation.swift

@@ -68,9 +68,8 @@ extension RunnerTests {
   }
 
   private func containsDismissPopupMarker(_ snapshot: XCUIElementSnapshot) -> Bool {
-    [snapshot.label, snapshot.identifier].contains {
-      $0.trimmingCharacters(in: .whitespacesAndNewlines).caseInsensitiveCompare("dismiss popup") == .orderedSame
-    } || snapshot.children.contains { containsDismissPopupMarker($0) }
+    [snapshot.label, snapshot.identifier].contains { isDismissPopupMarker($0) } ||
+      snapshot.children.contains { containsDismissPopupMarker($0) }
   }
 
   private func alertPresentation(_ snapshot: XCUIElementSnapshot) -> RunnerAlertPresentation {

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+CommandExecution.swift

@@ -78,20 +78,15 @@ extension RunnerTests {
               app: activeApp,
               policy: synthesizedGesturePolicy(policyKind)
             )
-            let (timing, outcome) = performGesture(activeApp, idleTimeout: false) {
+            switch performSynthesizedGesture(activeApp, kind: policyKind, context: context, synthesize: {
               synthesizedTapAt(
                 app: activeApp,
                 x: touchPoint.x,
                 y: touchPoint.y,
                 context: context
               )
-            }
-            if case .performed = outcome {
-              logSynthesizedGesturePolicyDecision(
-                kind: policyKind,
-                context: context,
-                fallbackAttempted: false
-              )
+            }) {
+            case .performed(let timing):
               if isTextEntry {
                 waitForTextEntryReadinessAfterTap(app: activeApp, element: element)
               }
@@ -107,13 +102,12 @@ extension RunnerTests {
                   ? match.usedNonHittableFallback
                   : nil
               )
+            case .xctestFallback(let message, let hint):
+              fallback = GestureFallback(strategy: "xctest-coordinate-tap", message: message, hint: hint)
+            case .refused(_, let message, let hint):
+              clearRememberedTextEntryTap()
+              return unsupportedResponse(message: message, hint: hint)
             }
-            logSynthesizedGesturePolicyDecision(
-              kind: policyKind,
-              context: context,
-              fallbackAttempted: true
-            )
-            fallback = gestureFallback(strategy: "xctest-coordinate-tap", from: outcome)
           }
           let (timing, outcome) = performGesture(activeApp) {
             if expectedPoint != nil || match.usedNonHittableFallback {
@@ -172,16 +166,18 @@ extension RunnerTests {
             app: activeApp,
             policy: synthesizedGesturePolicy(policyKind)
           )
-          let (timing, outcome) = performGesture(activeApp, idleTimeout: false) {
+          switch performSynthesizedGesture(activeApp, kind: policyKind, context: context, synthesize: {
             synthesizedTapAt(app: activeApp, x: x, y: y, context: context)
-          }
-          if case .performed = outcome {
-            logSynthesizedGesturePolicyDecision(kind: policyKind, context: context, fallbackAttempted: false)
+          }) {
+          case .performed(let timing):
             rememberTextEntryTap(textInput)
             return gestureResponse(message: "tapped", timing: timing)
+          case .xctestFallback(let message, let hint):
+            fallback = GestureFallback(strategy: "xctest-coordinate-tap", message: message, hint: hint)
+          case .refused(_, let message, let hint):
+            clearRememberedTextEntryTap()
+            return unsupportedResponse(message: message, hint: hint)
           }
-          logSynthesizedGesturePolicyDecision(kind: policyKind, context: context, fallbackAttempted: true)
-          fallback = gestureFallback(strategy: "xctest-coordinate-tap", from: outcome)
         }
         let touchFrame = resolvedTouchVisualizationFrame(app: activeApp, x: x, y: y)
         let (timing, outcome) = performGesture(activeApp) { tapAt(app: activeApp, x: x, y: y) }

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+GestureExecution.swift

@@ -25,13 +25,17 @@ extension RunnerTests {
     case .performed:
       return nil
     case .unsupported(let message, let hint):
-      return Response(
-        ok: false,
-        error: ErrorPayload(code: "UNSUPPORTED_OPERATION", message: message, hint: hint)
-      )
+      return unsupportedResponse(message: message, hint: hint)
     }
   }
 
+  func unsupportedResponse(message: String, hint: String?) -> Response {
+    Response(
+      ok: false,
+      error: ErrorPayload(code: "UNSUPPORTED_OPERATION", message: message, hint: hint)
+    )
+  }
+
 
   enum GestureFrame {
     case none
@@ -45,15 +49,6 @@ extension RunnerTests {
     let hint: String?
   }
 
-  func gestureFallback(strategy: String, from outcome: RunnerInteractionOutcome) -> GestureFallback? {
-    switch outcome {
-    case .performed:
-      return nil
-    case .unsupported(let message, let hint):
-      return GestureFallback(strategy: strategy, message: message, hint: hint)
-    }
-  }
-
 
 
 

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Navigation.swift

@@ -1,3 +1,4 @@
+import AgentDeviceSnapshotPresentation
 import XCTest
 
 extension RunnerTests {
@@ -120,16 +121,9 @@ extension RunnerTests {
     return navigationBackKeywords.firstIndex { text.contains($0) }
   }
 
-
-  static func isUsableNavigationFrame(_ frame: CGRect) -> Bool {
-    guard frame.width.isFinite, frame.height.isFinite, frame.width > 0, frame.height > 0 else {
-      return false
-    }
-    return !frame.isInfinite
-  }
-
   static func isTopNavigationControlFrame(_ candidate: CGRect, in window: CGRect) -> Bool {
-    guard isUsableNavigationFrame(candidate), isUsableNavigationFrame(window) else {
+    guard SnapshotGeometry.isPositiveFinite(candidate), SnapshotGeometry.isPositiveFinite(window)
+    else {
       return false
     }
 
@@ -138,7 +132,7 @@ extension RunnerTests {
   }
 
   static func topLeadingNavigationFallbackPoint(in frame: CGRect) -> CGPoint? {
-    guard isUsableNavigationFrame(frame) else {
+    guard SnapshotGeometry.isPositiveFinite(frame) else {
       return nil
     }
 
@@ -159,17 +153,20 @@ extension RunnerTests {
       app: app,
       policy: synthesizedGesturePolicy(.coordinateTap)
     )?.withReferenceFrame(frame)
-    let synthesized = performGesture(app, idleTimeout: false) {
+    switch performSynthesizedGesture(app, kind: .coordinateTap, context: context, synthesize: {
       synthesizedTapAt(app: app, x: point.x, y: point.y, context: context)
-    }
-    if case .performed = synthesized.outcome {
-      return verifyNavigationFallbackOutcome(app: app, before: before)
-    }
-    let fallback = performGesture(app) {
-      tapAt(app: app, x: point.x, y: point.y)
-    }
-    if case .performed = fallback.outcome {
+    }) {
+    case .performed:
       return verifyNavigationFallbackOutcome(app: app, before: before)
+    case .refused:
+      return .unavailable
+    case .xctestFallback:
+      let fallback = performGesture(app) {
+        tapAt(app: app, x: point.x, y: point.y)
+      }
+      if case .performed = fallback.outcome {
+        return verifyNavigationFallbackOutcome(app: app, before: before)
+      }
     }
 #endif
     return .unavailable

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+ScrollDragExecution.swift

@@ -149,19 +149,6 @@ extension RunnerTests {
       context: context
     )
     else {
-      if context?.allowsXCTestCoordinateFallback == true {
-        logSynthesizedGesturePolicyDecision(kind: policyKind, context: context, fallbackAttempted: true)
-        return executeCoordinateDragFallback(
-          activeApp: activeApp,
-          x: x,
-          y: y,
-          x2: x2,
-          y2: y2,
-          durationMs: durationMs,
-          message: message,
-          fallback: nil
-        )
-      }
       logSynthesizedGesturePolicyDecision(kind: policyKind, context: context, fallbackAttempted: false)
       return Response(
         ok: false,
@@ -179,7 +166,7 @@ extension RunnerTests {
       y2: plan.points.y2,
       referenceFrame: plan.referenceFrame
     )
-    let (timing, outcome) = performGesture(activeApp, idleTimeout: false) {
+    switch performSynthesizedGesture(activeApp, kind: policyKind, context: plan.context, synthesize: {
       synthesizedDragAt(
         app: activeApp,
         x: plan.points.x,
@@ -190,13 +177,10 @@ extension RunnerTests {
         profile: profile,
         context: plan.context
       )
-    }
-    if case .performed = outcome {
-      logSynthesizedGesturePolicyDecision(kind: policyKind, context: plan.context, fallbackAttempted: false)
+    }) {
+    case .performed(let timing):
       return gestureResponse(message: message, timing: timing, frame: .drag(dragFrame))
-    }
-    if plan.context.allowsXCTestCoordinateFallback {
-      logSynthesizedGesturePolicyDecision(kind: policyKind, context: plan.context, fallbackAttempted: true)
+    case .xctestFallback(let fallbackMessage, let hint):
       return executeCoordinateDragFallback(
         activeApp: activeApp,
         x: plan.points.x,
@@ -205,11 +189,11 @@ extension RunnerTests {
         y2: plan.points.y2,
         durationMs: durationMs,
         message: message,
-        fallback: gestureFallback(strategy: "xctest-coordinate-drag", from: outcome)
+        fallback: GestureFallback(strategy: "xctest-coordinate-drag", message: fallbackMessage, hint: hint)
       )
+    case .refused(_, let refusalMessage, let hint):
+      return unsupportedResponse(message: refusalMessage, hint: hint)
     }
-    logSynthesizedGesturePolicyDecision(kind: policyKind, context: plan.context, fallbackAttempted: false)
-    return unsupportedResponse(for: outcome)
 #else
     return nil
 #endif
@@ -223,7 +207,7 @@ extension RunnerTests {
     y2: Double,
     durationMs: Double,
     message: String,
-    fallback: GestureFallback?
+    fallback: GestureFallback
   ) -> Response {
     let dragPoints = keyboardAvoidingDragPoints(app: activeApp, x: x, y: y, x2: x2, y2: y2)
     let dragFrame = resolvedDragVisualizationFrame(

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+SequenceExecution.swift

@@ -143,51 +143,21 @@ extension RunnerTests {
   ) -> SequenceStepOutcome {
     let x = step.x ?? 0
     let y = step.y ?? 0
-
-
-
-    if step.kind == "tap", step.synthesized == true {
-      let policyKind = SynthesizedGesturePolicyKind.synthesizedDrag
-#if os(iOS)
-      guard let synthesizedContext else {
-        let nowMs = ProcessInfo.processInfo.systemUptime * 1000
-        logSynthesizedGesturePolicyDecision(kind: policyKind, context: nil, fallbackAttempted: false)
-        return SequenceStepOutcome(
-          outcome: .unsupported(
-            message: "synthesized coordinate tap could not resolve a finite coordinate frame",
-            hint: "Retry after the app is foregrounded, or use a plain screenshot to choose coordinates."
-          ),
-          gestureStartUptimeMs: nowMs,
-          gestureEndUptimeMs: nowMs
-        )
-      }
-#endif
-      let (timing, outcome) = performGesture(activeApp, idleTimeout: false) {
+    if let policyKind = synthesizedPolicyKind(forSequenceStep: step) {
+      switch performSynthesizedGesture(activeApp, kind: policyKind, context: synthesizedContext, synthesize: {
         synthesizedTapAt(app: activeApp, x: x, y: y, context: synthesizedContext)
-      }
-      if case .performed = outcome {
-        logSynthesizedGesturePolicyDecision(kind: policyKind, context: synthesizedContext, fallbackAttempted: false)
-        if let pauseMs = step.pauseMs, pauseMs > 0 {
-          sleepFor(min(max(pauseMs, 0), 10000) / 1000.0)
-        }
-        return SequenceStepOutcome(
-          outcome: outcome,
-          gestureStartUptimeMs: timing.gestureStartUptimeMs,
-          gestureEndUptimeMs: timing.gestureEndUptimeMs
+      }) {
+      case .performed(let timing):
+        return finishedSequenceStep(step, timing: timing, outcome: .performed)
+      case .refused(let timing, let message, let hint):
+        return finishedSequenceStep(
+          step,
+          timing: timing,
+          outcome: .unsupported(message: message, hint: hint)
         )
+      case .xctestFallback:
+        break
       }
-#if os(iOS)
-      guard synthesizedContext.allowsXCTestCoordinateFallback else {
-        logSynthesizedGesturePolicyDecision(kind: policyKind, context: synthesizedContext, fallbackAttempted: false)
-        return SequenceStepOutcome(
-          outcome: outcome,
-          gestureStartUptimeMs: timing.gestureStartUptimeMs,
-          gestureEndUptimeMs: timing.gestureEndUptimeMs
-        )
-      }
-      logSynthesizedGesturePolicyDecision(kind: policyKind, context: synthesizedContext, fallbackAttempted: true)
-#endif
-
     }
     let (timing, outcome) = performGesture(activeApp) {
       switch step.kind {
@@ -201,6 +171,14 @@ extension RunnerTests {
         return tapAt(app: activeApp, x: x, y: y)
       }
     }
+    return finishedSequenceStep(step, timing: timing, outcome: outcome)
+  }
+
+  private func finishedSequenceStep(
+    _ step: SequenceStep,
+    timing: (gestureStartUptimeMs: Double, gestureEndUptimeMs: Double),
+    outcome: RunnerInteractionOutcome
+  ) -> SequenceStepOutcome {
 
 
 

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Snapshot.swift

@@ -21,9 +21,8 @@ extension RunnerTests {
   struct SnapshotTraversalContext {
     let queryRoot: XCUIElement
     let rootSnapshot: XCUIElementSnapshot
-    let viewport: CGRect
 
-    let interfaceOrientation: Int
+    let viewport: SnapshotViewport
 
 
 
@@ -278,8 +277,7 @@ extension RunnerTests {
       nodes: nodes,
       truncated: false,
       effectiveDepth: nil,
-      viewport: context.viewport,
-      interfaceOrientation: context.interfaceOrientation
+      viewport: context.viewport
     )
   }
 
@@ -435,8 +433,7 @@ extension RunnerTests {
       nodes: nodes,
       truncated: false,
       effectiveDepth: nil,
-      viewport: context.viewport,
-      interfaceOrientation: context.interfaceOrientation
+      viewport: context.viewport
     )
   }
 
@@ -455,14 +452,13 @@ extension RunnerTests {
           nodes: nodes,
           truncated: false,
           effectiveDepth: nil,
-          viewport: .infinite,
-          interfaceOrientation: RunnerInterfaceOrientation.unknown
+          viewport: .missing(reason: .notProvided)
         ),
         .completed
       )
     }
 
-    let viewport = safeSnapshotViewport(app: app)
+    let viewport = safeSnapshotViewport(app: app, readingOrientation: false)
     var seen = Set<String>()
     var candidates: [RawAXNode] = []
     let flatElements = flatInteractiveElements(app: app, deadline: deadline)
@@ -494,9 +490,7 @@ extension RunnerTests {
 
 
 
-    let rootRect = viewport.isInfinite || viewport.isNull || viewport.isEmpty
-      ? interactiveRootFrame(for: candidates)
-      : viewport
+    let rootRect = viewport.rect ?? interactiveRootFrame(for: candidates)
     nodes[0] = interactiveRootNode(rect: rootRect)
     for candidate in candidates {
       nodes.append(
@@ -524,8 +518,7 @@ extension RunnerTests {
         nodes: nodes,
         truncated: outcome == .deadlineExhausted,
         effectiveDepth: nil,
-        viewport: viewport,
-        interfaceOrientation: RunnerInterfaceOrientation.unknown
+        viewport: viewport
       ),
       outcome
     )