ios: address PR55 review follow-ups

Author: thymikee

src/core/dispatch.ts

@@ -239,6 +239,7 @@ export async function dispatchCommand(
     case 'snapshot': {
       const backend = context?.snapshotBackend ?? 'xctest';
       if (device.platform === 'ios') {
+        // Keep this guard for non-daemon callers that invoke dispatch directly.
         if (backend === 'ax' && device.kind !== 'simulator') {
           throw new AppError(
             'UNSUPPORTED_OPERATION',

src/platforms/ios/__tests__/runner-client.test.ts

@@ -4,6 +4,7 @@ import type { DeviceInfo } from '../../../utils/device.ts';
 import {
   resolveRunnerBuildDestination,
   resolveRunnerDestination,
+  resolveRunnerMaxConcurrentDestinationsFlag,
   resolveRunnerSigningBuildSettings,
 } from '../runner-client.ts';
 
@@ -38,6 +39,20 @@ test('resolveRunnerBuildDestination uses generic iOS destination for physical de
   assert.equal(resolveRunnerBuildDestination(iosDevice), 'generic/platform=iOS');
 });
 
+test('resolveRunnerMaxConcurrentDestinationsFlag uses simulator flag for simulators', () => {
+  assert.equal(
+    resolveRunnerMaxConcurrentDestinationsFlag(iosSimulator),
+    '-maximum-concurrent-test-simulator-destinations',
+  );
+});
+
+test('resolveRunnerMaxConcurrentDestinationsFlag uses device flag for physical devices', () => {
+  assert.equal(
+    resolveRunnerMaxConcurrentDestinationsFlag(iosDevice),
+    '-maximum-concurrent-test-device-destinations',
+  );
+});
+
 test('resolveRunnerSigningBuildSettings returns empty args without env overrides', () => {
   assert.deepEqual(resolveRunnerSigningBuildSettings({}), []);
 });
@@ -48,6 +63,14 @@ test('resolveRunnerSigningBuildSettings enables automatic signing for device bui
   ]);
 });
 
+test('resolveRunnerSigningBuildSettings ignores device signing overrides for simulator builds', () => {
+  assert.deepEqual(resolveRunnerSigningBuildSettings({
+    AGENT_DEVICE_IOS_TEAM_ID: 'ABCDE12345',
+    AGENT_DEVICE_IOS_SIGNING_IDENTITY: 'Apple Development',
+    AGENT_DEVICE_IOS_PROVISIONING_PROFILE: 'My Profile',
+  }, false), []);
+});
+
 test('resolveRunnerSigningBuildSettings applies optional overrides when provided', () => {
   const settings = resolveRunnerSigningBuildSettings({
     AGENT_DEVICE_IOS_TEAM_ID: 'ABCDE12345',

src/platforms/ios/devices.ts

@@ -41,44 +41,45 @@ export async function listIosDevices(): Promise<DeviceInfo[]> {
     throw new AppError('COMMAND_FAILED', 'Failed to parse simctl devices JSON', undefined, err);
   }
 
-  const devicectlAvailable = await whichCmd('xcrun');
-  if (devicectlAvailable) {
-    try {
-      const jsonPath = path.join(
-        os.tmpdir(),
-        `agent-device-devicectl-${process.pid}-${Date.now()}.json`,
-      );
-      await runCmd('xcrun', ['devicectl', 'list', 'devices', '--json-output', jsonPath]);
-      const jsonText = await fs.readFile(jsonPath, 'utf8');
-      await fs.rm(jsonPath, { force: true });
-      const payload = JSON.parse(jsonText) as {
-        result?: {
-          devices?: Array<{
-            identifier?: string;
-            name?: string;
-            hardwareProperties?: { platform?: string; udid?: string };
-            deviceProperties?: { name?: string };
-            connectionProperties?: { tunnelState?: string };
-          }>;
-        };
+  let jsonPath: string | null = null;
+  try {
+    jsonPath = path.join(
+      os.tmpdir(),
+      `agent-device-devicectl-${process.pid}-${Date.now()}.json`,
+    );
+    await runCmd('xcrun', ['devicectl', 'list', 'devices', '--json-output', jsonPath]);
+    const jsonText = await fs.readFile(jsonPath, 'utf8');
+    const payload = JSON.parse(jsonText) as {
+      result?: {
+        devices?: Array<{
+          identifier?: string;
+          name?: string;
+          hardwareProperties?: { platform?: string; udid?: string };
+          deviceProperties?: { name?: string };
+          connectionProperties?: { tunnelState?: string };
+        }>;
       };
-      for (const device of payload.result?.devices ?? []) {
-        const platform = device.hardwareProperties?.platform ?? '';
-        if (platform.toLowerCase().includes('ios')) {
-          const id = device.hardwareProperties?.udid ?? device.identifier ?? '';
-          const name = device.name ?? device.deviceProperties?.name ?? id;
-          if (!id) continue;
-          devices.push({
-            platform: 'ios',
-            id,
-            name,
-            kind: 'device',
-            booted: true,
-          });
-        }
+    };
+    for (const device of payload.result?.devices ?? []) {
+      const platform = device.hardwareProperties?.platform ?? '';
+      if (platform.toLowerCase().includes('ios')) {
+        const id = device.hardwareProperties?.udid ?? device.identifier ?? '';
+        const name = device.name ?? device.deviceProperties?.name ?? id;
+        if (!id) continue;
+        devices.push({
+          platform: 'ios',
+          id,
+          name,
+          kind: 'device',
+          booted: true,
+        });
       }
-    } catch {
-      // Ignore devicectl failures; simulators are still supported.
+    }
+  } catch {
+    // Ignore devicectl failures; simulators are still supported.
+  } finally {
+    if (jsonPath) {
+      await fs.rm(jsonPath, { force: true }).catch(() => {});
     }
   }
 

src/platforms/ios/runner-client.ts

@@ -89,6 +89,7 @@ export async function runIosRunnerCommand(
   command: RunnerCommand,
   options: { verbose?: boolean; logPath?: string; traceLogPath?: string } = {},
 ): Promise<Record<string, unknown>> {
+  validateRunnerDevice(device);
   if (isReadOnlyRunnerCommand(command.command)) {
     return withRetry(
       () => executeRunnerCommand(device, command, options),
@@ -232,7 +233,7 @@ async function ensureRunnerSession(
       'NO',
       '-test-timeouts-enabled',
       'NO',
-      '-maximum-concurrent-test-device-destinations',
+      resolveRunnerMaxConcurrentDestinationsFlag(device),
       '1',
       '-xctestrun',
       xctestrunPath,
@@ -319,7 +320,7 @@ async function ensureXctestrun(
         'AgentDeviceRunner',
         '-parallel-testing-enabled',
         'NO',
-        '-maximum-concurrent-test-device-destinations',
+        resolveRunnerMaxConcurrentDestinationsFlag(device),
         '1',
         '-destination',
         resolveRunnerBuildDestination(device),
@@ -391,16 +392,31 @@ function ensureBootedIfNeeded(device: DeviceInfo): Promise<void> {
   return ensureBooted(device.id);
 }
 
+function validateRunnerDevice(device: DeviceInfo): void {
+  if (device.platform !== 'ios') {
+    throw new AppError('UNSUPPORTED_PLATFORM', `Unsupported platform for iOS runner: ${device.platform}`);
+  }
+  if (device.kind !== 'simulator' && device.kind !== 'device') {
+    throw new AppError('UNSUPPORTED_OPERATION', `Unsupported iOS device kind for runner: ${device.kind}`);
+  }
+}
+
+export function resolveRunnerMaxConcurrentDestinationsFlag(device: DeviceInfo): string {
+  return device.kind === 'device'
+    ? '-maximum-concurrent-test-device-destinations'
+    : '-maximum-concurrent-test-simulator-destinations';
+}
+
 export function resolveRunnerSigningBuildSettings(
   env: NodeJS.ProcessEnv = process.env,
   forDevice = false,
 ): string[] {
+  if (!forDevice) {
+    return [];
+  }
   const teamId = env.AGENT_DEVICE_IOS_TEAM_ID?.trim() || '';
   const configuredIdentity = env.AGENT_DEVICE_IOS_SIGNING_IDENTITY?.trim() || '';
   const profile = env.AGENT_DEVICE_IOS_PROVISIONING_PROFILE?.trim() || '';
-  if (!forDevice && !teamId && !configuredIdentity && !profile) {
-    return [];
-  }
   const args = ['CODE_SIGN_STYLE=Automatic'];
   if (teamId) {
     args.push(`DEVELOPMENT_TEAM=${teamId}`);

test/integration/ios.test.ts

@@ -6,10 +6,11 @@ import { createIntegrationTestContext, runCliJson } from './test-helpers.ts';
 const session = ['--session', 'ios-test'];
 const iosTarget = ['--platform', 'ios'];
 const iosPhysicalUdid = process.env.IOS_UDID?.trim();
+let didRunIosPhysicalSession = false;
 
 test.after(() => {
   runCliJson(['close', ...iosTarget, '--json', ...session]);
-  if (iosPhysicalUdid) {
+  if (iosPhysicalUdid && didRunIosPhysicalSession) {
     runCliJson(['close', '--platform', 'ios', '--udid', iosPhysicalUdid, '--json', '--session', 'ios-device-test']);
   }
 });
@@ -90,6 +91,7 @@ test('ios physical device core lifecycle', { skip: shouldSkipIosPhysicalDevice()
   });
   const deviceSession = ['--session', 'ios-device-test'];
   const target = ['--platform', 'ios', '--udid', iosPhysicalUdid as string];
+  didRunIosPhysicalSession = true;
 
   const openArgs = ['open', 'com.apple.Preferences', ...target, '--json', ...deviceSession];
   integration.runStep('open settings (device)', openArgs);