callstack · thymikee · Apr 11, 2026 · Apr 11, 2026
diff --git a/package.json b/package.json
@@ -12,10 +12,6 @@
       "import": "./dist/src/index.js",
       "types": "./dist/src/index.d.ts"
     },
-    "./artifacts": {
-      "import": "./dist/src/artifacts.js",
-      "types": "./dist/src/artifacts.d.ts"
-    },
     "./metro": {
       "import": "./dist/src/metro.js",
       "types": "./dist/src/metro.d.ts"
@@ -24,21 +20,9 @@
       "import": "./dist/src/remote-config.js",
       "types": "./dist/src/remote-config.d.ts"
     },
-    "./install-source": {
-      "import": "./dist/src/install-source.js",
-      "types": "./dist/src/install-source.d.ts"
-    },
     "./contracts": {
       "import": "./dist/src/contracts.js",
       "types": "./dist/src/contracts.d.ts"
-    },
-    "./selectors": {
-      "import": "./dist/src/selectors.js",
-      "types": "./dist/src/selectors.d.ts"
-    },
-    "./finders": {
-      "import": "./dist/src/finders.js",
-      "types": "./dist/src/finders.d.ts"
     }
   },
   "engines": {

diff --git a/rslib.config.ts b/rslib.config.ts
@@ -16,14 +16,10 @@ export default defineConfig({
       },
       source: {
         entry: {
-          artifacts: 'src/artifacts.ts',
           index: 'src/index.ts',
-          'install-source': 'src/install-source.ts',
           metro: 'src/metro.ts',
           'remote-config': 'src/remote-config.ts',
           contracts: 'src/contracts.ts',
-          selectors: 'src/selectors.ts',
-          finders: 'src/finders.ts',
         },
         tsconfigPath: 'tsconfig.lib.json',
       },

diff --git a/src/__tests__/artifacts-public.test.ts b/src/__tests__/artifacts-public.test.ts
diff --git a/src/__tests__/client-metro-auto-companion.test.ts b/src/__tests__/client-metro-auto-companion.test.ts
@@ -257,3 +257,100 @@ test('prepareMetroRuntime fails fast on non-retryable bridge errors after compan
     fs.rmSync(tempRoot, { recursive: true, force: true });
   }
 });
