refactor: extract snapshot/ folder — Phase 5

fallow-baselines/health.json

@@ -563,7 +563,7 @@
         "count": 1
       }
     },
-    "src/utils/mobile-snapshot-semantics.ts": {
+    "src/snapshot/mobile-snapshot-semantics.ts": {
       "crap_moderate": {
         "count": 2
       }
@@ -603,15 +603,15 @@
         "count": 1
       }
     },
-    "src/utils/snapshot-diff.ts": {
+    "src/snapshot/snapshot-diff.ts": {
       "complexity_moderate": {
         "count": 1
       },
       "crap_moderate": {
         "count": 1
       }
     },
-    "src/utils/snapshot-lines.ts": {
+    "src/snapshot/snapshot-lines.ts": {
       "crap_moderate": {
         "count": 1
       }
@@ -685,7 +685,7 @@
   "target_keys": [
     "src/daemon/handlers/session.ts:complexity",
     "src/daemon/handlers/session-replay-runtime.ts:high impact",
-    "src/utils/snapshot-processing.ts:high impact",
+    "src/snapshot/snapshot-processing.ts:high impact",
     "src/daemon/handlers/session-device-utils.ts:high impact",
     "src/commands/cli-grammar/common.ts:high impact",
     "src/client-shared.ts:high impact",
@@ -712,7 +712,7 @@
     "src/utils/rect-center.ts:high impact",
     "src/utils/process-identity.ts:high impact",
     "src/daemon/app-log-process.ts:high impact",
-    "src/utils/snapshot-lines.ts:high impact",
+    "src/snapshot/snapshot-lines.ts:high impact",
     "src/daemon/handlers/session-test-sharding.ts:high impact",
     "src/platforms/android/ui-hierarchy.ts:high impact",
     "src/platforms/linux/snapshot.ts:high impact",

src/commands/capture/runtime/snapshot.ts

@@ -7,17 +7,20 @@ import {
   type PublicSnapshotCaptureAnnotations,
   type SnapshotCaptureAnnotations,
 } from '../../../snapshot-capture-annotations.ts';
-import { renderSnapshotQualityWarnings } from '../../../utils/snapshot-quality.ts';
+import { renderSnapshotQualityWarnings } from '../../../snapshot/snapshot-quality.ts';
 import { AppError } from '../../../kernel/errors.ts';
-import { buildSnapshotDiff, countSnapshotComparableLines } from '../../../utils/snapshot-diff.ts';
-import type { SnapshotDiffLine, SnapshotDiffSummary } from '../../../utils/snapshot-diff.ts';
+import {
+  buildSnapshotDiff,
+  countSnapshotComparableLines,
+} from '../../../snapshot/snapshot-diff.ts';
+import type { SnapshotDiffLine, SnapshotDiffSummary } from '../../../snapshot/snapshot-diff.ts';
 import type {
   SnapshotNode,
   SnapshotState,
   SnapshotUnchanged,
   SnapshotVisibility,
 } from '../../../kernel/snapshot.ts';
-import { buildSnapshotVisibility } from '../../../utils/snapshot-visibility.ts';
+import { buildSnapshotVisibility } from '../../../snapshot/snapshot-visibility.ts';
 import { formatReactNativeOverlayWarning } from '../../react-native/overlay.ts';
 import {
   buildUnchangedSnapshotMetadata,
@@ -30,7 +33,7 @@ import type {
 } from '../../runtime-types.ts';
 import { now } from '../../runtime-common.ts';
 
-export type { SnapshotDiffLine, SnapshotDiffSummary } from '../../../utils/snapshot-diff.ts';
+export type { SnapshotDiffLine, SnapshotDiffSummary } from '../../../snapshot/snapshot-diff.ts';
 
 export type SnapshotCommandResult = {
   nodes: SnapshotNode[];

src/commands/interaction/runtime/gestures.ts

@@ -16,7 +16,7 @@ import {
 import type { AgentDeviceRuntime, CommandContext } from '../../../runtime-contract.ts';
 import { requireIntInRange } from '../../../utils/validation.ts';
 import { successText } from '../../../utils/success-text.ts';
-import { isNodeVisibleInEffectiveViewport } from '../../../utils/mobile-snapshot-semantics.ts';
+import { isNodeVisibleInEffectiveViewport } from '../../../snapshot/mobile-snapshot-semantics.ts';
 import {
   captureScrollEdgeState,
   formatScrollEdgeMessage,

src/commands/interaction/runtime/interactions.ts

@@ -1,7 +1,7 @@
 import { AppError } from '../../../kernel/errors.ts';
 import type { ClickButton } from '../../../core/click-button.ts';
 import type { AgentDeviceRuntime, CommandContext } from '../../../runtime-contract.ts';
-import { isFillableType } from '../../../utils/snapshot-processing.ts';
+import { isFillableType } from '../../../snapshot/snapshot-processing.ts';
 import type { Point } from '../../../kernel/snapshot.ts';
 import { requireIntInRange } from '../../../utils/validation.ts';
 import { successText } from '../../../utils/success-text.ts';

src/commands/interaction/runtime/resolution.ts

@@ -9,12 +9,12 @@ import {
   resolveSelectorChain,
 } from '../../../selectors.ts';
 import { buildSelectorChainForNode } from '../../../utils/selector-build.ts';
-import { findNodeByLabel, resolveRefLabel } from '../../../utils/snapshot-processing.ts';
+import { findNodeByLabel, resolveRefLabel } from '../../../snapshot/snapshot-processing.ts';
 import {
   isNodeVisibleInEffectiveViewport,
   resolveEffectiveViewportRect,
-} from '../../../utils/mobile-snapshot-semantics.ts';
-import { isSnapshotNodeInteractionBlocked } from '../../../utils/snapshot-occlusion.ts';
+} from '../../../snapshot/mobile-snapshot-semantics.ts';
+import { isSnapshotNodeInteractionBlocked } from '../../../snapshot/snapshot-occlusion.ts';
 import type {
   InteractionTarget,
   PointTarget,

src/commands/interaction/runtime/selector-read-shared.ts

@@ -6,7 +6,7 @@ import type {
 import { AppError } from '../../../kernel/errors.ts';
 import type { SnapshotNode, SnapshotState } from '../../../kernel/snapshot.ts';
 import { findNodeByRef, normalizeRef } from '../../../kernel/snapshot.ts';
-import { isSparseSnapshotQualityVerdict } from '../../../utils/snapshot-quality.ts';
+import { isSparseSnapshotQualityVerdict } from '../../../snapshot/snapshot-quality.ts';
 import { extractReadableText } from '../../../utils/text-surface.ts';
 import { now, toBackendContext } from '../../runtime-common.ts';
 import { findNodeByLabel } from './selector-read-utils.ts';

src/commands/interaction/runtime/selector-read-utils.ts

@@ -1,4 +1,4 @@
-export { findNodeByLabel, resolveRefLabel } from '../../../utils/snapshot-processing.ts';
+export { findNodeByLabel, resolveRefLabel } from '../../../snapshot/snapshot-processing.ts';
 
 export function shouldScopeFind(locator: string): boolean {
   return locator === 'text' || locator === 'label' || locator === 'any';

src/commands/interaction/runtime/selector-read.ts

@@ -9,7 +9,7 @@ import { findNodeByRef, normalizeRef } from '../../../kernel/snapshot.ts';
 import {
   isSparseSnapshotQualityVerdict,
   type SnapshotQualityVerdict,
-} from '../../../utils/snapshot-quality.ts';
+} from '../../../snapshot/snapshot-quality.ts';
 import type { AgentDeviceRuntime, CommandContext } from '../../../runtime-contract.ts';
 import { AppError } from '../../../kernel/errors.ts';
 import {

src/compat/maestro/runtime-assertions.ts

@@ -6,7 +6,7 @@ import type { DaemonFailureResponse } from '../../daemon/handlers/response.ts';
 import type { ReplayVarScope } from '../../replay/vars.ts';
 import { emitDiagnostic } from '../../utils/diagnostics.ts';
 import type { Point, SnapshotState } from '../../kernel/snapshot.ts';
-import { buildSnapshotDisplayLines } from '../../utils/snapshot-lines.ts';
+import { buildSnapshotDisplayLines } from '../../snapshot/snapshot-lines.ts';
 import { sleep } from '../../utils/timeouts.ts';
 import { pointForMaestroTapOnTarget } from './runtime-geometry.ts';
 import {

src/compat/maestro/runtime-targets.ts

@@ -11,7 +11,7 @@ import {
   findSnapshotAncestor,
   isDescendantOfSnapshotNode,
   normalizeType,
-} from '../../utils/snapshot-processing.ts';
+} from '../../snapshot/snapshot-processing.ts';
 import type { TouchReferenceFrame } from '../../daemon/touch-reference-frame.ts';
 import type { DaemonRequest } from '../../daemon/types.ts';
 import type { Selector, SelectorTerm } from '../../daemon/selectors-parse.ts';

src/core/interaction-targeting.ts

@@ -1,8 +1,8 @@
 import type { Rect, SnapshotNode } from '../kernel/snapshot.ts';
 import { centerOfRect } from '../kernel/snapshot.ts';
 import { containsPoint, pickLargestRect } from '../utils/rect-visibility.ts';
-import { findNearestHittableAncestor, normalizeType } from '../utils/snapshot-processing.ts';
-import { isSnapshotNodeInteractionBlocked } from '../utils/snapshot-occlusion.ts';
+import { findNearestHittableAncestor, normalizeType } from '../snapshot/snapshot-processing.ts';
+import { isSnapshotNodeInteractionBlocked } from '../snapshot/snapshot-occlusion.ts';
 import {
   areRectsApproximatelyEqual,
   normalizeRect,

src/core/interactors/apple.ts

@@ -22,7 +22,7 @@ import type { Interactor, RunnerContext } from '../interactor-types.ts';
 import {
   readSnapshotQualityVerdict,
   type SnapshotQualityVerdict,
-} from '../../utils/snapshot-quality.ts';
+} from '../../snapshot/snapshot-quality.ts';
 
 export function createAppleInteractor(
   device: DeviceInfo,

src/daemon/__tests__/snapshot-diff.test.ts

@@ -1,6 +1,6 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
-import { buildSnapshotDiff } from '../../utils/snapshot-diff.ts';
+import { buildSnapshotDiff } from '../../snapshot/snapshot-diff.ts';
 import { buildNodes as nodes } from '../../__tests__/test-utils/snapshot-builders.ts';
 
 test('buildSnapshotDiff reports unchanged lines when snapshots are equal', () => {

src/daemon/__tests__/snapshot-processing.test.ts

@@ -5,7 +5,7 @@ import {
   extractNodeReadText,
   findNearestHittableAncestor,
   pruneGroupNodes,
-} from '../../utils/snapshot-processing.ts';
+} from '../../snapshot/snapshot-processing.ts';
 
 test('pruneGroupNodes drops unlabeled group wrappers and rebalances depth', () => {
   const raw = [

src/daemon/android-system-dialog.ts

@@ -10,7 +10,7 @@ import { emitDiagnostic } from '../utils/diagnostics.ts';
 import { AppError } from '../kernel/errors.ts';
 import { centerOfRect, attachRefs, type SnapshotNode } from '../kernel/snapshot.ts';
 import { sleep } from '../utils/timeouts.ts';
-import { pruneGroupNodes } from '../utils/snapshot-processing.ts';
+import { pruneGroupNodes } from '../snapshot/snapshot-processing.ts';
 import type { SessionState } from './types.ts';
 
 const ANDROID_BLOCKING_MODAL_PATTERN = /\bis(?:n(?:'|'|')?t| not)\s+responding\b/i;

src/daemon/handlers/find.ts

@@ -11,12 +11,12 @@ import type { DaemonInvokeFn, DaemonRequest, DaemonResponse, SessionState } from
 import { SessionStore } from '../session-store.ts';
 import { contextFromFlags } from '../context.ts';
 import { ensureDeviceReady } from '../device-ready.ts';
-import { extractNodeText } from '../../utils/snapshot-processing.ts';
+import { extractNodeText } from '../../snapshot/snapshot-processing.ts';
 import {
   resolveActionableTouchNode,
   resolveActionableTouchResolution,
 } from '../../core/interaction-targeting.ts';
-import { isSnapshotNodeInteractionBlocked } from '../../utils/snapshot-occlusion.ts';
+import { isSnapshotNodeInteractionBlocked } from '../../snapshot/snapshot-occlusion.ts';
 import { readTextForNode } from './interaction-read.ts';
 import { errorResponse, noActiveSessionError } from './response.ts';
 import { recordSessionAction } from './handler-utils.ts';
@@ -26,7 +26,7 @@ import { createSelectorCaptureRuntime } from '../selector-capture-runtime.ts';
 import {
   isSparseSnapshotQualityVerdict,
   type SnapshotQualityVerdict,
-} from '../../utils/snapshot-quality.ts';
+} from '../../snapshot/snapshot-quality.ts';
 import { resolveSelectorChain, type SelectorChain } from '../../selectors.ts';
 
 export { parseFindArgs } from '../../utils/finders.ts';

src/daemon/handlers/interaction-read.ts

@@ -1,6 +1,6 @@
 import { dispatchCommand, type CommandFlags } from '../../core/dispatch.ts';
 import { emitDiagnostic } from '../../utils/diagnostics.ts';
-import { extractNodeReadText } from '../../utils/snapshot-processing.ts';
+import { extractNodeReadText } from '../../snapshot/snapshot-processing.ts';
 import type { SessionState } from '../types.ts';
 import type { SnapshotNode } from '../../kernel/snapshot.ts';
 import { prefersValueForReadableText } from '../../utils/text-surface.ts';

src/daemon/handlers/interaction-snapshot.ts

@@ -5,7 +5,7 @@ import type { SnapshotState } from '../../kernel/snapshot.ts';
 import type { ContextFromFlags } from './interaction-common.ts';
 import { captureSnapshot } from './snapshot-capture.ts';
 import { setSessionSnapshot } from '../session-snapshot.ts';
-import { isSparseSnapshotQualityVerdict } from '../../utils/snapshot-quality.ts';
+import { isSparseSnapshotQualityVerdict } from '../../snapshot/snapshot-quality.ts';
 
 export type CaptureSnapshotForSession = (
   session: SessionState,

src/daemon/handlers/react-native.ts

@@ -11,7 +11,7 @@ import type { SnapshotState } from '../../kernel/snapshot.ts';
 import {
   isSparseSnapshotQualityVerdict,
   type SnapshotQualityVerdict,
-} from '../../utils/snapshot-quality.ts';
+} from '../../snapshot/snapshot-quality.ts';
 import type { DaemonResponse, SessionState } from '../types.ts';
 import { errorResponse, noActiveSessionError, requireCommandSupported } from './response.ts';
 import { captureSnapshotForSession } from './interaction-snapshot.ts';

src/daemon/handlers/snapshot-capture.ts

@@ -13,9 +13,9 @@ import {
   type SnapshotBackend,
   type SnapshotState,
 } from '../../kernel/snapshot.ts';
-import { annotateCoveredSnapshotNodes } from '../../utils/snapshot-occlusion.ts';
-import { normalizeSnapshotTree } from '../../utils/snapshot-tree.ts';
-export { buildSnapshotVisibility } from '../../utils/snapshot-visibility.ts';
+import { annotateCoveredSnapshotNodes } from '../../snapshot/snapshot-occlusion.ts';
+import { normalizeSnapshotTree } from '../../snapshot/snapshot-tree.ts';
+export { buildSnapshotVisibility } from '../../snapshot/snapshot-visibility.ts';
 import type { SessionState } from '../types.ts';
 import {
   ANDROID_FRESHNESS_RETRY_DEADLINE_MS,
@@ -41,7 +41,7 @@ import {
   findNodeByLabel,
   pruneGroupNodes,
   resolveRefLabel,
-} from '../../utils/snapshot-processing.ts';
+} from '../../snapshot/snapshot-processing.ts';
 import { errorResponse, type DaemonFailureResponse } from './response.ts';
 import { presentIosInteractiveSnapshot } from '../snapshot-presentation/ios/index.ts';
 import {

src/daemon/screenshot-overlay-android.ts

@@ -1,5 +1,5 @@
 import type { Rect, SnapshotNode } from '../kernel/snapshot.ts';
-import { normalizeType } from '../utils/snapshot-processing.ts';
+import { normalizeType } from '../snapshot/snapshot-processing.ts';
 import { hasPositiveRect, rectContains, unionRects } from './screenshot-overlay-rects.ts';
 
 export function resolveAndroidOverlaySourceRect(

src/daemon/screenshot-overlay.ts

@@ -9,7 +9,7 @@ import {
 import type { PNG } from '../utils/png.ts';
 import { decodePngAsync, encodePngAsync } from '../utils/png-worker-client.ts';
 import { analyzeReactNativeOverlay } from '../core/react-native-overlay.ts';
-import { findNearestAncestor, normalizeType } from '../utils/snapshot-processing.ts';
+import { findNearestAncestor, normalizeType } from '../snapshot/snapshot-processing.ts';
 import { resolveAndroidOverlaySourceRect } from './screenshot-overlay-android.ts';
 import { hasPositiveRect, rectArea, rectContains } from './screenshot-overlay-rects.ts';
 

src/daemon/selector-capture-runtime.ts

@@ -5,7 +5,7 @@ import {
   snapshotPresentationOptionsFromFlags,
   type SnapshotState,
 } from '../kernel/snapshot.ts';
-import { isSparseSnapshotQualityVerdict } from '../utils/snapshot-quality.ts';
+import { isSparseSnapshotQualityVerdict } from '../snapshot/snapshot-quality.ts';
 import type { DaemonRequest, SessionState } from './types.ts';
 import { SessionStore } from './session-store.ts';
 import { captureSnapshot } from './handlers/snapshot-capture.ts';

src/daemon/selector-runtime-backend.ts

@@ -8,7 +8,7 @@ import { createAgentDevice } from '../runtime.ts';
 import { isApplePlatform } from '../kernel/device.ts';
 import { noActiveSessionError, requireCommandSupported } from './handlers/response.ts';
 import type { SnapshotNode } from '../kernel/snapshot.ts';
-import { findNodeByLabel } from '../utils/snapshot-processing.ts';
+import { findNodeByLabel } from '../snapshot/snapshot-processing.ts';
 import { runIosRunnerCommand } from '../platforms/ios/runner-client.ts';
 import { buildAppleRunnerRequestOptions } from './apple-runner-options.ts';
 import { createDaemonRuntimePolicy } from './runtime-policy.ts';

src/daemon/selectors-match.ts

@@ -1,7 +1,7 @@
 import type { Platform } from '../kernel/device.ts';
 import type { SnapshotNode } from '../kernel/snapshot.ts';
 import { isNodeEditable, isNodeVisible } from '../utils/selector-node.ts';
-import { extractNodeText, normalizeType } from '../utils/snapshot-processing.ts';
+import { extractNodeText, normalizeType } from '../snapshot/snapshot-processing.ts';
 import { normalizeText } from '../utils/finders.ts';
 import type { Selector, SelectorTerm } from './selectors-parse.ts';
 

src/daemon/snapshot-presentation/ios/actions.ts

@@ -1,5 +1,5 @@
 import type { RawSnapshotNode } from '../../../kernel/snapshot.ts';
-import { normalizeType } from '../../../utils/snapshot-processing.ts';
+import { normalizeType } from '../../../snapshot/snapshot-processing.ts';
 import {
   findLargestViewportRect,
   findNearestAncestor,

src/daemon/snapshot-presentation/ios/noise.ts

@@ -3,7 +3,7 @@ import {
   isReactNativeCollapsedWarningWrapperCandidate,
   isReactNativeCollapsedWarningWrapperWithVisibleBanner,
 } from '../../../core/react-native-overlay.ts';
-import { normalizeType } from '../../../utils/snapshot-processing.ts';
+import { normalizeType } from '../../../snapshot/snapshot-processing.ts';
 import { collectIosScrollIndicatorPresentation } from './scroll.ts';
 import {
   areRectsApproximatelyEqual,

src/daemon/snapshot-presentation/ios/presentation.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from 'vitest';
 import { attachRefs, type RawSnapshotNode } from '../../../kernel/snapshot.ts';
-import { buildSnapshotVisibility } from '../../../utils/snapshot-visibility.ts';
+import { buildSnapshotVisibility } from '../../../snapshot/snapshot-visibility.ts';
 import { presentIosInteractiveSnapshot } from './index.ts';
 
 function buildSnapshotState(data: { nodes?: RawSnapshotNode[]; backend?: 'xctest' }) {

src/daemon/snapshot-presentation/ios/rows.ts

@@ -1,5 +1,5 @@
 import type { RawSnapshotNode } from '../../../kernel/snapshot.ts';
-import { normalizeType } from '../../../utils/snapshot-processing.ts';
+import { normalizeType } from '../../../snapshot/snapshot-processing.ts';
 import {
   areRectsApproximatelyEqual,
   collectDescendants,

src/daemon/snapshot-presentation/tree.ts

@@ -1,5 +1,5 @@
 import type { RawSnapshotNode } from '../../kernel/snapshot.ts';
-import { normalizeType } from '../../utils/snapshot-processing.ts';
+import { normalizeType } from '../../snapshot/snapshot-processing.ts';
 export { areRectsApproximatelyEqual } from '../../utils/rect-center.ts';
 
 export type SnapshotTreeRuleContext = {

src/daemon/snapshot-runtime.ts

@@ -2,7 +2,7 @@ import type { AgentDeviceBackend, BackendSnapshotResult } from '../backend.ts';
 import type { CommandSessionRecord } from '../runtime.ts';
 import { createAgentDevice } from '../runtime.ts';
 import { AppError } from '../kernel/errors.ts';
-import type { SnapshotDiffSummary } from '../utils/snapshot-diff.ts';
+import type { SnapshotDiffSummary } from '../snapshot/snapshot-diff.ts';
 import type { DaemonRequest, DaemonResponse, DaemonResponseData, SessionState } from './types.ts';
 import { SessionStore } from './session-store.ts';
 import { errorResponse, requireCommandSupported } from './handlers/response.ts';

src/daemon/wait-current-surface.ts

@@ -2,7 +2,7 @@ import type { SnapshotNode } from '../kernel/snapshot.ts';
 import type { DaemonRequest, DaemonResponse, SessionState } from './types.ts';
 import { captureSnapshot } from './handlers/snapshot-capture.ts';
 import { errorResponse } from './handlers/response.ts';
-import { normalizeType } from '../utils/snapshot-processing.ts';
+import { normalizeType } from '../snapshot/snapshot-processing.ts';
 
 type WaitCurrentSurfaceParams = {
   req: DaemonRequest;

src/platforms/android/snapshot.ts

@@ -12,7 +12,7 @@ import {
   type SnapshotOptions,
 } from '../../kernel/snapshot.ts';
 import { isScrollableType } from '../../utils/scrollable.ts';
-import { deriveMobileSnapshotHiddenContentHints } from '../../utils/mobile-snapshot-semantics.ts';
+import { deriveMobileSnapshotHiddenContentHints } from '../../snapshot/mobile-snapshot-semantics.ts';
 import {
   buildUiHierarchySnapshot,
   parseUiHierarchy,

src/snapshot-capture-annotations.ts

@@ -2,7 +2,7 @@ import type { AndroidSnapshotBackendMetadata } from './platforms/android/snapsho
 import {
   readSnapshotQualityVerdict,
   type SnapshotQualityVerdict,
-} from './utils/snapshot-quality.ts';
+} from './snapshot/snapshot-quality.ts';
 
 export type SnapshotCaptureAnalysis = {
   rawNodeCount: number;