mobile-debug-mcp 0.34.0 → 0.35.0

package/src/utils/cli/idb/install-idb.ts

@@ -6,7 +6,7 @@ import { getIdbCmd, isIDBInstalled, commandWhich } from './idb-helper.js'
 const IDB_PKG = 'fb-idb'
 
 function runCommand(cmd: string, args: string[]): number {
-  const res = spawnSync(cmd, args, { stdio: 'inherit' as any })
+  const res = spawnSync(cmd, args, { stdio: 'inherit' })
   return typeof res.status === 'number' ? res.status : 1
 }
 
@@ -42,14 +42,7 @@ async function main() {
       console.log('Auto-install enabled (MCP_AUTO_INSTALL_IDB=true or CI=true)')
     }
 
-    const attempts: { name: string; cmd: string; args: string[] }[] = []
-    if (commandWhich('pipx')) attempts.push({ name: 'pipx', cmd: 'pipx', args: ['install', IDB_PKG] })
-    if (commandWhich('pip') || commandWhich('python3')) attempts.push({ name: 'pip', cmd: commandWhich('pip') ? 'pip' : 'python3', args: commandWhich('pip') ? ['install', '--user', IDB_PKG] : ['-m', 'pip', 'install', '--user', IDB_PKG] })
-
-    // Add brew as a fallback on macOS if present (best-effort)
-    if (process.platform === 'darwin' && commandWhich('brew')) {
-      attempts.push({ name: 'brew', cmd: 'brew', args: ['install', 'idb'] })
-    }
+    const attempts = installerCandidates()
 
     if (attempts.length === 0) {
       console.error('No installer tool (pipx/pip/brew) detected. Please install pipx or pip and re-run.')
@@ -88,3 +81,16 @@ if (scriptPath === process.argv[1]) {
 }
 
 export { main }
+
+function installerCandidates() {
+  const attempts: { name: string; cmd: string; args: string[] }[] = []
+  if (commandWhich('pipx')) attempts.push({ name: 'pipx', cmd: 'pipx', args: ['install', IDB_PKG] })
+  if (commandWhich('pip') || commandWhich('python3')) attempts.push({ name: 'pip', cmd: commandWhich('pip') ? 'pip' : 'python3', args: commandWhich('pip') ? ['install', '--user', IDB_PKG] : ['-m', 'pip', 'install', '--user', IDB_PKG] })
+
+  // Add brew as a fallback on macOS if present (best-effort)
+  if (process.platform === 'darwin' && commandWhich('brew')) {
+    attempts.push({ name: 'brew', cmd: 'brew', args: ['install', 'idb'] })
+  }
+
+  return attempts
+}

package/src/utils/cli/ios/preflight-ios.ts

@@ -9,22 +9,21 @@ async function exists(p: string) {
 }
 
 async function findFirst(root: string, patterns: string[], maxDepth = 4): Promise<string | null> {
-  const queue: Array<{dir:string, depth:number}> = [{dir: root, depth:0}]
+  const queue: Array<{ dir: string, depth: number }> = [{ dir: root, depth: 0 }]
   while (queue.length) {
-    const {dir, depth} = queue.shift()!
+    const { dir, depth } = queue.shift()!
     try {
       console.error('DEBUG findFirst: reading dir', dir, 'depth', depth)
       const ents: fs.Dirent[] = await fs.promises.readdir(dir, { withFileTypes: true })
-      console.error('DEBUG findFirst: entries', ents.map(e=>e.name))
+      console.error('DEBUG findFirst: entries', ents.map(e => e.name))
       for (const e of ents) {
         const full = path.join(dir, e.name)
-        for (const p of patterns) {
-          if (e.name.endsWith(p)) {
-            console.error('DEBUG findFirst: matched', full)
-            return full
-          }
+        const matched = patterns.some(pattern => e.name.endsWith(pattern))
+        if (matched) {
+          console.error('DEBUG findFirst: matched', full)
+          return full
         }
-        if (e.isDirectory() && depth < maxDepth) queue.push({dir: full, depth: depth+1})
+        if (e.isDirectory() && depth < maxDepth) queue.push({ dir: full, depth: depth + 1 })
       }
     } catch (err) {
       console.error('DEBUG findFirst: read failed for', dir, err)
@@ -46,18 +45,7 @@ function startCompanionIfNeeded(companionPath: string | null, udid: string | nul
 }
 
 async function main() {
-  const args = process.argv.slice(2)
-  let projectArg: string | undefined
-  let udid: string | undefined
-  let startCompanion = false
-  let kmpBuild: any = null
-  for (let i=0;i<args.length;i++) {
-    const a = args[i]
-    if (a === '--project' && args[i+1]) { projectArg = args[i+1]; i++ }
-    else if (a === '--udid' && args[i+1]) { udid = args[i+1]; i++ }
-    else if (a === '--start-companion') startCompanion = true
-    else if (!projectArg) projectArg = a
-  }
+  const { projectArg, udid, startCompanion, kmpBuild } = argumentsForPreflight(process.argv.slice(2))
 
   const cwd = process.cwd()
   const projectRoot = projectArg ? path.resolve(projectArg) : cwd
@@ -98,13 +86,10 @@ async function main() {
   const companionPath = commandWhich('idb_companion')
   const companionAvailable = !!companionPath
 
-  const suggestions: string[] = []
-  if (!projectFile) suggestions.push('Provide correct project path or ensure .xcodeproj/.xcworkspace exists in project dir')
-  if (!kmpFramework) suggestions.push('Run KMP Gradle task to produce Shared.framework before xcodebuild (e.g., :shared:embedAndSignAppleFrameworkForXcode)')
-  if (!idbAvailable) suggestions.push('Ensure idb is in PATH or set MCP_IDB_PATH / IDB_PATH')
-  if (!companionAvailable) suggestions.push('Install idb_companion and ensure it is in PATH')
+  const suggestions = preflightSuggestions(projectFile, kmpFramework, idbAvailable, companionAvailable)
 
-  const result: any = {
+  const companionInfo: { cmd: string | null; installed: boolean; start?: ReturnType<typeof startCompanionIfNeeded> } = { cmd: companionPath, installed: companionAvailable }
+  const result = {
     ok: !!projectFile && !!idbAvailable,
     project: {
       root: projectRoot,
@@ -120,10 +105,7 @@ async function main() {
       cmd: idbPath,
       installed: idbAvailable
     },
-    idb_companion: {
-      cmd: companionPath,
-      installed: companionAvailable
-    },
+    idb_companion: companionInfo,
     suggestions
   }
 
@@ -142,3 +124,29 @@ main().catch(e => {
   console.log(JSON.stringify({ ok: false, error: e instanceof Error ? e.message : String(e) }, null, 2))
   process.exit(2)
 })
+
+function argumentsForPreflight(args: string[]) {
+  let projectArg: string | undefined
+  let udid: string | undefined
+  let startCompanion = false
+  const kmpBuild = null
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i]
+    if (a === '--project' && args[i + 1]) { projectArg = args[i + 1]; i++ }
+    else if (a === '--udid' && args[i + 1]) { udid = args[i + 1]; i++ }
+    else if (a === '--start-companion') startCompanion = true
+    else if (!projectArg) projectArg = a
+  }
+
+  return { projectArg, udid, startCompanion, kmpBuild }
+}
+
+function preflightSuggestions(projectFile: string | null, kmpFramework: string | null, idbAvailable: boolean, companionAvailable: boolean) {
+  const suggestions: string[] = []
+  if (!projectFile) suggestions.push('Provide correct project path or ensure .xcodeproj/.xcworkspace exists in project dir')
+  if (!kmpFramework) suggestions.push('Run KMP Gradle task to produce Shared.framework before xcodebuild (e.g., :shared:embedAndSignAppleFrameworkForXcode)')
+  if (!idbAvailable) suggestions.push('Ensure idb is in PATH or set MCP_IDB_PATH / IDB_PATH')
+  if (!companionAvailable) suggestions.push('Install idb_companion and ensure it is in PATH')
+
+  return suggestions
+}

package/src/utils/cli/ios/run-ios-ui-tree-tap.ts

@@ -7,7 +7,7 @@ async function main() {
   const interact = new iOSInteract();
 
   console.log('Fetching UI tree...');
-  const tree = await obs.getUITree(deviceId as any);
+  const tree = await obs.getUITree(deviceId);
   if (tree.error) {
     console.error('getUITree error:', tree.error);
     process.exit(2);
@@ -18,12 +18,12 @@ async function main() {
     process.exit(3);
   }
 
-  const clickable = tree.elements.find((e: any) => e.clickable) || tree.elements[0];
+  const clickable = tree.elements.find((e: import('../../../types.js').UIElement) => e.clickable) || tree.elements[0];
   console.log('Using element:', clickable.text || '(no text)', 'clickable=', clickable.clickable, 'center=', clickable.center);
-  const [x,y] = clickable.center || [0,0];
+  const [x, y] = clickable.center || [0, 0];
 
   console.log(`Tapping at ${x},${y}...`);
-  const res = await interact.tap(x, y, deviceId as any);
+  const res = await interact.tap(x, y, deviceId);
   console.log('Tap result:', res);
 
   if (res.success) process.exit(0);

package/src/utils/ios/utils.ts

@@ -19,17 +19,14 @@ export function getConfiguredIdbPath(): string | undefined {
     for (const p of cfgPaths) {
       if (!p) continue
       try {
-        if (fs.existsSync(p)) {
-          const raw = fs.readFileSync(p, 'utf8')
-          const json = JSON.parse(raw)
-          if (json) {
-            if (json.idbPath) return json.idbPath
-            if (json.IDB_PATH) return json.IDB_PATH
-          }
-        }
-      } catch {}
+        if (!fs.existsSync(p)) continue
+        const raw = fs.readFileSync(p, 'utf8')
+        const json = JSON.parse(raw)
+        if (json?.idbPath) return json.idbPath
+        if (json?.IDB_PATH) return json.IDB_PATH
+      } catch { }
     }
-  } catch {}
+  } catch { }
   return undefined
 }
 
@@ -38,13 +35,13 @@ export function getIdbCmd() {
   if (cfg) return cfg
   if (process.env.IDB_PATH) return process.env.IDB_PATH
   try {
-    const p = execSync('which idb', { stdio: ['ignore','pipe','ignore'] }).toString().trim()
+    const p = execSync('which idb', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim()
     if (p) return p
-  } catch {}
+  } catch { }
   try {
-    const p2 = execSync('command -v idb', { stdio: ['ignore','pipe','ignore'] }).toString().trim()
+    const p2 = execSync('command -v idb', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim()
     if (p2) return p2
-  } catch {}
+  } catch { }
   // check common user locations
   const common = [
     `${process.env.HOME}/Library/Python/3.9/bin/idb`,
@@ -53,7 +50,7 @@ export function getIdbCmd() {
     '/usr/local/bin/idb',
   ]
   for (const c of common) {
-    try { execSync(`test -x ${c}`, { stdio: ['ignore','pipe','ignore'] }); return c } catch {}
+    try { execSync(`test -x ${c}`, { stdio: ['ignore', 'pipe', 'ignore'] }); return c } catch { }
   }
   return 'idb'
 }
@@ -62,7 +59,7 @@ export async function isIDBInstalled(): Promise<boolean> {
   const cmd = getIdbCmd()
   if (!cmd) return false
   try {
-    execSync(`${cmd} list-targets --json`, { stdio: ['ignore','pipe','pipe'], timeout: remainingBudget(5000), killSignal: 'SIGKILL' })
+    execSync(`${cmd} list-targets --json`, { stdio: ['ignore', 'pipe', 'pipe'], timeout: remainingBudget(5000), killSignal: 'SIGKILL' })
     return true
   } catch (e: unknown) {
     console.debug(`[isIDBInstalled] idb probe failed for '${cmd}': ${e instanceof Error ? e.message : String(e)}`)
@@ -89,7 +86,7 @@ export function execCommand(args: string[], deviceId: string = "booted"): Promis
     // Use spawn for better stream control and consistency with Android implementation
     const budgetMs = remainingBudget()
     const child = spawn(getXcrunCmd(), args)
-    
+
     let stdout = ''
     let stderr = ''
 
@@ -106,8 +103,8 @@ export function execCommand(args: string[], deviceId: string = "booted"): Promis
     }
 
     const DEFAULT_XCRUN_LOG_TIMEOUT = parseInt(process.env.MCP_XCRUN_LOG_TIMEOUT || '', 10) || 30000 // env (ms) or default 30s
-  const DEFAULT_XCRUN_CMD_TIMEOUT = parseInt(process.env.MCP_XCRUN_TIMEOUT || '', 10) || 60000 // env (ms) or default 60s
-  const timeoutMs = budgetMs || (args.includes('log') ? DEFAULT_XCRUN_LOG_TIMEOUT : DEFAULT_XCRUN_CMD_TIMEOUT) // choose appropriate timeout
+    const DEFAULT_XCRUN_CMD_TIMEOUT = parseInt(process.env.MCP_XCRUN_TIMEOUT || '', 10) || 60000 // env (ms) or default 60s
+    const timeoutMs = budgetMs || (args.includes('log') ? DEFAULT_XCRUN_LOG_TIMEOUT : DEFAULT_XCRUN_CMD_TIMEOUT) // choose appropriate timeout
     const timeout = setTimeout(() => {
       child.kill()
       reject(new Error(`Command timed out after ${timeoutMs}ms: ${getXcrunCmd()} ${args.join(' ')}`))
@@ -135,12 +132,12 @@ export function execCommandWithDiagnostics(args: string[], deviceId: string = "b
   const DEFAULT_XCRUN_LOG_TIMEOUT = parseInt(process.env.MCP_XCRUN_LOG_TIMEOUT || '', 10) || 30000
   const DEFAULT_XCRUN_CMD_TIMEOUT = parseInt(process.env.MCP_XCRUN_TIMEOUT || '', 10) || 60000
   const timeoutMs = budgetMs || (args.includes('log') ? DEFAULT_XCRUN_LOG_TIMEOUT : DEFAULT_XCRUN_CMD_TIMEOUT)
-  const res = spawnSync(getXcrunCmd(), args, { encoding: 'utf8', timeout: timeoutMs }) as any
+  const res = spawnSync(getXcrunCmd(), args, { encoding: 'utf8', timeout: timeoutMs })
   const runResult = {
     exitCode: typeof res.status === 'number' ? res.status : null,
     stdout: res.stdout || '',
     stderr: res.stderr || '',
-    envSnapshot: makeEnvSnapshot(['PATH','IDB_PATH','JAVA_HOME','HOME']),
+    envSnapshot: makeEnvSnapshot(['PATH', 'IDB_PATH', 'JAVA_HOME', 'HOME']),
     command: getXcrunCmd(),
     args,
     deviceId
@@ -168,17 +165,17 @@ function parseRuntimeName(runtime: string): string {
   try {
     const parts = runtime.split('.')
     const lastPart = parts[parts.length - 1] // e.g. "iOS-17-0"
-    
+
     // Split by hyphen to separate OS from version numbers
     // e.g. "iOS-17-0" -> ["iOS", "17", "0"]
     const segments = lastPart.split('-');
-    
+
     if (segments.length > 1) {
-        const os = segments[0]; // "iOS"
-        const version = segments.slice(1).join('.'); // "17.0"
-        return `${os} ${version}`;
+      const os = segments[0]; // "iOS"
+      const version = segments.slice(1).join('.'); // "17.0"
+      return `${os} ${version}`;
     }
-    
+
     return lastPart;
   } catch {
     return runtime
@@ -220,18 +217,17 @@ export async function getIOSDeviceMetadata(deviceId: string = "booted"): Promise
 
         for (const runtime in devicesMap) {
           const devices = devicesMap[runtime]
-          if (Array.isArray(devices)) {
-            for (const device of devices) {
-              if (deviceId === "booted" || device.udid === deviceId) {
-                resolve({
-                  platform: "ios",
-                  id: device.udid,
-                  osVersion: parseRuntimeName(runtime),
-                  model: device.name,
-                  simulator: true,
-                })
-                return
-              }
+          if (!Array.isArray(devices)) continue
+          for (const device of devices) {
+            if (deviceId === "booted" || device.udid === deviceId) {
+              resolve({
+                platform: "ios",
+                id: device.udid,
+                osVersion: parseRuntimeName(runtime),
+                model: device.name,
+                simulator: true,
+              })
+              return
             }
           }
         }
@@ -264,34 +260,34 @@ export async function listIOSDevices(appId?: string): Promise<DeviceInfo[]> {
               const bmap = bdata.devices || {}
               for (const rt in bmap) {
                 const devs = bmap[rt]
-                if (Array.isArray(devs)) for (const d of devs) bootedSet.add(d.udid)
+                if (!Array.isArray(devs)) continue
+                for (const d of devs) bootedSet.add(d.udid)
               }
-            } catch {}
+            } catch { }
           }
 
           for (const runtime in devicesMap) {
             const devices = devicesMap[runtime]
-            if (Array.isArray(devices)) {
-              for (const device of devices) {
-                const info: any = {
-                  platform: 'ios',
-                  id: device.udid,
-                  osVersion: parseRuntimeName(runtime),
-                  model: device.name,
-                  simulator: true,
-                  booted: bootedSet.has(device.udid)
-                }
+            if (!Array.isArray(devices)) continue
+            for (const device of devices) {
+              const info: DeviceInfo = {
+                platform: 'ios',
+                id: device.udid,
+                osVersion: parseRuntimeName(runtime),
+                model: device.name,
+                simulator: true,
+                booted: bootedSet.has(device.udid)
+              }
 
-                if (appId) {
-                  // check if installed
-                  const p = execCommand(['simctl', 'get_app_container', device.udid, appId, 'data'], device.udid)
-                    .then(() => { info.appInstalled = true })
-                    .catch(() => { info.appInstalled = false })
-                    .then(() => { out.push(info) })
-                  checks.push(p)
-                } else {
-                  out.push(info)
-                }
+              if (appId) {
+                // check if installed
+                const p = execCommand(['simctl', 'get_app_container', device.udid, appId, 'data'], device.udid)
+                  .then(() => { info.appInstalled = true })
+                  .catch(() => { info.appInstalled = false })
+                  .then(() => { out.push(info) })
+                checks.push(p)
+              } else {
+                out.push(info)
               }
             }
           }

package/src/utils/java.ts

@@ -35,27 +35,8 @@ export async function detectJavaHome(options: { quiet?: boolean } = {}): Promise
       debug('[java.detect] ANDROID_STUDIO_JDK present but java -version did not match expected versions')
     }
 
-    // 2) Android Studio JBR candidates (prefer these over JAVA_HOME)
-    const jbrCandidates = [
-      '/Applications/Android Studio.app/Contents/jbr',
-      '/Applications/Android Studio.app/Contents/jbr/Contents/Home',
-      '/Applications/Android Studio Preview.app/Contents/jbr',
-      '/Applications/Android Studio Preview.app/Contents/jbr/Contents/Home',
-      '/Applications/Android Studio Preview 2022.3.app/Contents/jbr',
-      '/Applications/Android Studio Preview 2022.3.app/Contents/jbr/Contents/Home',
-      '/Applications/Android Studio Preview 2023.1.app/Contents/jbr',
-      '/Applications/Android Studio Preview 2023.1.app/Contents/jbr/Contents/Home'
-    ]
-    for (const p of jbrCandidates) {
-      const javaBin = path.join(p, 'bin', 'java')
-      if (existsSync(javaBin)) {
-        const v = javaVersionOf(javaBin)
-        if (isJavaVersionAcceptable(v)) {
-          debug('[java.detect] Found Android Studio JBR at:', p)
-          return p
-        }
-      }
-    }
+    const jbr = findStudioJava(debug)
+    if (jbr) return jbr
 
     // 3) If JAVA_HOME set, validate it (accept 17 or 21)
     if (process.env.JAVA_HOME) {
@@ -86,31 +67,69 @@ export async function detectJavaHome(options: { quiet?: boolean } = {}): Promise
       if (out21) return out21
     } catch (e: unknown) { debug('[java.detect] /usr/libexec/java_home -v 21 failed: ' + String(e)) }
 
-    // 6) macOS common JDK locations
-    try {
-      const homes = execSync('ls -1 /Library/Java/JavaVirtualMachines || true', { stdio: ['ignore', 'pipe', 'inherit'] }).toString().split(/\r?\n/).filter(Boolean)
-      for (const h of homes) {
-        if (h.toLowerCase().includes('17') || h.toLowerCase().includes('jdk-17') || h.toLowerCase().includes('21') || h.toLowerCase().includes('jdk-21')) {
-          const candidate = `/Library/Java/JavaVirtualMachines/${h}/Contents/Home`
-          return candidate
-        }
-      }
-    } catch (e: unknown) { debug('[java.detect] listing /Library/Java/JavaVirtualMachines failed: ' + String(e)) }
+    const commonHome = findMacJavaHome(debug)
+    if (commonHome) return commonHome
 
-    // 7) Linux locations
-    const linuxCandidates = [
-      '/usr/lib/jvm/java-17-openjdk-amd64',
-      '/usr/lib/jvm/java-17-openjdk',
-      '/usr/lib/jvm/zulu17',
-      '/usr/lib/jvm/temurin-17-jdk',
-      '/usr/lib/jvm/temurin-21-jdk',
-      '/usr/lib/jvm/java-21-openjdk-amd64'
-    ]
-    for (const p of linuxCandidates) {
-      try { if (existsSync(p)) return p } catch (e: unknown) { debug(`[java.detect] checking linux candidate ${p} failed: ${String(e)}`) }
-    }
+    return findLinuxJavaHome(debug)
   } catch (e: unknown) {
     debug('[java.detect] error detecting java home:', e instanceof Error ? e.message : String(e))
   }
   return undefined
 }
+
+function findStudioJava(debug: (...args: unknown[]) => void): string | undefined {
+  // 2) Android Studio JBR candidates (prefer these over JAVA_HOME)
+  const jbrCandidates = [
+    '/Applications/Android Studio.app/Contents/jbr',
+    '/Applications/Android Studio.app/Contents/jbr/Contents/Home',
+    '/Applications/Android Studio Preview.app/Contents/jbr',
+    '/Applications/Android Studio Preview.app/Contents/jbr/Contents/Home',
+    '/Applications/Android Studio Preview 2022.3.app/Contents/jbr',
+    '/Applications/Android Studio Preview 2022.3.app/Contents/jbr/Contents/Home',
+    '/Applications/Android Studio Preview 2023.1.app/Contents/jbr',
+    '/Applications/Android Studio Preview 2023.1.app/Contents/jbr/Contents/Home'
+  ]
+  for (const p of jbrCandidates) {
+    const javaBin = path.join(p, 'bin', 'java')
+    if (existsSync(javaBin)) {
+      const v = javaVersionOf(javaBin)
+      if (isJavaVersionAcceptable(v)) {
+        debug('[java.detect] Found Android Studio JBR at:', p)
+        return p
+      }
+    }
+  }
+
+  return undefined
+}
+
+function findMacJavaHome(debug: (...args: unknown[]) => void): string | undefined {
+  // 6) macOS common JDK locations
+  try {
+    const homes = execSync('ls -1 /Library/Java/JavaVirtualMachines || true', { stdio: ['ignore', 'pipe', 'inherit'] }).toString().split(/\r?\n/).filter(Boolean)
+    for (const h of homes) {
+      if (h.toLowerCase().includes('17') || h.toLowerCase().includes('jdk-17') || h.toLowerCase().includes('21') || h.toLowerCase().includes('jdk-21')) {
+        const candidate = `/Library/Java/JavaVirtualMachines/${h}/Contents/Home`
+        return candidate
+      }
+    }
+  } catch (e: unknown) { debug('[java.detect] listing /Library/Java/JavaVirtualMachines failed: ' + String(e)) }
+
+  return undefined
+}
+
+function findLinuxJavaHome(debug: (...args: unknown[]) => void): string | undefined {
+  // 7) Linux locations
+  const linuxCandidates = [
+    '/usr/lib/jvm/java-17-openjdk-amd64',
+    '/usr/lib/jvm/java-17-openjdk',
+    '/usr/lib/jvm/zulu17',
+    '/usr/lib/jvm/temurin-17-jdk',
+    '/usr/lib/jvm/temurin-21-jdk',
+    '/usr/lib/jvm/java-21-openjdk-amd64'
+  ]
+  for (const p of linuxCandidates) {
+    try { if (existsSync(p)) return p } catch (e: unknown) { debug(`[java.detect] checking linux candidate ${p} failed: ${String(e)}`) }
+  }
+  return undefined
+}

package/src/utils/resolve-device.ts

@@ -16,7 +16,7 @@ export interface ResolveOptions {
 
 function parseNumericVersion(v: string): number {
   if (!v) return 0
-  const m = v.match(/(\d+)(?:[\.\-](\d+))?/) 
+  const m = v.match(/(\d+)(?:[\.\-](\d+))?/)
   if (!m) return 0
   const major = parseInt(m[1], 10) || 0
   const minor = parseInt(m[2] || "0", 10) || 0
@@ -82,13 +82,17 @@ async function resolveDevice(opts: ResolveOptions): Promise<DeviceInfo> {
     return found
   }
 
+  return selectDevice(devices, platform, appId, prefer)
+}
+
+function selectDevice(devices: DeviceInfo[], platform: string, appId?: string, prefer?: ResolveOptions['prefer']): DeviceInfo {
   let candidates = devices.slice()
 
   if (prefer === "physical") candidates = candidates.filter(d => !d.simulator)
   if (prefer === "emulator") candidates = candidates.filter(d => d.simulator)
 
   if (appId) {
-    const installed = candidates.filter(d => (d as any).appInstalled)
+    const installed = candidates.filter(d => d.appInstalled)
     if (installed.length > 0) candidates = installed
   }
 
@@ -103,7 +107,7 @@ async function resolveDevice(opts: ResolveOptions): Promise<DeviceInfo> {
 
     // Prefer booted iOS simulators if present
     if (platform === 'ios') {
-      const booted = candidates.filter((d: any) => !!d.booted)
+      const booted = candidates.filter((d: DeviceInfo) => !!d.booted)
       if (booted.length === 1) return booted[0]
       if (booted.length > 1) return booted[0] // if multiple booted, pick the first
     }
@@ -113,9 +117,8 @@ async function resolveDevice(opts: ResolveOptions): Promise<DeviceInfo> {
       return candidates[0]
     }
 
-    const list = candidates.map(d => ({ id: d.id, platform: d.platform, osVersion: d.osVersion, model: d.model, simulator: d.simulator, appInstalled: (d as any).appInstalled }))
-    const err = new Error(`Multiple matching devices found: ${JSON.stringify(list, null, 2)}`)
-    ;(err as any).devices = list
+    const list = candidates.map(d => ({ id: d.id, platform: d.platform, osVersion: d.osVersion, model: d.model, simulator: d.simulator, appInstalled: d.appInstalled }))
+    const err = Object.assign(new Error(`Multiple matching devices found: ${JSON.stringify(list, null, 2)}`), { devices: list })
     throw err
   }