fix: satisfy Android ANR fallow audit

Author: thymikee

src/daemon/handlers/interaction.ts

@@ -1,4 +1,4 @@
-import type { DaemonResponse } from '../types.ts';
+import type { DaemonResponse, SessionState } from '../types.ts';
 import type { InteractionHandlerParams } from './interaction-common.ts';
 import { handleTouchInteractionCommands } from './interaction-touch.ts';
 import { captureSnapshotForSession } from './interaction-snapshot.ts';
@@ -48,19 +48,37 @@ async function dispatchTypeViaRuntime(
     captureSnapshotForSession: typeof captureSnapshotForSession;
   },
 ): Promise<DaemonResponse> {
-  const { req, sessionName, sessionStore } = params;
+  const { sessionName, sessionStore } = params;
   const session = sessionStore.get(sessionName);
   if (!session) return errorResponse('SESSION_NOT_FOUND', 'No active session. Run open first.');
   if (!isCommandSupportedOnDevice(typeCommandDefinition.name, session.device)) {
     return errorResponse('UNSUPPORTED_OPERATION', 'type is not supported on this device');
   }
+  const recordingRecoveryResponse = await recoverAndroidRecordingDialogForType(session);
+  if (recordingRecoveryResponse) return recordingRecoveryResponse;
+
+  return await runTypeTextViaRuntime(params, session);
+}
+
+async function recoverAndroidRecordingDialogForType(
+  session: SessionState,
+): Promise<DaemonResponse | null> {
   if (session.device.platform === 'android' && session.recording) {
     const androidRecoveryResult = await recoverAndroidBlockingSystemDialog({ session });
     if (androidRecoveryResult === 'failed') {
       return errorResponse('COMMAND_FAILED', 'Android system dialog blocked the recording session');
     }
   }
+  return null;
+}
 
+async function runTypeTextViaRuntime(
+  params: InteractionHandlerParams & {
+    captureSnapshotForSession: typeof captureSnapshotForSession;
+  },
+  session: SessionState,
+): Promise<DaemonResponse> {
+  const { req, sessionName, sessionStore } = params;
   const text = (req.positionals ?? []).join(' ');
   const runtime = createInteractionRuntime(params);
   const actionStartedAt = Date.now();

src/platforms/android/app-lifecycle.ts

@@ -27,7 +27,6 @@ import {
 } from './app-parsers.ts';
 
 export {
-  parseAndroidBlockingDialogFocus,
   parseAndroidForegroundApp,
   parseAndroidLaunchablePackages,
   parseAndroidUserInstalledPackages,

src/platforms/android/app-parsers.ts

@@ -40,21 +40,19 @@ export function parseAndroidUserInstalledPackages(stdout: string): string[] {
 }
 
 export function parseAndroidForegroundApp(text: string): AndroidForegroundApp | null {
-  const lines = text.split('\n');
-
-  for (const marker of ANDROID_FOCUS_MARKERS) {
-    for (const line of lines) {
-      const markerIndex = line.indexOf(marker);
-      if (markerIndex === -1) continue;
-      const segment = line.slice(markerIndex + marker.length);
-      const parsed = parseAndroidComponentFromSegment(segment);
-      if (parsed) return parsed;
-    }
-  }
-  return null;
+  return parseAndroidFocusSegment(text, (segment) => parseAndroidComponentFromSegment(segment));
 }
 
 export function parseAndroidBlockingDialogFocus(text: string): AndroidBlockingDialogFocus | null {
+  return parseAndroidFocusSegment(text, (segment, raw) =>
+    parseAndroidBlockingDialogFromSegment(segment, raw),
+  );
+}
+
+function parseAndroidFocusSegment<T>(
+  text: string,
+  parse: (segment: string, raw: string) => T | null,
+): T | null {
   const lines = text.split('\n');
 
   for (const marker of ANDROID_FOCUS_MARKERS) {
@@ -63,8 +61,8 @@ export function parseAndroidBlockingDialogFocus(text: string): AndroidBlockingDi
       if (markerIndex === -1) continue;
       const raw = line.trim();
       const segment = line.slice(markerIndex + marker.length);
-      const focus = parseAndroidBlockingDialogFromSegment(segment, raw);
-      if (focus) return focus;
+      const parsed = parse(segment, raw);
+      if (parsed) return parsed;
     }
   }
   return null;