Fix duplicate find matching, add IOS_TOOL_MISSING reason, DRY retry log env check

- Remove redundant findNodeByLocator call in find handler; reuse
  bestMatches from the ambiguity check instead of scanning nodes twice.
- Add IOS_TOOL_MISSING boot failure reason so xcrun/simctl absence gets
  a specific diagnostic hint instead of generic BOOT_COMMAND_FAILED.
- Extract isEnvTruthy helper into retry.ts and replace duplicated
  RETRY_LOGS_ENABLED parsing in ios/index.ts and android/devices.ts.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: thymikee

src/daemon/handlers/find.ts

@@ -1,5 +1,5 @@
 import { dispatchCommand, resolveTargetDevice } from '../../core/dispatch.ts';
-import { findBestMatchesByLocator, findNodeByLocator, type FindLocator } from '../../utils/finders.ts';
+import { findBestMatchesByLocator, type FindLocator } from '../../utils/finders.ts';
 import { attachRefs, centerOfRect, type RawSnapshotNode, type SnapshotState } from '../../utils/snapshot.ts';
 import { AppError } from '../../utils/errors.ts';
 import type { DaemonRequest, DaemonResponse } from '../types.ts';
@@ -97,7 +97,7 @@ export async function handleFindCommands(params: {
     const start = Date.now();
     while (Date.now() - start < timeout) {
       const { nodes } = await fetchNodes();
-      const match = findNodeByLocator(nodes, locator, query, { requireRect: false });
+      const match = findBestMatchesByLocator(nodes, locator, query, { requireRect: false }).matches[0];
       if (match) {
         if (session) {
           sessionStore.recordAction(session, {
@@ -134,7 +134,7 @@ export async function handleFindCommands(params: {
       },
     };
   }
-  const node = findNodeByLocator(nodes, locator, query, { requireRect: requiresRect });
+  const node = bestMatches.matches[0] ?? null;
   if (!node) {
     return { ok: false, error: { code: 'COMMAND_FAILED', message: 'find did not match any element' } };
   }

src/platforms/__tests__/boot-diagnostics.test.ts

@@ -19,14 +19,22 @@ test('classifyBootFailure maps adb offline errors', () => {
   assert.equal(reason, 'ADB_TRANSPORT_UNAVAILABLE');
 });
 
-test('classifyBootFailure maps tool missing from AppError code', () => {
+test('classifyBootFailure maps tool missing from AppError code (android)', () => {
   const reason = classifyBootFailure({
     error: new AppError('TOOL_MISSING', 'adb not found in PATH'),
     context: { platform: 'android', phase: 'transport' },
   });
   assert.equal(reason, 'ADB_TRANSPORT_UNAVAILABLE');
 });
 
+test('classifyBootFailure maps tool missing from AppError code (ios)', () => {
+  const reason = classifyBootFailure({
+    error: new AppError('TOOL_MISSING', 'xcrun not found in PATH'),
+    context: { platform: 'ios', phase: 'boot' },
+  });
+  assert.equal(reason, 'IOS_TOOL_MISSING');
+});
+
 test('classifyBootFailure reads stderr from AppError details', () => {
   const reason = classifyBootFailure({
     error: new AppError('COMMAND_FAILED', 'adb failed', {

src/platforms/android/devices.ts

@@ -2,14 +2,12 @@ import { runCmd, whichCmd } from '../../utils/exec.ts';
 import type { ExecResult } from '../../utils/exec.ts';
 import { AppError, asAppError } from '../../utils/errors.ts';
 import type { DeviceInfo } from '../../utils/device.ts';
-import { Deadline, retryWithPolicy, TIMEOUT_PROFILES, type RetryTelemetryEvent } from '../../utils/retry.ts';
+import { Deadline, isEnvTruthy, retryWithPolicy, TIMEOUT_PROFILES, type RetryTelemetryEvent } from '../../utils/retry.ts';
 import { bootFailureHint, classifyBootFailure } from '../boot-diagnostics.ts';
 
 const EMULATOR_SERIAL_PREFIX = 'emulator-';
 const ANDROID_BOOT_POLL_MS = 1000;
-const RETRY_LOGS_ENABLED = ['1', 'true', 'yes', 'on'].includes(
-  (process.env.AGENT_DEVICE_RETRY_LOGS ?? '').toLowerCase(),
-);
+const RETRY_LOGS_ENABLED = isEnvTruthy(process.env.AGENT_DEVICE_RETRY_LOGS);
 
 function adbArgs(serial: string, args: string[]): string[] {
   return ['-s', serial, ...args];

src/platforms/boot-diagnostics.ts

@@ -3,6 +3,7 @@ import { asAppError } from '../utils/errors.ts';
 export type BootFailureReason =
   | 'IOS_BOOT_TIMEOUT'
   | 'IOS_RUNNER_CONNECT_TIMEOUT'
+  | 'IOS_TOOL_MISSING'
   | 'ANDROID_BOOT_TIMEOUT'
   | 'ADB_TRANSPORT_UNAVAILABLE'
   | 'CI_RESOURCE_STARVATION_SUSPECTED'
@@ -25,7 +26,7 @@ export function classifyBootFailure(input: {
   const platform = input.context?.platform;
   const phase = input.context?.phase;
   if (appErr?.code === 'TOOL_MISSING') {
-    return platform === 'android' ? 'ADB_TRANSPORT_UNAVAILABLE' : 'BOOT_COMMAND_FAILED';
+    return platform === 'android' ? 'ADB_TRANSPORT_UNAVAILABLE' : 'IOS_TOOL_MISSING';
   }
   const details = (appErr?.details ?? {}) as Record<string, unknown>;
   const detailMessage = typeof details.message === 'string' ? details.message : undefined;
@@ -117,6 +118,8 @@ export function bootFailureHint(reason: BootFailureReason): string {
       return 'Check adb server/device transport (adb devices -l), restart adb, and ensure the target device is online and authorized.';
     case 'CI_RESOURCE_STARVATION_SUSPECTED':
       return 'CI machine may be resource constrained; reduce parallel jobs or use a larger runner.';
+    case 'IOS_TOOL_MISSING':
+      return 'Xcode command-line tools are missing or not in PATH; run xcode-select --install and verify xcrun works.';
     case 'BOOT_COMMAND_FAILED':
       return 'Inspect command stderr/stdout for the failing boot phase and retry after environment validation.';
     default:

src/platforms/ios/index.ts

@@ -2,7 +2,7 @@ import { runCmd } from '../../utils/exec.ts';
 import type { ExecResult } from '../../utils/exec.ts';
 import { AppError } from '../../utils/errors.ts';
 import type { DeviceInfo } from '../../utils/device.ts';
-import { Deadline, retryWithPolicy, TIMEOUT_PROFILES, type RetryTelemetryEvent } from '../../utils/retry.ts';
+import { Deadline, isEnvTruthy, retryWithPolicy, TIMEOUT_PROFILES, type RetryTelemetryEvent } from '../../utils/retry.ts';
 import { bootFailureHint, classifyBootFailure } from '../boot-diagnostics.ts';
 
 const ALIASES: Record<string, string> = {
@@ -14,9 +14,7 @@ const IOS_BOOT_TIMEOUT_MS = resolveTimeoutMs(
   TIMEOUT_PROFILES.ios_boot.totalMs,
   5_000,
 );
-const RETRY_LOGS_ENABLED = ['1', 'true', 'yes', 'on'].includes(
-  (process.env.AGENT_DEVICE_RETRY_LOGS ?? '').toLowerCase(),
-);
+const RETRY_LOGS_ENABLED = isEnvTruthy(process.env.AGENT_DEVICE_RETRY_LOGS);
 
 export async function resolveIosApp(device: DeviceInfo, app: string): Promise<string> {
   const trimmed = app.trim();

src/utils/retry.ts

@@ -39,6 +39,10 @@ export type RetryTelemetryEvent = {
   reason?: string;
 };
 
+export function isEnvTruthy(value: string | undefined): boolean {
+  return ['1', 'true', 'yes', 'on'].includes((value ?? '').toLowerCase());
+}
+
 export const TIMEOUT_PROFILES: Record<string, TimeoutProfile> = {
   ios_boot: { startupMs: 120_000, operationMs: 20_000, totalMs: 120_000 },
   ios_runner_connect: { startupMs: 120_000, operationMs: 15_000, totalMs: 120_000 },