@devicelab/maestro-runner-darwin-arm64 1.1.27 → 1.1.28

package/drivers/ios/WebDriverAgent/lib/xcodebuild.ts

@@ -1,83 +1,79 @@
-import { retryInterval } from 'asyncbox';
-import { SubProcess, exec } from 'teen_process';
-import { logger, timing } from '@appium/support';
-import type { AppiumLogger, StringRecord } from '@appium/types';
-import { log as defaultLogger } from './logger';
-import B from 'bluebird';
-import {
-  setRealDeviceSecurity, setXctestrunFile,
-  killProcess, getWDAUpgradeTimestamp, isTvOS
-} from './utils';
-import _ from 'lodash';
 import path from 'node:path';
-import { WDA_RUNNER_BUNDLE_ID } from './constants';
-import type { AppleDevice, XcodeBuildArgs } from './types';
-import type { NoSessionProxy } from './no-session-proxy';
 
+import {logger, timing, util} from '@appium/support';
+import type {AppiumLogger, StringRecord} from '@appium/types';
+import {retryInterval} from 'asyncbox';
+import {SubProcess, exec} from 'teen_process';
+
+import {WDA_RUNNER_BUNDLE_ID, XCODEBUILD_PROCESS_MARKER} from './constants.js';
+import {log as defaultLogger} from './logger.js';
+import type {NoSessionProxy} from './no-session-proxy.js';
+import type {
+  AppleDevice,
+  RetrieveBuildSettingsOptions,
+  XcodeBuildArgs,
+  XcodeBuildSettings,
+  XcodeShowBuildSettingsEntry,
+} from './types.js';
+import {
+  getPlatformSchemeSuffix,
+  getWDAUpgradeTimestamp,
+  isTvOS,
+  isWatchOS,
+  setRealDeviceSecurity,
+  setXctestrunFile,
+} from './utils/index.js';
 
 const DEFAULT_SIGNING_ID = 'iPhone Developer';
 const PREBUILD_DELAY = 0;
-const RUNNER_SCHEME_IOS = 'WebDriverAgentRunner';
-const LIB_SCHEME_IOS = 'WebDriverAgentLib';
 
 const ERROR_WRITING_ATTACHMENT = 'Error writing attachment data to file';
 const ERROR_COPYING_ATTACHMENT = 'Error copying testing attachment';
-const IGNORED_ERRORS = [
-  ERROR_WRITING_ATTACHMENT,
-  ERROR_COPYING_ATTACHMENT,
-  'Failed to remove screenshot at path',
-];
+const IGNORED_ERRORS = [ERROR_WRITING_ATTACHMENT, ERROR_COPYING_ATTACHMENT, 'Failed to remove screenshot at path'];
 const IGNORED_ERRORS_PATTERN = new RegExp(
-  '(' +
-  IGNORED_ERRORS
-    .map((errStr) => _.escapeRegExp(errStr))
-    .join('|') +
-  ')'
+  '(' + IGNORED_ERRORS.map((errStr) => util.escapeRegExp(errStr)).join('|') + ')',
 );
 
-const RUNNER_SCHEME_TV = 'WebDriverAgentRunner_tvOS';
-const LIB_SCHEME_TV = 'WebDriverAgentLib_tvOS';
-
-const REAL_DEVICES_CONFIG_DOCS_LINK = 'https://appium.github.io/appium-xcuitest-driver/latest/preparation/real-device-config/';
+const REAL_DEVICES_CONFIG_DOCS_LINK =
+  'https://appium.github.io/appium-xcuitest-driver/latest/preparation/real-device-config/';
 
 const xcodeLog = logger.getLogger('Xcode');
 
