feat: expand android adb provider boundary

Author: thymikee

.fallowrc.json

@@ -8,7 +8,6 @@
     "src/metro.ts",
     "src/remote-config.ts",
     "src/install-source.ts",
-    "src/android-apps.ts",
     "src/android-adb.ts",
     "src/android-snapshot-helper.ts",
     "src/contracts.ts",

README.md

@@ -94,7 +94,7 @@ Snapshots assign refs like `@e1`, `@e2`, and `@e3` to current-screen elements. R
 
 `agent-device` runs session-aware commands through platform backends: XCTest for iOS and tvOS, ADB plus the Android snapshot helper for Android, a local helper for macOS desktop automation, and AT-SPI for Linux desktop targets. See [Introduction](https://incubator.callstack.com/agent-device/docs/introduction) and [Commands](https://incubator.callstack.com/agent-device/docs/commands) for platform details.
 
-Node consumers can use the typed client and public subpaths for bridge integrations. `agent-device/android-adb` exposes the Android ADB provider contract and reusable helpers for ADB-backed app listing and foreground state. `agent-device/daemon` exposes the supported daemon embedding surface for integrations that intentionally reuse the upstream request router.
+Node consumers can use the typed client and public subpaths for bridge integrations. `agent-device/android-adb` exposes the Android ADB provider contract, logcat/clipboard/keyboard/app helpers, and port reverse management. `agent-device/daemon` exposes the supported daemon embedding surface for integrations that intentionally reuse the upstream request router.
 
 ## Used By
 

package.json

@@ -45,10 +45,6 @@
       "import": "./dist/src/install-source.js",
       "types": "./dist/src/install-source.d.ts"
     },
