fix: close ios runner host after sessionless commands

Author: thymikee

src/daemon/handlers/__tests__/snapshot-handler.test.ts

@@ -4,6 +4,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { PNG } from '../../../utils/png.ts';
 import { handleSnapshotCommands } from '../snapshot.ts';
+import { withSessionlessRunnerCleanup } from '../snapshot-session.ts';
 import { captureSnapshot } from '../snapshot-capture.ts';
 import { SessionStore } from '../../session-store.ts';
 import type { SessionState } from '../../types.ts';
@@ -29,11 +30,25 @@ vi.mock('../../../platforms/ios/runner-client.ts', async (importOriginal) => {
   };
 });
 
+vi.mock('../../../platforms/ios/apps.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../platforms/ios/apps.ts')>();
+  return {
+    ...actual,
+    closeIosApp: vi.fn(async () => {}),
+  };
+});
+
 import { dispatchCommand } from '../../../core/dispatch.ts';
-import { runIosRunnerCommand } from '../../../platforms/ios/runner-client.ts';
+import {
+  runIosRunnerCommand,
+  stopIosRunnerSession,
+} from '../../../platforms/ios/runner-client.ts';
+import { closeIosApp } from '../../../platforms/ios/apps.ts';
 
 const mockDispatch = vi.mocked(dispatchCommand);
 const mockRunnerCommand = vi.mocked(runIosRunnerCommand);
+const mockStopIosRunnerSession = vi.mocked(stopIosRunnerSession);
+const mockCloseIosApp = vi.mocked(closeIosApp);
 
 function makeSessionStore(): SessionStore {
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-snapshot-handler-'));
@@ -80,6 +95,10 @@ beforeEach(() => {
   mockDispatch.mockResolvedValue({});
   mockRunnerCommand.mockReset();
   mockRunnerCommand.mockResolvedValue({});
+  mockStopIosRunnerSession.mockReset();
+  mockStopIosRunnerSession.mockResolvedValue();
+  mockCloseIosApp.mockReset();
+  mockCloseIosApp.mockResolvedValue();
 });
 
 function writeSolidPng(filePath: string, width = 390, height = 844): void {
@@ -1848,3 +1867,31 @@ test('wait sleep bypasses sessionless runner cleanup wrapper', async () => {
   expect(response).toBeTruthy();
   expect(response?.ok).toBe(true);
 });
+
+test('sessionless iOS runner cleanup stops the runner host app', async () => {
+  const result = await withSessionlessRunnerCleanup(undefined, iosSimulatorDevice, async () => {
+    return 'ok';
+  });
+
+  expect(result).toBe('ok');
+  expect(mockStopIosRunnerSession).toHaveBeenCalledWith(iosSimulatorDevice.id);
+  expect(mockCloseIosApp).toHaveBeenCalledWith(
+    iosSimulatorDevice,
+    'com.callstack.agentdevice.runner',
+  );
+});
+
+test('sessionless iOS runner host close is best effort', async () => {
+  mockCloseIosApp.mockRejectedValueOnce(new Error('terminate failed'));
+
+  const result = await withSessionlessRunnerCleanup(undefined, iosSimulatorDevice, async () => {
+    return 'ok';
+  });
+
+  expect(result).toBe('ok');
+  expect(mockStopIosRunnerSession).toHaveBeenCalledWith(iosSimulatorDevice.id);
+  expect(mockCloseIosApp).toHaveBeenCalledWith(
+    iosSimulatorDevice,
+    'com.callstack.agentdevice.runner',
+  );
+});

src/daemon/handlers/snapshot-session.ts

@@ -1,5 +1,10 @@
 import { resolveTargetDevice } from '../../core/dispatch.ts';
-import { stopIosRunnerSession } from '../../platforms/ios/runner-client.ts';
+import {
+  resolveRunnerAppBundleId,
+  stopIosRunnerSession,
+} from '../../platforms/ios/runner-client.ts';
+import { closeIosApp } from '../../platforms/ios/apps.ts';
+import { emitDiagnostic } from '../../utils/diagnostics.ts';
 import type { DaemonRequest, SessionState } from '../types.ts';
 import { ensureDeviceReady } from '../device-ready.ts';
 import { SessionStore } from '../session-store.ts';
@@ -28,10 +33,26 @@ export async function withSessionlessRunnerCleanup<T>(
     // 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);
     }
   }
 }
 
+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/platforms/ios/runner-client.ts

@@ -675,6 +675,7 @@ export {
   resolveRunnerDestination,
   resolveRunnerBuildDestination,
   resolveRunnerMaxConcurrentDestinationsFlag,
+  resolveRunnerAppBundleId,
   resolveRunnerSigningBuildSettings,
   resolveRunnerBundleBuildSettings,
   assertSafeDerivedCleanup,

src/platforms/ios/runner-xctestrun.ts

@@ -114,7 +114,7 @@ function normalizeBundleId(value: string | undefined): string {
   return value?.trim() ?? '';
 }
 
-function resolveRunnerAppBundleId(env: NodeJS.ProcessEnv = process.env): string {
+export function resolveRunnerAppBundleId(env: NodeJS.ProcessEnv = process.env): string {
   const configured =
     normalizeBundleId(env.AGENT_DEVICE_IOS_BUNDLE_ID) ||
     normalizeBundleId(env.AGENT_DEVICE_IOS_RUNNER_APP_BUNDLE_ID);