fix: stabilize Android Maestro replay context

Author: thymikee

src/compat/maestro/runtime-assertions.ts

@@ -78,6 +78,7 @@ async function invokeNativeMaestroVisibleWaitWithSnapshotFallback(
   const nativeStartedAt = Date.now();
   const nativeResponse = await runNativeVisibleWait(params, args, nativeWaitQuery);
   if (nativeResponse.ok) {
+    rememberMaestroVisibleContext(params.scope, args.selector);
     return visibleAssertionResponse(
       {
         ok: true,

src/daemon/__tests__/post-gesture-stabilization.test.ts

@@ -62,6 +62,32 @@ test('capturePostGestureStabilizedSnapshot retries until rects stop moving', asy
   assert.equal(session.postGestureStabilization, undefined);
 });
 
+test('capturePostGestureStabilizedSnapshot samples again after a slow first capture', async () => {
+  vi.useFakeTimers();
+  const session = makeSession('android');
+  markPostGestureStabilization(session, 'click', [], { postGestureStabilization: true });
+  let captures = 0;
+
+  const promise = capturePostGestureStabilizedSnapshot({
+    session,
+    capture: async () => {
+      captures += 1;
+      if (captures === 1) {
+        await new Promise((resolve) => setTimeout(resolve, 1_600));
+      }
+      return makeSnapshot(100);
+    },
+  });
+
+  await vi.advanceTimersByTimeAsync(1_600);
+  await vi.advanceTimersByTimeAsync(200);
+  const snapshot = await promise;
+
+  assert.equal(captures, 2);
+  assert.equal(snapshot.nodes[1]?.rect?.y, 100);
+  assert.equal(session.postGestureStabilization, undefined);
+});
+
 function makeSession(platform: 'ios' | 'android' = 'ios'): SessionState {
   return {
     name: platform,

src/daemon/handlers/__tests__/session-replay-vars.test.ts

@@ -1050,6 +1050,77 @@ test('runReplayScriptFile captures a fresh Maestro snapshot for tapOn after asse
   );
 });
 
+test('runReplayScriptFile scopes duplicate tap targets after native Maestro assertVisible', async () => {
+  const { response, calls } = await runReplayFixture({
+    label: 'maestro-native-assert-context-duplicate-tap',
+    script: ['appId: demo.app', '---', '- assertVisible: Albums', '- tapOn: Push article', ''].join(
+      '\n',
+    ),
+    flags: { replayBackend: 'maestro', platform: 'android' },
+    invoke: async (req) => {
+      if (req.command === 'wait') {
+        return { ok: true, data: { matched: true } };
+      }
+      if (req.command === 'snapshot') {
+        return {
+          ok: true,
+          data: {
+            nodes: [
+              {
+                index: 1,
+                depth: 1,
+                type: 'android.widget.ScrollView',
+                rect: { x: 0, y: 0, width: 390, height: 844 },
+              },
+              {
+                index: 2,
+                depth: 2,
+                parentIndex: 1,
+                type: 'android.widget.TextView',
+                label: 'Albums',
+                rect: { x: 24, y: 120, width: 120, height: 40 },
+              },
+              {
+                index: 3,
+                depth: 2,
+                parentIndex: 1,
+                type: 'android.widget.TextView',
+                label: 'Push article',
+                rect: { x: 32, y: 220, width: 160, height: 44 },
+              },
+              {
+                index: 10,
+                depth: 1,
+                type: 'android.widget.ScrollView',
+                rect: { x: 0, y: 0, width: 390, height: 844 },
+              },
+              {
+                index: 11,
+                depth: 2,
+                parentIndex: 10,
+                type: 'android.widget.TextView',
+                label: 'Push article',
+                rect: { x: 32, y: 520, width: 160, height: 44 },
+              },
+            ],
+          },
+        };
+      }
+      return { ok: true, data: {} };
+    },
+  });
+
+  assert.equal(response.ok, true);
+  assert.deepEqual(
+    calls.map((call) => [call.command, call.positionals]),
+    [
+      ['wait', ['Albums', '17000']],
+      ['snapshot', []],
+      ['click', ['112', '242']],
+    ],
+  );
+});
+
 test('runReplayScriptFile treats absent Maestro assertNotVisible targets as passing', async () => {
   const calls: CapturedInvocation[] = [];
   const { response } = await runReplayFixture({

src/daemon/post-gesture-stabilization.ts

@@ -10,6 +10,7 @@ import type { SessionState } from './types.ts';
 
 const STABILIZATION_DEADLINE_MS = 1_500;
 const STABILIZATION_INTERVAL_MS = 200;
+const STABILIZATION_MIN_ATTEMPTS = 2;
 
 export function markPostGestureStabilization(
   session: SessionState,
@@ -58,7 +59,10 @@ export async function capturePostGestureStabilizedResult<T>(params: {
   let previous = params.initial ?? (await capture());
   let previousSignature = buildInteractionSurfaceSignature(params.readSnapshot(previous).nodes);
 
-  while (Date.now() - startedAt < STABILIZATION_DEADLINE_MS) {
+  while (
+    attempts < STABILIZATION_MIN_ATTEMPTS ||
+    Date.now() - startedAt < STABILIZATION_DEADLINE_MS
+  ) {
     await sleep(STABILIZATION_INTERVAL_MS);
     attempts += 1;
     const current = await capture();