refactor: deeper structural simplification pass

Bigger wins from restructuring, not just mechanical dedup:

- cli.ts: move logTailStopper to try/finally (eliminates 28 duplicate
  calls), extract writeCommandCliOutput/writeLogsCliOutput/writeNetworkCliOutput
  from 350-line if/else chain, fix remaining throwDaemonError site
- session-store.ts: replace 67-line sanitizeFlags destructure/reconstruct
  with 10-line pick-from-array loop
- record-trace: extract finalizeRecordingOverlay helper, replacing 4
  copies of the telemetry+overlay block across ios/android/recording files
- Deduplicate normalizeText (finders.ts + selectors-match.ts)
- Fix isEnvTruthy to preserve whitespace-tolerant parsing (.trim())

Author: thymikee

src/cli.ts

@@ -1,10 +1,9 @@
 import fs from 'node:fs';
 import { emitDiagnostic } from '../../utils/diagnostics.ts';
-import { getRecordingOverlaySupportWarning } from '../../recording/overlay.ts';
 import type { DaemonResponse, SessionState } from '../types.ts';
-import { persistRecordingTelemetry } from '../recording-telemetry.ts';
-import { formatRecordTraceError, formatRecordTraceExecFailure } from '../record-trace-errors.ts';
+import { formatRecordTraceExecFailure } from '../record-trace-errors.ts';
 import type { RecordTraceDeps } from './record-trace-recording.ts';
+import { finalizeRecordingOverlay } from './record-trace-finalize.ts';
 import { errorResponse } from './response.ts';
 
 const ANDROID_REMOTE_FILE_POLL_MS = 250;
