refactor: move Apple resource access out of daemon

Author: thymikee

src/daemon/__tests__/request-execution-scope.test.ts

@@ -613,13 +613,13 @@ test('prepareLockedRequestScope preserves existing-session selector validation',
     leaseRegistry: new LeaseRegistry(),
   });
 
-  expect(() =>
+  await expect(
     prepareLockedRequestScope({
       scope,
       sessionStore,
       trackDownloadableArtifact: () => 'artifact-id',
     }),
-  ).toThrow(/already bound to android device "Pixel" \(emulator-5554\).*--platform=ios/i);
+  ).rejects.toThrow(/already bound to android device "Pixel" \(emulator-5554\).*--platform=ios/i);
 });
 
 test('prepareLockedRequestScope blocks commands for invalidated recordings before handlers run', async () => {
@@ -639,12 +639,14 @@ test('prepareLockedRequestScope blocks commands for invalidated recordings befor
     leaseRegistry: new LeaseRegistry(),
   });
 
-  const result = await withDiagnosticsScope({ command: 'snapshot', logPath: LOG_PATH }, async () =>
-    prepareLockedRequestScope({
-      scope,
-      sessionStore,
-      trackDownloadableArtifact: () => 'artifact-id',
-    }),
+  const result = await withDiagnosticsScope(
+    { command: 'snapshot', logPath: LOG_PATH },
+    async () =>
+      await prepareLockedRequestScope({
+        scope,
+        sessionStore,
+        trackDownloadableArtifact: () => 'artifact-id',
+      }),
   );
 
   expect(result.type).toBe('response');
@@ -665,7 +667,7 @@ test('prepareLockedRequestScope passes the session runner log path into handler
     leaseRegistry: new LeaseRegistry(),
   });
 
-  const result = prepareLockedRequestScope({
+  const result = await prepareLockedRequestScope({
     scope,
     sessionStore,
     trackDownloadableArtifact: () => 'artifact-id',
@@ -694,7 +696,7 @@ test('prepareLockedRequestScope streams ordinary diagnostics into the active tra
   });
 
   await withDiagnosticsScope({ command: 'snapshot', logPath: LOG_PATH }, async () => {
-    const result = prepareLockedRequestScope({
+    const result = await prepareLockedRequestScope({
       scope,
       sessionStore,
       trackDownloadableArtifact: () => 'artifact-id',

src/daemon/__tests__/request-recording-health.test.ts

@@ -40,7 +40,7 @@ function makeIosSimulatorSession(showTouches: boolean): SessionState {
   return session;
 }
 
-test('runner-backed iOS recordings still invalidate on runner restarts', () => {
+test('runner-backed iOS recordings still invalidate on runner restarts', async () => {
   const session = makeIosSimulatorSession(true);
   session.device.kind = 'device';
   session.screenRecording = makeTestScreenRecordingResource(session, {
@@ -53,7 +53,7 @@ test('runner-backed iOS recordings still invalidate on runner restarts', () => {
     sessionId: 'runner-after',
   });
 
-  refreshRecordingHealth(session);
+  await refreshRecordingHealth(session);
 
   expect(mockGetRunnerSessionSnapshot).toHaveBeenCalledWith('sim-1');
   expect(session.screenRecording?.handle.inspect().invalidatedReason).toBe(

src/daemon/handlers/session-device-utils.ts

@@ -2,7 +2,7 @@ import { isIosFamily, type DeviceInfo } from '@agent-device/kernel/device';
 import { AppError } from '@agent-device/kernel/errors';
 import { isActiveProviderDevice } from '../../provider-device-runtime.ts';
 import { ensureDeviceReady } from '../device-ready.ts';
-import { getRunnerSessionSnapshot } from '../../platforms/apple/core/runner-client.ts';
+import { inspectAppleRunnerSession } from '../../platform-runtime-apple-resources.ts';
 import { resolveTargetDevice } from '../../core/dispatch-resolve.ts';
 import type { DaemonRequest, DaemonResponse, SessionState } from '../types.ts';
 import { hasDeviceSelectionInput, hasExplicitDeviceSelector } from '../device-selector-intent.ts';
@@ -62,7 +62,7 @@ export async function refreshSessionDeviceIfNeeded(device: DeviceInfo): Promise<
   // A live XCUITest runner session is attached to this exact UDID, which
   // proves the simulator still exists and is booted — the two facts the
   // ~0.7s re-resolve inventory listing exists to establish.
-  if (getRunnerSessionSnapshot(device.id)?.alive) {
+  if ((await inspectAppleRunnerSession(device.id))?.alive) {
     return { ...device, booted: true };
   }
 

src/daemon/handlers/snapshot-session.ts

@@ -1,11 +1,6 @@
 import { isIosFamily } from '@agent-device/kernel/device';
 import { resolveTargetDevice } from '../../core/dispatch-resolve.ts';
-import {
-  resolveRunnerAppBundleId,
-  stopIosRunnerSession,
-} from '../../platforms/apple/core/runner-client.ts';
-import { closeIosApp } from '../../platforms/apple/core/apps.ts';
-import { emitDiagnostic } from '../../utils/diagnostics.ts';
+import { cleanupSessionlessAppleRunnerHost } from '../../platform-runtime-apple-resources.ts';
 import type { DaemonRequest, SessionState } from '../types.ts';
 import { ensureDeviceReady } from '../device-ready.ts';
 import { SessionStore } from '../session-store.ts';
@@ -33,27 +28,11 @@ export async function withSessionlessRunnerCleanup<T>(
     // Sessionless iOS commands intentionally stop the runner to avoid leaked xcodebuild processes.
     // For multi-command flows, keep an active session via `open` so the runner can be reused.
     if (shouldCleanupSessionlessIosRunner) {
-      await stopIosRunnerSession(device.id);
-      await closeSessionlessIosRunnerHostApp(device);
+      await cleanupSessionlessAppleRunnerHost(device);
     }
   }
 }
 
-async function closeSessionlessIosRunnerHostApp(device: SessionState['device']): Promise<void> {
-  const bundleId = resolveRunnerAppBundleId();
-  await closeIosApp(device, bundleId).catch((error) => {
-    emitDiagnostic({
-      level: 'debug',
-      phase: 'ios_sessionless_runner_host_close_failed',
-      data: {
-        deviceId: device.id,
-        bundleId,
-        error: error instanceof Error ? error.message : String(error),
-      },
-    });
-  });
-}
-
 export function recordIfSession(
   sessionStore: SessionStore,
   session: SessionState | undefined,

src/daemon/request-execution-scope.ts

@@ -381,7 +381,7 @@ function applyRequestCommandDefaults(req: DaemonRequest): DaemonRequest {
   };
 }
 
-export function prepareLockedRequestScope(params: {
+export async function prepareLockedRequestScope(params: {
   scope: RequestExecutionScope;
   sessionStore: SessionStore;
   trackDownloadableArtifact: (opts: {
@@ -390,14 +390,14 @@ export function prepareLockedRequestScope(params: {
     artifactType: DaemonArtifactType | undefined;
     fileName?: string;
   }) => string;
-}): LockedRequestScopeResult {
+}): Promise<LockedRequestScopeResult> {
   const { scope, sessionStore, trackDownloadableArtifact } = params;
   const logPath = scope.runnerLogPath;
   scope.throwIfCanceled();
   let existingSession = sessionStore.get(scope.sessionName);
   if (existingSession) {
     // Called under runLocked: refreshRecordingHealth may mutate session recording state.
-    refreshRecordingHealth(existingSession);
+    await refreshRecordingHealth(existingSession);
     sessionStore.set(scope.sessionName, existingSession);
   }
   const binding = prepareLockedRequestBinding({

src/daemon/request-recording-health.ts

@@ -1,15 +1,15 @@
 import { isIosFamily } from '@agent-device/kernel/device';
-import { getRunnerSessionSnapshot } from '../platforms/apple/core/runner-client.ts';
+import { inspectAppleRunnerSession } from '../platform-runtime-apple-resources.ts';
 import type { SessionState } from './types.ts';
 
-export function refreshRecordingHealth(session: SessionState): void {
+export async function refreshRecordingHealth(session: SessionState): Promise<void> {
   if (!recordingRequiresRunnerHealth(session)) {
     return;
   }
   const recording = session.screenRecording!.handle;
   const state = recording.inspect();
 
-  const snapshot = getRunnerSessionSnapshot(session.device.id);
+  const snapshot = await inspectAppleRunnerSession(session.device.id);
   if (!state.runnerSessionId) {
     if (snapshot?.alive) {
       recording.setRunnerSessionId(snapshot.sessionId);

src/daemon/request-router.ts

@@ -197,7 +197,7 @@ export function createRequestHandler(deps: RequestRouterDeps): DaemonInvokeFn {
     inheritedProviderScope?: RequestPlatformProviderScope,
   ): Promise<DaemonResponse> {
     const run = async (): Promise<DaemonResponse> => {
-      const locked = prepareLockedRequestScope({
+      const locked = await prepareLockedRequestScope({
         scope,
         sessionStore,
         trackDownloadableArtifact,

src/daemon/selector-runtime.ts

@@ -3,7 +3,7 @@ import { parseWaitPositionals } from '../core/wait-positionals.ts';
 import type { WaitParsed } from '../core/wait-positionals.ts';
 import { AppError, asAppError } from '@agent-device/kernel/errors';
 import type { SnapshotNode } from '@agent-device/kernel/snapshot';
-import { queryAppleRunnerSelector } from '../platforms/apple/core/runner-selector-query.ts';
+import { queryAppleRuntimeSelector } from '../platform-runtime-apple-resources.ts';
 import type { AppleRunnerRequestOptions } from './apple-runner-options.ts';
 import type { DaemonRequest, DaemonResponse, SessionState } from './types.ts';
 import { errorResponse } from './handlers/response.ts';
@@ -381,7 +381,7 @@ export async function queryDirectIosSelector(
   selector: Pick<DirectIosSelectorTarget, 'key' | 'value'>,
   requestOptions: AppleRunnerRequestOptions,
 ): Promise<DirectIosSelectorQueryResult> {
-  const data = await queryAppleRunnerSelector(
+  const data = await queryAppleRuntimeSelector(
     session.device,
     selector,
     session.appBundleId,

src/platform-runtime-apple-resources.ts

@@ -0,0 +1,39 @@
+import type { AppleRunnerRequestOptions } from '@agent-device/contracts/apple-runner-request';
+import type { ElementSelectorKey } from '@agent-device/contracts/interactor-types';
+import type { DeviceInfo } from '@agent-device/kernel/device';
+import { emitDiagnostic } from './utils/diagnostics.ts';
+
+export async function inspectAppleRunnerSession(deviceId: string) {
+  const { getRunnerSessionSnapshot } = await import('./platforms/apple/core/runner-client.ts');
+  return getRunnerSessionSnapshot(deviceId);
+}
+
+export async function cleanupSessionlessAppleRunnerHost(device: DeviceInfo): Promise<void> {
+  const { resolveRunnerAppBundleId, stopIosRunnerSession } =
+    await import('./platforms/apple/core/runner-client.ts');
+  await stopIosRunnerSession(device.id);
+  const bundleId = resolveRunnerAppBundleId();
+  const { closeIosApp } = await import('./platforms/apple/core/apps.ts');
+  await closeIosApp(device, bundleId).catch((error) => {
+    emitDiagnostic({
+      level: 'debug',
+      phase: 'ios_sessionless_runner_host_close_failed',
+      data: {
+        deviceId: device.id,
+        bundleId,
+        error: error instanceof Error ? error.message : String(error),
+      },
+    });
+  });
+}
+
+export async function queryAppleRuntimeSelector(
+  device: DeviceInfo,
+  selector: Readonly<{ key: ElementSelectorKey; value: string }>,
+  appBundleId: string | undefined,
+  options: AppleRunnerRequestOptions,
+): Promise<Record<string, unknown>> {
+  const { queryAppleRunnerSelector } =
+    await import('./platforms/apple/core/runner-selector-query.ts');
+  return await queryAppleRunnerSelector(device, selector, appBundleId, options);
+}