fix(ios): preserve verified and Maestro fill paths

Author: thymikee

apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerSynthesizedTextEntry.h

@@ -2,17 +2,30 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef NS_ENUM(NSInteger, RunnerSynthesizedTextEntryStatus) {
+  RunnerSynthesizedTextEntryStatusSucceeded,
+  RunnerSynthesizedTextEntryStatusUnavailable,
+  RunnerSynthesizedTextEntryStatusFailed,
+};
+
+@interface RunnerSynthesizedTextEntryResult : NSObject
+
+@property(nonatomic, readonly) RunnerSynthesizedTextEntryStatus status;
+@property(nonatomic, readonly, nullable) NSString *message;
+
+@end
+
 @interface RunnerSynthesizedTextEntry : NSObject
 
 // Synthesizes keyboard input for the current first responder without resolving an
 // XCUIElement or serializing the application's accessibility tree.
-+ (NSString * _Nullable)synthesizeTextWithApplication:(id)application
-                                                    text:(NSString *)text;
++ (RunnerSynthesizedTextEntryResult *)synthesizeTextWithApplication:(id)application
+                                                               text:(NSString *)text;
 
 // Replaces the current first responder's contents using one synthesized
 // Command-A, Delete, and text-input event sequence.
-+ (NSString * _Nullable)replaceTextWithApplication:(id)application
-                                              text:(NSString *)text;
++ (RunnerSynthesizedTextEntryResult *)replaceTextWithApplication:(id)application
+                                                           text:(NSString *)text;
 
 @end
 

apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerSynthesizedTextEntry.m

@@ -13,27 +13,42 @@
 
 static NSString * _Nullable RunnerRequireTextClass(Class cls, NSString *name);
 static NSString * _Nullable RunnerRequireTextSelector(Class cls, SEL selector, NSString *name);