-    "./android-apps": {
-      "import": "./dist/src/android-apps.js",
-      "types": "./dist/src/android-apps.d.ts"
-    },
     "./android-adb": {
       "import": "./dist/src/android-adb.js",
       "types": "./dist/src/android-adb.d.ts"

rslib.config.ts

@@ -23,7 +23,6 @@ export default defineConfig({
           metro: 'src/metro.ts',
           'remote-config': 'src/remote-config.ts',
           'install-source': 'src/install-source.ts',
-          'android-apps': 'src/android-apps.ts',
           'android-adb': 'src/android-adb.ts',
           'android-snapshot-helper': 'src/android-snapshot-helper.ts',
           'daemon-embedding': 'src/daemon-embedding.ts',

src/__tests__/android-apps-public.test.ts

@@ -1,18 +1,42 @@
 export {
-  createDeviceAdbExecutor,
-  resolveAndroidAdbExecutor,
-  spawnAndroidAdbBySerial,
-  withAndroidAdbProvider,
+  createAndroidPortReverseManager,
+  createLocalAndroidAdbProvider,
+  resolveAndroidAdbProvider,
   type AndroidAdbExecutor,
   type AndroidAdbExecutorOptions,
+  type AndroidAdbProcess,
   type AndroidAdbExecutorResult,
   type AndroidAdbProvider,
   type AndroidAdbSpawner,
+  type AndroidPortReverseEndpoint,
+  type AndroidPortReverseManager,
+  type AndroidPortReverseMapping,
+  type AndroidPortReverseOptions,
+  type AndroidPortReverseProvider,
 } from './platforms/android/adb-executor.ts';
 export {
   getAndroidAppStateWithAdb,
   listAndroidAppsWithAdb,
 } from './platforms/android/app-helpers.ts';
+export {
+  forceStopAndroidAppWithAdb,
+  openAndroidAppWithAdb,
+  resolveAndroidLaunchComponentWithAdb,
+  type AndroidOpenAppWithAdbOptions,
+} from './platforms/android/app-control.ts';
+export {
+  captureAndroidLogcatWithAdb,
+  streamAndroidLogcatWithAdb,
+  type AndroidLogcatCaptureOptions,
+  type AndroidLogcatStreamOptions,
+} from './platforms/android/logcat.ts';
+export {
+  dismissAndroidKeyboardWithAdb,
+  getAndroidKeyboardStatusWithAdb,
+  readAndroidClipboardWithAdb,
+  writeAndroidClipboardWithAdb,
+  type AndroidKeyboardState,
+} from './platforms/android/device-input-state.ts';
 export type {
   AndroidAppListFilter,
   AndroidAppListOptions,

src/android-adb.ts

@@ -1,38 +1,11 @@
 export { createRequestHandler } from './daemon/request-router.ts';
-export type { AndroidAdbProviderResolver, RequestRouterDeps } from './daemon/request-router.ts';
-export { withDeviceInventoryProvider } from './core/dispatch-resolve.ts';
-export type { DeviceInventoryProvider, DeviceInventoryRequest } from './core/dispatch-resolve.ts';
-export { SessionStore } from './daemon/session-store.ts';
-export { LeaseRegistry } from './daemon/lease-registry.ts';
-export type {
-  AdmissionRequest,
-  AllocateLeaseRequest,
-  HeartbeatLeaseRequest,
-  LeaseRegistryOptions,
-  ReleaseLeaseRequest,
-  SimulatorLease,
-} from './daemon/lease-registry.ts';
-export {
-  cleanupDownloadableArtifact,
-  cleanupUploadedArtifact,
-  prepareDownloadableArtifact,
-  prepareUploadedArtifact,
-  trackDownloadableArtifact,
-  trackUploadedArtifact,
-} from './daemon/artifact-tracking.ts';
 export type {
-  DaemonArtifact,
-  DaemonInstallSource,
-  DaemonRequest,
-  DaemonResponse,
-  DaemonResponseData,
-  SessionRuntimeHints,
-  SessionState,
-} from './daemon/types.ts';
+  AndroidAdbProviderRequestSession,
+  AndroidAdbProviderResolver,
+  RequestLeaseRegistry,
+  RequestRouterDeps,
+  RequestSessionStore,
+} from './daemon/request-router.ts';
+export type { DeviceInventoryProvider, DeviceInventoryRequest } from './core/dispatch-resolve.ts';
+export type { DaemonRequest, DaemonResponse } from './daemon/types.ts';
 export type { DeviceInfo, Platform, PlatformSelector } from './utils/device.ts';
-export type {
-  AndroidAdbExecutor,
-  AndroidAdbExecutorOptions,
-  AndroidAdbExecutorResult,
-  AndroidAdbProvider,
-} from './android-adb.ts';

src/android-apps.ts

@@ -7,9 +7,13 @@ import path from 'node:path';
 import { PassThrough } from 'node:stream';
 
 vi.mock('node:child_process', () => ({ spawn: vi.fn() }));
-vi.mock('../../utils/exec.ts', () => ({
-  runCmd: vi.fn(async () => ({ stdout: '', stderr: '', exitCode: 0 })),
-}));
+vi.mock('../../utils/exec.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../utils/exec.ts')>();
+  return {
+    ...actual,
+    runCmd: vi.fn(async () => ({ stdout: '', stderr: '', exitCode: 0 })),
+  };
+});
 vi.mock('../app-log-stream.ts', async (importOriginal) => {
   const actual = await importOriginal<typeof import('../app-log-stream.ts')>();
   return { ...actual, sleep: vi.fn(async () => {}) };

src/daemon-embedding.ts

@@ -0,0 +1,93 @@
+import { expect, test, vi } from 'vitest';
+
+vi.mock('../../utils/exec.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../utils/exec.ts')>();
+  return {
+    ...actual,
+    runCmd: vi.fn(async (cmd: string) => {
+      if (cmd === 'adb') {
+        throw new Error('local adb must not be used');
+      }
+      return { stdout: '', stderr: '', exitCode: 0 };
+    }),
+    whichCmd: vi.fn(async (cmd: string) => cmd !== 'adb'),
+  };
+});
+vi.mock('../device-ready.ts', () => ({
+  DEVICE_READY_CACHE_TTL_MS: 5_000,
+  clearDeviceReadyCacheForTests: vi.fn(),
+  ensureDeviceReady: vi.fn(async () => {}),
+}));
+
+import { createRequestHandler } from '../request-router.ts';
+import { LeaseRegistry } from '../lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
+import type { AndroidAdbProvider } from '../../platforms/android/adb-executor.ts';
+
+test('Android daemon commands route through injected provider without host adb', async () => {
+  const sessionStore = makeSessionStore('agent-device-router-adb-provider-conformance-');
+  sessionStore.set('default', {
+    name: 'default',
+    createdAt: Date.now(),
+    device: {
+      platform: 'android',
+      id: 'remote-android-1',
+      name: 'Remote Android',
+      kind: 'device',
+      booted: true,
+    },
+    appBundleId: 'com.example.app',
+    actions: [],
+  });
+  const adbCalls: string[][] = [];
+  const provider: AndroidAdbProvider = {
+    exec: async (args) => {
+      adbCalls.push(args);
+      if (args.join(' ') === 'shell cmd clipboard get text') {
+        return { stdout: 'clipboard text: hello', stderr: '', exitCode: 0 };
+      }
+      if (args.join(' ') === 'shell dumpsys input_method') {
+        return { stdout: 'mInputShown=false inputType=0x1', stderr: '', exitCode: 0 };
+      }
+      return { stdout: 'ok', stderr: '', exitCode: 0 };
+    },
+  };
+  const handler = createRequestHandler({
+    logPath: '/tmp/daemon.log',
+    token: 'token',
+    sessionStore,
+    leaseRegistry: new LeaseRegistry(),
+    trackDownloadableArtifact: () => 'artifact-id',
+    androidAdbProvider: () => provider,
+  });
+
+  const clipboard = await handler({
+    token: 'token',
+    session: 'default',
+    command: 'clipboard',
+    positionals: ['read'],
+    flags: {},
+  });
+  const keyboard = await handler({
+    token: 'token',
+    session: 'default',
+    command: 'keyboard',
+    positionals: ['status'],
+    flags: {},
+  });
+  const doctor = await handler({
+    token: 'token',
+    session: 'default',
+    command: 'logs',
+    positionals: ['doctor'],
+    flags: {},
+  });
+
+  expect(clipboard.ok).toBe(true);
+  expect(keyboard.ok).toBe(true);
+  expect(doctor.ok).toBe(true);
+  expect(adbCalls).toContainEqual(['shell', 'cmd', 'clipboard', 'get', 'text']);
+  expect(adbCalls).toContainEqual(['shell', 'dumpsys', 'input_method']);
+  expect(adbCalls).toContainEqual(['shell', 'echo', 'ok']);
+  expect(adbCalls).toContainEqual(['shell', 'pidof', 'com.example.app']);
+});