mobile-debug-mcp 0.24.6 → 0.24.7

package/src/server/tool-handlers.ts

@@ -12,16 +12,35 @@ import { getSystemStatus } from '../system/index.js'
 import {
   buildActionExecutionResult,
   captureActionFingerprint,
+  getArrayArg,
+  getBooleanArg,
+  getNumberArg,
+  getObjectArg,
+  getStringArg,
   inferGenericFailure,
   inferScrollFailure,
+  requireBooleanArg,
+  requireNumberArg,
+  requireObjectArg,
+  requireStringArg,
   ToolCallArgs,
   ToolHandler,
   wrapResponse,
   wrapToolError
 } from './common.js'
 
+type PlatformArg = 'android' | 'ios'
+type ProjectTypeArg = 'native' | 'kmp' | 'react-native' | 'flutter'
+type ExpectElementSelectorArg = { text?: string, resource_id?: string, accessibility_id?: string, contains?: boolean }
+type WaitForUiMatchArg = { index?: number }
+type WaitForUiRetryArg = { max_attempts?: number, backoff_ms?: number }
+type ScrollSelectorArg = { text?: string, resourceId?: string, contentDesc?: string, className?: string }
+type ClassifyNetworkRequestArg = { endpoint: string, status: 'success' | 'failure' | 'retryable' }
+
 async function handleStartApp(args: ToolCallArgs) {
-  const { platform, appId, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const appId = requireStringArg(args, 'appId')
+  const deviceId = getStringArg(args, 'deviceId')
   const uiFingerprintBefore = await captureActionFingerprint(platform, deviceId)
   ToolsNetwork.notifyActionStart()
   const res = await (platform === 'android' ? new AndroidManage().startApp(appId, deviceId) : new iOSManage().startApp(appId, deviceId))
@@ -45,14 +64,18 @@ async function handleStartApp(args: ToolCallArgs) {
 }
 
 async function handleTerminateApp(args: ToolCallArgs) {
-  const { platform, appId, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const appId = requireStringArg(args, 'appId')
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await (platform === 'android' ? new AndroidManage().terminateApp(appId, deviceId) : new iOSManage().terminateApp(appId, deviceId))
   const response: TerminateAppResponse = { device: res.device, appTerminated: res.appTerminated }
   return wrapResponse(response)
 }
 
 async function handleRestartApp(args: ToolCallArgs) {
-  const { platform, appId, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const appId = requireStringArg(args, 'appId')
+  const deviceId = getStringArg(args, 'deviceId')
   const uiFingerprintBefore = await captureActionFingerprint(platform, deviceId)
   ToolsNetwork.notifyActionStart()
   const res = await (platform === 'android' ? new AndroidManage().restartApp(appId, deviceId) : new iOSManage().restartApp(appId, deviceId))
@@ -77,14 +100,19 @@ async function handleRestartApp(args: ToolCallArgs) {
 }
 
 async function handleResetAppData(args: ToolCallArgs) {
-  const { platform, appId, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const appId = requireStringArg(args, 'appId')
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await (platform === 'android' ? new AndroidManage().resetAppData(appId, deviceId) : new iOSManage().resetAppData(appId, deviceId))
   const response: ResetAppDataResponse = { device: res.device, dataCleared: res.dataCleared }
   return wrapResponse(response)
 }
 
 async function handleInstallApp(args: ToolCallArgs) {
-  const { platform, projectType, appPath, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const projectType = requireStringArg(args, 'projectType') as ProjectTypeArg
+  const appPath = requireStringArg(args, 'appPath')
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsManage.installAppHandler({ platform, appPath, deviceId, projectType })
   const response: InstallAppResponse = {
     device: res.device,
@@ -96,13 +124,20 @@ async function handleInstallApp(args: ToolCallArgs) {
 }
 
 async function handleBuildApp(args: ToolCallArgs) {
-  const { platform, projectType, projectPath, variant } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const projectType = requireStringArg(args, 'projectType') as ProjectTypeArg
+  const projectPath = requireStringArg(args, 'projectPath')
+  const variant = getStringArg(args, 'variant')
   const res = await ToolsManage.buildAppHandler({ platform, projectPath, variant, projectType })
   return wrapResponse(res)
 }
 
 async function handleBuildAndInstall(args: ToolCallArgs) {
-  const { platform, projectType, projectPath, deviceId, timeout } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const projectType = requireStringArg(args, 'projectType') as ProjectTypeArg
+  const projectPath = requireStringArg(args, 'projectPath')
+  const deviceId = getStringArg(args, 'deviceId')
+  const timeout = getNumberArg(args, 'timeout')
   const res = await ToolsManage.buildAndInstallHandler({ platform, projectPath, deviceId, timeout, projectType })
   return {
     content: [
@@ -113,7 +148,16 @@ async function handleBuildAndInstall(args: ToolCallArgs) {
 }
 
 async function handleGetLogs(args: ToolCallArgs) {
-  const { platform, appId, deviceId, pid, tag, level, contains, since_seconds, limit, lines } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const appId = getStringArg(args, 'appId')
+  const deviceId = getStringArg(args, 'deviceId')
+  const pid = getNumberArg(args, 'pid')
+  const tag = getStringArg(args, 'tag')
+  const level = getStringArg(args, 'level')
+  const contains = getStringArg(args, 'contains')
+  const since_seconds = getNumberArg(args, 'since_seconds')
+  const limit = getNumberArg(args, 'limit')
+  const lines = getNumberArg(args, 'lines')
   const res = await ToolsObserve.getLogsHandler({ platform, appId, deviceId, pid, tag, level, contains, since_seconds, limit, lines })
   const filtered = !!(pid || tag || level || contains || since_seconds || appId)
   return {
@@ -125,7 +169,8 @@ async function handleGetLogs(args: ToolCallArgs) {
 }
 
 async function handleListDevices(args: ToolCallArgs) {
-  const { platform, appId } = args as any
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const appId = getStringArg(args, 'appId')
   const res = await ToolsManage.listDevicesHandler({ platform, appId })
   return wrapResponse(res)
 }
@@ -136,7 +181,8 @@ async function handleGetSystemStatus() {
 }
 
 async function handleCaptureScreenshot(args: ToolCallArgs) {
-  const { platform, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsObserve.captureScreenshotHandler({ platform, deviceId })
   const mime = (res as any).screenshot_mime || 'image/png'
   const content: Array<{ type: 'text' | 'image'; text?: string; data?: string; mimeType?: string }> = [
@@ -151,61 +197,95 @@ async function handleCaptureScreenshot(args: ToolCallArgs) {
 }
 
 async function handleCaptureDebugSnapshot(args: ToolCallArgs) {
-  const { reason, includeLogs, logLines, platform, appId, deviceId, sessionId } = args as any
+  const reason = getStringArg(args, 'reason')
+  const includeLogs = getBooleanArg(args, 'includeLogs')
+  const logLines = getNumberArg(args, 'logLines')
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const appId = getStringArg(args, 'appId')
+  const deviceId = getStringArg(args, 'deviceId')
+  const sessionId = getStringArg(args, 'sessionId')
   const res = await ToolsObserve.captureDebugSnapshotHandler({ reason, includeLogs, logLines, platform, appId, deviceId, sessionId })
   return wrapResponse(res)
 }
 
 async function handleGetUITree(args: ToolCallArgs) {
-  const { platform, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsObserve.getUITreeHandler({ platform, deviceId })
   return wrapResponse(res)
 }
 
 async function handleGetCurrentScreen(args: ToolCallArgs) {
-  const { deviceId } = args as any
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsObserve.getCurrentScreenHandler({ deviceId })
   return wrapResponse(res)
 }
 
 async function handleGetScreenFingerprint(args: ToolCallArgs) {
-  const { platform, deviceId } = args as any
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsObserve.getScreenFingerprintHandler({ platform, deviceId })
   return wrapResponse(res)
 }
 
 async function handleWaitForScreenChange(args: ToolCallArgs) {
-  const { platform, previousFingerprint, timeoutMs, pollIntervalMs, deviceId } = args as any
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const previousFingerprint = requireStringArg(args, 'previousFingerprint')
+  const timeoutMs = getNumberArg(args, 'timeoutMs')
+  const pollIntervalMs = getNumberArg(args, 'pollIntervalMs')
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsInteract.waitForScreenChangeHandler({ platform, previousFingerprint, timeoutMs, pollIntervalMs, deviceId })
   return wrapResponse(res)
 }
 
 async function handleExpectScreen(args: ToolCallArgs) {
-  const { platform, fingerprint, screen, deviceId } = args as any
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const fingerprint = getStringArg(args, 'fingerprint')
+  const screen = getStringArg(args, 'screen')
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsInteract.expectScreenHandler({ platform, fingerprint, screen, deviceId })
   return wrapResponse(res)
 }
 
 async function handleExpectElementVisible(args: ToolCallArgs) {
-  const { selector, element_id, timeout_ms, poll_interval_ms, platform, deviceId } = args as any
+  const selector = requireObjectArg<ExpectElementSelectorArg>(args, 'selector')
+  const element_id = getStringArg(args, 'element_id')
+  const timeout_ms = getNumberArg(args, 'timeout_ms')
+  const poll_interval_ms = getNumberArg(args, 'poll_interval_ms')
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsInteract.expectElementVisibleHandler({ selector, element_id, timeout_ms, poll_interval_ms, platform, deviceId })
   return wrapResponse(res)
 }
 
 async function handleWaitForUI(args: ToolCallArgs) {
-  const { selector, condition = 'exists', timeout_ms = 60000, poll_interval_ms = 300, match, retry, platform, deviceId } = args as any
+  const selector = getObjectArg<ExpectElementSelectorArg>(args, 'selector')
+  const condition = (getStringArg(args, 'condition') as 'exists' | 'not_exists' | 'visible' | 'clickable' | undefined) ?? 'exists'
+  const timeout_ms = getNumberArg(args, 'timeout_ms') ?? 60000
+  const poll_interval_ms = getNumberArg(args, 'poll_interval_ms') ?? 300
+  const match = getObjectArg<WaitForUiMatchArg>(args, 'match')
+  const retry = getObjectArg<WaitForUiRetryArg>(args, 'retry')
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsInteract.waitForUIHandler({ selector, condition, timeout_ms, poll_interval_ms, match, retry, platform, deviceId })
   return wrapResponse(res)
 }
 
 async function handleFindElement(args: ToolCallArgs) {
-  const { query, exact = false, timeoutMs = 3000, platform, deviceId } = args as any
+  const query = requireStringArg(args, 'query')
+  const exact = getBooleanArg(args, 'exact') ?? false
+  const timeoutMs = getNumberArg(args, 'timeoutMs') ?? 3000
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsInteract.findElementHandler({ query, exact, timeoutMs, platform, deviceId })
   return wrapResponse(res)
 }
 
 async function handleTap(args: ToolCallArgs) {
-  const { platform, x, y, deviceId } = args as any
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const x = requireNumberArg(args, 'x')
+  const y = requireNumberArg(args, 'y')
+  const deviceId = getStringArg(args, 'deviceId')
   const uiFingerprintBefore = await captureActionFingerprint(platform, deviceId)
   ToolsNetwork.notifyActionStart()
   const res = await ToolsInteract.tapHandler({ platform, x, y, deviceId })
@@ -221,14 +301,20 @@ async function handleTap(args: ToolCallArgs) {
 }
 
 async function handleTapElement(args: ToolCallArgs) {
-  const { elementId } = args as any
+  const elementId = requireStringArg(args, 'elementId')
   ToolsNetwork.notifyActionStart()
   const res = await ToolsInteract.tapElementHandler({ elementId })
   return wrapResponse(res)
 }
 
 async function handleSwipe(args: ToolCallArgs) {
-  const { platform = 'android', x1, y1, x2, y2, duration, deviceId } = args as any
+  const platform = (getStringArg(args, 'platform') as PlatformArg | undefined) ?? 'android'
+  const x1 = requireNumberArg(args, 'x1')
+  const y1 = requireNumberArg(args, 'y1')
+  const x2 = requireNumberArg(args, 'x2')
+  const y2 = requireNumberArg(args, 'y2')
+  const duration = requireNumberArg(args, 'duration')
+  const deviceId = getStringArg(args, 'deviceId')
   const uiFingerprintBefore = await captureActionFingerprint(platform, deviceId)
   ToolsNetwork.notifyActionStart()
   const res = await ToolsInteract.swipeHandler({ platform, x1, y1, x2, y2, duration, deviceId })
@@ -244,14 +330,19 @@ async function handleSwipe(args: ToolCallArgs) {
 }
 
 async function handleScrollToElement(args: ToolCallArgs) {
-  const { platform, selector, direction, maxScrolls, scrollAmount, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const selector = requireObjectArg<ScrollSelectorArg>(args, 'selector')
+  const direction = getStringArg(args, 'direction') as 'down' | 'up' | undefined
+  const maxScrolls = getNumberArg(args, 'maxScrolls')
+  const scrollAmount = getNumberArg(args, 'scrollAmount')
+  const deviceId = getStringArg(args, 'deviceId')
   const uiFingerprintBefore = await captureActionFingerprint(platform, deviceId)
   ToolsNetwork.notifyActionStart()
   const res = await ToolsInteract.scrollToElementHandler({ platform, selector, direction, maxScrolls, scrollAmount, deviceId })
   const uiFingerprintAfter = await captureActionFingerprint(platform, deviceId)
   return wrapResponse(buildActionExecutionResult({
     actionType: 'scroll_to_element',
-    selector,
+    selector: selector ?? null,
     resolved: res?.success && res?.element ? {
       elementId: null,
       text: (res.element as any).text ?? null,
@@ -269,7 +360,8 @@ async function handleScrollToElement(args: ToolCallArgs) {
 }
 
 async function handleTypeText(args: ToolCallArgs) {
-  const { text, deviceId } = args as any
+  const text = requireStringArg(args, 'text')
+  const deviceId = getStringArg(args, 'deviceId')
   const uiFingerprintBefore = await captureActionFingerprint('android', deviceId)
   ToolsNetwork.notifyActionStart()
   const res = await ToolsInteract.typeTextHandler({ text, deviceId })
@@ -285,7 +377,7 @@ async function handleTypeText(args: ToolCallArgs) {
 }
 
 async function handlePressBack(args: ToolCallArgs) {
-  const { deviceId } = args as any
+  const deviceId = getStringArg(args, 'deviceId')
   const uiFingerprintBefore = await captureActionFingerprint('android', deviceId)
   ToolsNetwork.notifyActionStart()
   const res = await ToolsInteract.pressBackHandler({ deviceId })
@@ -301,27 +393,38 @@ async function handlePressBack(args: ToolCallArgs) {
 }
 
 async function handleStartLogStream(args: ToolCallArgs) {
-  const { platform, packageName, level, sessionId, deviceId } = args as any
+  const platform = (getStringArg(args, 'platform') as PlatformArg | undefined) ?? 'android'
+  const packageName = requireStringArg(args, 'packageName')
+  const level = (getStringArg(args, 'level') as 'error' | 'warn' | 'info' | 'debug' | undefined) ?? 'error'
+  const sessionId = getStringArg(args, 'sessionId')
+  const deviceId = getStringArg(args, 'deviceId')
   const res = await ToolsObserve.startLogStreamHandler({ platform, packageName, level, sessionId, deviceId })
   return wrapResponse(res)
 }
 
 async function handleReadLogStream(args: ToolCallArgs) {
-  const { platform, sessionId, limit, since } = args as any
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const sessionId = getStringArg(args, 'sessionId')
+  const limit = getNumberArg(args, 'limit')
+  const since = getStringArg(args, 'since')
   const res = await ToolsObserve.readLogStreamHandler({ platform, sessionId, limit, since })
   return wrapResponse(res)
 }
 
 async function handleStopLogStream(args: ToolCallArgs) {
-  const { platform, sessionId } = args as any
+  const platform = getStringArg(args, 'platform') as PlatformArg | undefined
+  const sessionId = getStringArg(args, 'sessionId')
   const res = await ToolsObserve.stopLogStreamHandler({ platform, sessionId })
   return wrapResponse(res)
 }
 
 function handleClassifyActionOutcome(args: ToolCallArgs) {
-  const { uiChanged, expectedElementVisible, networkRequests, hasLogErrors } = args as any
+  const uiChanged = requireBooleanArg(args, 'uiChanged')
+  const expectedElementVisible = getBooleanArg(args, 'expectedElementVisible')
+  const networkRequests = getArrayArg<ClassifyNetworkRequestArg>(args, 'networkRequests')
+  const hasLogErrors = getBooleanArg(args, 'hasLogErrors')
   const result = classifyActionOutcome({
-    uiChanged: Boolean(uiChanged),
+    uiChanged,
     expectedElementVisible: expectedElementVisible ?? null,
     networkRequests: networkRequests ?? null,
     hasLogErrors: hasLogErrors ?? null
@@ -330,7 +433,8 @@ function handleClassifyActionOutcome(args: ToolCallArgs) {
 }
 
 async function handleGetNetworkActivity(args: ToolCallArgs) {
-  const { platform, deviceId } = args as any
+  const platform = requireStringArg(args, 'platform') as PlatformArg
+  const deviceId = getStringArg(args, 'deviceId')
   const result = await ToolsNetwork.getNetworkActivity({ platform, deviceId })
   return wrapResponse(result)
 }

package/src/server-core.ts

@@ -13,7 +13,7 @@ export { wrapResponse, toolDefinitions, handleToolCall }
 
 export const serverInfo = {
   name: 'mobile-debug-mcp',
-  version: '0.7.0'
+  version: '0.24.7'
 }
 
 export function createServer() {

package/src/utils/android/utils.ts

@@ -50,26 +50,40 @@ export function ensureAdbAvailable() {
   }
 }
 
+type GradleEnvOverrides = Record<string, string | undefined>
+
+function mergeEnv(overrides?: GradleEnvOverrides) {
+  const env: Record<string, string> = {}
+  for (const [key, value] of Object.entries(process.env)) {
+    if (typeof value === 'string') env[key] = value
+  }
+  for (const [key, value] of Object.entries(overrides || {})) {
+    if (typeof value === 'string') env[key] = value
+  }
+  return env
+}
+
 /**
  * Prepare Gradle execution options for building an Android project.
  * Returns execCmd (wrapper or gradle), base gradleArgs array, and spawn options including env.
  */
-export async function prepareGradle(projectPath: string): Promise<{ execCmd: string, gradleArgs: string[], spawnOpts: any }> {
+export async function prepareGradle(projectPath: string, envOverrides: GradleEnvOverrides = {}): Promise<{ execCmd: string, gradleArgs: string[], spawnOpts: any }> {
+  const env = mergeEnv(envOverrides)
   const gradlewPath = path.join(projectPath, 'gradlew')
   const gradleCmd = existsSync(gradlewPath) ? './gradlew' : 'gradle'
   const execCmd = existsSync(gradlewPath) ? gradlewPath : gradleCmd
 
   // Start with a default task; callers may append/override via env flags
-  const gradleArgs: string[] = [ process.env.MCP_GRADLE_TASK || 'assembleDebug' ]
+  const gradleArgs: string[] = [ env.MCP_GRADLE_TASK || 'assembleDebug' ]
 
   // Respect generic MCP_BUILD_JOBS and Android-specific MCP_GRADLE_WORKERS
-  const workers = process.env.MCP_GRADLE_WORKERS || process.env.MCP_BUILD_JOBS
+  const workers = env.MCP_GRADLE_WORKERS || env.MCP_BUILD_JOBS
   if (workers) {
     gradleArgs.push(`--max-workers=${workers}`)
   }
 
   // Respect gradle cache env: default enabled; set MCP_GRADLE_CACHE=0 to disable
-  if (process.env.MCP_GRADLE_CACHE === '0') {
+  if (env.MCP_GRADLE_CACHE === '0') {
     gradleArgs.push('-Dorg.gradle.caching=false')
   }
 
@@ -82,8 +96,6 @@ export async function prepareGradle(projectPath: string): Promise<{ execCmd: str
     gradleCheck = { gradleJavaHome: undefined, gradleValid: false, filesChecked: [], issues: [] }
   }
 
-  const env = Object.assign({}, process.env)
-
   // Ensure child processes can find Android platform-tools (adb, etc.) by
   // prepending the platform-tools directory to PATH for spawned processes.
   const adbPath = resolveAdbCmd()
@@ -488,4 +500,3 @@ export function parseLogLine(line: string) {  // Collapse internal newlines so m
 }
 
 // Legacy readLogStreamLines shim removed. Use AndroidObserve.readLogStream(sessionId, limit, since) instead.
-

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

@@ -24,7 +24,7 @@ async function runInstaller() {
     // prefer invoking the TS script via npx/tsx to ensure environment
     const runner = which('npx') ? 'npx' : which('tsx') ? 'tsx' : null
     if (runner) {
-      const args = runner === 'npx' ? ['tsx', './src/cli/idb/install-idb.ts'] : ['./src/cli/idb/install-idb.ts']
+      const args = runner === 'npx' ? ['tsx', './src/utils/cli/idb/install-idb.ts'] : ['./src/utils/cli/idb/install-idb.ts']
       const res = spawnSync(runner, args, { stdio: 'inherit' as any })
       return typeof res.status === 'number' ? res.status === 0 : false
     }

package/test/device/automated/observe/capture_screenshot.android.smoke.ts

@@ -15,7 +15,7 @@ if (!fs.existsSync(helperScript)) {
 }
 
 try {
-  const out = execSync(`tsx ${helperScript} --platform android --id default`, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
+  const out = execSync(`tsx ${helperScript} --platform android`, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
   const parsed = JSON.parse(out)
 
   if (!parsed?.resolution || parsed.resolution.width <= 0 || parsed.resolution.height <= 0) throw new Error('Invalid screenshot resolution')

package/test/device/automated/observe/capture_screenshot.ios.smoke.ts

@@ -15,7 +15,7 @@ if (!fs.existsSync(helperScript)) {
 }
 
 try {
-  const out = execSync(`tsx ${helperScript} --platform ios --id booted`, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
+  const out = execSync(`tsx ${helperScript} --platform ios`, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
   const parsed = JSON.parse(out)
 
   if (!parsed?.resolution || parsed.resolution.width <= 0 || parsed.resolution.height <= 0) throw new Error('Invalid screenshot resolution')

package/test/device/automated/observe/get_logs.android.smoke.ts

@@ -17,7 +17,7 @@ if (!fs.existsSync(helperScript)) {
 
 try {
   // Run the helper smoke script for android
-  const cmd = `tsx ${helperScript} --platform android --id default --limit 20`
+  const cmd = `tsx ${helperScript} --platform android --limit 20`
   const out = execSync(cmd, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
   const parsed = JSON.parse(out)
 

package/test/device/automated/observe/get_logs.ios.smoke.ts

@@ -15,7 +15,7 @@ if (!fs.existsSync(helperScript)) {
 }
 
 try {
-  const cmd = `tsx ${helperScript} --platform ios --id booted --limit 20`
+  const cmd = `tsx ${helperScript} --platform ios --limit 20`
   const out = execSync(cmd, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
   const parsed = JSON.parse(out)
 

package/test/device/automated/observe/get_ui_tree.android.smoke.ts

@@ -15,7 +15,7 @@ if (!fs.existsSync(helperScript)) {
 }
 
 try {
-  const out = execSync(`tsx ${helperScript} --platform android --id default`, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
+  const out = execSync(`tsx ${helperScript} --platform android`, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
   const parsed = JSON.parse(out)
 
   if (!parsed?.resolution || parsed.resolution.width <= 0 || parsed.resolution.height <= 0) throw new Error('Invalid UI tree resolution')

package/test/device/automated/observe/get_ui_tree.ios.smoke.ts

@@ -15,7 +15,7 @@ if (!fs.existsSync(helperScript)) {
 }
 
 try {
-  const out = execSync(`tsx ${helperScript} --platform ios --id booted`, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
+  const out = execSync(`tsx ${helperScript} --platform ios`, { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, timeout: 30000 })
   const parsed = JSON.parse(out)
 
   if (!parsed?.resolution || parsed.resolution.width <= 0 || parsed.resolution.height <= 0) throw new Error('Invalid UI tree resolution')

package/test/device/manual/interact/app_lifecycle.manual.ts

@@ -1,6 +1,6 @@
-import { AndroidObserve, iOSObserve } from "../../../src/observe/index.js";
-import { AndroidInteract } from "../../../src/interact/index.js";
-import { iOSInteract } from "../../../src/interact/index.js";
+import { AndroidObserve, iOSObserve } from "../../../../src/observe/index.js";
+import { AndroidInteract } from "../../../../src/interact/index.js";
+import { iOSInteract } from "../../../../src/interact/index.js";
 import fs from "fs/promises";
 
 const androidObserve = new AndroidObserve();

package/test/device/manual/observe/capture_screenshot.manual.ts

@@ -1,4 +1,4 @@
-import { ToolsObserve } from '../../../src/observe/index.js'
+import { ToolsObserve } from '../../../../src/observe/index.js'
 
 function readArg(flag: string): string | undefined {
   const index = process.argv.indexOf(flag)
@@ -8,7 +8,7 @@ function readArg(flag: string): string | undefined {
 
 async function main() {
   const platform = (readArg('--platform') || process.argv[2] || 'android') as 'android' | 'ios'
-  const deviceId = readArg('--id') || readArg('--deviceId') || process.argv[3]
+  const deviceId = readArg('--id') || readArg('--deviceId') || (process.argv[2]?.startsWith('-') ? undefined : process.argv[3])
 
   const result = await ToolsObserve.captureScreenshotHandler({ platform, deviceId })
   const screenshot = (result as any).screenshot || ''

package/test/device/manual/observe/get_logs.manual.ts

@@ -1,10 +1,10 @@
-import { ToolsObserve } from '../../../src/observe/index.js'
+import { ToolsObserve } from '../../../../src/observe/index.js'
 import minimist from 'minimist'
 
 async function main() {
   const args = minimist(process.argv.slice(2))
   const platform = args.platform || args.p || 'android'
-  const id = args.id || args.device || args.deviceId || 'default'
+  const id = args.id || args.device || args.deviceId
   const limit = typeof args.limit === 'number' ? args.limit : (typeof args.lines === 'number' ? args.lines : 50)
 
   try {

package/test/device/manual/observe/get_ui_tree.manual.ts

@@ -1,4 +1,4 @@
-import { ToolsObserve } from '../../../src/observe/index.js'
+import { ToolsObserve } from '../../../../src/observe/index.js'
 
 function readArg(flag: string): string | undefined {
   const index = process.argv.indexOf(flag)
@@ -8,7 +8,7 @@ function readArg(flag: string): string | undefined {
 
 async function main() {
   const platform = (readArg('--platform') || process.argv[2] || 'android') as 'android' | 'ios'
-  const deviceId = readArg('--id') || readArg('--deviceId') || process.argv[3]
+  const deviceId = readArg('--id') || readArg('--deviceId') || (process.argv[2]?.startsWith('-') ? undefined : process.argv[3])
 
   const result = await ToolsObserve.getUITreeHandler({ platform, deviceId })
   if ((result as any).error) throw new Error((result as any).error)

package/test/device/manual/observe/logstream.manual.ts

@@ -1,4 +1,4 @@
-import { AndroidObserve } from '../../../src/observe/index.js'
+import { AndroidObserve } from '../../../../src/observe/index.js'
 
 async function sleep(ms: number) { return new Promise(r => setTimeout(r, ms)) }
 

package/test/device/manual/observe/screen_fingerprint.manual.ts

@@ -4,8 +4,8 @@
  * Usage: RUN_DEVICE_TESTS=true npx tsx test/device/manual/observe/screen_fingerprint.manual.ts [android|ios] [deviceId]
  */
 
-import { AndroidObserve } from '../../../src/observe/index.js'
-import { iOSObserve } from '../../../src/observe/index.js'
+import { AndroidObserve } from '../../../../src/observe/index.js'
+import { iOSObserve } from '../../../../src/observe/index.js'
 
 async function main() {
   const args = process.argv.slice(2)