-static NSString * _Nullable RunnerSynthesizeTextWithMode(
+static RunnerSynthesizedTextEntryResult *RunnerTextEntryResult(
+  RunnerSynthesizedTextEntryStatus status,
+  NSString * _Nullable message
+);
+static RunnerSynthesizedTextEntryResult *RunnerSynthesizeTextWithMode(
   id application,
   NSString *text,
   BOOL replace
 );
 
+@interface RunnerSynthesizedTextEntryResult ()
+
+@property(nonatomic, readwrite) RunnerSynthesizedTextEntryStatus status;
+@property(nonatomic, readwrite, nullable) NSString *message;
+
+@end
+
+
+@implementation RunnerSynthesizedTextEntryResult
+@end
+
 @implementation RunnerSynthesizedTextEntry
 
-+ (NSString * _Nullable)synthesizeTextWithApplication:(id)application
-                                                    text:(NSString *)text {
++ (RunnerSynthesizedTextEntryResult *)synthesizeTextWithApplication:(id)application
+                                                               text:(NSString *)text {
   return RunnerSynthesizeTextWithMode(application, text, NO);
 }
 
-+ (NSString * _Nullable)replaceTextWithApplication:(id)application
-                                              text:(NSString *)text {
++ (RunnerSynthesizedTextEntryResult *)replaceTextWithApplication:(id)application
+                                                           text:(NSString *)text {
   return RunnerSynthesizeTextWithMode(application, text, YES);
 }
 
 @end
 
-static NSString * _Nullable RunnerSynthesizeTextWithMode(
+static RunnerSynthesizedTextEntryResult *RunnerSynthesizeTextWithMode(
   id application,
   NSString *text,
   BOOL replace
@@ -51,33 +66,39 @@ + (NSString * _Nullable)replaceTextWithApplication:(id)application
     SEL processID = NSSelectorFromString(@"processID");
 
     NSString *missing = RunnerRequireTextClass(recordClass, @"XCSynthesizedEventRecord");
-    if (missing != nil) return missing;
+    if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     missing = RunnerRequireTextClass(pathClass, @"XCPointerEventPath");
-    if (missing != nil) return missing;
+    if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     missing = RunnerRequireTextSelector(recordClass, initRecord, @"initWithName:");
-    if (missing != nil) return missing;
+    if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     missing = RunnerRequireTextSelector(recordClass, addPath, @"addPointerEventPath:");
-    if (missing != nil) return missing;
+    if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     missing = RunnerRequireTextSelector(recordClass, setTargetProcessID, @"setTargetProcessID:");
-    if (missing != nil) return missing;
+    if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     missing = RunnerRequireTextSelector(recordClass, synthesize, @"synthesizeWithError:");
-    if (missing != nil) return missing;
+    if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     missing = RunnerRequireTextSelector(pathClass, initPath, @"initForTextInput");
-    if (missing != nil) return missing;
+    if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     missing = RunnerRequireTextSelector(pathClass, typeText, @"typeText:atOffset:typingSpeed:shouldRedact:");
-    if (missing != nil) return missing;
+    if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     if (replace) {
       missing = RunnerRequireTextSelector(pathClass, typeKey, @"typeKey:modifiers:atOffset:");
-      if (missing != nil) return missing;
+      if (missing != nil) return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusUnavailable, missing);
     }
     if (![application respondsToSelector:processID]) {
-      return @"private XCTest text synthesis unavailable: XCUIApplication missing processID";
+      return RunnerTextEntryResult(
+        RunnerSynthesizedTextEntryStatusUnavailable,
+        @"private XCTest text synthesis unavailable: XCUIApplication missing processID"
+      );
     }
 
     NSInteger targetProcessID =
       ((RunnerTextMsgSendInteger)objc_msgSend)(application, processID);
     if (targetProcessID <= 0) {
-      return @"private XCTest text synthesis unavailable: could not resolve target process ID";
+      return RunnerTextEntryResult(
+        RunnerSynthesizedTextEntryStatusUnavailable,
+        @"private XCTest text synthesis unavailable: could not resolve target process ID"
+      );
     }
 
     if (replace) {
@@ -86,7 +107,10 @@ + (NSString * _Nullable)replaceTextWithApplication:(id)application
       );
       id selectionPath = ((RunnerTextMsgSendInitPath)objc_msgSend)([pathClass alloc], initPath);
       if (selectionRecord == nil || selectionPath == nil) {
-        return @"private XCTest text synthesis failed: could not create the selection event";
+        return RunnerTextEntryResult(
+          RunnerSynthesizedTextEntryStatusFailed,
+          @"private XCTest text synthesis failed: could not create the selection event"
+        );
       }
       ((RunnerTextMsgSendSetInteger)objc_msgSend)(
         selectionRecord, setTargetProcessID, targetProcessID
@@ -106,10 +130,10 @@ + (NSString * _Nullable)replaceTextWithApplication:(id)application
       );
       if (!selected) {
         NSString *detail = selectionError.localizedDescription ?: @"synthesizeWithError returned false";
-        return [NSString stringWithFormat:
-          @"private XCTest text selection failed: %@",
-          detail
-        ];
+        return RunnerTextEntryResult(
+          RunnerSynthesizedTextEntryStatusFailed,
+          [NSString stringWithFormat:@"private XCTest text selection failed: %@", detail]
+        );
       }
     }
 
@@ -118,7 +142,10 @@ + (NSString * _Nullable)replaceTextWithApplication:(id)application
     );
     id path = ((RunnerTextMsgSendInitPath)objc_msgSend)([pathClass alloc], initPath);
     if (record == nil || path == nil) {
-      return @"private XCTest text synthesis failed: could not create the text event";
+      return RunnerTextEntryResult(
+        RunnerSynthesizedTextEntryStatusFailed,
+        @"private XCTest text synthesis failed: could not create the text event"
+      );
     }
     ((RunnerTextMsgSendSetInteger)objc_msgSend)(record, setTargetProcessID, targetProcessID);
     ((RunnerTextMsgSendType)objc_msgSend)(path, typeText, text, 0.0, 60, YES);
@@ -128,16 +155,32 @@ + (NSString * _Nullable)replaceTextWithApplication:(id)application
     BOOL ok = ((RunnerTextMsgSendSynthesize)objc_msgSend)(record, synthesize, &error);
     if (!ok) {
       NSString *detail = error.localizedDescription ?: @"synthesizeWithError returned false";
-      return [NSString stringWithFormat:@"private XCTest text synthesis failed: %@", detail];
+      return RunnerTextEntryResult(
+        RunnerSynthesizedTextEntryStatusFailed,
+        [NSString stringWithFormat:@"private XCTest text synthesis failed: %@", detail]
+      );
     }
-    return nil;
+    return RunnerTextEntryResult(RunnerSynthesizedTextEntryStatusSucceeded, nil);
   } @catch (NSException *exception) {
     NSString *name = exception.name ?: @"NSException";
     NSString *reason = exception.reason ?: @"private XCTest text synthesis failed";
-    return [NSString stringWithFormat:@"%@: %@", name, reason];
+    return RunnerTextEntryResult(
+      RunnerSynthesizedTextEntryStatusFailed,
+      [NSString stringWithFormat:@"%@: %@", name, reason]
+    );
   }
 }
 
