mobile-debug-mcp 0.30.1 → 0.31.0

package/src/utils/android/utils.ts

@@ -20,8 +20,10 @@ function findInPath(cmd: string): string | null {
 }
 
 export function resolveAdbCmd(): string {
-  // Priority: explicit env ADB_PATH -> ANDROID_SDK_ROOT/platform-tools/adb -> ANDROID_HOME/platform-tools/adb -> ~/Library/Android/sdk/platform-tools/adb -> PATH discovery -> 'adb'
+  // Priority: explicit env ADB_PATH -> PATH -> known SDK locations -> fallback to 'adb'
   if (process.env.ADB_PATH && process.env.ADB_PATH.trim()) return process.env.ADB_PATH
+  const found = findInPath('adb')
+  if (found) return found
   const sdkRoot = process.env.ANDROID_SDK_ROOT || process.env.ANDROID_HOME
   if (sdkRoot) {
     const candidate = path.join(sdkRoot, 'platform-tools', process.platform === 'win32' ? 'adb.exe' : 'adb')
@@ -30,8 +32,6 @@ export function resolveAdbCmd(): string {
   // common macOS user SDK path
   const homeSdk = path.join(process.env.HOME || '', 'Library', 'Android', 'sdk', 'platform-tools', process.platform === 'win32' ? 'adb.exe' : 'adb')
   if (existsSync(homeSdk)) return homeSdk
-  const found = findInPath('adb')
-  if (found) return found
   return 'adb'
 }
 

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { execSync, spawnSync } from 'child_process'
 import { main as installMain } from './install-idb.js'
-import { getIdbCmd, isIDBInstalled } from './idb-helper.js'
+import { getIdbCmd, getIdbPackageVersion, isIDBInstalled } from './idb-helper.js'
 
 function which(cmd: string): string | null {
   try {
@@ -48,7 +48,16 @@ try {
   const idb = process.env.IDB_PATH || getIdbCmd()
   print('idb:', idb)
   if (idb && isIDBInstalled()) {
-    try { print('idb --version:', execSync(`${idb} --version`, { stdio: ['ignore','pipe','ignore'] }).toString().trim()) } catch (e) { print('idb --version: (failed)', e instanceof Error ? e.message : String(e)) }
+    const version = getIdbPackageVersion()
+    if (version) print('fb-idb version:', version)
+    try {
+      const output = execSync(`${idb} list-targets --json`, { stdio: ['ignore', 'pipe', 'pipe'], timeout: 5000 }).toString().trim()
+      print('idb list-targets --json: ok')
+      if (output) print(output)
+    } catch (e) {
+      print('idb list-targets --json: (failed)', e instanceof Error ? e.message : String(e))
+      process.exit(2)
+    }
     const companion = which('idb_companion')
     print('which idb_companion:', companion)
     if (companion) try { print('idb_companion --version:', execSync('idb_companion --version', { stdio: ['ignore','pipe','ignore'] }).toString().trim()) } catch (e) { print('idb_companion --version: (failed)', e instanceof Error ? e.message : String(e)) }

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

@@ -59,17 +59,54 @@ export function getIdbCmd(): string | null {
   return null
 }
 
-export function isIDBInstalled(): boolean {
-  const cmd = getIdbCmd()
-  if (!cmd) return false
-  try {
-    // command -v <cmd>
-    const r = spawnSync('command', ['-v', cmd], { stdio: ['ignore', 'pipe', 'ignore'] })
-    if (r && r.status === 0) return true
-  } catch {}
+export function getIdbPackageVersion(): string | null {
+  const runners = ['python3', 'python']
+  for (const runner of runners) {
+    try {
+      const result = spawnSync(runner, ['-m', 'pip', 'show', 'fb-idb'], {
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'pipe']
+      })
+      if (result.status !== 0) continue
+      const output = `${result.stdout || ''}\n${result.stderr || ''}`
+      const match = output.match(/^Version:\s*(.+)$/mi)
+      if (match?.[1]) return match[1].trim()
+    } catch {
+      continue
+    }
+  }
+  return null
+}
+
+export function probeIdb(cmd = getIdbCmd()): { ok: boolean; raw: string | null; parsedVersion: string | null } {
+  if (!cmd) return { ok: false, raw: null, parsedVersion: null }
+
   try {
-    execSync(`${cmd} list-targets --json`, { stdio: ['ignore', 'pipe', 'ignore'], timeout: 2000 })
-    return true
-  } catch {}
-  return false
+    const result = spawnSync(cmd, ['list-targets', '--json'], {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+      timeout: 5000
+    })
+    if (result.status !== 0) {
+      return {
+        ok: false,
+        raw: `${result.stdout || ''}${result.stderr || ''}`.trim() || null,
+        parsedVersion: null
+      }
+    }
+
+    const version = getIdbPackageVersion()
+    const raw = version ? `fb-idb ${version}` : `${result.stdout || ''}${result.stderr || ''}`.trim() || null
+    return {
+      ok: true,
+      raw,
+      parsedVersion: version
+    }
+  } catch {
+    return { ok: false, raw: null, parsedVersion: null }
+  }
+}
+
+export function isIDBInstalled(): boolean {
+  return probeIdb().ok
 }

package/src/utils/ios/utils.ts

@@ -59,17 +59,13 @@ export function getIdbCmd() {
 
 export async function isIDBInstalled(): Promise<boolean> {
   const cmd = getIdbCmd()
+  if (!cmd) return false
   try {
-    execSync(`command -v ${cmd}`, { stdio: ['ignore','pipe','ignore'] })
+    execSync(`${cmd} list-targets --json`, { stdio: ['ignore','pipe','pipe'], timeout: 5000 })
     return true
   } catch (e: unknown) {
-    try {
-      execSync(`${cmd} list-targets --json`, { stdio: ['ignore','pipe','ignore'], timeout: 2000 })
-      return true
-    } catch (e2: unknown) {
-      console.debug(`[isIDBInstalled] idb presence check failed for '${cmd}': ${e instanceof Error ? e.message : String(e2)}`)
-      return false
-    }
+    console.debug(`[isIDBInstalled] idb probe failed for '${cmd}': ${e instanceof Error ? e.message : String(e)}`)
+    return false
   }
 }