@react-native-harness/jest 1.3.0 → 1.4.0-rc.1

package/src/__tests__/index.test.ts

@@ -1,7 +1,8 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
-import type { Config, Test, TestRunnerOptions, TestWatcher } from 'jest-runner';
+import type { Config, Test, TestEvents, TestRunnerOptions, TestWatcher } from 'jest-runner';
 import type { TestSuiteResult } from '@react-native-harness/bridge';
 import type { HarnessSession } from '../harness-session.js';
+import type { executeRun as ExecuteRun } from '../execute-run.js';
 import { HarnessError } from '@react-native-harness/tools';
 import JestHarness from '../index.js';
 
@@ -14,6 +15,7 @@ const resolveUndefined = async () => undefined;
 const mockSession: HarnessSession = {
   config: { metroPort: 8081 } as HarnessSession['config'],
   context: {} as HarnessSession['context'],
+  onTestRunnerEvent: vi.fn(() => () => undefined),
   ensureAppReady: vi.fn(resolveUndefined),
   runTestFile: vi.fn(async (): Promise<TestSuiteResult> => ({
     name: '',
@@ -55,6 +57,41 @@ const makeTest = (): Test => ({
 const makeGlobalConfig = (overrides: Partial<Config.GlobalConfig> = {}): Config.GlobalConfig =>
   ({ rootDir: '/project', watch: false, watchAll: false, collectCoverage: false, ...overrides } as Config.GlobalConfig);
 
+type ExecuteRunMock = typeof ExecuteRun;
+type TypedExecuteRunMock = typeof mockExecuteRun & {
+  mockImplementationOnce: (implementation: ExecuteRunMock) => typeof mockExecuteRun;
+  mockResolvedValue: (value: Awaited<ReturnType<ExecuteRunMock>>) => typeof mockExecuteRun;
+};
+type ExecuteRunParams = Parameters<ExecuteRunMock>;
+
+const typedMockExecuteRun = mockExecuteRun as TypedExecuteRunMock;
+
+const makeTestCaseStartPayload = (): TestEvents['test-case-start'] => [
+  '/test/example.ts',
+  {
+    ancestorTitles: [],
+    fullName: 'suite case',
+    mode: undefined,
+    title: 'case',
+    startedAt: 1,
+  },
+];
+
+const makeTestCaseResultPayload = (): TestEvents['test-case-result'] => [
+  '/test/example.ts',
+  {
+    ancestorTitles: [],
+    duration: 1,
+    failureDetails: [],
+    failureMessages: [],
+    fullName: 'suite case',
+    numPassingAsserts: 1,
+    startedAt: 1,
+    status: 'passed',
+    title: 'case',
+  },
+];
+
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------
@@ -62,7 +99,7 @@ const makeGlobalConfig = (overrides: Partial<Config.GlobalConfig> = {}): Config.
 beforeEach(() => {
   vi.clearAllMocks();
   (mockSession.dispose as ReturnType<typeof vi.fn>).mockResolvedValue(undefined);
-  mockExecuteRun.mockResolvedValue(undefined);
+  typedMockExecuteRun.mockResolvedValue(undefined);
   mockCreateHarnessSession.mockResolvedValue(mockSession);
 });
 
@@ -71,7 +108,7 @@ describe('JestHarness', () => {
     it('creates a session on the first run', async () => {
       const runner = new JestHarness(makeGlobalConfig());
 
-      await runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), makeOptions());
+      await runner.runTests([makeTest()], makeWatcher(), makeOptions());
 
       expect(mockCreateHarnessSession).toHaveBeenCalledOnce();
     });
@@ -79,8 +116,8 @@ describe('JestHarness', () => {
     it('reuses the session across runs in watch mode', async () => {
       const runner = new JestHarness(makeGlobalConfig({ watch: true }));
 
-      await runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), makeOptions());
-      await runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), makeOptions());
+      await runner.runTests([makeTest()], makeWatcher(), makeOptions());
+      await runner.runTests([makeTest()], makeWatcher(), makeOptions());
 
       expect(mockCreateHarnessSession).toHaveBeenCalledOnce();
       expect(mockSession.dispose).not.toHaveBeenCalled();
@@ -89,7 +126,7 @@ describe('JestHarness', () => {
     it('disposes the session after each run in normal mode', async () => {
       const runner = new JestHarness(makeGlobalConfig());
 
-      await runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), makeOptions());
+      await runner.runTests([makeTest()], makeWatcher(), makeOptions());
 
       expect(mockSession.dispose).toHaveBeenCalledOnce();
     });
@@ -97,11 +134,52 @@ describe('JestHarness', () => {
     it('creates a fresh session for each run in normal mode', async () => {
       const runner = new JestHarness(makeGlobalConfig());
 
-      await runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), makeOptions());
-      await runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), makeOptions());
+      await runner.runTests([makeTest()], makeWatcher(), makeOptions());
+      await runner.runTests([makeTest()], makeWatcher(), makeOptions());
 
       expect(mockCreateHarnessSession).toHaveBeenCalledTimes(2);
     });
+
+    it('emits registered Jest events', async () => {
+      const runner = new JestHarness(makeGlobalConfig());
+      const listener = vi.fn();
+      const eventPayload = makeTestCaseStartPayload();
+
+      runner.on('test-case-start', listener);
+      typedMockExecuteRun.mockImplementationOnce(async (
+        _session: ExecuteRunParams[0],
+        _tests: ExecuteRunParams[1],
+        _watcher: ExecuteRunParams[2],
+        emitEvent: ExecuteRunParams[3],
+      ) => {
+        await emitEvent('test-case-start', ...eventPayload);
+      });
+
+      await runner.runTests([makeTest()], makeWatcher(), makeOptions());
+
+      expect(listener).toHaveBeenCalledWith(eventPayload);
+    });
+
+    it('stops emitting after listener unsubscribe', async () => {
+      const runner = new JestHarness(makeGlobalConfig());
+      const listener = vi.fn();
+      const unsubscribe = runner.on('test-case-result', listener);
+      const eventPayload = makeTestCaseResultPayload();
+
+      unsubscribe();
+      typedMockExecuteRun.mockImplementationOnce(async (
+        _session: ExecuteRunParams[0],
+        _tests: ExecuteRunParams[1],
+        _watcher: ExecuteRunParams[2],
+        emitEvent: ExecuteRunParams[3],
+      ) => {
+        await emitEvent('test-case-result', ...eventPayload);
+      });
+
+      await runner.runTests([makeTest()], makeWatcher(), makeOptions());
+
+      expect(listener).not.toHaveBeenCalled();
+    });
   });
 
   describe('error handling', () => {
@@ -115,7 +193,7 @@ describe('JestHarness', () => {
       const runner = new JestHarness(makeGlobalConfig());
 
       await expect(
-        runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), makeOptions()),
+        runner.runTests([makeTest()], makeWatcher(), makeOptions()),
       ).rejects.toBeTypeOf('string');
     });
 
@@ -126,7 +204,7 @@ describe('JestHarness', () => {
       const runner = new JestHarness(makeGlobalConfig());
 
       await expect(
-        runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), makeOptions()),
+        runner.runTests([makeTest()], makeWatcher(), makeOptions()),
       ).rejects.toBe(cause);
     });
 
