fix(snapshot): align scope ownership across runtimes

Author: thymikee

packages/contracts/src/snapshot-scope.ts

@@ -40,14 +40,18 @@ export function matchesSnapshotScope(node: SnapshotScopeCandidate, scope: string
 export function findSnapshotScopeRange(
   nodes: readonly (SnapshotScopeCandidate & { depth?: number })[],
   scope: string,
+  subtreeContributes: (range: { start: number; end: number }) => boolean = () => true,
 ): { start: number; end: number } | null {
   if (!normalizeSnapshotScope(scope)) return null;
-  const start = nodes.findIndex((node) => matchesSnapshotScope(node, scope));
-  if (start === -1) return null;
-  const rootDepth = nodes[start]?.depth ?? 0;
-  let end = start + 1;
-  while (end < nodes.length && (nodes[end]?.depth ?? 0) > rootDepth) end += 1;
-  return { start, end };
+  for (const [start, node] of nodes.entries()) {
+    if (!matchesSnapshotScope(node, scope)) continue;
+    const rootDepth = node.depth ?? 0;
+    let end = start + 1;
+    while (end < nodes.length && (nodes[end]?.depth ?? 0) > rootDepth) end += 1;
+    const range = { start, end };
+    if (subtreeContributes(range)) return range;
+  }
+  return null;
 }
 
 /** Re-roots a document-order slice: fresh indexes, remapped parents, depth rebased by `depthOffset`. */

src/daemon/snapshot-state.ts

@@ -69,13 +69,13 @@ export function buildSnapshotState(
 }
 
 /**
- * Scope resolves once per snapshot. Android resolves it inside its projection (the platform
- * matcher implements the shared scope specification, `@agent-device/contracts/snapshot`), and the
- * macOS helper scopes at capture; a second pass here would re-match inside an already-scoped tree
- * and hand the two layers different no-match semantics (#1832 C2).
+ * Scope resolves once per snapshot. Android and XCTest resolve it inside their projection (the
+ * platform matchers implement the shared scope specification, `@agent-device/contracts/snapshot`),
+ * and the macOS helper scopes at capture; a second pass here would re-match inside an already-scoped
+ * tree and hand the two layers different no-match semantics (#1832 C2).
  */
 function backendScopesAfterWire(backend: SnapshotBackend | undefined): boolean {
-  return backend !== 'macos-helper' && backend !== 'android';
+  return backend !== 'macos-helper' && backend !== 'android' && backend !== 'xctest';
 }
 
 function shouldPresentIosInteractiveSnapshot(

src/platforms/apple/interactor.ts

@@ -203,7 +203,9 @@ function acceptsEmptyScopedSnapshot(
   quality: SnapshotQualityVerdict | undefined,
 ): boolean {
   return (
-    normalizeSnapshotScope(options?.scope) !== null && quality?.state !== 'sparse' && !!quality
+    normalizeSnapshotScope(options?.scope) !== null &&
+    quality !== undefined &&
+    quality.state !== 'sparse'
   );
 }
 

src/snapshot/snapshot-desktop-surface.test.ts

@@ -106,7 +106,13 @@ test('scopeSnapshotNodes agrees with every golden scope-policy table case', () =
   ) as Array<{
     name: string;
     scope: string;
-    nodes: Array<{ depth: number; label?: string; value?: string; identifier?: string }>;
+    nodes: Array<{
+      depth: number;
+      label?: string;
+      value?: string;
+      identifier?: string;
+      presented?: boolean;
+    }>;
     expectedSubtreeIndexes: number[];
   }>;
   expect(cases.length).toBeGreaterThan(0);
@@ -118,7 +124,9 @@ test('scopeSnapshotNodes agrees with every golden scope-policy table case', () =
       parents[node.depth] = index;
       return { ...node, index, parentIndex, rect: { x: index, y: 0, width: 1, height: 1 } };
     });
-    const scoped = scopeSnapshotNodes(nodes, fixture.scope);
+    const scoped = scopeSnapshotNodes(nodes, fixture.scope, (range) =>
+      nodes.slice(range.start, range.end).some((node) => node.presented !== false),
+    );
     expect(
       scoped.map((node) => node.rect?.x),
       fixture.name,

src/snapshot/snapshot-desktop-surface.ts

@@ -72,17 +72,27 @@ function shapeDesktopSurfaceSnapshot(
   options: Pick<SnapshotOptions, 'depth' | 'interactiveOnly' | 'scope'>,
 ): SnapshotResult {
   let nodes = data.nodes ?? [];
-  if (options.scope) nodes = scopeSnapshotNodes(nodes, options.scope);
+  if (options.scope) {
+    nodes = scopeSnapshotNodes(nodes, options.scope, (range) =>
+      options.interactiveOnly
+        ? nodes.slice(range.start, range.end).some(isInteractiveSnapshotNode)
+        : true,
+    );
+  }
   if (options.interactiveOnly) nodes = filterInteractiveSnapshotNodes(nodes);
   if (typeof options.depth === 'number') nodes = filterSnapshotNodesByDepth(nodes, options.depth);
   return { ...data, nodes };
 }
 
 /** The shared scope specification applied post-wire (`@agent-device/contracts/snapshot`). */
-export function scopeSnapshotNodes(nodes: RawSnapshotNode[], scope: string): RawSnapshotNode[] {
+export function scopeSnapshotNodes(
+  nodes: RawSnapshotNode[],
+  scope: string,
+  subtreeContributes?: (range: { start: number; end: number }) => boolean,
+): RawSnapshotNode[] {
   const normalizedScope = normalizeSnapshotScope(scope);
   if (!normalizedScope) return reindexSnapshotNodes(nodes);
-  const range = findSnapshotScopeRange(nodes, normalizedScope);
+  const range = findSnapshotScopeRange(nodes, normalizedScope, subtreeContributes);
   if (!range) return [];
   const slice = nodes.slice(range.start, range.end);
   return reindexSnapshotNodes(slice, slice[0]?.depth ?? 0);