+
+test('prepareMetroRuntime retries malformed retryable bridge responses after companion startup', async () => {
+  const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-metro-companion-html-'));
+  const projectRoot = path.join(tempRoot, 'project');
+  fs.mkdirSync(path.join(projectRoot, 'node_modules'), { recursive: true });
+  fs.writeFileSync(
+    path.join(projectRoot, 'package.json'),
+    JSON.stringify({
+      name: 'metro-auto-companion-html-test',
+      private: true,
+      dependencies: {
+        'react-native': '0.0.0-test',
+      },
+    }),
+  );
+
+  vi.mocked(ensureMetroCompanion).mockResolvedValue({
+    pid: 123,
+    spawned: true,
+    statePath: path.join(projectRoot, '.agent-device', 'metro-companion.json'),
+    logPath: path.join(projectRoot, '.agent-device', 'metro-companion.log'),
+  });
+
+  const fetchMock = vi.fn();
+  fetchMock.mockResolvedValueOnce({
+    ok: true,
+    status: 200,
+    text: async () => 'packager-status:running',
+  });
+  fetchMock.mockResolvedValueOnce({
+    ok: false,
+    status: 409,
+    text: async () => JSON.stringify({ ok: false, error: 'Metro companion is not connected' }),
+  });
+  fetchMock.mockResolvedValueOnce({
+    ok: false,
+    status: 503,
+    text: async () => '<html>upstream unavailable</html>',
+  });
+  fetchMock.mockResolvedValueOnce({
+    ok: true,
+    status: 200,
+    text: async () =>
+      JSON.stringify({
+        ok: true,
+        data: {
+          enabled: true,
+          base_url: 'https://proxy.example.test',
+          status_url: 'https://proxy.example.test/status',
+          bundle_url: 'https://proxy.example.test/index.bundle?platform=ios',
+          ios_runtime: {
+            metro_bundle_url: 'https://proxy.example.test/index.bundle?platform=ios',
+          },
+          android_runtime: {
+            metro_bundle_url: 'https://proxy.example.test/index.bundle?platform=android',
+          },
+          upstream: {
+            bundle_url:
+              'https://public.example.test/index.bundle?platform=ios&dev=true&minify=false',
+          },
+          probe: {
+            reachable: true,
+            status_code: 200,
+            latency_ms: 5,
+            detail: 'ok',
+          },
+        },
+      }),
+  });
+  vi.stubGlobal('fetch', fetchMock);
+  vi.useFakeTimers();
+
+  try {
+    const preparePromise = prepareMetroRuntime({
+      projectRoot,
+      publicBaseUrl: 'https://public.example.test',
+      proxyBaseUrl: 'https://proxy.example.test',
+      proxyBearerToken: 'shared-token',
+      metroPort: 8081,
+      reuseExisting: true,
+      installDependenciesIfNeeded: false,
+      probeTimeoutMs: 10,
+    });
+
+    await vi.advanceTimersByTimeAsync(1_000);
+    const result = await preparePromise;
+
+    assert.equal(result.bridge?.enabled, true);
+    assert.equal(
+      result.iosRuntime.bundleUrl,
+      'https://proxy.example.test/index.bundle?platform=ios',
+    );
+    assert.equal(fetchMock.mock.calls.length, 4);
+  } finally {
+    fs.rmSync(tempRoot, { recursive: true, force: true });
+  }
+});
diff --git a/src/__tests__/client-metro-startup-cleanup.test.ts b/src/__tests__/client-metro-startup-cleanup.test.ts
@@ -0,0 +1,75 @@
+import { afterEach, test, vi } from 'vitest';
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+vi.mock('../utils/exec.ts', () => ({
+  runCmdDetached: vi.fn(),
+  runCmdSync: vi.fn(),
+}));
+
+vi.mock('../utils/process-identity.ts', () => ({
+  waitForProcessExit: vi.fn(),
+}));
+
+import { runCmdDetached } from '../utils/exec.ts';
+import { waitForProcessExit } from '../utils/process-identity.ts';
+import { prepareMetroRuntime } from '../client-metro.ts';
+
+afterEach(() => {
+  vi.useRealTimers();
+  vi.clearAllMocks();
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+});
+
+test('prepareMetroRuntime stops a spawned Metro process when startup readiness times out', async () => {
+  const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-metro-startup-cleanup-'));
+  const projectRoot = path.join(tempRoot, 'project');
+  fs.mkdirSync(path.join(projectRoot, 'node_modules'), { recursive: true });
+  fs.writeFileSync(
+    path.join(projectRoot, 'package.json'),
+    JSON.stringify({
+      name: 'metro-cleanup-test',
+      private: true,
+      dependencies: {
+        'react-native': '0.0.0-test',
+      },
+    }),
+  );
+
+  vi.mocked(runCmdDetached).mockReturnValue(987);
+  vi.mocked(waitForProcessExit).mockResolvedValue(true);
+  const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => true);
+  const fetchMock = vi.fn().mockResolvedValue({
+    ok: true,
+    status: 200,
+    text: async () => 'packager-status:not-running',
+  });
+  vi.stubGlobal('fetch', fetchMock);
+  vi.useFakeTimers();
+
+  try {
+    const preparePromise = prepareMetroRuntime({
+      projectRoot,
+      publicBaseUrl: 'https://public.example.test',
+      metroPort: 8081,
+      reuseExisting: true,
+      installDependenciesIfNeeded: false,
+      probeTimeoutMs: 10,
+      startupTimeoutMs: 30_000,
+    });
+
+    const expectedFailure = assert.rejects(
+      preparePromise,
+      /Metro did not become ready at http:\/\/127\.0\.0\.1:8081\/status within 30000ms/,
+    );
+    await vi.advanceTimersByTimeAsync(30_000);
+    await expectedFailure;
+    assert.equal(vi.mocked(runCmdDetached).mock.calls.length, 1);
+    assert.deepEqual(killSpy.mock.calls[0], [987, 'SIGTERM']);
+  } finally {
+    fs.rmSync(tempRoot, { recursive: true, force: true });
+  }
+});
diff --git a/src/__tests__/client-public.test.ts b/src/__tests__/client-public.test.ts
@@ -5,6 +5,7 @@ import {
   type AgentDeviceClient,
   type CaptureScreenshotResult,
   type CaptureSnapshotResult,
+  type AgentDeviceDaemonTransport,
   centerOfRect,
   type Point,
   type Rect,
@@ -13,6 +14,7 @@ import {
   type SnapshotVisibility,
   type SnapshotVisibilityReason,
 } from '../index.ts';
+import type { DaemonRequest, DaemonResponse } from '../contracts.ts';
 
 const rect = { x: 1, y: 2, width: 3, height: 4 } satisfies Rect;
 const point = { x: 2, y: 4 } satisfies Point;
@@ -58,3 +60,17 @@ test('package root exports createAgentDeviceClient', () => {
   assert.equal(typeof client.capture.snapshot, 'function');
   assert.deepEqual(centerOfRect(rect), { x: 3, y: 4 });
 });
+
+test('public daemon transport is typed against public daemon contracts', async () => {
+  const transport: AgentDeviceDaemonTransport = async (
+    request: Omit<DaemonRequest, 'token'>,
+  ): Promise<DaemonResponse> => ({
+    ok: true,
+    data: {
+      command: request.command,
+    },
+  });
+  const response = await transport({ command: 'devices', positionals: [] });
+
+  assert.equal(response.ok, true);
+});
diff --git a/src/__tests__/client.test.ts b/src/__tests__/client.test.ts
@@ -4,7 +4,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { createAgentDeviceClient, type AgentDeviceClientConfig } from '../client.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon/types.ts';
+import type { DaemonRequest, DaemonResponse } from '../contracts.ts';
 import { AppError } from '../utils/errors.ts';
 
 function createTransport(

diff --git a/src/__tests__/finders-public.test.ts b/src/__tests__/finders-public.test.ts
diff --git a/src/__tests__/selectors-public.test.ts b/src/__tests__/selectors-public.test.ts
diff --git a/src/artifacts.ts b/src/artifacts.ts