agent-device 0.21.13 → 0.21.15

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

@@ -27,6 +27,7 @@ extension RunnerTests {
     )
   }
 
+  @MainActor
   func executeScrollDragGesture(
     activeApp: XCUIApplication,
     x: Double,
@@ -65,6 +66,7 @@ extension RunnerTests {
 
 
 
+  @MainActor
   func executeDragGesture(
     activeApp: XCUIApplication,
     x: Double,
@@ -125,6 +127,7 @@ extension RunnerTests {
     return gestureResponse(message: message, timing: timing, frame: .drag(dragFrame))
   }
 
+  @MainActor
   private func executeSynthesizedDragGesture(
     activeApp: XCUIApplication,
     x: Double,
@@ -149,19 +152,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 +169,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 +180,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,16 +192,17 @@ 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
   }
 
+  @MainActor
   private func executeCoordinateDragFallback(
     activeApp: XCUIApplication,
     x: Double,
@@ -223,7 +211,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

@@ -19,6 +19,7 @@ extension RunnerTests {
     let gestureEndUptimeMs: Double
   }
 
+  @MainActor
   func executeSequence(command: Command, activeApp: XCUIApplication) -> Response {
     guard let steps = command.steps, !steps.isEmpty else {
       return sequenceInvalidArgs("sequence requires at least one step")
@@ -136,6 +137,7 @@ extension RunnerTests {
     return nil
   }
 
+  @MainActor
   private func performSequenceStep(
     _ step: SequenceStep,
     activeApp: XCUIApplication,
@@ -143,51 +145,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 +173,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
 
 
 
@@ -36,6 +35,7 @@ extension RunnerTests {
     let label: String
     let identifier: String
     let valueText: String?
+    let placeholder: String?
     let focused: Bool
     let selected: Bool
   }
@@ -176,6 +176,7 @@ extension RunnerTests {
     )
   }
 
+  @MainActor
   func recursiveTreeSnapshotAcquisition(
     context: SnapshotTraversalContext,
     hint: CaptureHint
@@ -278,8 +279,7 @@ extension RunnerTests {
       nodes: nodes,
       truncated: false,
       effectiveDepth: nil,
-      viewport: context.viewport,
-      interfaceOrientation: context.interfaceOrientation
+      viewport: context.viewport
     )
   }
 
@@ -329,7 +329,7 @@ extension RunnerTests {
   private func boundedBlockingSystemAlertSnapshotBody(
     deadline: Date,
     penaltyTarget: SnapshotProbePenaltyTarget,
-    probe: @escaping (Date) -> DataPayload?
+    probe: @escaping @MainActor (Date) -> DataPayload?
   ) -> DataPayload? {
     #if os(macOS)
       return nil
@@ -363,7 +363,7 @@ extension RunnerTests {
           )
         }
       ) {
-        penaltyIdentity.captureFromMain(bundleId: self.currentBundleId)
+        penaltyIdentity.captureFromMain(bundleId: self.mainOwned.bundleId)
         return probe(probeDeadline)
       }
     } catch {
@@ -435,11 +435,11 @@ extension RunnerTests {
       nodes: nodes,
       truncated: false,
       effectiveDepth: nil,
-      viewport: context.viewport,
-      interfaceOrientation: context.interfaceOrientation
+      viewport: context.viewport
     )
   }
 
+  @MainActor
   func querySweepSnapshotAcquisition(
     app: XCUIApplication,
     hint: CaptureHint,
@@ -455,14 +455,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 +493,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(
@@ -506,6 +503,7 @@ extension RunnerTests {
           label: candidate.label,
           identifier: candidate.identifier,
           value: candidate.value,
+          placeholder: candidate.placeholder,
           rect: candidate.rect,
           enabled: candidate.enabled,
           focused: candidate.focused,
@@ -524,8 +522,7 @@ extension RunnerTests {
         nodes: nodes,
         truncated: outcome == .deadlineExhausted,
         effectiveDepth: nil,
-        viewport: viewport,
-        interfaceOrientation: RunnerInterfaceOrientation.unknown
+        viewport: viewport
       ),
       outcome
     )
@@ -534,7 +531,7 @@ extension RunnerTests {
   func snapshotAccessibilityUnavailable(failure: SnapshotCaptureFailure) -> DataPayload {
     NSLog("AGENT_DEVICE_RUNNER_SNAPSHOT_AX_UNAVAILABLE=%@", failure.message)
     applyMainOwnedSnapshotState("ax_unavailable_invalidation") {
-      self.runnerAccessibilityHealth = .unavailable
+      self.mainOwned.accessibilityHealth = .unavailable
       self.invalidateCachedTarget(reason: Self.axSnapshotUnavailableReason)
     }
 
@@ -542,7 +539,7 @@ extension RunnerTests {
     return sparseTruncatedSnapshotPayload(
       message: recoveredSnapshotMessage(failure),
       snapshotQuality: SnapshotQuality(
-        state: "sparse",
+        state: .sparse,
         backend: SnapshotBackendKind.recursiveTree.rawValue,
         reason: failure.message,
         reasonCode: "ax-rejected",

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

@@ -38,27 +38,22 @@ extension RunnerTests {
     captureDeadline: Date = .distantFuture,
     treeCaptureSliceBudgetOverride: TimeInterval? = nil
   ) throws -> SnapshotTraversalContext? {
+    let treeSliceBudget = treeCaptureSliceBudgetOverride ?? treeCaptureSliceBudget
+    let slice = min(treeSliceBudget, max(0.5, captureDeadline.timeIntervalSinceNow))
+    guard let rootSnapshot = try captureSnapshotRootBounded(app, sliceSeconds: slice) else {
+      return nil
+    }
+
 
 
 
-    let geometry = try runMainThreadWork(
+    let viewport = try runMainThreadWork(
       "snapshot_viewport",
       timeout: min(1.0, max(0.1, captureDeadline.timeIntervalSinceNow)),
-      timeoutError: snapshotMainThreadTimeoutError("preparing tree snapshot")
+      timeoutError: snapshotMainThreadTimeoutError("reading snapshot viewport")
     ) {
-      (
-        viewport: self.safeSnapshotViewport(app: app),
-        interfaceOrientation: self.capturedInterfaceOrientation(app: app)
-      )
+      self.safeSnapshotViewport(app: app, readingOrientation: true)
     }
-    let viewport = geometry.viewport
-    let interfaceOrientation = geometry.interfaceOrientation
-    let treeSliceBudget = treeCaptureSliceBudgetOverride ?? treeCaptureSliceBudget
-    let slice = min(treeSliceBudget, max(0.5, captureDeadline.timeIntervalSinceNow))
-    guard let rootSnapshot = try captureSnapshotRootBounded(app, sliceSeconds: slice) else {
-      return nil
-    }
-
 
 
 
@@ -70,7 +65,6 @@ extension RunnerTests {
       queryRoot: app,
       rootSnapshot: rootSnapshot,
       viewport: viewport,
-      interfaceOrientation: interfaceOrientation,
       keyboardBand: keyboardBand
     )
   }
@@ -99,7 +93,7 @@ extension RunnerTests {
     }
   }
 
-  private func treeCaptureTimeoutError(sliceSeconds: TimeInterval) -> () -> Error {
+  private func treeCaptureTimeoutError(sliceSeconds: TimeInterval) -> @Sendable () -> Error {
     {
       SnapshotCaptureFailure(
         code: Self.xCTestSnapshotTimeoutCode,
@@ -109,7 +103,7 @@ extension RunnerTests {
     }
   }
 
-  func snapshotMainThreadTimeoutError(_ operation: String) -> () -> Error {
+  func snapshotMainThreadTimeoutError(_ operation: String) -> @Sendable () -> Error {
     {
       SnapshotCaptureFailure(
         code: Self.xCTestSnapshotTimeoutCode,
@@ -140,8 +134,18 @@ extension RunnerTests {
     return nil
   }
 
-  func safeSnapshotViewport(app: XCUIApplication) -> CGRect {
-    safely("SNAPSHOT_VIEWPORT", CGRect.infinite) { snapshotViewport(app: app) }
+
+
+
+  func safeSnapshotViewport(app: XCUIApplication, readingOrientation: Bool) -> SnapshotViewport {
+    safely("SNAPSHOT_VIEWPORT", .missing(reason: .notProvided)) {
+      .reported(
+        box: snapshotAppFrame(app: app),
+        interfaceOrientation: readingOrientation
+          ? capturedInterfaceOrientation(app: app)
+          : RunnerInterfaceOrientation.unknown
+      )
+    }
   }
 
   private func describeSnapshotError(_ error: Error) -> String {
@@ -185,6 +189,7 @@ extension RunnerTests {
       label: label,
       identifier: identifier,
       valueText: valueText,
+      placeholder: placeholderText(snapshot.placeholderValue),
       focused: snapshotHasFocus(snapshot),
       selected: snapshotIsSelected(snapshot)
     )
@@ -205,6 +210,7 @@ extension RunnerTests {
       label: evaluation.label.isEmpty ? nil : evaluation.label,
       identifier: evaluation.identifier.isEmpty ? nil : evaluation.identifier,
       value: evaluation.valueText,
+      placeholder: evaluation.placeholder,
       rect: SnapshotRect(snapshot.frame),
       enabled: snapshot.isEnabled,
       focused: evaluation.focused ? true : nil,
@@ -231,16 +237,32 @@ extension RunnerTests {
     return text.isEmpty ? nil : text
   }
 
-  private func snapshotViewport(app: XCUIApplication) -> CGRect {
+
+
+
+  func placeholderText(_ placeholderValue: String?) -> String? {
+    let text = placeholderValue?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+    return text.isEmpty ? nil : text
+  }
+
+
+
+
+  static let placeholderElementTypes: Set<XCUIElement.ElementType> = [
+    .textField, .secureTextField, .searchField, .textView,
+  ]
+
+  func elementPlaceholderText(_ element: XCUIElement, type: XCUIElement.ElementType) -> String? {
+    guard Self.placeholderElementTypes.contains(type) else { return nil }
+    return placeholderText(element.placeholderValue)
+  }
+
+  private func snapshotAppFrame(app: XCUIApplication) -> CGRect {
 #if os(iOS)
-    let appFrame = onScreenWindowFrame(app: app)
+    return onScreenWindowFrame(app: app)
 #else
-    let appFrame = app.frame
+    return app.frame
 #endif
-    if !appFrame.isNull && !appFrame.isEmpty {
-      return appFrame
-    }
-    return .infinite
   }
 
   static func snapshotTraversalIdentity(
@@ -341,6 +363,7 @@ extension RunnerTests {
         label: node.label,
         identifier: node.identifier,
         value: node.value,
+        placeholder: node.placeholder,
         rect: node.rect,
         enabled: node.enabled,
         focused: node.focused,
@@ -376,7 +399,8 @@ extension RunnerTests {
       let label = element.label.trimmingCharacters(in: .whitespacesAndNewlines)
       let identifier = element.identifier.trimmingCharacters(in: .whitespacesAndNewlines)
       let valueText = snapshotValueText(element)
-      let hasContent = !label.isEmpty || !identifier.isEmpty || valueText != nil
+      let placeholder = elementPlaceholderText(element, type: elementType)
+      let hasContent = !label.isEmpty || !identifier.isEmpty || valueText != nil || placeholder != nil
       if !hasContent { return }
       if sameSemanticElement(
         containerSnapshot: containerSnapshot,
@@ -395,6 +419,7 @@ extension RunnerTests {
         label: label.isEmpty ? nil : label,
         identifier: identifier.isEmpty ? nil : identifier,
         value: valueText,
+        placeholder: placeholder,
         rect: SnapshotRect(frame),
         enabled: element.isEnabled,
         focused: elementHasFocus(element) ? true : nil,
@@ -417,13 +442,27 @@ extension RunnerTests {
   }
 
   private func snapshotHasFocus(_ snapshot: XCUIElementSnapshot) -> Bool {
-    var focused = false
+    return focusBool(snapshot as! NSObject)
+  }
+
+
+
+
+
+
+
+  func focusBool(_ object: NSObject) -> Bool {
+    return kvcBool(object, forKey: "hasKeyboardFocus") || kvcBool(object, forKey: "hasFocus")
+  }
+
+  private func kvcBool(_ object: NSObject, forKey key: String) -> Bool {
+    var result = false
     _ = RunnerObjCExceptionCatcher.catchException({
-      if let value = (snapshot as! NSObject).value(forKey: "hasFocus") as? Bool {
-        focused = value
+      if let value = object.value(forKey: key) as? Bool {
+        result = value
       }
     })
-    return focused
+    return result
   }
 
   private func snapshotIsSelected(_ snapshot: XCUIElementSnapshot) -> Bool {
@@ -461,6 +500,7 @@ extension RunnerTests {
     return containerLabel == label && containerIdentifier == identifier
   }
 
+  @MainActor
   func flatInteractiveElements(
     app: XCUIApplication,
     deadline: Date
@@ -519,6 +559,7 @@ extension RunnerTests {
     return (elements, .completed)
   }
 
+  @MainActor
   func snapshotElementsQuery(
     _ fetch: () -> [XCUIElement]
   ) -> (elements: [XCUIElement], axUnavailable: Bool) {
@@ -558,6 +599,7 @@ extension RunnerTests {
         label: label.isEmpty ? nil : label,
         identifier: identifier.isEmpty ? nil : identifier,
         value: valueText,
+        placeholder: elementPlaceholderText(element, type: elementType),
         rect: SnapshotRect(frame),
         enabled: enabled,
         focused: elementHasFocus(element) ? true : nil,

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

@@ -9,10 +9,20 @@ import AgentDeviceSnapshotPresentation
 
 
 
-struct SnapshotQuality: Codable {
 
 
-  let state: String
+enum SnapshotQualityState: String, Codable, CaseIterable {
+
+  case healthy
+
+  case recovered
+
+  case sparse
+}
+
+
+struct SnapshotQuality: Codable {
+  let state: SnapshotQualityState
 
   let backend: String
 
@@ -391,7 +401,7 @@ extension RunnerTests {
       return stampedSnapshotPayload(
         capture,
         backend: kind,
-        state: recovered ? "recovered" : "healthy",
+        state: recovered ? .recovered : .healthy,
         reason: recovered || firstFailure?.code == "requested-backend" ? firstFailure : nil
       )
     }
@@ -416,11 +426,11 @@ extension RunnerTests {
     }
 
     let fallbackPayload =
-      best.map { stampedSnapshotPayload($0.capture, backend: $0.kind, state: "sparse", reason: firstFailure) }
+      best.map { stampedSnapshotPayload($0.capture, backend: $0.kind, state: .sparse, reason: firstFailure) }
       ?? stampedSnapshotPayload(
         SnapshotBackendCapture(payload: sparseTruncatedSnapshotPayload(), effectiveDepth: nil),
         backend: effectivePlan.last ?? plan.last ?? .recursiveTree,
-        state: "sparse",
+        state: .sparse,
         reason: firstFailure
       )
     return fallbackPayload
@@ -513,8 +523,7 @@ extension RunnerTests {
     let normalizedAcquisition = acquisition.replacingNodes(
       SnapshotGeometrySpace.normalized(
         nodes: acquisition.nodes,
-        viewport: acquisition.viewport,
-        interfaceOrientation: acquisition.interfaceOrientation
+        viewport: acquisition.viewport
       )
     )
 
@@ -641,7 +650,7 @@ extension RunnerTests {
       guard Self.structuralOnlyNodeTypes.contains(node.type) else { return false }
       guard !isRootContainer else { return true }
 
-      let isFullScreenContainer = !node.hittable && rootRects.contains { rootRect in
+      let isFullScreenContainer = node.hittable != true && rootRects.contains { rootRect in
         rootRect.x == node.rect.x && rootRect.y == node.rect.y
           && rootRect.width == node.rect.width && rootRect.height == node.rect.height
       }
@@ -680,12 +689,12 @@ extension RunnerTests {
   func stampedSnapshotPayload(
     _ capture: SnapshotBackendCapture,
     backend: SnapshotBackendKind,
-    state: String,
+    state: SnapshotQualityState,
     reason: (reason: String, code: String)?
   ) -> DataPayload {
     let health: RunnerAccessibilityHealth = reason?.code == "ax-rejected" ? .unavailable : .healthy
     applyMainOwnedSnapshotState("accessibility_health") {
-      self.runnerAccessibilityHealth = health
+      self.mainOwned.accessibilityHealth = health
     }
     let payload = capture.payload
     let quality = SnapshotQuality(
@@ -705,7 +714,7 @@ extension RunnerTests {
 
 
 
-      truncated: payload.truncated == true || state == "sparse" || capture.effectiveDepth != nil,
+      truncated: payload.truncated == true || state == .sparse || capture.effectiveDepth != nil,
       qualityPayload: capture.qualityPayload.flatMap { quality in
         guard let nodes = quality.nodes else { return nil }
         return SnapshotQualityPayload(nodes: nodes, truncated: quality.truncated == true)

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

@@ -8,7 +8,6 @@ import XCTest
 
 
 
-
 struct SnapshotCaptureTarget {
   let app: XCUIApplication
   let bundleId: String?
@@ -67,32 +66,35 @@ final class SnapshotProbePenaltyIdentity {
 
 extension RunnerTests {
 
+  @MainActor
   func takeSnapshotCaptureTarget(app: XCUIApplication) -> SnapshotCaptureTarget {
     SnapshotCaptureTarget(
       app: app,
-      bundleId: currentBundleId,
-      processIdentifier: currentAppProcessIdentifier
+      bundleId: mainOwned.bundleId,
+      processIdentifier: mainOwned.processIdentifier
     )
   }
 
 
 
 
-  func applyMainOwnedSnapshotState(_ operation: String, _ write: @escaping () -> Void) {
+  func applyMainOwnedSnapshotState(_ operation: String, _ write: @escaping @MainActor () -> Void) {
     if Thread.isMainThread {
-      write()
+      _ = runOnMainActor(write)
       return
     }
     guard !hasAbandonedMainThreadWork() else {
       NSLog("AGENT_DEVICE_RUNNER_SNAPSHOT_STATE_DEFERRED_XCTEST_OCCUPIED operation=%@", operation)
-      DispatchQueue.main.async(execute: write)
+      DispatchQueue.main.async {
+        _ = runOnMainActor(write)
+      }
       return
     }
     do {
       try runMainThreadWork(
         operation,
         timeout: 1,
-        timeoutError: mainThreadExecutionTimeoutError,
+        timeoutError: Self.mainThreadExecutionTimeoutError,
         write
       )
     } catch {