@@ -134,7 +212,7 @@ describe('JestHarness', () => {
       const runner = new JestHarness(makeGlobalConfig());
 
       await expect(
-        runner.runTests([makeTest()], makeWatcher(), vi.fn(), vi.fn(), vi.fn(), { serial: false }),
+        runner.runTests([makeTest()], makeWatcher(), { serial: false }),
       ).rejects.toThrow('Parallel test running is not supported');
     });
   });

package/src/__tests__/test-file-platform-filter.test.ts

@@ -0,0 +1,83 @@
+import { describe, expect, it } from 'vitest';
+import {
+  createPlatformSkippedTestResult,
+  getHarnessTestFilePlatform,
+  shouldRunHarnessTestFile,
+} from '../test-file-platform-filter.js';
+
+const knownPlatformIds = new Set(['android', 'ios', 'web', 'vega']);
+
+describe('getHarnessTestFilePlatform', () => {
+  it('returns null for shared harness test files', () => {
+    expect(getHarnessTestFilePlatform('/tests/smoke.harness.ts', knownPlatformIds)).toBeNull();
+    expect(getHarnessTestFilePlatform('/tests/smoke.harness.tsx', knownPlatformIds)).toBeNull();
+    expect(getHarnessTestFilePlatform('/tests/smoke.harness.mjs', knownPlatformIds)).toBeNull();
+  });
+
+  it('returns the platform id for platform-specific harness test files', () => {
+    expect(
+      getHarnessTestFilePlatform('/tests/kotlin.android.harness.ts', knownPlatformIds),
+    ).toBe('android');
+    expect(
+      getHarnessTestFilePlatform('/tests/swift.ios.harness.ts', knownPlatformIds),
+    ).toBe('ios');
+    expect(
+      getHarnessTestFilePlatform('/tests/browser.web.harness.ts', knownPlatformIds),
+    ).toBe('web');
+  });
+
+  it('returns null when the segment before .harness is not a known platform id', () => {
+    expect(
+      getHarnessTestFilePlatform('/tests/smoke.harness.ts', knownPlatformIds),
+    ).toBeNull();
+    expect(
+      getHarnessTestFilePlatform('/tests/custom.foo.harness.ts', knownPlatformIds),
+    ).toBeNull();
+  });
+});
+
+describe('shouldRunHarnessTestFile', () => {
+  it('runs shared harness test files on every platform', () => {
+    expect(
+      shouldRunHarnessTestFile('/tests/smoke.harness.ts', 'android', knownPlatformIds),
+    ).toBe(true);
+    expect(
+      shouldRunHarnessTestFile('/tests/smoke.harness.ts', 'ios', knownPlatformIds),
+    ).toBe(true);
+  });
+
+  it('runs platform-specific files only on the matching platform', () => {
+    expect(
+      shouldRunHarnessTestFile('/tests/kotlin.android.harness.ts', 'android', knownPlatformIds),
+    ).toBe(true);
+    expect(
+      shouldRunHarnessTestFile('/tests/kotlin.android.harness.ts', 'ios', knownPlatformIds),
+    ).toBe(false);
+    expect(
+      shouldRunHarnessTestFile('/tests/swift.ios.harness.ts', 'ios', knownPlatformIds),
+    ).toBe(true);
+    expect(
+      shouldRunHarnessTestFile('/tests/swift.ios.harness.ts', 'android', knownPlatformIds),
+    ).toBe(false);
+  });
+});
+
+describe('createPlatformSkippedTestResult', () => {
+  it('marks the entire test file as skipped', () => {
+    const result = createPlatformSkippedTestResult('/tests/swift.ios.harness.ts');
+
+    expect(result.skipped).toBe(true);
+    expect(result.numPassingTests).toBe(0);
+    expect(result.numFailingTests).toBe(0);
+    expect(result.numPendingTests).toBe(1);
+    expect(result.testResults).toHaveLength(1);
+    expect(result.testResults[0]).toEqual(
+      expect.objectContaining({
+        status: 'skipped',
+        title: 'swift.ios.harness.ts',
+        fullName: 'swift.ios.harness.ts',
+      }),
+    );
+    expect(result.testFilePath).toBe('/tests/swift.ios.harness.ts');
+  });
+});

