appium-webdriveragent 16.9.0 → 16.9.2

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [16.9.2](https://github.com/appium/WebDriverAgent/compare/v16.9.1...v16.9.2) (2026-08-28)
+
+### Bug Fixes
+
+* cache the testmanagerd protocol version fallback on timeout ([#1228](https://github.com/appium/WebDriverAgent/issues/1228)) ([f3d8e0c](https://github.com/appium/WebDriverAgent/commit/f3d8e0ce42488b6e95a74f1c59e0f20a500d1a54))
+* sanitize non-UTF-8-encodable strings before JSON response serialization ([#1236](https://github.com/appium/WebDriverAgent/issues/1236)) ([fa6a250](https://github.com/appium/WebDriverAgent/commit/fa6a2503222ac2ffd039cb73a96689467774d7f2))
+
+### Miscellaneous Chores
+
+* **deps:** bump @appium/strongbox from 1.1.3 to 2.0.0 ([#1237](https://github.com/appium/WebDriverAgent/issues/1237)) ([03db844](https://github.com/appium/WebDriverAgent/commit/03db844ee0cb408bb323d0d77241ba55188c47f3))
+
+## [16.9.1](https://github.com/appium/WebDriverAgent/compare/v16.9.0...v16.9.1) (2026-08-28)
+
+### Bug Fixes
+
+* add missing settings to the exported WDASettings/WDACapabilities types ([#1230](https://github.com/appium/WebDriverAgent/issues/1230)) ([a9e8203](https://github.com/appium/WebDriverAgent/commit/a9e8203d71051db7a0c14c192288b2b5115cf5cf))
+* do not trust XCUIElement.lastSnapshot for long-lived elements ([#1235](https://github.com/appium/WebDriverAgent/issues/1235)) ([57968cc](https://github.com/appium/WebDriverAgent/commit/57968cc58b69ea9f036d70a694a0c9a5b6f764f7))
+
 ## [16.9.0](https://github.com/appium/WebDriverAgent/compare/v16.8.0...v16.9.0) (2026-08-27)
 
 ### Features

package/WebDriverAgent.xcodeproj/project.pbxproj

@@ -604,6 +604,7 @@
 		716F0DA12A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 716F0D9F2A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.h */; };
 		716F0DA32A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 716F0DA02A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.m */; };
 		716F0DA62A17323300CDD977 /* NSDictionaryFBUtf8SafeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 716F0DA52A17323300CDD977 /* NSDictionaryFBUtf8SafeTests.m */; };
+		E82332D32C4E06280CBE3F4C /* FBResponseJSONPayloadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F5C37472190A686297D3534 /* FBResponseJSONPayloadTests.m */; };
 		7182A87F3CAA27F71B624AD2 /* XCTRunnerAutomationSession-Protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 01AF8E73DD47455B4854E470 /* XCTRunnerAutomationSession-Protocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		718F49C8230844330045FE8B /* FBProtocolHelpersTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 718F49C7230844330045FE8B /* FBProtocolHelpersTests.m */; };
 		718F49C923087ACF0045FE8B /* FBProtocolHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 71B155DD23080CA600646AFB /* FBProtocolHelpers.h */; };
@@ -1595,6 +1596,7 @@
 		716F0D9F2A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+FBUtf8SafeDictionary.h"; sourceTree = "<group>"; };
 		716F0DA02A16CA1000CDD977 /* NSDictionary+FBUtf8SafeDictionary.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+FBUtf8SafeDictionary.m"; sourceTree = "<group>"; };
 		716F0DA52A17323300CDD977 /* NSDictionaryFBUtf8SafeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSDictionaryFBUtf8SafeTests.m; sourceTree = "<group>"; };
+		3F5C37472190A686297D3534 /* FBResponseJSONPayloadTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBResponseJSONPayloadTests.m; sourceTree = "<group>"; };
 		717C0D702518ED2800CAA6EC /* TVOSSettings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = TVOSSettings.xcconfig; sourceTree = "<group>"; };
 		717C0D862518ED7000CAA6EC /* TVOSTestSettings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = TVOSTestSettings.xcconfig; sourceTree = "<group>"; };
 		7183E8C2B556594311CB8898 /* XCUIRemoteSiriInterface-Protocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "XCUIRemoteSiriInterface-Protocol.h"; sourceTree = "<group>"; };
@@ -2682,6 +2684,7 @@
 				712A0C841DA3E459007D02E5 /* FBXPathTests.m */,
 				EE9B76581CF7987300275851 /* Info.plist */,
 				716F0DA52A17323300CDD977 /* NSDictionaryFBUtf8SafeTests.m */,
+				3F5C37472190A686297D3534 /* FBResponseJSONPayloadTests.m */,
 				7139145B1DF01A12005896C2 /* NSExpressionFBFormatTests.m */,
 				71A224E71DE326C500844D55 /* NSPredicateFBFormatTests.m */,
 				713914591DF01989005896C2 /* XCUIElementHelpersTests.m */,
@@ -4811,6 +4814,7 @@
 				71A224E81DE326C500844D55 /* NSPredicateFBFormatTests.m in Sources */,
 				EE6A892B1D0B25820083E92B /* XCUIApplicationDouble.m in Sources */,
 				716F0DA62A17323300CDD977 /* NSDictionaryFBUtf8SafeTests.m in Sources */,
+				E82332D32C4E06280CBE3F4C /* FBResponseJSONPayloadTests.m in Sources */,
 				EE6A892D1D0B2AF40083E92B /* FBErrorBuilderTests.m in Sources */,
 				712A0C851DA3E459007D02E5 /* FBXPathTests.m in Sources */,
 				ADBC39981D07842800327304 /* XCUIElementDouble.m in Sources */,

package/WebDriverAgent.xcodeproj/xcshareddata/xcschemes/IntegrationTests_1.xcscheme

@@ -59,6 +59,13 @@
             ReferencedContainer = "container:WebDriverAgent.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CI"
+            value = "$(CI)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

package/WebDriverAgent.xcodeproj/xcshareddata/xcschemes/IntegrationTests_2.xcscheme

@@ -59,6 +59,13 @@
             ReferencedContainer = "container:WebDriverAgent.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CI"
+            value = "$(CI)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

package/WebDriverAgent.xcodeproj/xcshareddata/xcschemes/IntegrationTests_3.xcscheme

@@ -59,6 +59,13 @@
             ReferencedContainer = "container:WebDriverAgent.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CI"
+            value = "$(CI)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

package/WebDriverAgent.xcodeproj/xcshareddata/xcschemes/IntegrationTests_tvOS.xcscheme

@@ -59,6 +59,13 @@
             ReferencedContainer = "container:WebDriverAgent.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CI"
+            value = "$(CI)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

package/WebDriverAgent.xcodeproj/xcshareddata/xcschemes/IntegrationTests_watchOS.xcscheme

@@ -59,6 +59,13 @@
             ReferencedContainer = "container:WebDriverAgent.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CI"
+            value = "$(CI)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

package/WebDriverAgentLib/Categories/NSDictionary+FBUtf8SafeDictionary.m

@@ -14,32 +14,42 @@ const unichar REPLACER = 0xfffd;
 
 - (instancetype)fb_utf8SafeStringWithReplacement:(unichar)replacement
 {
-  if ([self canBeConvertedToEncoding:NSUTF8StringEncoding]) {
-    return self;
-  }
-
-  NSData *data = [self dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES];
-  NSString *convertedString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-  NSMutableString *result = [NSMutableString string];
-  NSString *replacementStr = [NSString stringWithCharacters:&replacement length:1];
-  NSUInteger originalIdx = 0;
-  NSUInteger convertedIdx = 0;
-  while (originalIdx < [self length] && convertedIdx < [convertedString length]) {
-    unichar originalChar = [self characterAtIndex:originalIdx];
-    unichar convertedChar = [convertedString characterAtIndex:convertedIdx];
-
-    if (originalChar == convertedChar) {
-      [result appendString:[NSString stringWithCharacters:&originalChar length:1]];
-      originalIdx++;
-      convertedIdx++;
+  // -canBeConvertedToEncoding: and -dataUsingEncoding:allowLossyConversion:
+  // both misreport strings containing unpaired UTF-16 surrogates, so the
+  // code units are validated manually instead of relying on them.
+  NSUInteger length = self.length;
+  NSMutableString *result = nil;
+  NSString *replacementStr = nil;
+  NSUInteger copiedIdx = 0;
+  NSUInteger idx = 0;
+  while (idx < length) {
+    unichar c = [self characterAtIndex:idx];
+    if (c >= 0xD800 && c <= 0xDBFF && idx + 1 < length) {
+      unichar next = [self characterAtIndex:idx + 1];
+      if (next >= 0xDC00 && next <= 0xDFFF) {
+        idx += 2;
+        continue;
+      }
+    }
+    if (c < 0xD800 || c > 0xDFFF) {
+      idx += 1;
       continue;
     }
-
-    while (originalChar != convertedChar && originalIdx < [self length]) {
-      [result appendString:replacementStr];
-      originalChar = [self characterAtIndex:++originalIdx];
+    // Unpaired surrogate found. Lazily allocate the result and copy over
+    // the valid run preceding it, so strings without any are returned as-is.
+    if (nil == result) {
+      result = [NSMutableString stringWithCapacity:length];
+      replacementStr = [NSString stringWithCharacters:&replacement length:1];
     }
+    [result appendString:[self substringWithRange:NSMakeRange(copiedIdx, idx - copiedIdx)]];
+    [result appendString:replacementStr];
+    idx += 1;
+    copiedIdx = idx;
+  }
+  if (nil == result) {
+    return self;
   }
+  [result appendString:[self substringWithRange:NSMakeRange(copiedIdx, length - copiedIdx)]];
   return result.copy;
 }
 
@@ -70,16 +80,24 @@ const unichar REPLACER = 0xfffd;
 
 - (instancetype)fb_utf8SafeDictionary
 {
-  NSMutableDictionary *result = [self mutableCopy];
+  NSMutableDictionary *result = [NSMutableDictionary dictionaryWithCapacity:self.count];
   for (id key in self) {
-    id value = result[key];
+    id value = self[key];
+    id safeValue = value;
     if ([value isKindOfClass:NSString.class]) {
-      result[key] = [(NSString *)value fb_utf8SafeStringWithReplacement:REPLACER];
+      safeValue = [(NSString *)value fb_utf8SafeStringWithReplacement:REPLACER];
     } else if ([value isKindOfClass:NSArray.class]) {
-      result[key] = [(NSArray *)value fb_utf8SafeArray];
+      safeValue = [(NSArray *)value fb_utf8SafeArray];
     } else if ([value isKindOfClass:NSDictionary.class]) {
-      result[key] = [(NSDictionary *)value fb_utf8SafeDictionary];
+      safeValue = [(NSDictionary *)value fb_utf8SafeDictionary];
     }
+    // Sanitized keys could theoretically collide (e.g. two distinct invalid
+    // keys both reducing to the same replacement string); the later one
+    // wins, same as any other NSDictionary literal with duplicate keys.
+    id safeKey = [key isKindOfClass:NSString.class]
+      ? [(NSString *)key fb_utf8SafeStringWithReplacement:REPLACER]
+      : key;
+    result[safeKey] = safeValue;
   }
   return result.copy;
 }

package/WebDriverAgentLib/Categories/XCUIElement+FBClassChain.m

@@ -134,10 +134,8 @@
 - (NSArray<XCUIElement *> *)fb_snapshotDescendantsMatchingChainItems:(NSArray<FBClassChainItem *> *)chainItems shouldReturnAfterFirstMatch:(BOOL)shouldReturnAfterFirstMatch
 {
   NSMutableArray<FBClassChainItem *> *lookupChain = chainItems.mutableCopy;
-  // 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_cachedSnapshot ?: [self fb_customSnapshot]];
+  // self.lastSnapshot may be stale leftover from an unrelated earlier command.
+  NSArray<id<FBXCElementSnapshot>> *currentRoots = @[self.fb_cachedSnapshot ?: [self fb_customSnapshot]];
   FBClassChainItem *chainItem = lookupChain.firstObject;
   NSArray<id<FBXCElementSnapshot>> *candidates = [self.class fb_snapshotsMatchingItem:chainItem inRoots:currentRoots];
   [lookupChain removeObjectAtIndex:0];

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -100,9 +100,11 @@
     }
   }
   NSMutableArray<XCUIElement *> *matchedElements = [NSMutableArray array];
-  NSString *uid = nil == self.lastSnapshot
+  // self.lastSnapshot may be stale leftover from an unrelated earlier command.
+  id<FBXCElementSnapshot> selfSnapshot = self.fb_cachedSnapshot;
+  NSString *uid = nil == selfSnapshot
     ? self.fb_uid
-    : [FBXCElementSnapshotWrapper wdUIDWithSnapshot:self.lastSnapshot];
+    : [FBXCElementSnapshotWrapper wdUIDWithSnapshot:selfSnapshot];
   if (nil != uid && [matchedIds containsObject:uid]) {
     XCUIElement *stableSelf = [self fb_stableInstanceWithUid:uid];
     if (1 == snapshots.count) {

package/WebDriverAgentLib/Info.plist

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

package/WebDriverAgentLib/Routing/FBResponseJSONPayload.m

@@ -43,9 +43,8 @@
   NSData *jsonData = [NSJSONSerialization dataWithJSONObject:self.dictionary
                                                      options:NSJSONWritingPrettyPrinted
                                                        error:&error];
-  NSCAssert(jsonData, @"Valid JSON must be responded, error of %@", error);
-  if (nil == [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]) {
-    [FBLogger log:@"The incoming data cannot be encoded to UTF-8 JSON. Applying lossy conversion as a workaround."];
+  if (nil == jsonData || nil == [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]) {
+    [FBLogger log:@"JSON serialization failed or produced non-UTF-8 data. Applying lossy conversion as a workaround."];
     jsonData = [NSJSONSerialization dataWithJSONObject:[self.dictionary fb_utf8SafeDictionary]
                                                options:NSJSONWritingPrettyPrinted
                                                  error:&error];

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m

@@ -81,8 +81,9 @@
 
 NSInteger FBTestmanagerdVersion(void)
 {
-  // Not dispatch_once: that would permanently cache the timeout fallback below if the first call's
-  // reply merely arrived late. -1 means "not yet determined"; a timeout isn't cached, so it retries.
+  // -1 means "not yet determined". The timeout fallback is cached like any other outcome: the
+  // value is diagnostic-only, and retrying would stall every later /status for the full timeout
+  // against a daemon that never answers.
   static NSInteger cachedVersion = -1;
   static dispatch_queue_t syncQueue;
   static dispatch_once_t onceToken;
@@ -108,12 +109,11 @@ NSInteger FBTestmanagerdVersion(void)
       }];
       int64_t timeoutNs = (int64_t)(TESTMANAGERD_VERSION_TIMEOUT_SEC * NSEC_PER_SEC);
       if (0 != dispatch_semaphore_wait(sem, dispatch_time(DISPATCH_TIME_NOW, timeoutNs))) {
-        // Assume newest/full-featured on timeout, but don't cache it - retry on the next call.
         [FBLogger logFmt:@"Did not receive a testmanagerd protocol version reply within %d seconds; assuming the newest/full-featured protocol", TESTMANAGERD_VERSION_TIMEOUT_SEC];
         result = 0xFFFF;
-        return;
+      } else {
+        result = receivedVersion;
       }
-      result = receivedVersion;
     } else {
       // Modern testmanagerd (Xcode 15+) negotiates named XCTCapabilities instead of a scalar
       // version; there's no direct integer equivalent, so just confirm capabilities negotiated.

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -258,10 +258,11 @@ static NSString *const topNodeIndexPath = @"top";
       if ([root isKindOfClass:XCUIElement.class]) {
         lookupScopeSnapshot = [self snapshotWithRoot:[(XCUIElement *)root application]
                                            useNative:useNativeSnapshot];
+        // root.lastSnapshot may be stale leftover from an unrelated earlier command.
         contextRootSnapshot = [root isKindOfClass:XCUIApplication.class]
           ? nil
-          : ([(XCUIElement *)root lastSnapshot] ?: [self snapshotWithRoot:(XCUIElement *)root
-                                                                useNative:useNativeSnapshot]);
+          : ([(XCUIElement *)root fb_cachedSnapshot] ?: [self snapshotWithRoot:(XCUIElement *)root
+                                                                     useNative:useNativeSnapshot]);
       } else {
         lookupScopeSnapshot = (id<FBXCElementSnapshot>)root;
         contextRootSnapshot = nil == lookupScopeSnapshot.parent ? nil : (id<FBXCElementSnapshot>)root;

package/WebDriverAgentTests/IntegrationTests/FBAutoAlertsHandlerTests.m

@@ -44,9 +44,12 @@
   [super tearDown];
 }
 
-// The test is flaky on slow Travis CI
-- (void)disabled_testAutoAcceptingOfAlerts
+- (void)testAutoAcceptingOfAlerts
 {
+  if (FBIntegrationTestCase.isRunningInCI) {
+    XCTSkip(@"Flaky on slow CI machines");
+  }
+
   self.session = [FBSession
                   initWithApplication:XCUIApplication.fb_activeApplication
                   defaultAlertAction:@"accept"];
@@ -57,9 +60,12 @@
   }
 }
 
-// The test is flaky on slow Travis CI
-- (void)disabled_testAutoDismissingOfAlerts
+- (void)testAutoDismissingOfAlerts
 {
+  if (FBIntegrationTestCase.isRunningInCI) {
+    XCTSkip(@"Flaky on slow CI machines");
+  }
+
   self.session = [FBSession
                   initWithApplication:XCUIApplication.fb_activeApplication
                   defaultAlertAction:@"dismiss"];

package/WebDriverAgentTests/IntegrationTests/FBConfigurationTests.m

@@ -40,7 +40,7 @@
 
 - (void)testAccessibilityDeadlineAbortsSnapshotRequestForDeadlockedApp
 {
-  if (nil != NSProcessInfo.processInfo.environment[@"CI"]) {
+  if (FBIntegrationTestCase.isRunningInCI) {
     XCTSkip(@"Deliberately freezes the app for several seconds, too slow/flaky for CI");
   }
 

package/WebDriverAgentTests/IntegrationTests/FBElementAttributeTests.m

@@ -66,7 +66,7 @@
   // Images are neither accessibility elements nor contain them, so both checks should fail
   XCUIElement *imageElement = self.testedApplication.images.allElementsBoundByIndex.firstObject;
   if (nil == imageElement) {
-    return;
+    XCTSkip(@"No image element available to test");
   }
   
   XCTAssertTrue(imageElement.exists);

package/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m

@@ -22,7 +22,7 @@
 - (void)testSpringBoardIcons
 {
   if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad) {
-    return;
+    XCTSkip(@"Not applicable to iPad");
   }
   [self launchApplication];
   [self goToSpringBoardFirstPage];
@@ -37,21 +37,14 @@
   XCTAssertFalse(self.springboard.icons[@"IntegrationApp"].firstMatch.fb_isVisible);
 }
 
-- (void)testSpringBoardSubfolder
+- (void)testIconsFromSearchDashboard
 {
-  if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad
-      || SYSTEM_VERSION_GREATER_THAN(@"12.0")) {
-    return;
+  if (FBIntegrationTestCase.isRunningInCI) {
+    // Causes: Failure fetching attributes for element <XCAccessibilityElement>
+    // Device element: Error Domain=XCTDaemonErrorDomain Code=13 "Value for attribute 5017 is an error."
+    XCTSkip(@"Fails with XCTDaemonErrorDomain Code=13 on CI simulators");
   }
-  [self launchApplication];
-  [self goToSpringBoardExtras];
-  XCTAssertFalse(self.springboard.icons[@"Extras"].otherElements[@"Contacts"].fb_isVisible);
-}
 
-- (void)disabled_testIconsFromSearchDashboard
-{
-  // This test causes:
-  // Failure fetching attributes for element <XCAccessibilityElement: 0x60800044dd10> Device element: Error Domain=XCTDaemonErrorDomain Code=13 "Value for attribute 5017 is an error." UserInfo={NSLocalizedDescription=Value for attribute 5017 is an error.}
   [self launchApplication];
   [self goToSpringBoardDashboard];
   XCTAssertFalse(self.springboard.icons[@"Reminders"].fb_isVisible);

package/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m

@@ -61,7 +61,7 @@
             @"FIXME: Unstable on platform version 27.");
 
   if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
-    return;
+    XCTSkip(@"Device does not support pressure interaction");
   }
 
   [self verifyForceTapWithOrientation:UIDeviceOrientationPortrait];
@@ -70,7 +70,7 @@
 - (void)testForceTapInLandscapeLeft
 {
   if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
-    return;
+    XCTSkip(@"Device does not support pressure interaction");
   }
 
   [self verifyForceTapWithOrientation:UIDeviceOrientationLandscapeLeft];
@@ -79,7 +79,7 @@
 - (void)testForceTapInLandscapeRight
 {
   if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
-    return;
+    XCTSkip(@"Device does not support pressure interaction");
   }
 
   [self verifyForceTapWithOrientation:UIDeviceOrientationLandscapeRight];

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h

@@ -28,6 +28,13 @@ extern NSArray<NSString *> *const FBMainViewButtonLabels;
 @property (nonatomic, strong, readonly) XCUIApplication *testedApplication;
 @property (nonatomic, strong, readonly) XCUIApplication *springboard;
 
+/**
+ Whether tests are running under CI, as forwarded into the test process by the
+ scheme's CI environment variable (see Fastlane/Fastfile). Use to XCTSkip tests
+ that are known to be too slow/flaky/unsupported for CI.
+ */
++ (BOOL)isRunningInCI;
+
 /**
  Launches application and resets side effects of testing like orientation etc.
  */
@@ -53,11 +60,6 @@ extern NSArray<NSString *> *const FBMainViewButtonLabels;
  */
 - (void)goToSpringBoardFirstPage;
 
-/**
- Navigates to SpringBoard path with Extras folder
- */
-- (void)goToSpringBoardExtras;
-
 /**
  Navigates to SpringBoard's dashboard
  */

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m

@@ -43,6 +43,12 @@ NSArray<NSString *> *const FBMainViewButtonLabels = @[
 
 @implementation FBIntegrationTestCase
 
++ (BOOL)isRunningInCI
+{
+  NSString *value = NSProcessInfo.processInfo.environment[@"CI"];
+  return nil != value && value.length > 0;
+}
+
 - (void)setUp
 {
   // Enable it to get extended XCTest logs printed into the console
@@ -105,14 +111,6 @@ NSArray<NSString *> *const FBMainViewButtonLabels = @[
   FBAssertWaitTillBecomesTrue(XCUIApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.fb_isVisible);
 }
 
-- (void)goToSpringBoardExtras
-{
-  [self goToSpringBoardFirstPage];
-  [self.springboard swipeLeft];
-  [self.testedApplication fb_waitUntilStable];
-  FBAssertWaitTillBecomesTrue(self.springboard.icons[@"Extras"].fb_isVisible);
-}
-
 - (void)goToSpringBoardDashboard
 {
   [self goToSpringBoardFirstPage];

package/WebDriverAgentTests/IntegrationTests/FBSafariAlertTests.m

@@ -42,8 +42,12 @@
   [self.session terminateApplicationWithBundleId:FB_SAFARI_BUNDLE_ID];
 }
 
-- (void)disabled_testCanHandleSafariInputPrompt
+- (void)testCanHandleSafariInputPrompt
 {
+  if (FBIntegrationTestCase.isRunningInCI) {
+    XCTSkip(@"Depends on an external website (w3schools.com), unreliable on CI");
+  }
+
   XCUIElement *urlInput = [[self.safariApp
                             descendantsMatchingType:XCUIElementTypeTextField]
                            matchingPredicate:[

package/WebDriverAgentTests/IntegrationTests/FBScrollingTests.m

@@ -52,8 +52,7 @@
 - (void)testSimpleScroll
 {
   if (SYSTEM_VERSION_LESS_THAN(@"16.0")) {
-    // This test is unstable in CI env
-    return;
+    XCTSkip(@"Requires iOS 16.0+");
   }
 
   FBAssertVisibleCell(@"0");
@@ -90,8 +89,7 @@
 - (void)testNativeFarScrollToVisible
 {
   if (SYSTEM_VERSION_LESS_THAN(@"16.0")) {
-    // This test is unstable in CI env
-    return;
+    XCTSkip(@"Requires iOS 16.0+");
   }
 
   NSString *cellName = @"80";
@@ -114,8 +112,7 @@
   XCTAssertTrue(element.fb_isVisible);
   
   if (SYSTEM_VERSION_LESS_THAN(@"16.0")) {
-    // This test is unstable in CI env
-    return;
+    XCTSkip(@"Requires iOS 16.0+");
   }
 
   [element tap];

package/WebDriverAgentTests/IntegrationTests/FBVideoRecordingTests.m

@@ -32,9 +32,8 @@
 {
   XCTSkip(@"Failed on Azure Pipeline. Local run succeeded.");
 
-  // Video recording is only available since iOS 17
   if (SYSTEM_VERSION_LESS_THAN(@"17.0")) {
-    return;
+    XCTSkip(@"Video recording is only available since iOS 17");
   }
 
   FBScreenRecordingRequest *recordingRequest = [[FBScreenRecordingRequest alloc] initWithFps:24

package/WebDriverAgentTests/IntegrationTests/FBVoiceOverTests.m

@@ -32,7 +32,7 @@
 - (void)testVoiceOverUnavailableOnOlderSDK
 {
   if ([XCUIDevice.sharedDevice fb_isVoiceOverServiceAvailable]) {
-    return;
+    XCTSkip(@"Only applicable when the VoiceOver service is unavailable");
   }
 
   NSError *error = nil;
@@ -44,10 +44,10 @@
 - (void)testVoiceOverEnableDisableAndNavigation
 {
   if (SYSTEM_VERSION_LESS_THAN(@"27.0")) {
-    return;
+    XCTSkip(@"Requires iOS 27.0+");
   }
   if (![XCUIDevice.sharedDevice fb_isVoiceOverServiceAvailable]) {
-    return;
+    XCTSkip(@"VoiceOver service is unavailable on this device");
   }
 
   [self launchApplication];
@@ -78,10 +78,10 @@
 - (void)testVoiceOverMoveBackward
 {
   if (SYSTEM_VERSION_LESS_THAN(@"27.0")) {
-    return;
+    XCTSkip(@"Requires iOS 27.0+");
   }
   if (![XCUIDevice.sharedDevice fb_isVoiceOverServiceAvailable]) {
-    return;
+    XCTSkip(@"VoiceOver service is unavailable on this device");
   }
 
   [self launchApplication];

package/WebDriverAgentTests/IntegrationTests/FBW3CTouchActionsIntegrationTests.m

@@ -368,7 +368,7 @@
 - (void)testForceTap
 {
   if (![XCUIDevice.sharedDevice supportsPressureInteraction]) {
-    return;
+    XCTSkip(@"Device does not support pressure interaction");
   }
 
   NSArray<NSDictionary<NSString *, id> *> *gesture =

package/WebDriverAgentTests/IntegrationTests/FBW3CTypeActionsTests.m

@@ -32,7 +32,7 @@
 - (void)testErroneousGestures
 {
   if (![XCPointerEvent.class fb_areKeyEventsSupported]) {
-    return;
+    XCTSkip(@"Key events are not supported on this platform");
   }
 
   NSArray<NSArray<NSDictionary<NSString *, id> *> *> *invalidGestures =
@@ -121,7 +121,7 @@
 - (void)testTextTyping
 {
   if (![XCPointerEvent.class fb_areKeyEventsSupported]) {
-    return;
+    XCTSkip(@"Key events are not supported on this platform");
   }
 
   XCUIElement *textField = self.testedApplication.textFields[@"aIdentifier"];
@@ -160,7 +160,7 @@
 - (void)testTextTypingWithEmptyActions
 {
   if (![XCPointerEvent.class fb_areKeyEventsSupported]) {
-    return;
+    XCTSkip(@"Key events are not supported on this platform");
   }
 
   XCUIElement *textField = self.testedApplication.textFields[@"aIdentifier"];

package/WebDriverAgentTests/IntegrationTests/XCUIApplicationHelperTests.m

@@ -124,7 +124,7 @@ void calculateMaxTreeDepth(NSDictionary *tree, NSNumber *currentDepth, NSNumber*
 - (void)testAccessbilityAudit
 {
   if (SYSTEM_VERSION_LESS_THAN(@"17.0")) {
-    return;
+    XCTSkip(@"Requires iOS 17.0+");
   }
 
   NSError *error;

package/WebDriverAgentTests/IntegrationTests/XCUIDeviceHelperTests.m

@@ -90,7 +90,7 @@
 {
   NSString *adderss = [XCUIDevice sharedDevice].fb_wifiIPAddress;
   if (!adderss) {
-    return;
+    XCTSkip(@"No WiFi IP address available on this device");
   }
   NSRange range = [adderss rangeOfString:@"^([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})" options:NSRegularExpressionSearch];
   XCTAssertTrue(range.location != NSNotFound);
@@ -119,7 +119,7 @@
 - (void)testUrlSchemeActivation
 {
   if (SYSTEM_VERSION_LESS_THAN(@"16.4")) {
-    return;
+    XCTSkip(@"Requires iOS 16.4+");
   }
 
   NSError *error;
@@ -131,7 +131,7 @@
 - (void)testUrlSchemeActivationWithApp
 {
   if (SYSTEM_VERSION_LESS_THAN(@"16.4")) {
-    return;
+    XCTSkip(@"Requires iOS 16.4+");
   }
 
   NSError *error;
@@ -146,7 +146,7 @@
 - (void)testSimulatedLocationSetup
 {
   if (SYSTEM_VERSION_LESS_THAN(@"16.4")) {
-    return;
+    XCTSkip(@"Requires iOS 16.4+");
   }
 
   CLLocation *simulatedLocation = [[CLLocation alloc] initWithLatitude:50 longitude:50];
@@ -226,7 +226,7 @@
 - (void)testAppearance
 {
   if (SYSTEM_VERSION_LESS_THAN(@"15.0")) {
-    return;
+    XCTSkip(@"Requires iOS 15.0+");
   }
   NSError *error;
   XCTAssertTrue([XCUIDevice.sharedDevice fb_setAppearance:FBUIInterfaceAppearanceDark error:&error]);

package/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m

@@ -21,6 +21,7 @@
 #import "XCUIElement+FBResolve.h"
 #import "FBXPath.h"
 #import "FBXCodeCompatibility.h"
+#import "XCUIElement+FBUtilities.h"
 
 @interface XCUIElementFBFindTests : FBIntegrationTestCase
 @property (nonatomic, strong) XCUIElement *testedView;
@@ -536,3 +537,24 @@
 }
 
 @end
+
+@interface XCUIElementFBFindTests_StaleAppSnapshot : FBIntegrationTestCase
+@end
+@implementation XCUIElementFBFindTests_StaleAppSnapshot
+
+// Regression test for https://github.com/appium/appium/issues/22672.
+- (void)testClassChainWithIntermediatePositionAfterStaleAppSnapshot
+{
+  [self launchApplication];
+  // Simulates a stale snapshot cached by an earlier, unrelated command (e.g. GET /source).
+  [self.testedApplication fb_customSnapshot];
+  [self goToDeepHierarchyPage];
+
+  NSString *query = @"**/XCUIElementTypeOther[`label == \"View 10\"`][1]/**/XCUIElementTypeOther[`label BEGINSWITH \"View 19\"`]";
+  NSArray<XCUIElement *> *matches = [self.testedApplication fb_descendantsMatchingClassChain:query
+                                                                   shouldReturnAfterFirstMatch:NO];
+  XCTAssertEqual(matches.count, 1);
+  XCTAssertEqualObjects(matches.firstObject.label, @"View 19");
+}
+
+@end

package/WebDriverAgentTests/UnitTests/FBResponseJSONPayloadTests.m

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import "FBResponseJSONPayload.h"
+#import "RouteResponse.h"
+
+@interface FBResponseJSONPayloadTests : XCTestCase
+@end
+
+@implementation FBResponseJSONPayloadTests
+
+// https://github.com/appium/appium/issues/22673
+- (void)testDispatchSanitizesNonUtf8EncodableStrings
+{
+  unichar chars[] = {'a', 'b', 'c', 0xD800, 'd', 'e', 'f'};
+  NSString *unsafe = [NSString stringWithCharacters:chars length:sizeof(chars) / sizeof(unichar)];
+  NSDictionary *dictionary = @{@"value": unsafe};
+  FBResponseJSONPayload *payload = [[FBResponseJSONPayload alloc] initWithDictionary:dictionary
+                                                                        httpStatusCode:kHTTPStatusCodeOK];
+  RouteResponse *response = [RouteResponse new];
+
+  XCTAssertNoThrow([payload dispatchWithResponse:response]);
+  XCTAssertNotNil(response.responseData);
+
+  NSError *error = nil;
+  NSDictionary *parsed = [NSJSONSerialization JSONObjectWithData:response.responseData
+                                                           options:0
+                                                             error:&error];
+  XCTAssertNil(error);
+  XCTAssertEqualObjects(parsed[@"value"], @"abc�def");
+}
+
+// Dictionary keys must be sanitized too, not just values
+- (void)testDispatchSanitizesNonUtf8EncodableKeys
+{
+  unichar chars[] = {'k', 0xD800, 'y'};
+  NSString *unsafeKey = [NSString stringWithCharacters:chars length:sizeof(chars) / sizeof(unichar)];
+  NSDictionary *dictionary = @{unsafeKey: @"value"};
+  FBResponseJSONPayload *payload = [[FBResponseJSONPayload alloc] initWithDictionary:dictionary
+                                                                        httpStatusCode:kHTTPStatusCodeOK];
+  RouteResponse *response = [RouteResponse new];
+
+  XCTAssertNoThrow([payload dispatchWithResponse:response]);
+  XCTAssertNotNil(response.responseData);
+
+  NSError *error = nil;
+  NSDictionary *parsed = [NSJSONSerialization JSONObjectWithData:response.responseData
+                                                           options:0
+                                                             error:&error];
+  XCTAssertNil(error);
+  XCTAssertEqualObjects(parsed[@"k�y"], @"value");
+}
+
+- (void)testDispatchWithRegularDictionary
+{
+  NSDictionary *dictionary = @{@"value": @"regular string"};
+  FBResponseJSONPayload *payload = [[FBResponseJSONPayload alloc] initWithDictionary:dictionary
+                                                                        httpStatusCode:kHTTPStatusCodeOK];
+  RouteResponse *response = [RouteResponse new];
+
+  [payload dispatchWithResponse:response];
+
+  NSDictionary *parsed = [NSJSONSerialization JSONObjectWithData:response.responseData
+                                                           options:0
+                                                             error:nil];
+  XCTAssertEqualObjects(parsed, dictionary);
+}
+
+@end

package/WebDriverAgentTests/UnitTests/NSDictionaryFBUtf8SafeTests.m

@@ -31,4 +31,47 @@
   XCTAssertEqualObjects(d, d.fb_utf8SafeDictionary);
 }
 
+- (void)testUnpairedSurrogateSanitization
+{
+  unichar chars[] = {'a', 'b', 'c', 0xD800, 'd', 'e', 'f'};
+  NSString *unsafe = [NSString stringWithCharacters:chars length:sizeof(chars) / sizeof(unichar)];
+  NSDictionary *d = @{
+    @"key": unsafe,
+    @"nested": @{@"value": @[unsafe]},
+  };
+  NSDictionary *safe = d.fb_utf8SafeDictionary;
+
+  NSString *expected = @"abc�def";
+  XCTAssertEqualObjects(safe[@"key"], expected);
+  XCTAssertEqualObjects(safe[@"nested"][@"value"][0], expected);
+
+  NSError *error = nil;
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:safe
+                                                     options:0
+                                                       error:&error];
+  XCTAssertNotNil(jsonData, @"JSON serialization of the sanitized dictionary unexpectedly failed: %@", error);
+}
+
+- (void)testUnpairedSurrogateKeySanitization
+{
+  unichar chars[] = {'k', 0xD800, 'y'};
+  NSString *unsafeKey = [NSString stringWithCharacters:chars length:sizeof(chars) / sizeof(unichar)];
+  NSDictionary *d = @{unsafeKey: @"value"};
+  NSDictionary *safe = d.fb_utf8SafeDictionary;
+
+  XCTAssertEqualObjects(safe[@"k�y"], @"value");
+
+  NSError *error = nil;
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:safe
+                                                     options:0
+                                                       error:&error];
+  XCTAssertNotNil(jsonData, @"JSON serialization of the sanitized dictionary unexpectedly failed: %@", error);
+}
+
+- (void)testValidSurrogatePairIsPreserved
+{
+  NSString *emoji = @"a😀b";
+  XCTAssertEqualObjects([emoji fb_utf8SafeStringWithReplacement:0xfffd], emoji);
+}
+
 @end

package/build/lib/types.d.ts

@@ -11,6 +11,16 @@ export interface WDASettings {
     keyboardAutocorrection?: boolean;
     keyboardPrediction?: boolean;
     customSnapshotTimeout?: number;
+    accessibilityDeadline?: number;
+    enforceCustomSnapshots?: boolean;
+    limitXPathContextScope?: boolean;
+    includeHittableInPageSource?: boolean;
+    includeNativeFrameInPageSource?: boolean;
+    includeNativeAccessibilityElementInPageSource?: boolean;
+    includeMinMaxValueInPageSource?: boolean;
+    includeCustomActionsInPageSource?: boolean;
+    respectSystemAlerts?: boolean;
+    autoClickAlertSelector?: string;
     snapshotMaxDepth?: number;
     snapshotMaxChildren?: number;
     useFirstMatch?: boolean;
@@ -46,6 +56,7 @@ export interface WDACapabilities {
     forceSimulatorSoftwareKeyboardPresence?: boolean;
     defaultAlertAction?: 'accept' | 'dismiss';
     appLaunchStateTimeoutSec?: number;
+    accessibilityDeadline?: number;
 }
 export interface WebDriverAgentArgs {
     device: AppleDevice;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"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"}

package/lib/types.ts

@@ -13,6 +13,16 @@ export interface WDASettings {
   keyboardAutocorrection?: boolean;
   keyboardPrediction?: boolean;
   customSnapshotTimeout?: number;
+  accessibilityDeadline?: number;
+  enforceCustomSnapshots?: boolean;
+  limitXPathContextScope?: boolean;
+  includeHittableInPageSource?: boolean;
+  includeNativeFrameInPageSource?: boolean;
+  includeNativeAccessibilityElementInPageSource?: boolean;
+  includeMinMaxValueInPageSource?: boolean;
+  includeCustomActionsInPageSource?: boolean;
+  respectSystemAlerts?: boolean;
+  autoClickAlertSelector?: string;
   snapshotMaxDepth?: number;
   snapshotMaxChildren?: number;
   useFirstMatch?: boolean;
@@ -50,6 +60,7 @@ export interface WDACapabilities {
   forceSimulatorSoftwareKeyboardPresence?: boolean;
   defaultAlertAction?: 'accept' | 'dismiss';
   appLaunchStateTimeoutSec?: number;
+  accessibilityDeadline?: number;
 }
 
 export interface WebDriverAgentArgs {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "16.9.0",
+  "version": "16.9.2",
   "description": "Package bundling WebDriverAgent",
   "keywords": [
     "Appium",
@@ -65,7 +65,7 @@
   },
   "dependencies": {
     "@appium/base-driver": "^10.3.0",
-    "@appium/strongbox": "^1.0.0-rc.1",
+    "@appium/strongbox": "^2.0.0",
     "@appium/support": "^7.2.1",
     "appium-ios-simulator": "^9.0.0",
     "async-lock": "^1.0.0",