fix(daemon): a surface entry carries a state-free content key, so an anonymous toggle is not movement

Review follow-up. The within-container movement check fell back to `key` for an entry without an identity, and `key` carries the checked state, so an unlabelled switch a swipe brushed still read as content moving. Every entry now carries `content`: the identity where the node has one, else its type and role; the check compares on that alone.

Author: okwasniewski

src/daemon/__tests__/interaction-outcome-policy.test.ts

@@ -478,22 +478,30 @@ test('classifyInteractionSurfaceChange reads a checked-only flip as a change', (
   assert.equal(classifyInteractionSurfaceChange(before, after), 'changed');
 });
 
-test('discriminatingSurfaceChangedWithinRect reads a flip at the same rect as no movement, and a moved row as movement', () => {
-  const rect = { x: 0, y: 0, width: 390, height: 844 };
-  const signature = (checked: boolean, y?: number) =>
-    buildInteractionSurfaceSignature(makeToggleSnapshot(checked, y).nodes);
-
-  assert.equal(
-    discriminatingSurfaceChangedWithinRect(signature(false), signature(true), rect),
-    false,
-  );
-  assert.equal(
-    discriminatingSurfaceChangedWithinRect(signature(false, 300), signature(false, 200), rect),
-    true,
-  );
-});
-
-function makeToggleSnapshot(checked: boolean, y = 300): SnapshotState {
+test.each([
+  { anonymous: false, label: 'a labelled switch' },
+  { anonymous: true, label: 'an anonymous switch' },
+])(
+  'discriminatingSurfaceChangedWithinRect reads a flip of $label at the same rect as no movement, and a moved one as movement',
+  ({ anonymous }) => {
+    const rect = { x: 0, y: 0, width: 390, height: 844 };
+    const signature = (checked: boolean, y?: number) =>
+      buildInteractionSurfaceSignature(makeToggleSnapshot(checked, y, anonymous).nodes);
+
+    assert.equal(
+      discriminatingSurfaceChangedWithinRect(signature(false), signature(true), rect),
+      false,
+    );
+    assert.equal(
+      discriminatingSurfaceChangedWithinRect(signature(false, 300), signature(false, 200), rect),
+      true,
+    );
+  },
+);
+
+// An anonymous switch has no identity, so its content is its type: the flip still changes only the
+// key, and a swipe that brushed it must not read as the list moving.
+function makeToggleSnapshot(checked: boolean, y = 300, anonymous = false): SnapshotState {
   const base = makeSnapshot('Inbox');
   return {
     ...base,
@@ -504,8 +512,7 @@ function makeToggleSnapshot(checked: boolean, y = 300): SnapshotState {
         index: 2,
         parentIndex: 0,
         type: 'android.widget.Switch',
-        identifier: 'wifi-switch',
-        label: 'Wi-Fi switch',
+        ...(anonymous ? {} : { identifier: 'wifi-switch', label: 'Wi-Fi switch' }),
         checked,
         rect: { x: 300, y, width: 60, height: 40 },
       },

src/daemon/handlers/__tests__/snapshot-handler-capture-retry.test.ts

@@ -97,6 +97,8 @@ test('captureSnapshot lazily retries pending no-change touch before returning fr
     preSignature: [
       {
         key: 'open-feed|Open feed||Button||hittable|#0',
+        identity: 'open-feed|Open feed||Button',
+        content: 'open-feed|Open feed||Button',
         x: 20,
         y: 120,
         width: 160,
@@ -240,6 +242,8 @@ test('captureSnapshot retries pending tap outcome before post-gesture stabilizat
     preSignature: [
       {
         key: '|Navigate to Third||android.widget.Button||hittable|#0',
+        identity: '|Navigate to Third||android.widget.Button',
+        content: '|Navigate to Third||android.widget.Button',
         x: 302,
         y: 1301,
         width: 476,

src/daemon/interaction-outcome-policy.ts

@@ -467,10 +467,10 @@ export function summarizeDiscriminatingSurfaceDivergence(
 
 /**
  * Whether the DISCRIMINATING entries inside `rect` moved across a gesture: one left or entered the
- * region, or its rect moved beyond tolerance. Entries match on the flip-tolerant `identity` where
- * they have one, told apart by document order when repeated, and on `key` otherwise. A scroll moves
- * content, while a state flip inside the container (a switch the swipe brushed, a row it selected)
- * changes the key at the same rect and is not movement.
+ * region, or its rect moved beyond tolerance. Entries match on `content`: the flip-tolerant
+ * `identity` where they have one, the type and role of an anonymous node otherwise, told apart by
+ * document order when repeated. A scroll moves content, while a state flip inside the container (a
+ * switch the swipe brushed, a row it selected) changes the key at the same rect and is not movement.
  *
  * A whole-surface difference is not automatically the gesture's doing. A captured tree carries system
  * chrome with it, and on Android the status bar clocks and icons change on their own while the app's
@@ -500,10 +500,9 @@ function contentKeyed(
   const occurrences = new Map<string, number>();
   const keyed = new Map<string, InteractionSurfaceSignature[number]>();
   for (const entry of entries) {
-    const content = entry.identity ?? entry.key;
-    const occurrence = occurrences.get(content) ?? 0;
-    occurrences.set(content, occurrence + 1);
-    keyed.set(`${content}|#${occurrence}`, entry);
+    const occurrence = occurrences.get(entry.content) ?? 0;
+    occurrences.set(entry.content, occurrence + 1);
+    keyed.set(`${entry.content}|#${occurrence}`, entry);
   }
   return keyed;
 }
@@ -558,6 +557,7 @@ function buildInteractionSurfaceEntry(
   return {
     key: `${semanticKey}|#${occurrence}`,
     ...(identity ? { identity } : {}),
+    content: interactionSurfaceContent(node, identity),
     x: Math.round(node.rect.x),
     y: Math.round(node.rect.y),
     width: Math.round(node.rect.width),
@@ -566,6 +566,11 @@ function buildInteractionSurfaceEntry(
   };
 }
 
+/** What the element is without the state it is in: its identity, else the type and role of an anonymous node. */
+function interactionSurfaceContent(node: SnapshotNode, identity: string | undefined): string {
+  return identity ?? `${node.type ?? ''}|${node.role ?? ''}`;
+}
+
 /**
  * What the element IS — never where it sits, and never volatile state a gesture
  * is expected to change. `interactionSurfaceSemanticKey` deliberately folds in

src/daemon/session-state.ts

@@ -53,6 +53,13 @@ export type InteractionSurfaceEntry = {
    * comparison entirely.
    */
   identity?: string;
+  /**
+   * What the element is without the state it is in: `identity` where the node
+   * has one, else its type and role. A within-container movement check compares
+   * entries on this, in document order when repeated, because a state flip
+   * changes `key` at the same rect and is not movement.
+   */
+  content: string;
   x: number;
   y: number;
   width: number;