fix(snapshot): address ownership review feedback

Author: thymikee

packages/contracts/src/facades/snapshot.ts

@@ -1,5 +1,9 @@
 export { isScrollableNodeLike, isScrollableType } from '../snapshot-scroll.ts';
-export { buildSnapshotNodeMap, findNearestAncestor, findSnapshotAncestor } from '../snapshot-tree.ts';
+export {
+  buildSnapshotNodeMap,
+  findNearestAncestor,
+  findSnapshotAncestor,
+} from '../snapshot-tree.ts';
 export {
   findNearestScrollableAncestor,
   isNodeVisibleInEffectiveViewport,
@@ -10,4 +14,9 @@ export {
   resolveEffectiveViewportRect,
   resolveViewportRect,
 } from '../snapshot-visibility.ts';
-export { extractNodeText, isFillableType, isMeaningfulLabel, normalizeType } from '../snapshot-text.ts';
+export {
+  extractNodeText,
+  isFillableType,
+  isMeaningfulLabel,
+  normalizeType,
+} from '../snapshot-text.ts';

packages/contracts/src/snapshot.test.ts

@@ -4,6 +4,7 @@ import type { RawSnapshotNode, Rect, SnapshotNode } from '@agent-device/kernel/s
 import {
   buildSnapshotNodeMap,
   extractNodeText,
+  findNearestAncestor,
   findNearestScrollableAncestor,
   findSnapshotAncestor,
   isFillableType,
@@ -28,8 +29,6 @@ test('snapshot text semantics normalize roles, identify fillable controls, and e
   assert.equal(isFillableType('android.widget.EditText', 'android'), true);
   assert.equal(
     extractNodeText({
-      index: 0,
-      ref: '@e0',
       label: '  ',
       value: '  Enter name  ',
       identifier: 'name',
@@ -68,6 +67,19 @@ test('findSnapshotAncestor terminates on a parent-linkage cycle without resolvin
   assert.equal(ancestor, null);
 });
 
+test('findNearestAncestor adapts a predicate to the shared tree walk', () => {
+  const nodes: SnapshotNode[] = [
+    { ref: 'e10', index: 10, type: 'Window' },
+    { ref: 'e30', index: 30, parentIndex: 20, type: 'Text' },
+    { ref: 'e20', index: 20, parentIndex: 10, type: 'Cell' },
+  ];
+
+  assert.equal(
+    findNearestAncestor(nodes, nodes[1]!, (ancestor) => ancestor.type === 'Window')?.index,
+    10,
+  );
+});
+
 test('snapshot tree and scroll semantics identify nodes through their stable indexes', () => {
   const nodes = [
     node({ index: 0, type: 'Window' }),

src/core/interaction-targeting.ts

@@ -124,19 +124,7 @@ export function isRootInteractionContainer(
   );
 }
 
-/**
- * The retarget itself. Runtime callers reach it through the promotion stage of
- * `selector-pipeline-policy.ts`, which is what decides whether a given caller
- * promotes at all; this stays exported for that runner and for focused tests.
- */
-export function resolveActionableTouchNode(
-  nodes: SnapshotNode[],
-  node: SnapshotNode,
-): SnapshotNode {
-  return resolveActionableTouchResolution(nodes, node).node;
-}
-
-/** @internal Exposed for focused policy tests; runtime callers should use resolveActionableTouchNode. */
+/** @internal Exposed for focused policy tests. */
 export function resolveActionableTouchResolution(
   nodes: SnapshotNode[],
   node: SnapshotNode,

src/core/snapshot-chrome.ts

@@ -239,11 +239,7 @@ function collectAndroidSettleChrome(
   appBundleId: string | undefined,
 ): SettleChrome {
   const byIndex = new Map(nodes.map((node) => [node.index, node]));
-  const imeIndexes = new Set(
-    nodes
-      .filter(isAndroidInputMethodNode)
-      .map((node) => node.index),
-  );
+  const imeIndexes = new Set(nodes.filter(isAndroidInputMethodNode).map((node) => node.index));
   const imeContainerIndexes = new Set(
     [...imeIndexes].filter((index) => {
       const parentIndex = byIndex.get(index)?.parentIndex;

src/core/snapshot-tree-ingestion.ts

@@ -1,5 +1,9 @@
 import type { RawSnapshotNode } from '@agent-device/kernel/snapshot';
-import { extractNodeText, isMeaningfulLabel, normalizeType } from '@agent-device/contracts/snapshot';
+import {
+  extractNodeText,
+  isMeaningfulLabel,
+  normalizeType,
+} from '@agent-device/contracts/snapshot';
 
 export function normalizeSnapshotTree(nodes: RawSnapshotNode[]): RawSnapshotNode[] {
   const originalToNormalizedIndex = new Map<number, number>();

src/platforms/android/__tests__/input-ownership.test.ts

@@ -2,10 +2,25 @@ import assert from 'node:assert/strict';
 import { test } from 'vitest';
 import {
   classifyAndroidInputOwnership,
+  isAndroidInputMethodNode,
   parseAndroidInputMethodPackage,
   readAndroidActiveInputMethodPackage,
 } from '@agent-device/contracts/platform';
 
+test('classifies raw snapshot nodes through the node-shaped IME predicate', () => {
+  assert.equal(
+    isAndroidInputMethodNode({
+      bundleId: 'com.google.android.inputmethod.latin',
+      identifier: 'com.google.android.inputmethod.latin:id/key',
+    }),
+    true,
+  );
+  assert.equal(
+    isAndroidInputMethodNode({ bundleId: 'com.example.app', identifier: 'save' }),
+    false,
+  );
+});
+
 test('classifies active input method package as IME-owned', () => {
   assert.deepEqual(
     classifyAndroidInputOwnership({