package/src/crash-monitor.ts

@@ -1,18 +1,24 @@
 import {
-  type AppMonitor,
   type AppCrashDetails,
-  type AppMonitorEvent,
-  type AppMonitorListener,
-  type HarnessPlatformRunner,
+  type AppSession,
+  type AppSessionEvent,
+  type AppSessionListener,
+  type AppSessionLog,
+  type AppSessionState,
 } from '@react-native-harness/platforms';
 import {
   NativeCrashError,
+  RuntimeDisconnectError,
+  type HarnessRuntimeFailure,
   type NativeCrashDetails,
   type NativeCrashPhase,
+  type RuntimeDisconnectDetails,
 } from './errors.js';
 import { logger } from '@react-native-harness/tools';
 
 const crashLogger = logger.child('crash');
+const CRASH_CLASSIFICATION_SETTLE_MS = 1500;
+const CRASH_LOG_WINDOW_MS = 3000;
 
 export class CrashWatchCancelledError extends Error {
   constructor() {
@@ -32,172 +38,220 @@ export type CrashMonitor = {
   stop: () => Promise<void>;
   start: () => Promise<void>;
   reset: () => void;
+  setAppSession: (session: AppSession | null) => void;
+  handleBridgeDisconnect: () => void;
   dispose: () => Promise<void>;
 };
 
 export type CrashMonitorOptions = {
-  appMonitor: AppMonitor;
-  platformRunner: HarnessPlatformRunner;
+  appSession?: AppSession | null;
 };
 
-type CrashDetailsProvider = {
-  getCrashDetails?: (options: {
-    processName?: string;
-    pid?: number;
-    occurredAt: number;
-  }) => Promise<AppCrashDetails | null>;
+type PendingCrash = {
+  testFilePath: string;
+  phase: NativeCrashPhase;
+  occurredAt: number;
 };
 
-const mergeCrashDetails = (
+const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+const isCrashIndicator = (line: string) =>
+  /uncaught exception|terminating app due to|fatal error|EXC_[A-Z_]+|termination reason|crash|abort/i.test(
+    line
+  ) || /\bSIG[A-Z]{2,}\b/.test(line);
+
+const getMatchingCrashLines = (
+  logs: AppSessionLog[],
+  occurredAt: number
+): string[] =>
+  logs
+    .filter(
+      (log) => Math.abs(log.occurredAt - occurredAt) <= CRASH_LOG_WINDOW_MS
+    )
+    .map((log) => log.line)
+    .filter(isCrashIndicator);
+
+const buildNativeCrashDetails = (
   phase: NativeCrashPhase,
-  initial?: AppCrashDetails,
-  enriched?: AppCrashDetails | null,
-  fallbackSummary?: string,
+  rawLines: string[],
+  summary: string
 ): NativeCrashDetails => ({
   phase,
-  source: enriched?.source ?? initial?.source,
-  summary: enriched?.summary ?? initial?.summary ?? fallbackSummary,
-  signal: enriched?.signal ?? initial?.signal,
-  exceptionType: enriched?.exceptionType ?? initial?.exceptionType,
-  processName: enriched?.processName ?? initial?.processName,
-  pid: enriched?.pid ?? initial?.pid,
-  stackTrace: enriched?.stackTrace ?? initial?.stackTrace,
-  rawLines: enriched?.rawLines ?? initial?.rawLines,
-  artifactType: enriched?.artifactType ?? initial?.artifactType,
-  artifactPath: enriched?.artifactPath ?? initial?.artifactPath,
+  source: rawLines.length > 0 ? 'logs' : 'bridge',
+  summary: rawLines.length > 0 ? rawLines.join('\n') : summary,
+  rawLines: rawLines.length > 0 ? rawLines : undefined,
+});
+
+const getStatePid = (state: AppSessionState | undefined) => {
+  if (state && 'pid' in state) {
+    return state.pid;
+  }
+
+  return undefined;
+};
+
+const mergeCrashDetails = (
+  fallback: NativeCrashDetails,
+  extracted: AppCrashDetails | null
+): NativeCrashDetails => {
+  if (!extracted) {
+    return fallback;
+  }
+
+  return {
+    ...fallback,
+    ...extracted,
+    phase: fallback.phase,
+    source: extracted.source ?? fallback.source,
+    summary: extracted.summary ?? fallback.summary,
+    rawLines: extracted.rawLines ?? fallback.rawLines,
+  };
+};
+
+const buildRuntimeDisconnectDetails = (
+  phase: NativeCrashPhase,
+  rawLines: string[]
+): RuntimeDisconnectDetails => ({
+  phase,
+  source: 'bridge',
+  summary:
+    'The runtime bridge disconnected, but the app session still appears to be running.',
+  rawLines: rawLines.length > 0 ? rawLines : undefined,
 });
 
 export const createCrashMonitor = ({
-  appMonitor,
-  platformRunner,
-}: CrashMonitorOptions): CrashMonitor => {
+  appSession: initialAppSession = null,
+}: CrashMonitorOptions = {}): CrashMonitor => {
   let alive = false;
   let monitoring = true;
   let isResolvingCrash = false;
   let disposed = false;
+  let appSession: AppSession | null = null;
+  let pendingTimer: NodeJS.Timeout | null = null;
 
-  // Both updated when watch() is called so crashes are attributed to the
-  // correct test file and lifecycle phase.
   let currentTestFilePath = '';
   let currentPhase: NativeCrashPhase = 'startup';
-  const watchers = new Set<(err: NativeCrashError) => void>();
-
-  const getCrashDetailsProvider = (): CrashDetailsProvider | null => {
-    if ('getCrashDetails' in appMonitor) {
-      return appMonitor as AppMonitor & CrashDetailsProvider;
-    }
-    if (platformRunner.getCrashDetails) {
-      return platformRunner;
-    }
-    return null;
-  };
+  const watchers = new Set<(err: HarnessRuntimeFailure) => void>();
 
-  const notifyCrash = (err: NativeCrashError) => {
+  const notifyFailure = (err: HarnessRuntimeFailure) => {
     const pending = [...watchers];
     watchers.clear();
     for (const fn of pending) fn(err);
   };
 
-  const handleCrash = async (
-    phase: NativeCrashPhase,
-    details?: AppCrashDetails,
-    fallbackSummary?: string,
-  ) => {
-    if (isResolvingCrash) return;
-    isResolvingCrash = true;
-    alive = false;
-
-    crashLogger.debug('native crash detected (phase=%s)', phase);
-    for (const line of details?.rawLines ?? []) {
-      crashLogger.debug('%s', line);
-    }
-
-    try {
-      const enriched = await getCrashDetailsProvider()?.getCrashDetails?.({
-        processName: details?.processName,
-        pid: details?.pid,
-        occurredAt: Date.now(),
-      });
-      const merged = mergeCrashDetails(phase, details, enriched, fallbackSummary);
-      crashLogger.debug('crash details: %o', {
-        phase: merged.phase,
-        source: merged.source,
-        summary: merged.summary,
-        signal: merged.signal,
-        exceptionType: merged.exceptionType,
-        processName: merged.processName,
-        pid: merged.pid,
-      });
-      notifyCrash(new NativeCrashError(currentTestFilePath, merged));
-    } finally {
-      isResolvingCrash = false;
+  const clearPendingTimer = () => {
+    if (pendingTimer) {
+      clearTimeout(pendingTimer);
+      pendingTimer = null;
     }
   };
 
-  const confirmAndHandleCrash = async (
-    phase: NativeCrashPhase,
-    details?: AppCrashDetails,
-    fallbackSummary?: string,
+  const classify = async (
+    pending: PendingCrash,
+    trigger: 'bridge-disconnect' | 'app-exit'
   ) => {
-    if (disposed || !monitoring) return;
+    if (disposed || !monitoring || isResolvingCrash) {
+      return;
+    }
+
+    isResolvingCrash = true;
+
     try {
-      const isRunning = await platformRunner.isAppRunning();
-      if (!isRunning) {
-        void handleCrash(phase, details, fallbackSummary);
+      const session = appSession;
+      const state = await session?.getState();
+      const logs = session?.getLogs() ?? [];
+      const rawLines = getMatchingCrashLines(logs, pending.occurredAt);
+
+      if (state?.status === 'running' && trigger === 'bridge-disconnect') {
+        crashLogger.debug(
+          'runtime bridge disconnected without confirmed app death'
+        );
+        notifyFailure(
+          new RuntimeDisconnectError(
+            pending.testFilePath,
+            buildRuntimeDisconnectDetails(pending.phase, rawLines)
+          )
+        );
+        return;
       }
-    } catch (error) {
-      crashLogger.debug('crash confirmation failed', error);
+
+      alive = false;
+      crashLogger.debug('native crash detected (phase=%s)', pending.phase);
+      for (const line of rawLines) {
+        crashLogger.debug('%s', line);
+      }
+
+      const fallbackSummary =
+        trigger === 'bridge-disconnect'
+          ? 'The app process exited after the runtime bridge disconnected, but no crash log lines were found.'
+          : 'The app process exited, but no crash log lines were found.';
+      const details = buildNativeCrashDetails(
+        pending.phase,
+        rawLines,
+        fallbackSummary
+      );
+      const extractedDetails = session?.getCrashDetails
+        ? await session
+            .getCrashDetails({
+              occurredAt: pending.occurredAt,
+              pid: getStatePid(state),
+              processName: details.processName,
+              testFilePath: pending.testFilePath,
+            })
+            .catch((error) => {
+              crashLogger.warn(
+                'failed to extract native crash details: %s',
+                error
+              );
+              return null;
+            })
+        : null;
+      notifyFailure(
+        new NativeCrashError(
+          pending.testFilePath,
+          mergeCrashDetails(details, extractedDetails)
+        )
+      );
+    } finally {
+      isResolvingCrash = false;
+      pendingTimer = null;
     }
   };
 
-  const extractCrashDetails = (
-    event: Extract<AppMonitorEvent, { type: 'app_exited' | 'possible_crash' }>,
-  ): AppCrashDetails | undefined =>
-    event.crashDetails
-      ? {
-          source: event.crashDetails.source ?? event.source,
-          summary: event.crashDetails.summary,
-          signal: event.crashDetails.signal,
-          exceptionType: event.crashDetails.exceptionType,
-          processName: event.crashDetails.processName,
-          pid: event.crashDetails.pid ?? event.pid,
-          stackTrace: event.crashDetails.stackTrace,
-          rawLines:
-            event.crashDetails.rawLines ??
-            (event.line ? [event.line] : undefined),
-        }
-      : undefined;
-
-  const appMonitorListener: AppMonitorListener = (event: AppMonitorEvent) => {
-    if (disposed || !monitoring) return;
-
-    if (event.type === 'app_started') {
-      alive = true;
+  const startCrashResolution = (trigger: 'bridge-disconnect' | 'app-exit') => {
+    if (disposed || !monitoring || isResolvingCrash) {
       return;
     }
 
+    clearPendingTimer();
+    const pending: PendingCrash = {
+      testFilePath: currentTestFilePath,
+      phase: currentPhase,
+      occurredAt: Date.now(),
+    };
+
+    pendingTimer = setTimeout(
+      () => {
+        void classify(pending, trigger);
+      },
+      trigger === 'bridge-disconnect' ? CRASH_CLASSIFICATION_SETTLE_MS : 0
+    );
+  };
+
+  const appSessionListener: AppSessionListener = (event: AppSessionEvent) => {
     if (event.type === 'app_exited') {
-      const details = extractCrashDetails(event);
-      if (event.isConfirmed ?? event.source === 'polling') {
-        void handleCrash(currentPhase, details);
-      } else {
-        void confirmAndHandleCrash(currentPhase, details);
-      }
-      return;
+      startCrashResolution('app-exit');
     }
+  };
 
-    if (event.type === 'possible_crash') {
-      const details = extractCrashDetails(event);
-      const fallback = `possible crash signal (${event.source ?? 'unknown'})`;
-      if (event.isConfirmed) {
-        void handleCrash(currentPhase, details, fallback);
-      } else {
-        void confirmAndHandleCrash(currentPhase, details, fallback);
-      }
-    }
+  const setAppSession = (session: AppSession | null) => {
+    appSession?.removeListener(appSessionListener);
+    appSession = session;
+    alive = Boolean(session);
+    session?.addListener(appSessionListener);
   };
 
-  appMonitor.addListener(appMonitorListener);
+  setAppSession(initialAppSession);
 
   const watch = (testFilePath: string, phase: NativeCrashPhase): CrashWatch => {
     currentTestFilePath = testFilePath;
@@ -224,25 +278,32 @@ export const createCrashMonitor = ({
     isAlive: () => alive,
     stop: async () => {
       monitoring = false;
-      await appMonitor.stop();
+      clearPendingTimer();
+      await sleep(0);
     },
     start: async () => {
       monitoring = true;
-      await appMonitor.start();
     },
     reset: () => {
-      alive = false;
+      alive = Boolean(appSession);
       watchers.clear();
       isResolvingCrash = false;
       currentTestFilePath = '';
+      clearPendingTimer();
+    },
+    setAppSession,
+    handleBridgeDisconnect: () => {
+      startCrashResolution('bridge-disconnect');
     },
     dispose: async () => {
       disposed = true;
       monitoring = false;
       watchers.clear();
       isResolvingCrash = false;
-      appMonitor.removeListener(appMonitorListener);
-      await appMonitor.dispose();
+      clearPendingTimer();
+      appSession?.removeListener(appSessionListener);
+      appSession = null;
+      alive = false;
     },
   };
 };