+static RunnerSynthesizedTextEntryResult *RunnerTextEntryResult(
+  RunnerSynthesizedTextEntryStatus status,
+  NSString * _Nullable message
+) {
+  RunnerSynthesizedTextEntryResult *result = [RunnerSynthesizedTextEntryResult new];
+  result.status = status;
+  result.message = message;
+  return result;
+}
+
 static NSString * _Nullable RunnerRequireTextClass(Class cls, NSString *name) {
   if (cls == Nil) {
     return [NSString stringWithFormat:@"private XCTest text synthesis unavailable: missing %@", name];

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

@@ -2465,14 +2465,23 @@ extension RunnerTests {
     let target: TextEntryTarget
     var resolvedCoordinateContext: SynthesizedCoordinateContext?
     var maestroNonHittableCoordinateFallbackUsed: Bool?
+    if command.allowNonHittableCoordinateFallback == true,
+      command.x != nil,
+      command.y != nil
+    {
+      // The shared runtime has already resolved this node as non-hittable and
+      // deliberately selected Maestro's coordinate compatibility route.
+      maestroNonHittableCoordinateFallbackUsed = true
+    }
     let focusStartedAt = Date()
 #if os(iOS)
+    let xCTestChannelPenalized = isSnapshotXCTestChannelPenalized(bundleId: currentBundleId)
     var resolvedCoordinateTarget: TextEntryTarget?
     if Self.shouldUseResolvedCoordinateTextEntryRoute(
       repairMode: textEntryMode,
       hasX: command.x != nil,
       hasY: command.y != nil,
-      resolvedTextInputTarget: command.resolvedTextInputTarget == true
+      xCTestChannelPenalized: xCTestChannelPenalized
     ), let x = command.x, let y = command.y {
       let policyKind = SynthesizedGesturePolicyKind.coordinateTap
       let context = synthesizedCoordinateContext(
@@ -2482,27 +2491,35 @@ extension RunnerTests {
       let (_, outcome) = performGesture(activeApp, idleTimeout: false) {
         synthesizedTapAt(app: activeApp, x: x, y: y, context: context)
       }
-      if let response = unsupportedResponse(for: outcome) {
-        return response
+      if Self.shouldFallbackFromSynthesizedTextEntryFocus(outcome) {
+        logSynthesizedGesturePolicyDecision(
+          kind: policyKind,
+          context: context,
+          fallbackAttempted: true
+        )
+      } else {
+        logSynthesizedGesturePolicyDecision(
+          kind: policyKind,
+          context: context,
+          fallbackAttempted: false
+        )
+        resolvedCoordinateContext = context
+        resolvedCoordinateTarget = TextEntryTarget(
+          element: nil,
+          refreshPoint: CGPoint(x: x, y: y),
+          prefersFocusedElement: false
+        )
       }
-      logSynthesizedGesturePolicyDecision(
-        kind: policyKind,
-        context: context,
-        fallbackAttempted: false
-      )
-      resolvedCoordinateContext = context
-      resolvedCoordinateTarget = TextEntryTarget(
-        element: nil,
-        refreshPoint: CGPoint(x: x, y: y),
-        prefersFocusedElement: false
-      )
     }
 #else
+    let xCTestChannelPenalized = false
     let resolvedCoordinateTarget: TextEntryTarget? = nil
 #endif
     if let resolvedCoordinateTarget {
       target = resolvedCoordinateTarget
     } else if let selectorKey = command.selectorKey, let selectorValue = command.selectorValue {
+      // Released daemons may still send selector-keyed type commands even though current
+      // daemons resolve fill selectors through the runtime tree before reaching the runner.
       let match = findElement(
         app: activeApp,
         selectorKey: selectorKey,
@@ -2537,7 +2554,7 @@ extension RunnerTests {
       let canReplaceResolvedFirstResponder = Self.shouldUseSynthesizedFirstResponderReplacement(
         hasResolvedElement: target.element != nil,
         hasRefreshPoint: target.refreshPoint != nil,
-        resolvedTextInputTarget: command.resolvedTextInputTarget == true
+        xCTestChannelPenalized: xCTestChannelPenalized
       )
 #else
       let canReplaceResolvedFirstResponder = false
@@ -2556,7 +2573,8 @@ extension RunnerTests {
       text: text,
       delaySeconds: delaySeconds,
       repairMode: textEntryMode,
-      resolvedTextInputTarget: command.resolvedTextInputTarget == true,
+      xCTestChannelPenalized: xCTestChannelPenalized,
+      synthesizer: PrivateXCTestTextEntrySynthesizer(),
       commandId: command.commandId
     )
     if textResult.verified == false {

apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+Models.swift

@@ -120,7 +120,6 @@ struct Command: Codable {
   let allowNonHittableCoordinateFallback: Bool?
   let delayMs: Int?
   let textEntryMode: String?
-  let resolvedTextInputTarget: Bool?
   let action: String?
   let x: Double?
   let y: Double?