test: align maestro input provider guard

Author: thymikee

src/compat/maestro/__tests__/replay-flow.test.ts

@@ -223,7 +223,7 @@ test('parseMaestroReplayFlow keeps focused inputText and pressKey Enter as separ
   assert.deepEqual(parsed.actionLines, [3, 4, 5]);
 });
 
-test('parseMaestroReplayFlow coalesces tapOn inputText without requiring Enter', () => {
+test('parseMaestroReplayFlow marks tapOn before inputText for snapshot tap focus', () => {
   const parsed = parseMaestroReplayFlow(`appId: com.callstack.agentdevicelab
 ---
 - tapOn:
@@ -234,12 +234,11 @@ test('parseMaestroReplayFlow coalesces tapOn inputText without requiring Enter',
   assert.deepEqual(
     parsed.actions.map((entry) => [entry.command, entry.positionals]),
     [
-      ['wait', ['id="editableNameInput"', '30000']],
-      ['fill', ['id="editableNameInput"', 'Saved list']],
+      ['__maestroTapOn', ['id="editableNameInput"']],
+      ['type', ['Saved list']],
     ],
   );
-  assert.deepEqual(parsed.actionLines, [3, 3]);
-  assert.equal(parsed.actions[1]?.flags?.maestro?.allowNonHittableCoordinateFallback, true);
+  assert.equal(parsed.actions[0]?.flags?.maestro?.allowNonHittableCoordinateFallback, undefined);
 });
 
 test('parseMaestroReplayFlow coalesces tapOn inputText while preserving pressKey Enter submit', () => {
@@ -659,10 +658,10 @@ test('parseMaestroReplayFlow parses the test-app Maestro suite fixture', () => {
       '__maestroAssertVisible',
       '__maestroTapOn',
       '__maestroAssertVisible',
-      'wait',
-      'fill',
-      'wait',
-      'fill',
+      '__maestroTapOn',
+      'type',
+      '__maestroTapOn',
+      'type',
       '__maestroTapOn',
       '__maestroAssertVisible',
       '__maestroAssertVisible',

src/compat/maestro/replay-flow.ts

@@ -113,32 +113,27 @@ function optimizeTypedAfterTap(
   if (!isLikelyTextEntrySelector(tapSelector)) {
     return { actions: [clearMaestroNonHittableTap(action)], actionLines: [line], consumed: 1 };
   }
-  const fillActions: SessionAction[] = [
-    {
-      ...action,
-      command: 'wait',
-      positionals: [tapSelector, '30000'],
-    },
-    {
-      ...nextAction,
-      command: 'fill',
-      positionals: [tapSelector, typedAfterTap],
-      flags: action.flags,
-    },
-  ];
-  const fillActionLines = [line, line];
   const pressEnterAction = actions[index + 2];
-  if (pressEnterAction?.command === MAESTRO_RUNTIME_COMMAND.pressEnter) {
-    return {
-      actions: [...fillActions, pressEnterAction],
-      actionLines: [...fillActionLines, actionLines[index + 2] ?? line],
-      consumed: 3,
-    };
+  if (pressEnterAction?.command !== MAESTRO_RUNTIME_COMMAND.pressEnter) {
+    return { actions: [clearMaestroNonHittableTap(action)], actionLines: [line], consumed: 1 };
   }
   return {
-    actions: fillActions,
-    actionLines: fillActionLines,
-    consumed: 2,
+    actions: [
+      {
+        ...action,
+        command: 'wait',
+        positionals: [tapSelector, '30000'],
+      },
+      {
+        ...nextAction,
+        command: 'fill',
+        positionals: [tapSelector, typedAfterTap],
+        flags: action.flags,
+      },
+      pressEnterAction,
+    ],
+    actionLines: [line, line, actionLines[index + 2] ?? line],
+    consumed: 3,
   };
 }
 

test/integration/provider-scenarios/android-test-suite.test.ts

@@ -172,7 +172,7 @@ test('Provider-backed integration Android Maestro replay test suite discovers YA
   );
 });
 
-test('Provider-backed integration Android Maestro fills tapOn inputText without trailing Enter', async () => {
+test('Provider-backed integration Android Maestro types after tapOn inputText without trailing Enter', async () => {
   await withProviderScenarioResource(
     async () => await createAndroidSettingsWorld({ nativeTextInjection: true }),
     async (world) => {
@@ -205,12 +205,15 @@ test('Provider-backed integration Android Maestro fills tapOn inputText without
       assert.equal(suite.failed, 0, JSON.stringify(suite));
       assert.deepEqual(world.textInjectionCalls, [
         {
-          action: 'fill',
-          target: { x: 195, y: 52 },
+          action: 'type',
           text: 'Łódź café',
           delayMs: 0,
         },
       ]);
+      assert.deepEqual(
+        world.adbCalls.find((call) => call.slice(0, 3).join(' ') === 'shell input tap'),
+        ['shell', 'input', 'tap', '195', '52'],
+      );
       assert.equal(
         world.adbCalls.some(
           (call) => call[0] === 'shell' && call[1] === 'input' && call[2] === 'text',