-
 export class XcodeBuild {
-  xcodebuild?: SubProcess;
   readonly device: AppleDevice;
-  private readonly log: AppiumLogger;
   readonly realDevice: boolean;
   readonly agentPath: string;
   readonly bootstrapPath: string;
   readonly platformVersion?: string;
   readonly platformName?: string;
   readonly iosSdkVersion?: string;
+  readonly xcodeSigningId: string;
+  private xcodebuild?: SubProcess;
+  private usePrebuiltWDA?: boolean;
+  private derivedDataPath?: string;
+  private readonly log: AppiumLogger;
   private readonly showXcodeLog?: boolean;
   private readonly xcodeConfigFile?: string;
   private readonly xcodeOrgId?: string;
-  readonly xcodeSigningId: string;
   private readonly keychainPath?: string;
   private readonly keychainPassword?: string;
-  usePrebuiltWDA?: boolean;
   private readonly useSimpleBuildTest?: boolean;
   private readonly useXctestrunFile?: boolean;
   private readonly launchTimeout?: number;
   private readonly wdaRemotePort?: number;
   private readonly wdaBindingIP?: string;
   private readonly updatedWDABundleId?: string;
-  derivedDataPath?: string;
   private readonly mjpegServerPort?: number;
+  private readonly maxHttpRequestBodySize?: number;
   private readonly prebuildDelay: number;
   private readonly allowProvisioningDeviceRegistration?: boolean;
   private readonly resultBundlePath?: string;
   private readonly resultBundleVersion?: string;
   private _didBuildFail: boolean;
   private _didProcessExit: boolean;
-  private _derivedDataPathPromise?: Promise<string | undefined>;
+  private readonly _buildSettingsPromises = new Map<string, Promise<XcodeBuildSettings | undefined>>();
   private noSessionProxy?: NoSessionProxy;
   private xctestrunFilePath?: string;
-  agentUrl?: string;
 
   /**
    * Creates a new XcodeBuild instance.
@@ -85,7 +81,7 @@ export class XcodeBuild {
    * @param args - Configuration arguments for xcodebuild
    * @param log - Optional logger instance
    */
-  constructor (device: AppleDevice, args: XcodeBuildArgs, log: AppiumLogger | null = null) {
+  constructor(device: AppleDevice, args: XcodeBuildArgs, log: AppiumLogger | null = null) {
     this.device = device;
     this.log = log ?? defaultLogger;
 
@@ -120,8 +116,9 @@ export class XcodeBuild {
     this.derivedDataPath = args.derivedDataPath;
 
     this.mjpegServerPort = args.mjpegServerPort;
+    this.maxHttpRequestBodySize = args.maxHttpRequestBodySize;
 
-    this.prebuildDelay = _.isNumber(args.prebuildDelay) ? args.prebuildDelay : PREBUILD_DELAY;
+    this.prebuildDelay = typeof args.prebuildDelay === 'number' ? args.prebuildDelay : PREBUILD_DELAY;
 
     this.allowProvisioningDeviceRegistration = args.allowProvisioningDeviceRegistration;
 
@@ -137,7 +134,7 @@ export class XcodeBuild {
    * Sets up xctestrun file if needed.
    * @param noSessionProxy - The proxy instance for WDA communication
    */
-  async init (noSessionProxy: NoSessionProxy): Promise<void> {
+  async init(noSessionProxy: NoSessionProxy): Promise<void> {
     this.noSessionProxy = noSessionProxy;
 
     if (this.useXctestrunFile) {
@@ -145,63 +142,65 @@ export class XcodeBuild {
         isRealDevice: !!this.realDevice,
         udid: this.device.udid,
         platformVersion: this.platformVersion || '',
-        platformName: this.platformName || ''
+        platformName: this.platformName || '',
       };
       this.xctestrunFilePath = await setXctestrunFile({
-          deviceInfo,
-          sdkVersion: this.iosSdkVersion || '',
-          bootstrapPath: this.bootstrapPath,
-          wdaRemotePort: this.wdaRemotePort || 8100,
-          wdaBindingIP: this.wdaBindingIP
-        });
+        deviceInfo,
+        sdkVersion: this.iosSdkVersion || '',
+        bootstrapPath: this.bootstrapPath,
+        wdaRemotePort: this.wdaRemotePort || 8100,
+        wdaBindingIP: this.wdaBindingIP,
+        maxHttpRequestBodySize: this.maxHttpRequestBodySize,
+      });
       return;
     }
   }
 
   /**
-   * Retrieves the Xcode derived data path for the build.
-   * Uses cached value if available, otherwise queries xcodebuild for BUILD_DIR.
+   * Retrieves Xcode build settings via `xcodebuild -showBuildSettings -json`.
+   * @param options - Optional scheme, SDK, configuration, or destination
+   * @returns Build settings for the `build` action, or `undefined` if they cannot be determined
+   */
+  async retrieveBuildSettings(options?: RetrieveBuildSettingsOptions): Promise<XcodeBuildSettings | undefined> {
+    const cacheKey = buildSettingsCacheKey(options);
+    let promise = this._buildSettingsPromises.get(cacheKey);
+    if (!promise) {
+      promise = this.fetchBuildSettings(options);
+      this._buildSettingsPromises.set(cacheKey, promise);
+    }
+    return await promise;
+  }
+
+  /**
    * @returns The derived data path, or `undefined` if it cannot be determined
    */
-  async retrieveDerivedDataPath (): Promise<string | undefined> {
+  async retrieveDerivedDataPath(): Promise<string | undefined> {
     if (this.derivedDataPath) {
       return this.derivedDataPath;
     }
 
-    // avoid race conditions
-    if (this._derivedDataPathPromise) {
-      return await this._derivedDataPathPromise;
+    // iOS/tvOS share the same derived data path
+    const buildSettings = await this.retrieveBuildSettings({
+      scheme: 'WebDriverAgentRunner',
+    });
+    const buildDir = buildSettings?.BUILD_DIR;
+    if (!buildDir) {
+      this.log.warn('Cannot parse WDA BUILD_DIR from build settings');
+      return;
     }
 
-    this._derivedDataPathPromise = (async () => {
-      let stdout: string;
-      try {
-        ({stdout} = await exec('xcodebuild', ['-project', this.agentPath, '-showBuildSettings']));
-      } catch (err: any) {
-        this.log.warn(`Cannot retrieve WDA build settings. Original error: ${err.message}`);
-        return;
-      }
-
-      const pattern = /^\s*BUILD_DIR\s+=\s+(\/.*)/m;
-      const match = pattern.exec(stdout);
-      if (!match) {
-        this.log.warn(`Cannot parse WDA build dir from ${_.truncate(stdout, {length: 300})}`);
-        return;
-      }
-      this.log.debug(`Parsed BUILD_DIR configuration value: '${match[1]}'`);
-      // Derived data root is two levels higher over the build dir
-      this.derivedDataPath = path.dirname(path.dirname(path.normalize(match[1])));
-      this.log.debug(`Got derived data root: '${this.derivedDataPath}'`);
-      return this.derivedDataPath;
-    })();
-    return await this._derivedDataPathPromise;
+    this.log.debug(`Parsed BUILD_DIR configuration value: '${buildDir}'`);
+    // Derived data root is two levels higher over the build dir
+    this.derivedDataPath = path.dirname(path.dirname(path.normalize(buildDir)));
+    this.log.debug(`Got derived data root: '${this.derivedDataPath}'`);
+    return this.derivedDataPath;
   }
 
   /**
    * Pre-builds WebDriverAgent before launching tests.
    * Performs a build-only operation and sets usePrebuiltWDA flag.
    */
-  async prebuild (): Promise<void> {
+  async prebuild(): Promise<void> {
     // first do a build phase
     this.log.debug('Pre-building WDA before launching test');
     this.usePrebuiltWDA = true;
@@ -209,7 +208,7 @@ export class XcodeBuild {
 
     if (this.prebuildDelay > 0) {
       // pause a moment
-      await B.delay(this.prebuildDelay);
+      await new Promise((resolve) => setTimeout(resolve, this.prebuildDelay));
     }
   }
 
@@ -217,17 +216,16 @@ export class XcodeBuild {
    * Cleans the Xcode project to remove leftovers from previous installs.
    * Cleans both the library and runner schemes for the appropriate platform.
    */
-  async cleanProject (): Promise<void> {
-    const libScheme = isTvOS(this.platformName || '') ? LIB_SCHEME_TV : LIB_SCHEME_IOS;
-    const runnerScheme = isTvOS(this.platformName || '') ? RUNNER_SCHEME_TV : RUNNER_SCHEME_IOS;
+  async cleanProject(): Promise<void> {
+    const schemeSuffix = getPlatformSchemeSuffix(this.platformName || '');
+    const libScheme = `WebDriverAgentLib${schemeSuffix}`;
+    const runnerScheme = `WebDriverAgentRunner${schemeSuffix}`;
 
     for (const scheme of [libScheme, runnerScheme]) {
-      this.log.debug(`Cleaning the project scheme '${scheme}' to make sure there are no leftovers from previous installs`);
-      await exec('xcodebuild', [
-        'clean',
-        '-project', this.agentPath,
-        '-scheme', scheme,
-      ]);
+      this.log.debug(
+        `Cleaning the project scheme '${scheme}' to make sure there are no leftovers from previous installs`,
+      );
+      await exec('xcodebuild', ['clean', '-project', this.agentPath, '-scheme', scheme]);
     }
   }
 
@@ -237,7 +235,7 @@ export class XcodeBuild {
    * @returns The WDA status record if tests are run, `void` if build-only
    * @throws Error if xcodebuild fails or cannot start
    */
-  async start (buildOnly: boolean = false): Promise<StringRecord | void> {
+  async start(buildOnly: boolean = false): Promise<StringRecord | void> {
     this.xcodebuild = await this.createSubProcess(buildOnly);
 
     // wrap the start procedure in a promise so that we can catch, and report,
@@ -246,20 +244,23 @@ export class XcodeBuild {
       throw new Error('xcodebuild subprocess was not created');
     }
     const xcodebuild = this.xcodebuild;
-    return await new B((resolve, reject) => {
-        xcodebuild.once('exit', (code, signal) => {
+    return await new Promise<StringRecord | void>((resolve, reject) => {
+      xcodebuild.once('exit', (code, signal) => {
         xcodeLog.error(`xcodebuild exited with code '${code}' and signal '${signal}'`);
         xcodebuild.removeAllListeners();
         this._didProcessExit = true;
         if (this._didBuildFail || (!signal && code !== 0)) {
-          let errorMessage = `xcodebuild failed with code ${code}.` +
+          let errorMessage =
+            `xcodebuild failed with code ${code}.` +
             ` This usually indicates an issue with the local Xcode setup or WebDriverAgent` +
             ` project configuration or the driver-to-platform version mismatch.`;
           if (!this.showXcodeLog) {
-            errorMessage += ` Consider setting 'showXcodeLog' capability to true in` +
+            errorMessage +=
+              ` Consider setting 'showXcodeLog' capability to true in` +
               ` order to check the Appium server log for build-related error messages.`;
           } else if (this.realDevice) {
-            errorMessage += ` Consider checking the WebDriverAgent configuration guide` +
+            errorMessage +=
+              ` Consider checking the WebDriverAgent configuration guide` +
               ` for real iOS devices at ${REAL_DEVICES_CONFIG_DOCS_LINK}.`;
           }
           return reject(new Error(errorMessage));
@@ -293,16 +294,78 @@ export class XcodeBuild {
   /**
    * Stops the xcodebuild process and cleans up resources.
    */
-  async quit (): Promise<void> {
-    await killProcess('xcodebuild', this.xcodebuild);
+  async quit(): Promise<void> {
+    const xcodebuild = this.xcodebuild;
+    if (!xcodebuild || !xcodebuild.isRunning) {
+      return;
+    }
+
+    this.log.info(`Shutting down 'xcodebuild' process (pid '${xcodebuild.proc?.pid}')`);
+
+    try {
+      await xcodebuild.stop('SIGTERM', 1000);
+      return;
+    } catch (err: unknown) {
+      if (!(err as Error)?.message?.includes(`Process didn't end after`)) {
+        throw err;
+      }
+      this.log.debug(`xcodebuild process did not end in a timely fashion: '${(err as Error)?.message}'.`);
+    }
+
+    try {
+      await xcodebuild.stop('SIGKILL');
+    } catch (err: unknown) {
+      if ((err as Error)?.message?.includes('not currently running')) {
+        // The process ended but for some reason we were not informed.
+        return;
+      }
+      throw err;
+    }
+  }
+
+  private async fetchBuildSettings(options?: RetrieveBuildSettingsOptions): Promise<XcodeBuildSettings | undefined> {
+    const schemeLabel = options?.scheme ?? 'default';
+    let stdout: string;
+    try {
+      ({stdout} = await exec('xcodebuild', [
+        '-project',
+        this.agentPath,
+        '-showBuildSettings',
+        '-json',
+        ...buildSettingsArgsFromOptions(options),
+      ]));
+    } catch (err: any) {
+      this.log.warn(`Cannot retrieve WDA build settings for scheme '${schemeLabel}'. Original error: ${err.message}`);
+      return;
+    }
+
+    let entries: XcodeShowBuildSettingsEntry[];
+    try {
+      entries = JSON.parse(stdout) as XcodeShowBuildSettingsEntry[];
+    } catch (err: any) {
+      this.log.warn(
+        `Cannot parse WDA build settings for scheme '${schemeLabel}' from ${util.truncateString(stdout, 300)}. ` +
+          `Original error: ${err.message}`,
+      );
+      return;
+    }
+
+    const entry = entries.find(({action}) => action === 'build') ?? entries[0];
+    if (!entry?.buildSettings) {
+      this.log.warn(`Cannot find build settings for scheme '${schemeLabel}'`);
+      return;
+    }
+    return entry.buildSettings;
   }
 
-  private getCommand (buildOnly: boolean = false): {cmd: string; args: string[]} {
+  private getCommand(buildOnly: boolean = false): {cmd: string; args: string[]} {
     const cmd = 'xcodebuild';
     const args: string[] = [];
 
     // figure out the targets for xcodebuild
-    const [buildCmd, testCmd] = this.useSimpleBuildTest ? ['build', 'test'] : ['build-for-testing', 'test-without-building'];
+    const [buildCmd, testCmd] = this.useSimpleBuildTest
+      ? ['build', 'test']
+      : ['build-for-testing', 'test-without-building'];
     if (buildOnly) {
       args.push(buildCmd);
     } else if (this.usePrebuiltWDA || this.useXctestrunFile) {
@@ -327,7 +390,7 @@ export class XcodeBuild {
     if (this.useXctestrunFile && this.xctestrunFilePath) {
       args.push('-xctestrun', this.xctestrunFilePath);
     } else {
-      const runnerScheme = isTvOS(this.platformName || '') ? RUNNER_SCHEME_TV : RUNNER_SCHEME_IOS;
+      const runnerScheme = `WebDriverAgentRunner${getPlatformSchemeSuffix(this.platformName || '')}`;
       args.push('-project', this.agentPath, '-scheme', runnerScheme);
       if (this.derivedDataPath) {
         args.push('-derivedDataPath', this.derivedDataPath);
@@ -335,15 +398,14 @@ export class XcodeBuild {
     }
     args.push('-destination', `id=${this.device.udid}`);
 
-    let versionMatch: RegExpMatchArray | null = null;
-    if (this.platformVersion && (versionMatch = new RegExp(/^(\d+)\.(\d+)/).exec(this.platformVersion))) {
-      args.push(
-        `${isTvOS(this.platformName || '') ? 'TV' : 'IPHONE'}OS_DEPLOYMENT_TARGET=${versionMatch[1]}.${versionMatch[2]}`
-      );
+    const versionMatch = this.platformVersion ? new RegExp(/^(\d+)\.(\d+)/).exec(this.platformVersion) : null;
+    if (versionMatch) {
+      const deploymentTargetPrefix = getDeploymentTargetPrefix(this.platformName || '');
+      args.push(`${deploymentTargetPrefix}OS_DEPLOYMENT_TARGET=${versionMatch[1]}.${versionMatch[2]}`);
     } else {
       this.log.warn(
         `Cannot parse major and minor version numbers from platformVersion "${this.platformVersion}". ` +
-        'Will build for the default platform instead'
+          'Will build for the default platform instead',
       );
     }
 
@@ -353,10 +415,7 @@ export class XcodeBuild {
         args.push('-xcconfig', this.xcodeConfigFile);
       }
       if (this.xcodeOrgId && this.xcodeSigningId) {
-        args.push(
-          `DEVELOPMENT_TEAM=${this.xcodeOrgId}`,
-          `CODE_SIGN_IDENTITY=${this.xcodeSigningId}`,
-        );
+        args.push(`DEVELOPMENT_TEAM=${this.xcodeOrgId}`, `CODE_SIGN_IDENTITY=${this.xcodeSigningId}`);
       }
       if (this.updatedWDABundleId) {
         args.push(`PRODUCT_BUNDLE_IDENTIFIER=${this.updatedWDABundleId}`);
@@ -372,23 +431,31 @@ export class XcodeBuild {
     // with preventing to generate `/Index/DataStore` which is used by development
     args.push('COMPILER_INDEX_STORE_ENABLE=NO');
 
+    // Tags this process so resetTestProcesses() can kill only xcodebuild instances
+    // this package started, not unrelated ones sharing the same device udid.
+    args.push(XCODEBUILD_PROCESS_MARKER);
+
     return {cmd, args};
   }
 
-  private async createSubProcess (buildOnly: boolean = false): Promise<SubProcess> {
-    if (!this.useXctestrunFile && this.realDevice) {
-      if (this.keychainPath && this.keychainPassword) {
-        await setRealDeviceSecurity(this.keychainPath, this.keychainPassword);
-      }
+  private async createSubProcess(buildOnly: boolean = false): Promise<SubProcess> {
+    if (!this.useXctestrunFile && this.realDevice && this.keychainPath && this.keychainPassword) {
+      await setRealDeviceSecurity(this.keychainPath, this.keychainPassword);
     }
 
     const {cmd, args} = this.getCommand(buildOnly);
-    this.log.debug(`Beginning ${buildOnly ? 'build' : 'test'} with command '${cmd} ${args.join(' ')}' ` +
-      `in directory '${this.bootstrapPath}'`);
+    this.log.debug(
+      `Beginning ${buildOnly ? 'build' : 'test'} with command '${cmd} ${args.join(' ')}' ` +
+        `in directory '${this.bootstrapPath}'`,
+    );
     const env: Record<string, any> = Object.assign({}, process.env, {
       USE_PORT: this.wdaRemotePort,
       WDA_PRODUCT_BUNDLE_IDENTIFIER: this.updatedWDABundleId || WDA_RUNNER_BUNDLE_ID,
     });
+    delete env.MAX_HTTP_REQUEST_BODY_SIZE;
+    if (this.maxHttpRequestBodySize) {
+      env.MAX_HTTP_REQUEST_BODY_SIZE = this.maxHttpRequestBodySize;
+    }
     if (this.mjpegServerPort) {
       // https://github.com/appium/WebDriverAgent/pull/105
       env.MJPEG_SERVER_PORT = this.mjpegServerPort;
@@ -409,9 +476,10 @@ export class XcodeBuild {
     });
 
     let logXcodeOutput = !!this.showXcodeLog;
-    const logMsg = _.isBoolean(this.showXcodeLog)
-      ? `Output from xcodebuild ${this.showXcodeLog ? 'will' : 'will not'} be logged`
-      : 'Output from xcodebuild will only be logged if any errors are present there';
+    const logMsg =
+      typeof this.showXcodeLog === 'boolean'
+        ? `Output from xcodebuild ${this.showXcodeLog ? 'will' : 'will not'} be logged`
+        : 'Output from xcodebuild will only be logged if any errors are present there';
     this.log.debug(`${logMsg}. To change this, use 'showXcodeLog' desired capability`);
 
     const onStreamLine = (line: string) => {
@@ -437,7 +505,7 @@ export class XcodeBuild {
     return xcodebuild;
   }
 
-  private async waitForStart (timer: timing.Timer): Promise<StringRecord | null> {
+  private async waitForStart(timer: timing.Timer): Promise<StringRecord | null> {
     // try to connect once every 0.5 seconds, until `launchTimeout` is up
     const timeout = this.launchTimeout || 60000; // Default to 60 seconds if not set
     this.log.debug(`Waiting up to ${timeout}ms for WebDriverAgent to start`);
@@ -455,18 +523,17 @@ export class XcodeBuild {
         }
 
         const proxyTimeout = noSessionProxy.timeout;
-        noSessionProxy.timeout = 1000;
+        (noSessionProxy as any).timeout = 1000;
         try {
-          currentStatus = await noSessionProxy.command('/status', 'GET') as StringRecord;
-          if (currentStatus && currentStatus.ios && (currentStatus.ios as any).ip) {
-            this.agentUrl = (currentStatus.ios as any).ip;
-          }
+          currentStatus = (await noSessionProxy.command('/status', 'GET')) as StringRecord;
           this.log.debug(`WebDriverAgent information:`);
           this.log.debug(JSON.stringify(currentStatus, null, 2));
         } catch (err: any) {
-          throw new Error(`Unable to connect to running WebDriverAgent: ${err.message}`);
+          throw new Error(`Unable to connect to running WebDriverAgent: ${err.message}`, {
+            cause: err,
+          });
         } finally {
-          noSessionProxy.timeout = proxyTimeout;
+          (noSessionProxy as any).timeout = proxyTimeout;
         }
       });
 
@@ -480,9 +547,47 @@ export class XcodeBuild {
       this.log.debug(err.stack);
       throw new Error(
         `We were not able to retrieve the /status response from the WebDriverAgent server after ${timeout}ms timeout.` +
-        `Try to increase the value of 'appium:wdaLaunchTimeout' capability as a possible workaround.`
+          `Try to increase the value of 'appium:wdaLaunchTimeout' capability as a possible workaround.`,
+        {cause: err},
       );
     }
     return currentStatus;
   }
 }
+
+/**
+ * @returns The `xcodebuild` deployment target setting prefix for the given platform.
+ */
+function getDeploymentTargetPrefix(platformName: string): string {
+  if (isTvOS(platformName)) {
+    return 'TV';
+  }
+  if (isWatchOS(platformName)) {
+    return 'WATCH';
+  }
+  return 'IPHONE';
+}
+
+function buildSettingsArgsFromOptions(options?: RetrieveBuildSettingsOptions): string[] {
+  const args: string[] = [];
+  if (!options) {
+    return args;
+  }
+  if (options.scheme) {
+    args.push('-scheme', options.scheme);
+  }
+  if (options.sdk) {
+    args.push('-sdk', options.sdk);
+  }
+  if (options.configuration) {
+    args.push('-configuration', options.configuration);
+  }
+  if (options.destination) {
+    args.push('-destination', options.destination);
+  }
+  return args;
+}
+
+function buildSettingsCacheKey(options?: RetrieveBuildSettingsOptions): string {
+  return buildSettingsArgsFromOptions(options).join('\0');
+}

package/drivers/ios/WebDriverAgent/oxfmt.config.mjs

@@ -0,0 +1,6 @@
+import appiumConfig, {defineConfig, ignorePatterns} from '@appium/oxc-config/oxfmt';
+
+export default defineConfig({
+  ...appiumConfig,
+  ignorePatterns: [...ignorePatterns, 'Configurations/**', 'Fastlane/**', 'PrivateHeaders/**', 'WebDriverAgent*/**'],
+});

package/drivers/ios/WebDriverAgent/oxlint.config.mjs

@@ -0,0 +1,6 @@
+import appiumConfig, {defineConfig, ignorePatterns} from '@appium/oxc-config/oxlint';
+
+export default defineConfig({
+  extends: [appiumConfig],
+  ignorePatterns: [...ignorePatterns, 'Configurations/**', 'Fastlane/**', 'PrivateHeaders/**', 'WebDriverAgent*/**'],
+});