From b07ef46331bfb1170b177e15432abd8a6ea24392 Mon Sep 17 00:00:00 2001
From: Kazuaki Matsuo <fly.49.89.over@gmail.com>
Date: Fri, 28 Nov 2025 12:46:03 -0800
Subject: [PATCH 1/3] fix: fix type and mark deprecated as no usage

---
 lib/webdriveragent.js | 2 +-
 lib/xcodebuild.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/webdriveragent.js b/lib/webdriveragent.js
index 09f3e10fd..59f9d2fd8 100644
--- a/lib/webdriveragent.js
+++ b/lib/webdriveragent.js
@@ -35,7 +35,7 @@ export class WebDriverAgent {
   agentPath;
 
   /**
-   * @param {import('appium-xcode').XcodeVersion} xcodeVersion
+   * @param {import('appium-xcode').XcodeVersion | undefined} xcodeVersion @deprecated Will be removed as no actual usage.
    * @param {import('./types').WebDriverAgentArgs} args
    * @param {import('@appium/types').AppiumLogger?} [log=null]
    */
diff --git a/lib/xcodebuild.js b/lib/xcodebuild.js
index 34f10dfe6..1cdfdd61b 100644
--- a/lib/xcodebuild.js
+++ b/lib/xcodebuild.js
@@ -46,7 +46,7 @@ export class XcodeBuild {
   xcodebuild;
 
   /**
-   * @param {import('appium-xcode').XcodeVersion} xcodeVersion
+   * @param {import('appium-xcode').XcodeVersion | undefined} xcodeVersion @deprecated Will be removed as no actual usage.
    * @param {import('./types').AppleDevice} device
    * @param {import('./types').XcodeBuildArgs} args
    * @param {import('@appium/types').AppiumLogger | null} [log=null]

From 640f74d2f9e3df83ae5fcef21acc78661ddefe7c Mon Sep 17 00:00:00 2001
From: Kazuaki Matsuo <fly.49.89.over@gmail.com>
Date: Fri, 28 Nov 2025 18:00:40 -0800
Subject: [PATCH 2/3] chore: add deprecated for idb stuff as well

---
 lib/types.ts          | 1 +
 lib/webdriveragent.js | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/types.ts b/lib/types.ts
index 32a32493b..1d1d1af54 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -94,6 +94,7 @@ export interface AppleDevice {
   udid: string;
   simctl?: any;
   devicectl?: any;
+  /** @deprecated We'll stop supporting idb */
   idb?: any;
   [key: string]: any;
 }
diff --git a/lib/webdriveragent.js b/lib/webdriveragent.js
index 59f9d2fd8..42f5913f3 100644
--- a/lib/webdriveragent.js
+++ b/lib/webdriveragent.js
@@ -51,6 +51,7 @@ export class WebDriverAgent {
     this.iosSdkVersion = args.iosSdkVersion;
     this.host = args.host;
     this.isRealDevice = !!args.realDevice;
+    /** @deprecated We'll stop supporting idb */
     this.idb = args.device.idb;
     this.wdaBundlePath = args.wdaBundlePath;
 
@@ -509,7 +510,7 @@ export class WebDriverAgent {
    */
   async startWithIDB () {
     this.log.info('Will launch WDA with idb instead of xcodebuild since the corresponding flag is enabled');
-    const {wdaBundleId, testBundleId} = await this.prepareWDA();
+    const {wdaBundleId, testBundleId} = await this.prepareWDAWithIdb();
     const env = {
       USE_PORT: this.wdaRemotePort,
       WDA_PRODUCT_BUNDLE_IDENTIFIER: this.bundleIdForXctest,
@@ -539,9 +540,10 @@ export class WebDriverAgent {
   }
 
   /**
+   * @deprecated We'll stop using idb
    * @returns {Promise<{wdaBundleId: string, testBundleId: string, wdaBundlePath: string}>}
    */
-  async prepareWDA () {
+  async prepareWDAWithIdb () {
     const wdaBundlePath = this.wdaBundlePath || await this.fetchWDABundle();
     const wdaBundleId = await this.parseBundleId(wdaBundlePath);
     if (!await this.device.isAppInstalled(wdaBundleId)) {

From 18385b87135d85db893c299e8d1e6880fa13b0fd Mon Sep 17 00:00:00 2001
From: Kazuaki Matsuo <fly.49.89.over@gmail.com>
Date: Fri, 28 Nov 2025 18:01:45 -0800
Subject: [PATCH 3/3] reverr unnecessary change

---
 lib/webdriveragent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/webdriveragent.js b/lib/webdriveragent.js
index 42f5913f3..9c045aad5 100644
--- a/lib/webdriveragent.js
+++ b/lib/webdriveragent.js
@@ -510,7 +510,7 @@ export class WebDriverAgent {
    */
   async startWithIDB () {
     this.log.info('Will launch WDA with idb instead of xcodebuild since the corresponding flag is enabled');
-    const {wdaBundleId, testBundleId} = await this.prepareWDAWithIdb();
+    const {wdaBundleId, testBundleId} = await this.prepareWDA();
     const env = {
       USE_PORT: this.wdaRemotePort,
       WDA_PRODUCT_BUNDLE_IDENTIFIER: this.bundleIdForXctest,
@@ -543,7 +543,7 @@ export class WebDriverAgent {
    * @deprecated We'll stop using idb
    * @returns {Promise<{wdaBundleId: string, testBundleId: string, wdaBundlePath: string}>}
    */
-  async prepareWDAWithIdb () {
+  async prepareWDA () {
     const wdaBundlePath = this.wdaBundlePath || await this.fetchWDABundle();
     const wdaBundleId = await this.parseBundleId(wdaBundlePath);
     if (!await this.device.isAppInstalled(wdaBundleId)) {