agent-device 0.21.12 → 0.21.14

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

@@ -31,8 +31,10 @@ final class RunnerTests: XCTestCase {
 
 
 
+
   enum RunnerWireErrorCode {
     static let mainThreadTimeout = "MAIN_THREAD_TIMEOUT"
+    static let appNotRunning = "APP_NOT_RUNNING"
   }
 
   static let springboardBundleId = "com.apple.springboard"
@@ -52,6 +54,8 @@ final class RunnerTests: XCTestCase {
   let commandExecutionQueue = DispatchQueue(label: "agent-device.runner.commands")
   let app = XCUIApplication()
   lazy var springboard = XCUIApplication(bundleIdentifier: Self.springboardBundleId)
+
+
   var currentApp: XCUIApplication?
   var currentBundleId: String?
   var currentAppProcessIdentifier: Int?
@@ -75,11 +79,22 @@ final class RunnerTests: XCTestCase {
   let xctestIdleKeepaliveInterval: TimeInterval = 60.0
   let minRecordingFps = 1
   let maxRecordingFps = 120
+
+
+
+  let recordingFrameCaptureTimeout: TimeInterval = 1
   var needsPostSnapshotInteractionDelay = false
 
 
 
 
+  var lastLoggedFastAppGuardLine: String?
+  var lastLoggedGesturePolicyLines: [SynthesizedGesturePolicyKind: String] = [:]
+  var runnerMarkerWriter: (String) -> Void = { NSLog("%@", $0) }
+
+
+
+
   var firstInteractionReadyUptime: TimeInterval?
   var runnerAccessibilityHealth: RunnerAccessibilityHealth = .unknown
   var activeRecording: ScreenRecorder?
@@ -95,6 +110,9 @@ final class RunnerTests: XCTestCase {
 
   let mainThreadWorkLock = NSLock()
   var abandonedMainThreadWorkCount = 0
+
+
+  var mainThreadWorkInFlightCount = 0
   var abandonedMainThreadWorkSince: Date?
 
 
@@ -107,7 +125,7 @@ final class RunnerTests: XCTestCase {
   var snapshotXCTestChannelPenaltyBundleId: String?
   var snapshotXCTestChannelPenaltyUntil = Date.distantPast
   let snapshotXCTestChannelPenaltyDuration: TimeInterval = 120
-  var snapshotXCTestPenaltyWarmupExemptionPending = false
+  let snapshotXCTestPenaltyWarmupExemption = SnapshotXCTestPenaltyWarmupExemption()
 
 
 
@@ -189,6 +207,9 @@ final class RunnerTests: XCTestCase {
 
 
 
+
+
+
 
 
 
@@ -263,11 +284,6 @@ final class RunnerTests: XCTestCase {
 
   @MainActor
   func testCommand() throws {
-    if RunnerEnv.isTruthy("AGENT_DEVICE_RUNNER_NOOP_STARTUP") {
-      NSLog("AGENT_DEVICE_RUNNER_NOOP_STARTUP=1")
-      return
-    }
-
     doneExpectation = expectation(description: "agent-device command handled")
     NSLog("AGENT_DEVICE_RUNNER_HEADLESS_STARTUP=1")
     let desiredPort = RunnerEnv.resolvePort()

package/dist/apple/runner/AgentDeviceRunner/RecordingScripts/recording-overlay.swift

@@ -11,6 +11,13 @@ let minimumPinchVisibility: CFTimeInterval = 0.5
 let swipeVisibilityTail: CFTimeInterval = 0.16
 let trailOpacityKeyTimes: [NSNumber] = [0.0, 0.08, 0.62, 1.0]
 
+
+
+let compositedBlackFrameLuma: Double = 1.0
+
+
+let sourceVisibleFrameLuma: Double = 2.0
+
 struct GestureEnvelope: Decodable {
   let events: [GestureEvent]
 }
@@ -129,7 +136,7 @@ func run() throws {
 
 
 
-  let presetName = exportPresetName(for: parsedArgs.exportQuality, compatibleWith: composition)
+  let presetName = try exportPresetName(compatibleWith: composition)
   let exporter = try makeRecordingExporter(
     composition,
     presetName: presetName,
@@ -141,17 +148,19 @@ func run() throws {
     timeoutMessage: "Touch overlay export timed out.",
     failureMessage: "Touch overlay export failed."
   )
+  try verifyCompositedOverlay(
+    input: inputURL,
+    output: outputURL,
+    expectedRenderSize: renderSize
+  )
 }
 
 func parseArguments(
   _ arguments: [String]
-) throws -> (inputPath: String, outputPath: String, eventsPath: String, exportQuality: ExportQuality) {
+) throws -> (inputPath: String, outputPath: String, eventsPath: String) {
   var inputPath: String?
   var outputPath: String?
   var eventsPath: String?
-
-
-  var exportQuality: ExportQuality = .medium
   var index = 0
 
   while index < arguments.count {
@@ -168,11 +177,13 @@ func parseArguments(
       eventsPath = try recordingOptionValue(arguments, nextIndex, "--events")
       index += 2
     case "--quality":
+
+
+
       let rawValue = try recordingOptionValue(arguments, nextIndex, "--quality")
-      guard let parsed = ExportQuality(rawValue: rawValue) else {
+      guard ExportQuality(rawValue: rawValue) != nil else {
         throw RecordingScriptError.invalidArgs("--quality must be one of: medium, high")
       }
-      exportQuality = parsed
       index += 2
     default:
       throw RecordingScriptError.invalidArgs("Unknown argument: \(argument)")
@@ -184,24 +195,22 @@ func parseArguments(
       "Usage: recording-overlay.swift --input <video> --output <video> --events <json> [--quality <medium|high>]"
     )
   }
-  return (inputPath, outputPath, eventsPath, exportQuality)
+  return (inputPath, outputPath, eventsPath)
 }
 
-func exportPresetName(
-  for exportQuality: ExportQuality,
-  compatibleWith asset: AVAsset
-) -> String {
-  switch exportQuality {
-  case .high:
-    return AVAssetExportPresetHighestQuality
-  case .medium:
 
 
-    let compatible = AVAssetExportSession.exportPresets(compatibleWith: asset)
-    return compatible.contains(AVAssetExportPresetMediumQuality)
-      ? AVAssetExportPresetMediumQuality
-      : AVAssetExportPresetHighestQuality
+
+
+
+
+func exportPresetName(compatibleWith asset: AVAsset) throws -> String {
+  guard AVAssetExportSession.exportPresets(compatibleWith: asset).contains(AVAssetExportPresetHighestQuality) else {
+    throw RecordingScriptError.exportFailed(
+      "No geometry-preserving export preset is available; refusing to rescale the capture."
+    )
   }
+  return AVAssetExportPresetHighestQuality
 }
 
 func resolvedRenderSize(for track: AVAssetTrack) -> CGSize {
@@ -209,6 +218,117 @@ func resolvedRenderSize(for track: AVAssetTrack) -> CGSize {
   return CGSize(width: abs(transformed.width), height: abs(transformed.height))
 }
 
+
+
+
+
+func verifyCompositedOverlay(input: URL, output: URL, expectedRenderSize: CGSize) throws {
+  let composited = AVURLAsset(url: output)
+  guard let track = composited.tracks(withMediaType: .video).first else {
+    throw RecordingScriptError.exportFailed("Touch overlay export produced no video track.")
+  }
+
+  let producedSize = resolvedRenderSize(for: track)
+  if !renderSizeMatches(producedSize, expectedRenderSize) {
+    throw RecordingScriptError.exportFailed(
+      "Touch overlay export changed the track geometry: \(Int(producedSize.width))x\(Int(producedSize.height)) instead of \(Int(expectedRenderSize.width))x\(Int(expectedRenderSize.height))."
+    )
+  }
+
+
+  guard let compositedLuma = meanFrameLuma(of: composited) else {
+    throw RecordingScriptError.exportFailed("Touch overlay export produced no decodable frames.")
+  }
+
+  let source = AVURLAsset(url: input)
+  let sourceDuration = CMTimeGetSeconds(source.duration)
+  let producedDuration = CMTimeGetSeconds(composited.duration)
+  if sourceDuration.isFinite, sourceDuration > 1, producedDuration.isFinite,
+    producedDuration < sourceDuration * 0.5
+  {
+    throw RecordingScriptError.exportFailed(
+      "Touch overlay export truncated the track to \(Int(producedDuration))s of \(Int(sourceDuration))s."
+    )
+  }
+
+  if compositedLuma <= compositedBlackFrameLuma,
+    let sourceLuma = meanFrameLuma(of: source),
+    sourceLuma > sourceVisibleFrameLuma
+  {
+    throw RecordingScriptError.exportFailed(
+      "Touch overlay export produced an all-black track while the raw capture had visible content."
+    )
+  }
+}
+
+func renderSizeMatches(_ produced: CGSize, _ expected: CGSize) -> Bool {
+
+
+  let tolerance: CGFloat = 32
+  return abs(produced.width - expected.width) <= tolerance
+    && abs(produced.height - expected.height) <= tolerance
+}
+
+func meanFrameLuma(of asset: AVURLAsset, sampleCount: Int = 5) -> Double? {
+  let duration = CMTimeGetSeconds(asset.duration)
+  guard duration.isFinite, duration > 0 else { return nil }
+  let generator = AVAssetImageGenerator(asset: asset)
+  generator.appliesPreferredTrackTransform = true
+  generator.requestedTimeToleranceBefore = .positiveInfinity
+  generator.requestedTimeToleranceAfter = .positiveInfinity
+
+  generator.maximumSize = CGSize(width: 64, height: 64)
+
+  var total = 0.0
+  var sampled = 0
+  for index in 0..<sampleCount {
+    let fraction = (Double(index) + 0.5) / Double(sampleCount)
+    let time = CMTime(seconds: fraction * duration, preferredTimescale: 600)
+    guard let image = try? generator.copyCGImage(at: time, actualTime: nil),
+      let luma = frameMeanLuma(image)
+    else { continue }
+    total += luma
+    sampled += 1
+  }
+  guard sampled > 0 else { return nil }
+  return total / Double(sampled)
+}
+
+func frameMeanLuma(_ image: CGImage) -> Double? {
+  let width = image.width
+  let height = image.height
+  guard width > 0, height > 0 else { return nil }
+  let bytesPerRow = width * 4
+  var pixels = [UInt8](repeating: 0, count: bytesPerRow * height)
+  let drawn = pixels.withUnsafeMutableBytes { raw -> Bool in
+    guard
+      let context = CGContext(
+        data: raw.baseAddress,
+        width: width,
+        height: height,
+        bitsPerComponent: 8,
+        bytesPerRow: bytesPerRow,
+        space: CGColorSpaceCreateDeviceRGB(),
+        bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
+      )
+    else { return false }
+    context.draw(image, in: CGRect(x: 0, y: 0, width: width, height: height))
+    return true
+  }
+  guard drawn else { return nil }
+
+  var total = 0.0
+  var count = 0
+  for offset in stride(from: 0, to: bytesPerRow * height, by: 4) {
+    total += 0.299 * Double(pixels[offset])
+      + 0.587 * Double(pixels[offset + 1])
+      + 0.114 * Double(pixels[offset + 2])
+    count += 1
+  }
+  guard count > 0 else { return nil }
+  return total / Double(count)
+}
+
 func resolvedFrameDuration(for track: AVAssetTrack) -> CMTime {
   let minFrameDuration = track.minFrameDuration
   if minFrameDuration.isValid && !minFrameDuration.isIndefinite && minFrameDuration.seconds > 0 {

package/dist/apple/snapshot-presentation/Sources/AgentDeviceSnapshotPresentation/SnapshotCoordinateSpace.swift

@@ -105,7 +105,7 @@ public enum CoordinateSpaceRotation {
 
 public enum SnapshotGeometrySpace: Equatable {
   case appOrientation
-  case deviceNative(appFrame: CGRect, interfaceOrientation: Int)
+  case deviceNative(appFrame: SnapshotViewport.Box, interfaceOrientation: Int)
 
   public static let quarterTurnTolerance: Double = 1
 
@@ -116,22 +116,26 @@ public enum SnapshotGeometrySpace: Equatable {
     case .deviceNative(let appFrame, let interfaceOrientation):
       return CoordinateSpaceRotation.oriented(
         rect: reportedFrame,
-        in: appFrame,
+        in: appFrame.rect,
         interfaceOrientation: interfaceOrientation
       )
     }
   }
 
+  /// Only a `.reported` viewport carries an orientation, so only it can anchor a rotation.
   public static func space(
     reportedBySurfaceHost isSurfaceHost: Bool,
     reportedFrame: CGRect,
     inheritedFrom inherited: SnapshotGeometrySpace,
-    appFrame: CGRect,
-    interfaceOrientation: Int
+    viewport: SnapshotViewport
   ) -> SnapshotGeometrySpace {
     guard isSurfaceHost else { return inherited }
-    guard namesQuarterTurn(interfaceOrientation) else { return .appOrientation }
-    guard isQuarterTurned(reportedFrame, relativeTo: appFrame) else { return .appOrientation }
+    guard case .reported(let appFrame, let interfaceOrientation) = viewport,
+      namesQuarterTurn(interfaceOrientation),
+      isQuarterTurned(reportedFrame, relativeTo: appFrame.rect)
+    else {
+      return .appOrientation
+    }
     return .deviceNative(appFrame: appFrame, interfaceOrientation: interfaceOrientation)
   }
 
@@ -145,7 +149,7 @@ public enum SnapshotGeometrySpace: Equatable {
   }
 
   private static func isQuarterTurned(_ frame: CGRect, relativeTo appFrame: CGRect) -> Bool {
-    guard isPlottable(frame), isPlottable(appFrame),
+    guard SnapshotGeometry.isPositiveFinite(frame),
       abs(appFrame.width - appFrame.height) > quarterTurnTolerance
     else {
       return false
@@ -153,19 +157,12 @@ public enum SnapshotGeometrySpace: Equatable {
     return abs(frame.width - appFrame.height) <= quarterTurnTolerance
       && abs(frame.height - appFrame.width) <= quarterTurnTolerance
   }
-
-  private static func isPlottable(_ frame: CGRect) -> Bool {
-    frame.origin.x.isFinite && frame.origin.y.isFinite
-      && frame.width.isFinite && frame.height.isFinite
-      && frame.width > 0 && frame.height > 0
-  }
 }
 
 extension SnapshotGeometrySpace {
   public static func normalized(
     nodes: [RawAXNode],
-    viewport: CGRect,
-    interfaceOrientation: Int
+    viewport: SnapshotViewport
   ) -> [RawAXNode] {
     let carriers = SnapshotVisibilityFold.visibilityExemptCarrierTypes
     var spaces = [SnapshotGeometrySpace](repeating: .appOrientation, count: nodes.count)
@@ -180,16 +177,16 @@ extension SnapshotGeometrySpace {
         ),
         reportedFrame: node.rect.cgRect,
         inheritedFrom: parentIndex.map { spaces[$0] } ?? .appOrientation,
-        appFrame: viewport,
-        interfaceOrientation: interfaceOrientation
+        viewport: viewport
       )
       spaces[position] = nodeSpace
       let frame = nodeSpace.orientedFrame(of: node.rect.cgRect)
       result.append(
         node.replacing(
           rect: SnapshotRect(frame),
-          hittable: node.parentIndex != nil
-            && SnapshotGeometry.isGeometricallyActionable(
+          hittable: node.parentIndex == nil
+            ? false
+            : SnapshotGeometry.isGeometricallyActionable(
               enabled: node.enabled,
               frame: frame,
               viewport: viewport

package/dist/apple/snapshot-presentation/Sources/AgentDeviceSnapshotPresentation/SnapshotGeometry.swift

@@ -2,14 +2,23 @@ import Foundation
 import CoreGraphics
 
 public enum SnapshotGeometry {
+  /// Twin of `isPositiveFiniteRect` in `packages/kernel/src/rect.ts`. `CGRect.infinite` is built
+  /// from finite components, so it is refused by identity.
+  public static func isPositiveFinite(_ rect: CGRect) -> Bool {
+    !rect.isInfinite
+      && rect.origin.x.isFinite && rect.origin.y.isFinite
+      && rect.size.width.isFinite && rect.size.height.isFinite
+      && rect.size.width > 0 && rect.size.height > 0
+  }
+
   public static func effectiveFrame(
     reportedFrame: CGRect,
-    viewport: CGRect,
+    viewport: SnapshotViewport,
     ancestorClip: CGRect?
   ) -> CGRect {
     var frame = reportedFrame
-    if !viewport.isInfinite {
-      frame = clipped(frame, to: viewport)
+    if let box = viewport.rect {
+      frame = clipped(frame, to: box)
     }
     if let ancestorClip {
       frame = clipped(frame, to: ancestorClip)
@@ -34,15 +43,18 @@ public enum SnapshotGeometry {
     )
   }
 
+  /// The shared `hittable` predicate (#1933), twin of `isGeometricallyActionable` in
+  /// `packages/kernel/src/rect.ts`, with `CGRect.contains`'s half-open right and bottom edges.
+  /// `nil` when only containment is left to decide and the capture has no viewport box: the node's
+  /// `hittable` is then absent on the wire, as it is on the host bridge (#2891).
   public static func isGeometricallyActionable(
     enabled: Bool,
     frame: CGRect,
-    viewport: CGRect
-  ) -> Bool {
-    guard enabled, !frame.isNull, !frame.isEmpty else { return false }
-    if viewport.isInfinite { return true }
-    let center = CGPoint(x: frame.midX, y: frame.midY)
-    return viewport.contains(center)
+    viewport: SnapshotViewport
+  ) -> Bool? {
+    guard enabled, isPositiveFinite(frame) else { return false }
+    guard let box = viewport.rect else { return nil }
+    return box.contains(CGPoint(x: frame.midX, y: frame.midY))
   }
 
   private static func clipped(_ frame: CGRect, to clip: CGRect) -> CGRect {

package/dist/apple/snapshot-presentation/Sources/AgentDeviceSnapshotPresentation/SnapshotModels.swift

@@ -38,7 +38,8 @@ public struct RawAXNode: Equatable {
   public let enabled: Bool
   public let focused: Bool?
   public let selected: Bool?
-  public var hittable: Bool
+  /// Geometric actionability; `nil` when the capture has no viewport box to decide it against.
+  public var hittable: Bool?
   public let depth: Int
   public let parentIndex: Int?
   public let hiddenContentAbove: Bool?
@@ -55,7 +56,7 @@ public struct RawAXNode: Equatable {
     enabled: Bool,
     focused: Bool?,
     selected: Bool?,
-    hittable: Bool,
+    hittable: Bool?,
     depth: Int,
     parentIndex: Int?,
     hiddenContentAbove: Bool?,
@@ -79,7 +80,7 @@ public struct RawAXNode: Equatable {
     self.actions = actions
   }
 
-  func replacing(rect: SnapshotRect, hittable: Bool) -> RawAXNode {
+  func replacing(rect: SnapshotRect, hittable: Bool?) -> RawAXNode {
     var updated = self
     updated.rect = rect
     updated.hittable = hittable
@@ -153,15 +154,65 @@ public struct PresentationOptions: Equatable {
   }
 }
 
+/// What a capture knows about the viewport hosting its tree: the three cases of the host's
+/// `IosViewportEvidence` (#2891). No rectangle stands for "unknown".
+public enum SnapshotViewport: Equatable {
+  /// A box `SnapshotGeometry.isPositiveFinite` accepted. Only the factories below construct one.
+  public struct Box: Equatable {
+    public let rect: CGRect
+
+    init(positiveFinite rect: CGRect) {
+      self.rect = rect
+    }
+  }
+
+  /// The platform's box for the app's surface, with the interface orientation read in the same hop.
+  /// Only this case can anchor a rotation (#2612).
+  case reported(Box, interfaceOrientation: Int)
+  /// A box the capture inferred from its own root element. It clips and contains, and carries no
+  /// orientation, so it cannot anchor a rotation.
+  case derived(Box)
+  case missing(reason: MissingReason)
+
+  public enum MissingReason: Equatable {
+    /// The read was skipped or raised.
+    case notProvided
+    /// The box read is one `SnapshotGeometry.isPositiveFinite` refuses.
+    case invalid
+  }
+
+  public var rect: CGRect? {
+    switch self {
+    case .reported(let box, _), .derived(let box):
+      return box.rect
+    case .missing:
+      return nil
+    }
+  }
+
+  public static func reported(
+    box: CGRect,
+    interfaceOrientation: Int = RunnerInterfaceOrientation.unknown
+  ) -> SnapshotViewport {
+    SnapshotGeometry.isPositiveFinite(box)
+      ? .reported(Box(positiveFinite: box), interfaceOrientation: interfaceOrientation)
+      : .missing(reason: .invalid)
+  }
+
+  public static func derived(box: CGRect) -> SnapshotViewport {
+    SnapshotGeometry.isPositiveFinite(box)
+      ? .derived(Box(positiveFinite: box))
+      : .missing(reason: .invalid)
+  }
+}
+
 public struct SnapshotAcquisition {
   public let hint: CaptureHint
   public var nodes: [RawAXNode]
   public let truncated: Bool
   public let effectiveDepth: Int?
   public var customActions: SnapshotCustomActionCoverage?
-  public let viewport: CGRect
-  /// The app's interface orientation, consumed by the one `normalized` pass; `unknown` turns nothing.
-  public let interfaceOrientation: Int
+  public let viewport: SnapshotViewport
 
   public init(
     hint: CaptureHint,
@@ -169,8 +220,7 @@ public struct SnapshotAcquisition {
     truncated: Bool,
     effectiveDepth: Int?,
     customActions: SnapshotCustomActionCoverage? = nil,
-    viewport: CGRect,
-    interfaceOrientation: Int = 0
+    viewport: SnapshotViewport
   ) {
     self.hint = hint
     self.nodes = nodes
@@ -178,7 +228,6 @@ public struct SnapshotAcquisition {
     self.effectiveDepth = effectiveDepth
     self.customActions = customActions
     self.viewport = viewport
-    self.interfaceOrientation = interfaceOrientation
   }
 
   public func replacingNodes(_ nodes: [RawAXNode]) -> SnapshotAcquisition {
@@ -226,7 +275,7 @@ public struct PresentedNode: Codable, Equatable {
   public let enabled: Bool
   public let focused: Bool?
   public let selected: Bool?
-  public let hittable: Bool
+  public let hittable: Bool?
   public let depth: Int
   public let parentIndex: Int?
   public let hiddenContentAbove: Bool?

package/dist/apple/snapshot-presentation/Sources/AgentDeviceSnapshotPresentation/SnapshotPresentationInvariant.swift

@@ -1,6 +1,7 @@
 import Foundation
 import CoreGraphics
 
+/// With no viewport box the cumulative clip has no root, so containment has nothing to violate.
 public enum SnapshotPresentationInvariant {
   struct ValidationStats: Equatable {
     let parentClipLookups: Int
@@ -12,7 +13,7 @@ public enum SnapshotPresentationInvariant {
 
   public static func validateRegular(
     _ nodes: [SnapshotPresentationNode],
-    viewport: CGRect,
+    viewport: SnapshotViewport,
     policy: SnapshotVisibilityFold.Policy
   ) throws {
     _ = try validateRegularWithStats(nodes, viewport: viewport, policy: policy)
@@ -20,24 +21,25 @@ public enum SnapshotPresentationInvariant {
 
   static func validateRegularWithStats(
     _ nodes: [SnapshotPresentationNode],
-    viewport: CGRect,
+    viewport: SnapshotViewport,
     policy: SnapshotVisibilityFold.Policy
   ) throws -> ValidationStats {
     var parentClipLookups = 0
-    var clipIncludingNodeByIndex: [Int: CGRect] = [:]
+    var clipIncludingNodeByIndex: [Int: CGRect?] = [:]
     clipIncludingNodeByIndex.reserveCapacity(nodes.count)
+    let rootClip = viewport.rect
 
     for node in nodes {
-      let ancestorClip: CGRect
+      let ancestorClip: CGRect?
       if let parentIndex = node.raw.parentIndex {
         parentClipLookups += 1
-        ancestorClip = clipIncludingNodeByIndex[parentIndex] ?? viewport
+        ancestorClip = clipIncludingNodeByIndex[parentIndex] ?? rootClip
       } else {
-        ancestorClip = viewport
+        ancestorClip = rootClip
       }
 
       let frame = node.effectiveRect.cgRect
-      let clipIncludingNode: CGRect
+      let clipIncludingNode: CGRect?
       if policy == .cursorProjected,
         SnapshotVisibilityFold.scrollContainerTypeNames.contains(node.raw.type),
         !frame.isNull,
@@ -50,7 +52,7 @@ public enum SnapshotPresentationInvariant {
       clipIncludingNodeByIndex[node.raw.index] = clipIncludingNode
 
       guard !frame.isNull, !frame.isEmpty else {
-        if node.raw.hittable {
+        if node.raw.hittable == true {
           throw SnapshotPresentationFailure.regularDegenerateNodeIsActionable(
             index: node.raw.index,
             frame: node.effectiveRect
@@ -59,11 +61,11 @@ public enum SnapshotPresentationInvariant {
         continue
       }
 
-      guard contains(frame, in: ancestorClip) else {
+      if let clip = ancestorClip, !contains(frame, in: clip) {
         throw SnapshotPresentationFailure.regularNodeOutsideCumulativeClip(
           index: node.raw.index,
           frame: node.effectiveRect,
-          clip: SnapshotRect(ancestorClip)
+          clip: SnapshotRect(clip)
         )
       }
     }

package/dist/apple/snapshot-presentation/Sources/AgentDeviceSnapshotPresentation/SnapshotVisibilityFold.swift

@@ -100,7 +100,7 @@ public enum SnapshotVisibilityFold {
   public static func traversalDecision(
     for node: RawAXNode,
     parent: TraversalState,
-    viewport: CGRect,
+    viewport: SnapshotViewport,
     interactiveOnly: Bool,
     hasChildren: Bool,
     policy: Policy
@@ -153,7 +153,7 @@ public enum SnapshotVisibilityFold {
 
   public static func fold(
     _ nodes: [RawAXNode],
-    viewport: CGRect,
+    viewport: SnapshotViewport,
     interactiveOnly: Bool,
     policy: Policy
   ) -> [SnapshotPresentationNode] {
@@ -203,12 +203,17 @@ public enum SnapshotVisibilityFold {
               enabled: node.enabled,
               focused: node.focused,
               selected: node.selected,
-              hittable: node.parentIndex != nil && node.hittable
-                && SnapshotGeometry.isGeometricallyActionable(
-                  enabled: node.enabled,
-                  frame: decision.effectiveFrame,
-                  viewport: viewport
-                ),
+              hittable: node.parentIndex == nil
+                ? false
+                : node.hittable.flatMap { sourceHittable in
+                  sourceHittable
+                    ? SnapshotGeometry.isGeometricallyActionable(
+                      enabled: node.enabled,
+                      frame: decision.effectiveFrame,
+                      viewport: viewport
+                    )
+                    : false
+                },
               depth: outDepth,
               parentIndex: keptIndex,
               hiddenContentAbove: node.hiddenContentAbove,