ios appstate: prefer xctest before ax fallback

Author: thymikee

README.md

@@ -192,7 +192,7 @@ Settings helpers:
 Note: iOS supports these only on simulators. iOS wifi/airplane toggles status bar indicators, not actual network state. Airplane off clears status bar overrides.
 
 App state:
-- `appstate` shows the foreground app/activity (Android). On iOS it uses the current session app when available, otherwise it falls back to a snapshot-based guess (`xctest` on devices; AX-first on simulators with XCTest fallback).
+- `appstate` shows the foreground app/activity (Android). On iOS it uses the current session app when available, otherwise it uses a snapshot-based guess (XCTest first; AX fallback on simulators).
 - `apps --metadata` returns app list with minimal metadata.
 
 ## Debug

src/daemon/__tests__/app-state.test.ts

@@ -0,0 +1,101 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import type { DeviceInfo } from '../../utils/device.ts';
+import { resolveIosAppStateFromSnapshots } from '../app-state.ts';
+import type { CommandFlags, dispatchCommand } from '../../core/dispatch.ts';
+
+const iosSimulator: DeviceInfo = {
+  platform: 'ios',
+  id: 'sim-1',
+  name: 'iPhone Simulator',
+  kind: 'simulator',
+  booted: true,
+};
+
+const iosDevice: DeviceInfo = {
+  platform: 'ios',
+  id: '00008110-000E12341234002E',
+  name: 'iPhone',
+  kind: 'device',
+  booted: true,
+};
+
+test('appstate uses xctest first on iOS simulator', async () => {
+  const backends: string[] = [];
+  const fakeDispatch: typeof dispatchCommand = async (_device, _command, _positionals, _outPath, context) => {
+    backends.push(context?.snapshotBackend ?? 'unknown');
+    return {
+      nodes: [
+        {
+          type: 'XCUIElementTypeApplication',
+          label: 'Settings',
+          identifier: 'com.apple.Preferences',
+        },
+      ],
+    };
+  };
+
+  const result = await resolveIosAppStateFromSnapshots(
+    iosSimulator,
+    '/tmp/daemon.log',
+    undefined,
+    {} as CommandFlags,
+    fakeDispatch,
+  );
+
+  assert.deepEqual(backends, ['xctest']);
+  assert.equal(result.source, 'snapshot-xctest');
+  assert.equal(result.appBundleId, 'com.apple.Preferences');
+});
+
+test('appstate falls back to ax on simulator when xctest is empty', async () => {
+  const backends: string[] = [];
+  const fakeDispatch: typeof dispatchCommand = async (_device, _command, _positionals, _outPath, context) => {
+    const backend = context?.snapshotBackend ?? 'unknown';
+    backends.push(backend);
+    if (backend === 'xctest') {
+      return { nodes: [] };
+    }
+    return {
+      nodes: [
+        {
+          type: 'AXApplication',
+          label: 'Calculator',
+          identifier: 'com.apple.calculator',
+        },
+      ],
+    };
+  };
+
+  const result = await resolveIosAppStateFromSnapshots(
+    iosSimulator,
+    '/tmp/daemon.log',
+    undefined,
+    {} as CommandFlags,
+    fakeDispatch,
+  );
+
+  assert.deepEqual(backends, ['xctest', 'ax']);
+  assert.equal(result.source, 'snapshot-ax');
+  assert.equal(result.appBundleId, 'com.apple.calculator');
+});
+
+test('appstate does not try ax on iOS device', async () => {
+  const backends: string[] = [];
+  const fakeDispatch: typeof dispatchCommand = async (_device, _command, _positionals, _outPath, context) => {
+    backends.push(context?.snapshotBackend ?? 'unknown');
+    return { nodes: [] };
+  };
+
+  const result = await resolveIosAppStateFromSnapshots(
+    iosDevice,
+    '/tmp/daemon.log',
+    undefined,
+    {} as CommandFlags,
+    fakeDispatch,
+  );
+
+  assert.deepEqual(backends, ['xctest']);
+  assert.equal(result.source, 'snapshot-xctest');
+  assert.equal(result.appName, 'unknown');
+});

src/daemon/app-state.ts

@@ -9,30 +9,39 @@ export async function resolveIosAppStateFromSnapshots(
   logPath: string,
   traceLogPath: string | undefined,
   flags: CommandFlags | undefined,
+  dispatch: typeof dispatchCommand = dispatchCommand,
 ): Promise<{ appName: string; appBundleId?: string; source: 'snapshot-ax' | 'snapshot-xctest' }> {
+  const xctestResult = await dispatch(device, 'snapshot', [], flags?.out, {
+    ...contextFromFlags(
+      logPath,
+      {
+        ...flags,
+        snapshotDepth: 1,
+        snapshotCompact: true,
+        snapshotBackend: 'xctest',
+      },
+      undefined,
+      traceLogPath,
+    ),
+  });
+  const xcNode = extractAppNodeFromSnapshot(xctestResult as { nodes?: RawSnapshotNode[] });
+  if (xcNode?.appName || xcNode?.appBundleId) {
+    return {
+      appName: xcNode.appName ?? xcNode.appBundleId ?? 'unknown',
+      appBundleId: xcNode.appBundleId,
+      source: 'snapshot-xctest',
+    };
+  }
+
   if (device.kind === 'device') {
-    const xctestResult = await dispatchCommand(device, 'snapshot', [], flags?.out, {
-      ...contextFromFlags(
-        logPath,
-        {
-          ...flags,
-          snapshotDepth: 1,
-          snapshotCompact: true,
-          snapshotBackend: 'xctest',
-        },
-        undefined,
-        traceLogPath,
-      ),
-    });
-    const xcNode = extractAppNodeFromSnapshot(xctestResult as { nodes?: RawSnapshotNode[] });
     return {
-      appName: xcNode?.appName ?? xcNode?.appBundleId ?? 'unknown',
-      appBundleId: xcNode?.appBundleId,
+      appName: 'unknown',
+      appBundleId: undefined,
       source: 'snapshot-xctest',
     };
   }
 
-  const axResult = await dispatchCommand(device, 'snapshot', [], flags?.out, {
+  const axResult = await dispatch(device, 'snapshot', [], flags?.out, {
     ...contextFromFlags(
       logPath,
       {
@@ -53,23 +62,10 @@ export async function resolveIosAppStateFromSnapshots(
       source: 'snapshot-ax',
     };
   }
-  const xctestResult = await dispatchCommand(device, 'snapshot', [], flags?.out, {
-    ...contextFromFlags(
-      logPath,
-      {
-        ...flags,
-        snapshotDepth: 1,
-        snapshotCompact: true,
-        snapshotBackend: 'xctest',
-      },
-      undefined,
-      traceLogPath,
-    ),
-  });
-  const xcNode = extractAppNodeFromSnapshot(xctestResult as { nodes?: RawSnapshotNode[] });
+
   return {
-    appName: xcNode?.appName ?? xcNode?.appBundleId ?? 'unknown',
-    appBundleId: xcNode?.appBundleId,
+    appName: 'unknown',
+    appBundleId: undefined,
     source: 'snapshot-xctest',
   };
 }