@@ -361,25 +360,11 @@ export async function stopAndroidRecording(params: {
       return errorResponse('COMMAND_FAILED', copyError);
     }
 
-    persistRecordingTelemetry({
+    await finalizeRecordingOverlay({
       recording,
+      deps,
+      targetLabel: 'Android recording',
     });
-    if (recording.showTouches && recording.telemetryPath) {
-      const overlaySupportWarning = getRecordingOverlaySupportWarning();
-      if (overlaySupportWarning) {
-        recording.overlayWarning = overlaySupportWarning;
-      } else {
-        try {
-          await deps.overlayRecordingTouches({
-            videoPath: recording.outPath,
-            telemetryPath: recording.telemetryPath,
-            targetLabel: 'Android recording',
-          });
-        } catch (error) {
-          recording.overlayWarning = `failed to overlay recording touches: ${formatRecordTraceError(error)}`;
-        }
-      }
-    }
   }
 
   await cleanupRemoteRecording();

src/daemon/handlers/record-trace-android.ts

@@ -0,0 +1,45 @@
+import { persistRecordingTelemetry } from '../recording-telemetry.ts';
+import { getRecordingOverlaySupportWarning } from '../../recording/overlay.ts';
+import { formatRecordTraceError } from '../record-trace-errors.ts';
+import type { RecordTraceDeps } from './record-trace-recording.ts';
+
+type FinalizeRecordingOverlayParams = {
+  recording: {
+    outPath: string;
+    gestureEvents: import('../types.ts').RecordingGestureEvent[];
+    telemetryPath?: string;
+    showTouches: boolean;
+    overlayWarning?: string;
+  };
+  deps: Pick<RecordTraceDeps, 'overlayRecordingTouches'>;
+  trimStartMs?: number;
+  targetLabel: string;
+};
+
+export async function finalizeRecordingOverlay(
+  params: FinalizeRecordingOverlayParams,
+): Promise<void> {
+  const { recording, deps, trimStartMs, targetLabel } = params;
+
+  const telemetryPath = persistRecordingTelemetry({
+    recording,
+    trimStartMs,
+  });
+
+  if (recording.showTouches) {
+    const overlaySupportWarning = getRecordingOverlaySupportWarning();
+    if (overlaySupportWarning) {
+      recording.overlayWarning = overlaySupportWarning;
+    } else {
+      try {
+        await deps.overlayRecordingTouches({
+          videoPath: recording.outPath,
+          telemetryPath,
+          targetLabel,
+        });
+      } catch (error) {
+        recording.overlayWarning = `failed to overlay recording touches: ${formatRecordTraceError(error)}`;
+      }
+    }
+  }
+}

src/daemon/handlers/record-trace-finalize.ts

@@ -1,11 +1,10 @@
 import { SessionStore } from '../session-store.ts';
 import type { DaemonRequest, DaemonResponse, SessionState } from '../types.ts';
 import { emitDiagnostic } from '../../utils/diagnostics.ts';
-import { persistRecordingTelemetry } from '../recording-telemetry.ts';
 import { IOS_RUNNER_CONTAINER_BUNDLE_IDS } from '../../platforms/ios/runner-client.ts';
-import { getRecordingOverlaySupportWarning } from '../../recording/overlay.ts';
 import { formatRecordTraceError } from '../record-trace-errors.ts';
 import type { RecordTraceDeps, RecordingBase } from './record-trace-recording.ts';
+import { finalizeRecordingOverlay } from './record-trace-finalize.ts';
 import { errorResponse } from './response.ts';
 
 export function normalizeAppBundleId(session: SessionState): string | undefined {
@@ -319,28 +318,13 @@ export async function stopIosDeviceRecording(params: {
     });
   }
 
-  const telemetryPath = persistRecordingTelemetry({
+  await finalizeRecordingOverlay({
     recording,
+    deps,
     trimStartMs,
+    targetLabel: 'iOS recording',
   });
 
-  if (recording.showTouches) {
-    const overlaySupportWarning = getRecordingOverlaySupportWarning();
-    if (overlaySupportWarning) {
-      recording.overlayWarning = overlaySupportWarning;
-    } else {
-      try {
-        await deps.overlayRecordingTouches({
-          videoPath: recording.outPath,
-          telemetryPath,
-          targetLabel: 'iOS recording',
-        });
-      } catch (error) {
-        recording.overlayWarning = `failed to overlay recording touches: ${formatRecordTraceError(error)}`;
-      }
-    }
-  }
-
   return null;
 }
 
@@ -375,26 +359,11 @@ export async function stopMacOsRecording(params: {
     });
   }
 
-  const telemetryPath = persistRecordingTelemetry({
+  await finalizeRecordingOverlay({
     recording,
+    deps,
+    targetLabel: 'macOS recording',
   });
 
-  if (recording.showTouches) {
-    const overlaySupportWarning = getRecordingOverlaySupportWarning();
-    if (overlaySupportWarning) {
-      recording.overlayWarning = overlaySupportWarning;
-    } else {
-      try {
-        await deps.overlayRecordingTouches({
-          videoPath: recording.outPath,
-          telemetryPath,
-          targetLabel: 'macOS recording',
-        });
-      } catch (error) {
-        recording.overlayWarning = `failed to overlay recording touches: ${formatRecordTraceError(error)}`;
-      }
-    }
-  }
-
   return null;
 }

src/daemon/handlers/record-trace-ios.ts

@@ -13,15 +13,12 @@ import type {
 } from '../types.ts';
 import { runCmd, runCmdBackground } from '../../utils/exec.ts';
 import { isPlayableVideo, waitForStableFile } from '../../utils/video.ts';
-import { deriveRecordingTelemetryPath, persistRecordingTelemetry } from '../recording-telemetry.ts';
+import { deriveRecordingTelemetryPath } from '../recording-telemetry.ts';
 import { runIosRunnerCommand } from '../../platforms/ios/runner-client.ts';
-import {
-  getRecordingOverlaySupportWarning,
-  overlayRecordingTouches,
-  trimRecordingStart,
-} from '../../recording/overlay.ts';
+import { overlayRecordingTouches, trimRecordingStart } from '../../recording/overlay.ts';
 import { buildSimctlArgsForDevice } from '../../platforms/ios/simctl.ts';
-import { formatRecordTraceError, formatRecordTraceExecFailure } from '../record-trace-errors.ts';
+import { formatRecordTraceExecFailure } from '../record-trace-errors.ts';
+import { finalizeRecordingOverlay } from './record-trace-finalize.ts';
 import { errorResponse, unsupportedOperationResponse } from './response.ts';
 import { startAndroidRecording, stopAndroidRecording } from './record-trace-android.ts';
 import {
@@ -302,27 +299,12 @@ async function stopNonRunnerRecording(params: {
     );
   }
 
-  const telemetryPath = persistRecordingTelemetry({
+  await finalizeRecordingOverlay({
     recording,
+    deps,
+    targetLabel: 'iOS recording',
   });
 
-  if (recording.showTouches) {
-    const overlaySupportWarning = getRecordingOverlaySupportWarning();
-    if (overlaySupportWarning) {
-      recording.overlayWarning = overlaySupportWarning;
-    } else {
-      try {
-        await deps.overlayRecordingTouches({
-          videoPath: recording.outPath,
-          telemetryPath,
-          targetLabel: 'iOS recording',
-        });
-      } catch (error) {
-        recording.overlayWarning = `failed to overlay recording touches: ${formatRecordTraceError(error)}`;
-      }
-    }
-  }
-
   return null;
 }
 

src/daemon/handlers/record-trace-recording.ts

@@ -1,6 +1,7 @@
 import type { Platform } from '../utils/device.ts';
 import type { SnapshotNode } from '../utils/snapshot.ts';
 import { extractNodeText, isFillableType, normalizeType } from './snapshot-processing.ts';
+import { normalizeText } from '../utils/finders.ts';
 import type { Selector, SelectorTerm } from './selectors-parse.ts';
 
 export function matchesSelector(
@@ -58,6 +59,3 @@ function textEquals(value: string | undefined, query: string): boolean {
   return normalizeText(value ?? '') === normalizeText(query);
 }
 
-function normalizeText(value: string): string {
-  return value.trim().toLowerCase().replace(/\s+/g, ' ');
-}

src/daemon/selectors-match.ts

@@ -216,72 +216,24 @@ export class SessionStore {
   }
 }
 
+const SANITIZED_FLAG_KEYS = [
+  'platform', 'device', 'udid', 'serial', 'out', 'verbose',
+  'metroHost', 'metroPort', 'bundleUrl', 'launchUrl',
+  'snapshotInteractiveOnly', 'snapshotCompact', 'snapshotDepth', 'snapshotScope', 'snapshotRaw',
+  'screenshotFullscreen', 'relaunch', 'saveScript', 'noRecord',
+  'fps', 'hideTouches', 'count', 'intervalMs', 'delayMs', 'holdMs', 'jitterPx',
+  'doubleTap', 'clickButton', 'pauseMs', 'pattern',
+] as const;
+
 function sanitizeFlags(flags: CommandFlags | undefined): SessionAction['flags'] {
   if (!flags) return {};
-  const {
-    platform,
-    device,
-    udid,
-    serial,
-    out,
-    verbose,
-    metroHost,
-    metroPort,
-    bundleUrl,
-    launchUrl,
-    snapshotInteractiveOnly,
-    snapshotCompact,
-    snapshotDepth,
-    snapshotScope,
-    snapshotRaw,
-    screenshotFullscreen,
-    relaunch,
-    saveScript,
-    noRecord,
-    fps,
-    hideTouches,
-    count,
-    intervalMs,
-    delayMs,
-    holdMs,
-    jitterPx,
-    doubleTap,
-    clickButton,
-    pauseMs,
-    pattern,
-  } = flags;
-  return {
-    platform,
-    device,
-    udid,
-    serial,
-    out,
-    verbose,
-    metroHost,
-    metroPort,
-    bundleUrl,
-    launchUrl,
-    snapshotInteractiveOnly,
-    snapshotCompact,
-    snapshotDepth,
-    snapshotScope,
-    snapshotRaw,
-    screenshotFullscreen,
-    relaunch,
-    saveScript,
-    noRecord,
-    fps,
-    hideTouches,
-    count,
-    intervalMs,
-    delayMs,
-    holdMs,
-    jitterPx,
-    doubleTap,
-    clickButton,
-    pauseMs,
-    pattern,
-  };
+  const result: Record<string, unknown> = {};
+  for (const key of SANITIZED_FLAG_KEYS) {
+    if (flags[key] !== undefined) {
+      result[key] = flags[key];
+    }
+  }
+  return result as SessionAction['flags'];
 }
 
 function formatScript(session: SessionState, actions: SessionAction[]): string {

src/daemon/session-store.ts

@@ -85,7 +85,7 @@ function matchRole(value: string | undefined, query: string): number {
   return 0;
 }
 
-function normalizeText(value: string): string {
+export function normalizeText(value: string): string {
   return value.trim().toLowerCase().replace(/\s+/g, ' ');
 }
 

src/utils/finders.ts

@@ -43,7 +43,7 @@ type RetryTelemetryEvent = {
 const RETRY_LOGS_ENABLED = isEnvTruthy(process.env.AGENT_DEVICE_RETRY_LOGS);
 
 export function isEnvTruthy(value: string | undefined): boolean {
-  return ['1', 'true', 'yes', 'on'].includes((value ?? '').toLowerCase());
+  return ['1', 'true', 'yes', 'on'].includes((value ?? '').trim().toLowerCase());
 }
 
 export const TIMEOUT_PROFILES: Record<string, TimeoutProfile> = {