Avoid extra target probes in Android boot fast lookup

Author: thymikee

src/daemon/handlers/session.ts

@@ -57,6 +57,7 @@ type EnsureAndroidEmulatorBoot = (params: {
 type ResolveAndroidBootSelectorDevice = (params: {
   deviceName?: string;
   serial?: string;
+  includeTarget?: boolean;
 }) => Promise<DeviceInfo | undefined>;
 
 const IOS_APPSTATE_SESSION_REQUIRED_MESSAGE =
@@ -258,9 +259,9 @@ const defaultEnsureAndroidEmulatorBoot: EnsureAndroidEmulatorBoot = async ({ avd
   return await ensureAndroidEmulatorBooted({ avdName, serial, headless });
 };
 
-const defaultResolveAndroidBootSelectorDevice: ResolveAndroidBootSelectorDevice = async ({ deviceName, serial }) => {
+const defaultResolveAndroidBootSelectorDevice: ResolveAndroidBootSelectorDevice = async ({ deviceName, serial, includeTarget }) => {
   const { resolveAndroidBootSelectorDevice } = await import('../../platforms/android/devices.ts');
-  return await resolveAndroidBootSelectorDevice({ deviceName, serial });
+  return await resolveAndroidBootSelectorDevice({ deviceName, serial, includeTarget });
 };
 
 const defaultReinstallOps: ReinstallOps = {
@@ -611,6 +612,7 @@ export async function handleSessionCommands(params: {
       ? await resolveAndroidBootSelectorDeviceOverride({
         deviceName: flags.device,
         serial: flags.serial,
+        includeTarget: Boolean(flags.target),
       })
       : undefined;
     const targetMismatch = Boolean(flags.target)

src/platforms/android/__tests__/devices.test.ts

@@ -185,7 +185,7 @@ test('ensureAndroidEmulatorBooted launches emulator with GUI by default', async
 test('resolveAndroidBootSelectorDevice matches emulator by device name', async () => {
   await withMockedAndroidTools(async () => {
     await fs.writeFile(process.env.AGENT_DEVICE_TEST_EMU_BOOTED_FILE!, 'ready', 'utf8');
-    const device = await resolveAndroidBootSelectorDevice({ deviceName: 'Pixel 9 Pro XL' });
+    const device = await resolveAndroidBootSelectorDevice({ deviceName: 'Pixel 9 Pro XL', includeTarget: true });
     assert.ok(device);
     assert.equal(device?.id, 'emulator-5554');
     assert.equal(device?.kind, 'emulator');

src/platforms/android/devices.ts

@@ -190,6 +190,7 @@ async function listAndroidDeviceEntries(): Promise<AndroidDeviceEntry[]> {
 export async function resolveAndroidBootSelectorDevice(params: {
   deviceName?: string;
   serial?: string;
+  includeTarget?: boolean;
 }): Promise<DeviceInfo | undefined> {
   const adbAvailable = await whichCmd('adb');
   if (!adbAvailable) {
@@ -230,10 +231,8 @@ export async function resolveAndroidBootSelectorDevice(params: {
   }
 
   if (!matched) return undefined;
-  const [booted, target] = await Promise.all([
-    isAndroidBooted(matched.serial),
-    resolveAndroidTarget(matched.serial),
-  ]);
+  const booted = await isAndroidBooted(matched.serial);
+  const target = params.includeTarget ? await resolveAndroidTarget(matched.serial) : undefined;
   return {
     platform: 'android',
     id: matched.serial,