appium-webdriveragent 16.1.4 → 16.1.6

package/WebDriverAgentLib/Categories/XCUIApplication+FBAlert.m

@@ -113,17 +113,13 @@ static NSString *const FB_LIMITED_ACCESS_PROMPT_BUNDLE_ID = @"com.apple.Contacts
   NSMutableArray<XCUIElement *> *sheets = [NSMutableArray array];
   NSMutableArray<XCUIElement *> *scrollViews = [NSMutableArray array];
   for (XCUIElement *candidate in candidates) {
-    switch (candidate.elementType) {
-      case XCUIElementTypeAlert:
-        return candidate;
-      case XCUIElementTypeSheet:
-        [sheets addObject:candidate];
-        break;
-      case XCUIElementTypeScrollView:
-        [scrollViews addObject:candidate];
-        break;
-      default:
-        break;
+    XCUIElementType elementType = candidate.elementType;
+    if (elementType == XCUIElementTypeAlert) {
+      return candidate;
+    } else if (elementType == XCUIElementTypeSheet) {
+      [sheets addObject:candidate];
+    } else if (elementType == XCUIElementTypeScrollView) {
+      [scrollViews addObject:candidate];
     }
   }
 
@@ -135,7 +131,7 @@ static NSString *const FB_LIMITED_ACCESS_PROMPT_BUNDLE_ID = @"com.apple.Contacts
 
     // In case of iPad we want to check if sheet isn't contained by popover.
     // In that case we ignore it.
-    id<FBXCElementSnapshot> sheetSnapshot = sheet.lastSnapshot ?: sheet.fb_cachedSnapshot ?: [sheet fb_customSnapshot];
+    id<FBXCElementSnapshot> sheetSnapshot = sheet.fb_cachedSnapshot ?: [sheet fb_customSnapshot];
     BOOL isInsidePopover = NO;
     id<FBXCElementSnapshot> ancestor = sheetSnapshot.parent;
     while (nil != ancestor) {
@@ -154,7 +150,7 @@ static NSString *const FB_LIMITED_ACCESS_PROMPT_BUNDLE_ID = @"com.apple.Contacts
   }
 
   for (XCUIElement *scrollView in scrollViews) {
-    id<FBXCElementSnapshot> scrollViewSnapshot = scrollView.lastSnapshot ?: scrollView.fb_cachedSnapshot ?: [scrollView fb_customSnapshot];
+    id<FBXCElementSnapshot> scrollViewSnapshot = scrollView.fb_cachedSnapshot ?: [scrollView fb_customSnapshot];
     id<FBXCElementSnapshot> app = [[FBXCElementSnapshotWrapper ensureWrapped:scrollViewSnapshot] fb_parentMatchingType:XCUIElementTypeApplication];
     if (nil == app || ![app.label isEqualToString:FB_SAFARI_APP_NAME]) {
       continue;

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -23,7 +23,7 @@
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCAXClientProxy.h"
 #import "FBXMLGenerationOptions.h"
-#import "XCTestManager_ManagerInterface-Protocol.h"
+#import "XCTMessagingChannel_RunnerToDaemon-Protocol.h"
 #import "XCTestPrivateSymbols.h"
 #import "XCTRunnerDaemonSession.h"
 #import "XCUIApplication.h"
@@ -144,7 +144,7 @@ NSDictionary<NSString *, NSString *> *customExclusionAttributesMap(void) {
 + (NSArray<NSDictionary<NSString *, id> *> *)fb_appsInfoWithAxElements:(NSArray<id<FBXCAccessibilityElement>> *)axElements
 {
   NSMutableArray<NSDictionary<NSString *, id> *> *result = [NSMutableArray array];
-  id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
+  id<XCTMessagingChannel_RunnerToDaemon> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
   for (id<FBXCAccessibilityElement> axElement in axElements) {
     NSMutableDictionary<NSString *, id> *appInfo = [NSMutableDictionary dictionary];
     pid_t pid = axElement.processIdentifier;

package/WebDriverAgentLib/Categories/XCUIApplication+FBTouchAction.m

@@ -16,7 +16,6 @@
 #import "FBRunLoopSpinner.h"
 #import "FBW3CActionsSynthesizer.h"
 #import "FBXCTestDaemonsProxy.h"
-#import "XCEventGenerator.h"
 #import "XCUIElement+FBUtilities.h"
 
 #if !TARGET_OS_TV

package/WebDriverAgentLib/Categories/XCUIApplicationProcess+FBQuiescence.m

@@ -10,6 +10,7 @@
 
 #import <objc/runtime.h>
 
+#import "CDStructures.h"
 #import "FBConfiguration.h"
 #import "FBExceptions.h"
 #import "FBLogger.h"

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -123,6 +123,9 @@ static bool fb_isLocked;
   if (fb_isLocked) {
     return YES;
   }
+#if TARGET_OS_SIMULATOR
+  [self pressLockButton];
+#else
   if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"27.0")) {
     // iOS 27: pressLockButton no longer locks; use a direct IOHID Power press (0x0C/0x30, ~0.5s hold).
     if (![self fb_performIOHIDEventWithPage:0x0C
@@ -134,6 +137,7 @@ static bool fb_isLocked;
   } else {
     [self pressLockButton];
   }
+#endif
   return [[[[FBRunLoopSpinner new]
             timeout:FBScreenLockTimeout]
            timeoutErrorMessage:@"Timed out while waiting until the screen gets locked"]

package/WebDriverAgentLib/Categories/XCUIDevice+FBVoiceOver.m

@@ -190,19 +190,21 @@ static NSDictionary<NSString *, NSString *> *FBVoiceOverMoveSelectors(void)
 - (nullable NSString *)fb_voiceOverMove:(NSString *)direction error:(NSError **)error
 {
   if (![direction isKindOfClass:NSString.class] || 0 == direction.length) {
-    return [[[FBErrorBuilder builder]
-             withDescription:@"VoiceOver move direction must be a non-empty string"]
-            buildError:error], nil;
+    [[[FBErrorBuilder builder]
+      withDescription:@"VoiceOver move direction must be a non-empty string"]
+     buildError:error];
+    return nil;
   }
 
   NSString *normalizedDirection = direction.lowercaseString;
   NSString *selectorName = FBVoiceOverMoveSelectors()[normalizedDirection];
   if (nil == selectorName) {
     NSArray *supportedDirections = [FBVoiceOverMoveSelectors().allKeys sortedArrayUsingSelector:@selector(compare:)];
-    return [[[FBErrorBuilder builder]
-             withDescriptionFormat:@"Unsupported VoiceOver move direction '%@'. Supported directions: %@",
-             direction, supportedDirections]
-            buildError:error], nil;
+    [[[FBErrorBuilder builder]
+      withDescriptionFormat:@"Unsupported VoiceOver move direction '%@'. Supported directions: %@",
+      direction, supportedDirections]
+     buildError:error];
+    return nil;
   }
 
   return FBVoiceOverSpeechFromSelector(NSSelectorFromString(selectorName), error);

package/WebDriverAgentLib/Categories/XCUIElement+FBClassChain.m

@@ -137,7 +137,7 @@
   // Reuse an already-taken snapshot of `self` if one is available (e.g. the
   // caller just resolved/inspected this same element) instead of always
   // paying for a fresh one.
-  NSArray<id<FBXCElementSnapshot>> *currentRoots = @[self.lastSnapshot ?: [self fb_customSnapshot]];
+  NSArray<id<FBXCElementSnapshot>> *currentRoots = @[self.lastSnapshot ?: self.fb_cachedSnapshot ?: [self fb_customSnapshot]];
   FBClassChainItem *chainItem = lookupChain.firstObject;
   NSArray<id<FBXCElementSnapshot>> *candidates = [self.class fb_snapshotsMatchingItem:chainItem inRoots:currentRoots];
   [lookupChain removeObjectAtIndex:0];
@@ -153,7 +153,7 @@
       if (0 == currentRootMatch.count) {
         return @[];
       }
-      currentRoots = @[currentRootMatch.firstObject];
+      currentRoots = @[(id<FBXCElementSnapshot> _Nonnull)currentRootMatch.firstObject];
     } else {
       currentRoots = candidates;
     }

package/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m

@@ -48,9 +48,13 @@ const CGFloat FBScrollTouchProportion = 0.75f;
 
 - (BOOL)fb_nativeScrollToVisibleWithError:(NSError **)error
 {
-  id<FBXCElementSnapshot> snapshot = [self fb_customSnapshot];
-  return nil != [self _hitPointByAttemptingToScrollToVisibleSnapshot:snapshot
-                                                               error:error];
+  [self scrollToVisible];
+  if (self.wdVisible) {
+    return YES;
+  }
+  return [[[FBErrorBuilder builder]
+           withDescriptionFormat:@"Failed to scroll element '%@' into view", self.description]
+          buildError:error];
 }
 
 - (void)fb_scrollUpByNormalizedDistance:(CGFloat)distance

package/WebDriverAgentLib/Categories/XCUIElement+FBTyping.h

@@ -7,6 +7,7 @@
  */
 
 #import <XCTest/XCTest.h>
+#import <WebDriverAgentLib/FBXCElementSnapshot.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -50,6 +51,25 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error);
           frequency:(NSUInteger)frequency
               error:(NSError **)error;
 
+/**
+ Types a text into element, reusing a snapshot the caller already holds
+ instead of fetching a new one. Only pass a snapshot that is known to
+ reflect the element's current state (e.g. one taken moments earlier in
+ the same operation) - a stale snapshot here will not be detected as such.
+
+ @param text text that should be typed
+ @param shouldClear Whether to clear the input field before start typing
+ @param frequency Frequency of typing (letters per sec)
+ @param snapshot A recent snapshot of the receiver
+ @param error If there is an error, upon return contains an NSError object that describes the problem.
+ @return YES if the operation succeeds, otherwise NO.
+ */
+- (BOOL)fb_typeText:(NSString *)text
+        shouldClear:(BOOL)shouldClear
+          frequency:(NSUInteger)frequency
+           snapshot:(id<FBXCElementSnapshot>)snapshot
+              error:(NSError **)error;
+
 /**
  Clears text on element.
  It will try to activate keyboard on element, if element has no keyboard focus.
@@ -59,6 +79,19 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error);
  */
 - (BOOL)fb_clearTextWithError:(NSError **)error;
 
+/**
+ Clears text on element, reusing a snapshot the caller already holds
+ instead of fetching a new one. Only pass a snapshot that is known to
+ reflect the element's current state (e.g. one taken moments earlier in
+ the same operation) - a stale snapshot here will not be detected as such.
+
+ @param snapshot A recent snapshot of the receiver
+ @param error If there is an error, upon return contains an NSError object that describes the problem.
+ @return YES if the operation succeeds, otherwise NO.
+ */
+- (BOOL)fb_clearTextWithSnapshot:(id<FBXCElementSnapshot>)snapshot
+                            error:(NSError **)error;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIElement+FBTyping.m

@@ -109,7 +109,22 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
           frequency:(NSUInteger)frequency
               error:(NSError **)error
 {
+  // No snapshot was handed to us, so there is nothing to safely reuse -
+  // always fetch a fresh one.
   id<FBXCElementSnapshot> snapshot = [self fb_standardSnapshot];
+  return [self fb_typeText:text
+               shouldClear:shouldClear
+                 frequency:frequency
+                  snapshot:snapshot
+                     error:error];
+}
+
+- (BOOL)fb_typeText:(NSString *)text
+        shouldClear:(BOOL)shouldClear
+          frequency:(NSUInteger)frequency
+           snapshot:(id<FBXCElementSnapshot>)snapshot
+              error:(NSError **)error
+{
   FBXCElementSnapshotWrapper *wrapped = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
   [self fb_prepareForTextInputWithSnapshot:wrapped];
   if (shouldClear && ![self fb_clearTextWithSnapshot:wrapped shouldPrepareForInput:NO error:error]) {
@@ -120,7 +135,15 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
 
 - (BOOL)fb_clearTextWithError:(NSError **)error
 {
+  // No snapshot was handed to us, so there is nothing to safely reuse -
+  // always fetch a fresh one.
   id<FBXCElementSnapshot> snapshot = [self fb_standardSnapshot];
+  return [self fb_clearTextWithSnapshot:snapshot error:error];
+}
+
+- (BOOL)fb_clearTextWithSnapshot:(id<FBXCElementSnapshot>)snapshot
+                            error:(NSError **)error
+{
   return [self fb_clearTextWithSnapshot:[FBXCElementSnapshotWrapper ensureWrapped:snapshot]
                   shouldPrepareForInput:YES
                                   error:error];

package/WebDriverAgentLib/Categories/XCUIElementQuery+FBHelpers.m

@@ -11,6 +11,7 @@
 #import "FBXCodeCompatibility.h"
 #import "XCUIElementQuery.h"
 #import "FBXCElementSnapshot.h"
+#import "XCTElementSetTransformer-Protocol.h"
 
 @implementation XCUIElementQuery (FBHelpers)
 

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -221,9 +221,14 @@
   }
   NSUInteger frequency = (NSUInteger)[request.arguments[@"frequency"] longLongValue] ?: [FBConfiguration maxTypingFrequency];
   NSError *error = nil;
+  // checkStaleness:YES above already took a fresh, verified-live snapshot of
+  // `element` and cached it as `lastSnapshot` - reuse it instead of paying
+  // for another round trip.
+  id<FBXCElementSnapshot> snapshot = element.lastSnapshot ?: element.fb_cachedSnapshot ?: [element fb_standardSnapshot];
   if (![element fb_typeText:textToType
                 shouldClear:NO
                   frequency:frequency
+                   snapshot:snapshot
                       error:&error]) {
     return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description traceback:nil]);
   }

package/WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -313,7 +313,7 @@
     return nil;
   }
 
-  XCUIApplication *app = [[XCUIApplication alloc] initWithBundleIdentifier:bundleID];
+  XCUIApplication *app = [[XCUIApplication alloc] initWithBundleIdentifier:(NSString * _Nonnull)bundleID];
   BOOL forceAppLaunch = nil == capabilities[FB_CAP_FORCE_APP_LAUNCH]
     || [capabilities[FB_CAP_FORCE_APP_LAUNCH] boolValue];
   XCUIApplicationState appState = app.state;

package/WebDriverAgentLib/FBAlert.m

@@ -74,7 +74,7 @@
     XCUIElement *alertElement = self.alertElement;
     self.cachedAlertSnapshot = nil == alertElement
       ? nil
-      : (alertElement.lastSnapshot ?: alertElement.fb_cachedSnapshot ?: [alertElement fb_customSnapshot]);
+      : (alertElement.fb_cachedSnapshot ?: [alertElement fb_customSnapshot]);
     self.hasCachedAlertSnapshot = YES;
   }
   return self.cachedAlertSnapshot;
@@ -194,7 +194,15 @@
     [self fb_raiseSetTextFailedExceptionWithReason:@"Failed to resolve the input field element"];
   }
   NSError *error;
-  if (![dstField fb_typeText:text shouldClear:YES error:&error]) {
+  // dstField was just resolved via a live query in fb_elementForSnapshot:underElement:
+  // above, so its cached snapshot can be safely reconstructed in memory
+  // instead of paying for a fresh round trip.
+  id<FBXCElementSnapshot> snapshot = dstField.fb_cachedSnapshot ?: [dstField fb_standardSnapshot];
+  if (![dstField fb_typeText:text
+                  shouldClear:YES
+                    frequency:FBConfiguration.maxTypingFrequency
+                     snapshot:snapshot
+                        error:&error]) {
     [self fb_raiseSetTextFailedExceptionWithReason:error.description];
   }
 }
@@ -394,7 +402,8 @@
   }
   XCUIElement *matchedElement = nil;
   for (XCUIElement *match in matches) {
-    if (nil == alertSnapshotUids || [alertSnapshotUids containsObject:match.fb_uid]) {
+    NSString *matchUid = match.fb_uid;
+    if (nil == alertSnapshotUids || (nil != matchUid && [alertSnapshotUids containsObject:matchUid])) {
       matchedElement = match;
       break;
     }

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>16.1.4</string>
+    <string>16.1.6</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>16.1.4</string>
+    <string>16.1.6</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentLib/Routing/FBWebServer.m

@@ -128,8 +128,9 @@ static NSString *const FBServerURLEndMarker = @"<-ServerURLHere";
 
   if (!serverStarted) {
     [FBLogger logFmt:@"Last attempt to start web server failed with error %@", [error description]];
-    if ([self.delegate respondsToSelector:@selector(webServer:didFailToStartWithError:)]) {
-      [self.delegate webServer:self didFailToStartWithError:(NSError * _Nonnull)error];
+    id<FBWebServerDelegate> delegate = self.delegate;
+    if ([delegate respondsToSelector:@selector(webServer:didFailToStartWithError:)]) {
+      [delegate webServer:self didFailToStartWithError:(NSError * _Nonnull)error];
       return NO;
     }
     abort();

package/WebDriverAgentLib/Routing/FBXCElementSnapshot.h

@@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)mergeTreeWithSnapshot:(id)arg1;
 - (id)_childMatchingElement:(id)arg1;
 - (NSArray<id<FBXCElementSnapshot>> *)_allDescendants;
-- (BOOL)hasDescendantMatchingFilter:(CDUnknownBlockType)arg1;
+- (BOOL)hasDescendantMatchingFilter:(BOOL(^)(id<FBXCElementSnapshot> snapshot))arg1;
 - (NSArray<id<FBXCElementSnapshot>> *)descendantsByFilteringWithBlock:(BOOL(^)(id<FBXCElementSnapshot> snapshot))block;
 - (id)elementSnapshotMatchingAccessibilityElement:(id)arg1;
 - (void)enumerateDescendantsUsingBlock:(void(^)(id<FBXCElementSnapshot> snapshot))block;

package/WebDriverAgentLib/Utilities/FBActiveAppDetectionPoint.m

@@ -11,7 +11,7 @@
 #import "FBErrorBuilder.h"
 #import "FBLogger.h"
 #import "FBXCTestDaemonsProxy.h"
-#import "XCTestManager_ManagerInterface-Protocol.h"
+#import "XCTMessagingChannel_RunnerToDaemon-Protocol.h"
 
 @implementation FBActiveAppDetectionPoint
 
@@ -38,7 +38,7 @@
 + (id<FBXCAccessibilityElement>)axElementWithPoint:(CGPoint)point
 {
   __block id<FBXCAccessibilityElement> onScreenElement = nil;
-  id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
+  id<XCTMessagingChannel_RunnerToDaemon> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
   dispatch_semaphore_t sem = dispatch_semaphore_create(0);
   [proxy _XCT_requestElementAtPoint:point
                               reply:^(id element, NSError *error) {

package/WebDriverAgentLib/Utilities/FBBaseActionsSynthesizer.h

@@ -9,6 +9,7 @@
 #import "FBElementCache.h"
 #import "FBXCElementSnapshot.h"
 #import "XCUIApplication.h"
+#import "XCPointerEventPath.h"
 #import "XCSynthesizedEventRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN

package/WebDriverAgentLib/Utilities/FBFailureProofTestCase.m

@@ -9,6 +9,9 @@
 #import "FBFailureProofTestCase.h"
 
 #import "FBLogger.h"
+#import "XCTIssue.h"
+#import "XCTSourceCodeContext.h"
+#import "XCTSourceCodeLocation.h"
 
 @implementation FBFailureProofTestCase
 
@@ -45,6 +48,8 @@
 /**
  Override 'recordFailureWithDescription' to not stop by failures.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (void)recordFailureWithDescription:(NSString *)description
                               inFile:(NSString *)filePath
                               atLine:(NSUInteger)lineNumber
@@ -52,6 +57,7 @@
 {
   [self _enqueueFailureWithDescription:description inFile:filePath atLine:lineNumber expected:expected];
 }
+#pragma clang diagnostic pop
 
 /**
  Private XCTestCase method used to block and tunnel failure messages

package/WebDriverAgentLib/Utilities/FBScreenshot.m

@@ -17,7 +17,7 @@
 #import "FBMacros.h"
 #import "FBXCodeCompatibility.h"
 #import "FBXCTestDaemonsProxy.h"
-#import "XCTestManager_ManagerInterface-Protocol.h"
+#import "XCTMessagingChannel_RunnerToDaemon-Protocol.h"
 #import "XCUIScreen.h"
 
 static const NSTimeInterval SCREENSHOT_TIMEOUT = 20.;
@@ -95,7 +95,7 @@ NSString *formatTimeInterval(NSTimeInterval interval) {
                                          timeout:(NSTimeInterval)timeout
                                            error:(NSError **)error
 {
-  id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
+  id<XCTMessagingChannel_RunnerToDaemon> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
   __block NSData *screenshotData = nil;
   __block NSError *innerError = nil;
   dispatch_semaphore_t sem = dispatch_semaphore_create(0);

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.h

@@ -16,12 +16,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@protocol XCTestManager_ManagerInterface;
+@protocol XCTMessagingChannel_RunnerToDaemon;
 @class FBScreenRecordingRequest, FBScreenRecordingPromise;
 
 @interface FBXCTestDaemonsProxy : NSObject
 
-+ (id<XCTestManager_ManagerInterface>)testRunnerProxy;
++ (id<XCTMessagingChannel_RunnerToDaemon>)testRunnerProxy;
 
 + (BOOL)synthesizeEventWithRecord:(XCSynthesizedEventRecord *)record
                             error:(NSError *__autoreleasing*)error;

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.m

@@ -80,9 +80,9 @@ static void swizzledLaunchApp(id self, SEL _cmd, NSString *path, NSString *bundl
 #pragma clang diagnostic pop
 }
 
-+ (id<XCTestManager_ManagerInterface>)testRunnerProxy
++ (id<XCTMessagingChannel_RunnerToDaemon>)testRunnerProxy
 {
-  static id<XCTestManager_ManagerInterface> proxy = nil;
+  static id<XCTMessagingChannel_RunnerToDaemon> proxy = nil;
   if ([FBConfiguration shouldUseSingletonTestManager]) {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
@@ -97,7 +97,7 @@ static void swizzledLaunchApp(id self, SEL _cmd, NSString *path, NSString *bundl
   return proxy;
 }
 
-+ (id<XCTestManager_ManagerInterface>)retrieveTestRunnerProxy
++ (id<XCTMessagingChannel_RunnerToDaemon>)retrieveTestRunnerProxy
 {
   return ((XCTRunnerDaemonSession *)[XCTRunnerDaemonSession sharedSession]).daemonProxy;
 }
@@ -113,7 +113,7 @@ static void swizzledLaunchApp(id self, SEL _cmd, NSString *path, NSString *bundl
       completion();
     };
 
-    XCEventGeneratorHandler handlerBlock = ^(XCSynthesizedEventRecord *innerRecord, NSError *invokeError) {
+    void (^handlerBlock)(XCSynthesizedEventRecord *, NSError *) = ^(XCSynthesizedEventRecord *innerRecord, NSError *invokeError) {
       errorHandler(invokeError);
     };
     [[XCUIDevice.sharedDevice eventSynthesizer] synthesizeEvent:record completion:(id)^(BOOL result, NSError *invokeError) {

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m

@@ -15,7 +15,18 @@
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIElementQuery.h"
 #import "FBXCTestDaemonsProxy.h"
-#import "XCTestManager_ManagerInterface-Protocol.h"
+#import "XCTCapabilities.h"
+#import "XCTMessagingChannel_RunnerToDaemon-Protocol.h"
+#import "XCTRunnerDaemonSession.h"
+
+/**
+ Legacy testmanagerd (pre-Xcode 15) protocol-version handshake. Xcode 15+ testmanagerd replaced
+ this with named XCTCapabilities negotiation and no longer declares this selector at all, so it
+ does not appear in the modern XCTMessagingChannel_RunnerToDaemon protocol surface.
+ */
+@protocol FBXCTestManagerLegacyProtocolVersionExchanging <NSObject>
+- (void)_XCT_exchangeProtocolVersion:(unsigned long long)version reply:(void (^)(unsigned long long code))reply;
+@end
 
 @implementation XCUIElementQuery (FBCompatibility)
 
@@ -71,15 +82,25 @@ NSInteger FBTestmanagerdVersion(void)
   static dispatch_once_t getTestmanagerdVersion;
   static NSInteger testmanagerdVersion;
   dispatch_once(&getTestmanagerdVersion, ^{
-    id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
+    id<XCTMessagingChannel_RunnerToDaemon> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
     if ([(NSObject *)proxy respondsToSelector:@selector(_XCT_exchangeProtocolVersion:reply:)]) {
+      id<FBXCTestManagerLegacyProtocolVersionExchanging> legacyProxy = (id<FBXCTestManagerLegacyProtocolVersionExchanging>)proxy;
       [FBRunLoopSpinner spinUntilCompletion:^(void(^completion)(void)){
-        [proxy _XCT_exchangeProtocolVersion:testmanagerdVersion reply:^(unsigned long long code) {
+        [legacyProxy _XCT_exchangeProtocolVersion:testmanagerdVersion reply:^(unsigned long long code) {
           testmanagerdVersion = (NSInteger) code;
           completion();
         }];
       }];
     } else {
+      // Modern testmanagerd (Xcode 15+) has already negotiated named XCTCapabilities by the time
+      // a daemon session exists, instead of a single scalar protocol version. There is no direct
+      // integer equivalent to report here (this value is diagnostic-only, surfaced via the
+      // 'testmanagerdVersion' session capability), so keep reporting the existing "assume
+      // newest/full-featured" sentinel, while confirming capabilities did negotiate successfully.
+      XCTCapabilities *capabilities = [XCTRunnerDaemonSession sharedSession].remoteInterfaceCapabilities;
+      if (nil == capabilities) {
+        [FBLogger log:@"Could not retrieve testmanagerd capabilities"];
+      }
       testmanagerdVersion = 0xFFFF;
     }
   });

package/build/lib/no-session-proxy.d.ts

@@ -1,6 +1,6 @@
-import { JWProxy } from '@appium/base-driver';
+import { WebDriverProxy } from '@appium/base-driver';
 import type { ProxyOptions } from '@appium/types';
-export declare class NoSessionProxy extends JWProxy {
+export declare class NoSessionProxy extends WebDriverProxy {
     constructor(opts?: ProxyOptions);
     getUrlForProxy(url: string): string;
 }

package/build/lib/no-session-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-session-proxy.d.ts","sourceRoot":"","sources":["../../lib/no-session-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAC5C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,qBAAa,cAAe,SAAQ,OAAO;gBAC7B,IAAI,GAAE,YAAiB;IAI1B,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAU7C"}
+{"version":3,"file":"no-session-proxy.d.ts","sourceRoot":"","sources":["../../lib/no-session-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,qBAAa,cAAe,SAAQ,cAAc;gBACpC,IAAI,GAAE,YAAiB;IAI1B,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAU7C"}

package/build/lib/no-session-proxy.js

@@ -1,5 +1,5 @@
-import { JWProxy } from '@appium/base-driver';
-export class NoSessionProxy extends JWProxy {
+import { WebDriverProxy } from '@appium/base-driver';
+export class NoSessionProxy extends WebDriverProxy {
     constructor(opts = {}) {
         super(opts);
     }

package/build/lib/no-session-proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"no-session-proxy.js","sourceRoot":"","sources":["../../lib/no-session-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAG5C,MAAM,OAAO,cAAe,SAAQ,OAAO;IACzC,YAAY,OAAqB,EAAE;QACjC,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEQ,cAAc,CAAC,GAAW;QACjC,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;YACf,GAAG,GAAG,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7E,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,8BAA8B;QAC3E,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,GAAG,CAAC,CAAC;IAC/D,CAAC;CACF"}
+{"version":3,"file":"no-session-proxy.js","sourceRoot":"","sources":["../../lib/no-session-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAGnD,MAAM,OAAO,cAAe,SAAQ,cAAc;IAChD,YAAY,OAAqB,EAAE;QACjC,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEQ,cAAc,CAAC,GAAW;QACjC,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;YACf,GAAG,GAAG,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7E,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,8BAA8B;QAC3E,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,GAAG,CAAC,CAAC;IAC/D,CAAC;CACF"}

package/build/lib/webdriveragent.d.ts

@@ -1,4 +1,4 @@
-import { JWProxy } from '@appium/base-driver';
+import { WebDriverProxy } from '@appium/base-driver';
 import type { AppiumLogger, StringRecord } from '@appium/types';
 import { NoSessionProxy } from './no-session-proxy.js';
 import type { WebDriverAgentArgs, AppleDevice, XcodeBuildSettings, RetrieveBuildSettingsOptions } from './types.js';
@@ -20,7 +20,7 @@ export declare class WebDriverAgent {
     started: boolean;
     updatedWDABundleId?: string;
     noSessionProxy?: NoSessionProxy;
-    jwproxy?: JWProxy;
+    jwproxy?: WebDriverProxy;
     proxyReqRes?: any;
     private readonly log;
     private readonly wdaLocalPort?;

package/build/lib/webdriveragent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webdriveragent.d.ts","sourceRoot":"","sources":["../../lib/webdriveragent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webdriveragent.d.ts","sourceRoot":"","sources":["../../lib/webdriveragent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAGnD,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAW9D,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EACV,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,4BAA4B,EAE7B,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAQ3C,qBAAa,cAAc;IACzB,aAAa,EAAG,MAAM,CAAC;IACvB,SAAS,EAAG,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAU;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAS;IAC/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAU;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAU;IAC1C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAU;IAC9C,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAS;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,qBAAqB,CAAC,CAAqB;IACnD,OAAO,CAAC,WAAW,CAAC,CAAoB;IACxC,OAAO,CAAC,IAAI,CAAC,CAAM;IAEnB;;;;OAIG;gBACS,IAAI,EAAE,kBAAkB,EAAE,GAAG,GAAE,YAAY,GAAG,IAAW;IAyFrE;;;OAGG;IACH,IAAI,iBAAiB,IAAI,OAAO,CAI/B;IAED;;;;OAIG;IACH,IAAI,UAAU,IAAI,UAAU,CAK3B;IAED;;;;;;;OAOG;IACH,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED;;;OAGG;IACH,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED;;;;;OAKG;IACH,IAAI,GAAG,IAAI,GAAG,CAWb;IAED;;;OAGG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;OAGG;IACH,IAAI,YAAY,CAAC,OAAO,EAAE,OAAO,EAEhC;IAED;;;OAGG;IACH,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,EAEnB;IAED;;;OAGG;IACG,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAY/C;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACG,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAO7D;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAOvC;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB3B;;;;OAIG;IACG,qBAAqB,CAAC,OAAO,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAO5G;;;;;OAKG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAyDjD,OAAO,CAAC,qBAAqB;IAiD7B,OAAO,CAAC,YAAY;IAsBpB,OAAO,CAAC,KAAK;IAYb,OAAO,CAAC,WAAW;IAWnB;;;;;;;;;;;;;;;;;;;;OAoBG;YACW,SAAS;YAiDT,sBAAsB;CA4DrC"}

package/build/lib/webdriveragent.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { JWProxy } from '@appium/base-driver';
+import { WebDriverProxy } from '@appium/base-driver';
 import { strongbox } from '@appium/strongbox';
 import { fs, util } from '@appium/support';
 import AsyncLock from 'async-lock';
@@ -399,7 +399,7 @@ export class WebDriverAgent {
         if (this.args.reqBasePath) {
             proxyOpts.reqBasePath = this.args.reqBasePath;
         }
-        this.jwproxy = new JWProxy(proxyOpts);
+        this.jwproxy = new WebDriverProxy(proxyOpts);
         this.jwproxy.sessionId = sessionId;
         this.proxyReqRes = this.jwproxy.proxyReqRes.bind(this.jwproxy);
         this.noSessionProxy = new NoSessionProxy(proxyOpts);