refactor: trim lazy loading cleanup

Author: thymikee

src/cli/commands/connection.ts

@@ -149,17 +149,9 @@ function resolveRemoteConnectFlags(flags: CliFlags): {
 }
 
 export const disconnectCommand: ClientCommandHandler = async ({ flags, client }) => {
-  const session = flags.session ?? 'default';
-  const stateDir = resolveDaemonPaths(flags.stateDir).baseDir;
-  const state =
-    readRemoteConnectionState({ stateDir, session }) ??
-    (flags.session ? null : readActiveConnectionState({ stateDir }));
+  const { session, stateDir, state } = readRequestedConnectionState(flags);
   if (!state) {
-    writeCommandOutput(
-      flags,
-      { connected: false, session },
-      () => `No remote connection for "${session}".`,
-    );
+    writeNoRemoteConnectionOutput(flags, session);
     return true;
   }
   const connectedSession = state.session;
@@ -197,17 +189,9 @@ export const connectionCommand: ClientCommandHandler = async ({ positionals, fla
   if (positionals[0] !== 'status') {
     throw new AppError('INVALID_ARGS', 'connection accepts only: status');
   }
-  const session = flags.session ?? 'default';
-  const stateDir = resolveDaemonPaths(flags.stateDir).baseDir;
-  const state =
-    readRemoteConnectionState({ stateDir, session }) ??
-    (flags.session ? null : readActiveConnectionState({ stateDir }));
+  const { session, state } = readRequestedConnectionState(flags);
   if (!state) {
-    writeCommandOutput(
-      flags,
-      { connected: false, session },
-      () => `No remote connection for "${session}".`,
-    );
+    writeNoRemoteConnectionOutput(flags, session);
     return true;
   }
   const leasePreparation = buildLeasePreparationNotice(state);
@@ -237,6 +221,30 @@ function createRemoteSessionName(stateDir: string): string {
   return `adc-${Date.now().toString(36)}-${crypto.randomBytes(2).toString('hex')}`;
 }
 
+function readRequestedConnectionState(flags: CliFlags): {
+  session: string;
+  stateDir: string;
+  state: RemoteConnectionState | null;
+} {
+  const session = flags.session ?? 'default';
+  const stateDir = resolveDaemonPaths(flags.stateDir).baseDir;
+  return {
+    session,
+    stateDir,
+    state:
+      readRemoteConnectionState({ stateDir, session }) ??
+      (flags.session ? null : readActiveConnectionState({ stateDir })),
+  };
+}
+
+function writeNoRemoteConnectionOutput(flags: CliFlags, session: string): void {
+  writeCommandOutput(
+    flags,
+    { connected: false, session },
+    () => `No remote connection for "${session}".`,
+  );
+}
+
 function isCompatibleConnection(
   state: RemoteConnectionState,
   options: {

src/commands/client-command-metadata.ts

@@ -1,6 +1,6 @@
 import type { MetroPrepareOptions, RecordOptions } from '../client-types.ts';
 import type { DaemonInstallSource } from '../contracts.ts';
-import { getCommandDescription } from './command-descriptions.ts';
+import { requireCommandDescription } from './command-descriptions.ts';
 import {
   booleanField,
   booleanSchema,
@@ -230,7 +230,5 @@ function defineClientCommandMetadata<
   const TName extends string,
   const TFields extends CommandFieldMap,
 >(name: TName, fields: TFields) {
-  const description = getCommandDescription(name);
-  if (!description) throw new Error(`Missing command description for ${name}`);
-  return defineFieldCommandMetadata(name, description, fields);
+  return defineFieldCommandMetadata(name, requireCommandDescription(name), fields);
 }

src/commands/command-descriptions.ts

@@ -49,10 +49,16 @@ const COMMAND_DESCRIPTIONS = {
 
 export type DescribedCommandName = keyof typeof COMMAND_DESCRIPTIONS;
 
-export function getCommandDescription(command: string): string | undefined {
+function getCommandDescription(command: string): string | undefined {
   return COMMAND_DESCRIPTIONS[command as DescribedCommandName];
 }
 
+export function requireCommandDescription(command: string): string {
+  const description = getCommandDescription(command);
+  if (!description) throw new Error(`Missing command description for ${command}`);
+  return description;
+}
+
 export function listCommandDescriptionMetadata(): Array<{
   name: DescribedCommandName;
   description: string;

src/commands/interaction-command-metadata.ts

@@ -1,4 +1,4 @@
-import { getCommandDescription } from './command-descriptions.ts';
+import { requireCommandDescription } from './command-descriptions.ts';
 import { defineCommandMetadata } from './command-contract.ts';
 import {
   booleanField,
@@ -185,19 +185,19 @@ export type GestureInput = PanInput | FlingInput | PinchInput | RotateInput | Tr
 export const interactionCommandMetadata = [
   defineCommandMetadata({
     name: 'click',
-    description: descriptionFor('click'),
+    description: requireCommandDescription('click'),
     inputSchema: fieldsInputSchema(clickFields),
     readInput: (input) => readFieldInput(input, clickFields),
   }),
   defineCommandMetadata({
     name: 'press',
-    description: descriptionFor('press'),
+    description: requireCommandDescription('press'),
     inputSchema: fieldsInputSchema(pressFields),
     readInput: (input) => readFieldInput(input, pressFields),
   }),
   defineCommandMetadata({
     name: 'fill',
-    description: descriptionFor('fill'),
+    description: requireCommandDescription('fill'),
     inputSchema: fieldsInputSchema(fillFields),
     readInput: (input) => readFieldInput(input, fillFields),
   }),
@@ -211,7 +211,7 @@ export const interactionCommandMetadata = [
   defineInteractionCommandMetadata('find', findFields),
   defineCommandMetadata({
     name: 'gesture',
-    description: descriptionFor('gesture'),
+    description: requireCommandDescription('gesture'),
     inputSchema: fieldsInputSchema(gestureFields),
     readInput: readGestureInput,
   }),
@@ -272,13 +272,7 @@ function defineInteractionCommandMetadata<
   const TName extends string,
   const TFields extends CommandFieldMap,
 >(name: TName, fields: TFields) {
-  return defineFieldCommandMetadata(name, descriptionFor(name), fields);
-}
-
-function descriptionFor(name: string): string {
-  const description = getCommandDescription(name);
-  if (!description) throw new Error(`Missing command description for ${name}`);
-  return description;
+  return defineFieldCommandMetadata(name, requireCommandDescription(name), fields);
 }
 
 function optionalPoint(record: Record<string, unknown>, key: string): PointInput | undefined {

src/core/dispatch-resolve.ts

@@ -181,11 +181,6 @@ export async function resolveTargetDevice(flags: ResolveDeviceFlags): Promise<De
         );
       }
 
-      if (selector.platform === 'android') {
-        const { ensureAdb } = await import('../platforms/android/adb.ts');
-        await ensureAdb();
-      }
-
       const devices = await listLocalDeviceInventory({
         ...selector,
         iosSimulatorSetPath,