fix: correct unified gesture helper behavior

Author: thymikee

android-multitouch-helper/src/main/java/com/callstack/agentdevice/multitouchhelper/MultiTouchInstrumentation.java

@@ -409,9 +409,7 @@ private static PointerPair pointerPairAt(GestureSpec spec, double t) {
         endRadius = spec.radius * spec.scale;
       }
       double radius = startRadius + (endRadius - startRadius) * t;
-      return new PointerPair(
-          new float[] {(float) (spec.x - radius), (float) (spec.x + radius)},
-          new float[] {(float) spec.y, (float) spec.y});
+      return twoPointerPairAt(spec.x, spec.y, radius, 0.0d);
     }
     double centerX = spec.x;
     double centerY = spec.y;
@@ -427,16 +425,15 @@ private static PointerPair pointerPairAt(GestureSpec spec, double t) {
       }
       radius = startRadius + (endRadius - startRadius) * t;
     }
-    double angle = Math.toRadians(-90 + spec.degrees * t);
+    return twoPointerPairAt(centerX, centerY, radius, spec.degrees * t);
+  }
+
+  private static PointerPair twoPointerPairAt(
+      double centerX, double centerY, double radius, double rotationDegrees) {
+    float[][] coordinates = TwoPointerGeometry.pointsAt(
+        centerX, centerY, radius, rotationDegrees);
     return new PointerPair(
-        new float[] {
-          (float) (centerX + Math.cos(angle) * radius),
-          (float) (centerX - Math.cos(angle) * radius)
-        },
-        new float[] {
-          (float) (centerY + Math.sin(angle) * radius),
-          (float) (centerY - Math.sin(angle) * radius)
-        });
+        coordinates[0], coordinates[1]);
   }
 
   private static PlannedPointerPath[] readPlannedPointers(

android-multitouch-helper/src/main/java/com/callstack/agentdevice/multitouchhelper/TwoPointerGeometry.java

@@ -0,0 +1,22 @@
+package com.callstack.agentdevice.multitouchhelper;
+
+final class TwoPointerGeometry {
+  private static final double INITIAL_ANGLE_DEGREES = -90.0d;
+
+  private TwoPointerGeometry() {}
+
+  static float[][] pointsAt(
+      double centerX, double centerY, double radius, double rotationDegrees) {
+    double angle = Math.toRadians(INITIAL_ANGLE_DEGREES + rotationDegrees);
+    return new float[][] {
+      {
+        (float) (centerX + Math.cos(angle) * radius),
+        (float) (centerX - Math.cos(angle) * radius)
+      },
+      {
+        (float) (centerY + Math.sin(angle) * radius),
+        (float) (centerY - Math.sin(angle) * radius)
+      }
+    };
+  }
+}

android-multitouch-helper/src/test/java/com/callstack/agentdevice/multitouchhelper/TwoPointerGeometryTest.java

@@ -0,0 +1,20 @@
+package com.callstack.agentdevice.multitouchhelper;
+
+public final class TwoPointerGeometryTest {
+  private TwoPointerGeometryTest() {}
+
+  public static void main(String[] args) {
+    float[][] points = TwoPointerGeometry.pointsAt(300.0d, 400.0d, 60.0d, 0.0d);
+
+    assertNear(300.0f, points[0][0], "first x");
+    assertNear(300.0f, points[0][1], "second x");
+    assertNear(340.0f, points[1][0], "first y");
+    assertNear(460.0f, points[1][1], "second y");
+  }
+
+  private static void assertNear(float expected, float actual, String label) {
+    if (Math.abs(expected - actual) > 0.001f) {
+      throw new AssertionError(label + ": expected " + expected + ", got " + actual);
+    }
+  }
+}

scripts/build-android-multitouch-helper.sh

@@ -47,21 +47,31 @@ VERSION_CODE="$(
 
 BUILD_DIR="$HELPER_DIR/build"
 CLASSES_DIR="$BUILD_DIR/classes"
+TEST_CLASSES_DIR="$BUILD_DIR/test-classes"
 DEX_DIR="$BUILD_DIR/dex"
 KEYSTORE="$PROJECT_DIR/android-snapshot-helper/debug.keystore"
 UNSIGNED_APK="$BUILD_DIR/helper-unsigned.apk"
 ALIGNED_APK="$BUILD_DIR/helper-aligned.apk"
 APK_PATH="$OUTPUT_DIR/$APK_BASENAME"
 
 rm -rf "$BUILD_DIR"
-mkdir -p "$CLASSES_DIR" "$DEX_DIR" "$OUTPUT_DIR"
+mkdir -p "$CLASSES_DIR" "$TEST_CLASSES_DIR" "$DEX_DIR" "$OUTPUT_DIR"
 
 javac \
   --release 11 \
   -classpath "$ANDROID_JAR" \
   -d "$CLASSES_DIR" \
   $(find "$HELPER_DIR/src/main/java" -name '*.java' | sort)
 
+javac \
+  --release 11 \
+  -classpath "$CLASSES_DIR" \
+  -d "$TEST_CLASSES_DIR" \
+  $(find "$HELPER_DIR/src/test/java" -name '*.java' | sort)
+
+java -classpath "$CLASSES_DIR:$TEST_CLASSES_DIR" \
+  com.callstack.agentdevice.multitouchhelper.TwoPointerGeometryTest
+
 "$BUILD_TOOLS_DIR/d8" \
   --min-api "$MIN_SDK" \
   --classpath "$ANDROID_JAR" \

src/core/__tests__/capabilities.test.ts

@@ -153,7 +153,7 @@ test('device capability matrix stays consistent across shared command groups', (
       ],
     },
     {
-      commands: ['swipe'],
+      commands: ['gesture', 'swipe'],
       checks: [
         { device: iosSimulator, expected: true, label: 'on iOS sim' },
         { device: iosDevice, expected: true, label: 'on iOS device' },
@@ -232,6 +232,7 @@ test('macOS supports the Apple runner interaction core but excludes mobile-only
       'scroll',
       'snapshot',
       'swipe',
+      'gesture',
       'trigger-app-event',
       'type',
       'wait',
@@ -382,6 +383,7 @@ test('web supports only the initial browser interaction slice', () => {
       'boot',
       'clipboard',
       'diff',
+      'gesture',
       'home',
       'install',
       'install-from-source',

src/core/__tests__/gesture-capabilities.test.ts

@@ -80,7 +80,13 @@ test('TV, spatial, watch, desktop, Linux, and web gesture policy stays explicit'
   const web = device({ platform: 'web', kind: 'device', target: 'desktop' });
 
   assertSupported(oneFingerPan, androidTv);
-  assertUnsupported(twoFingerPan, androidTv, /tvOS/);
+  assertUnsupported(twoFingerPan, androidTv, /Android TV/);
+  assert.throws(
+    () => requireGestureSupported(twoFingerPan, androidTv),
+    (error: unknown) =>
+      error instanceof AppError &&
+      /Android TV has no touch input/.test(String(error.details?.hint)),
+  );
   assertUnsupported(twoFingerPan, tvOs, /tvOS/);
   assertUnsupported(twoFingerPan, visionOs, /visionOS/i);
   assertUnsupported(oneFingerPan, watchOs, /watchos/);

src/core/capabilities.ts

@@ -165,8 +165,8 @@ function requireMultiTouchGestureSupported(input: GestureSemanticInput, device:
     if (device.target !== 'tv') return;
     throw unsupportedGesture(
       input,
-      `gesture ${input.intent} is not supported on tvOS`,
-      'tvOS has no touch input — this gesture is supported on Android and the iOS simulator only.',
+      `gesture ${input.intent} is not supported on Android TV`,
+      'Android TV has no touch input — this gesture is supported on Android phones, tablets, and the iOS simulator only.',
     );
   }
   if (device.platform !== 'apple') {

src/core/command-descriptor/__tests__/parity.test.ts

@@ -47,7 +47,6 @@ const NO_CAPABILITY_PUBLIC_COMMANDS = new Set<string>([
   PUBLIC_COMMANDS.devices,
   PUBLIC_COMMANDS.doctor,
   PUBLIC_COMMANDS.events,
-  PUBLIC_COMMANDS.gesture,
   PUBLIC_COMMANDS.prepare,
   PUBLIC_COMMANDS.replay,
   PUBLIC_COMMANDS.test,
@@ -285,6 +284,7 @@ test('capability-checked command list is built from descriptor capabilities', ()
 
   assert.deepEqual(listCapabilityCheckedCommandNames(), expected);
   assert.ok(expectedNames.has(PUBLIC_COMMANDS.snapshot), 'snapshot remains capability-checked');
+  assert.ok(expectedNames.has(PUBLIC_COMMANDS.gesture), 'gesture remains capability-checked');
   assert.equal(
     expectedNames.has(PUBLIC_COMMANDS.capabilities),
     false,

src/core/command-descriptor/registry.ts

@@ -772,6 +772,7 @@ export const RAW_COMMAND_DESCRIPTORS = [
     ...(ownerFilesEnabled ? { ownerFiles: ['src/commands/interaction/index.ts'] as const } : {}),
     catalog: { group: 'public' },
     daemon: { route: 'interaction', replayScopedAction: true, androidBlockingDialogGuard: true },
+    capability: ALL_DEVICE_COMMAND_CAPABILITY,
     timeoutPolicy: DEFAULT_TIMEOUT_POLICY,
     batchable: true,
   },

src/daemon/handlers/__tests__/session-capabilities.test.ts

@@ -34,7 +34,16 @@ test('capabilities reports supported commands for the selected session device',
     kind: 'emulator',
   });
   expect(response.data?.availableCommands).toEqual(
-    expect.arrayContaining(['open', 'screenshot', 'snapshot', 'press', 'fill', 'network', 'perf']),
+    expect.arrayContaining([
+      'open',
+      'screenshot',
+      'snapshot',
+      'press',
+      'fill',
+      'network',
+      'perf',
+      PUBLIC_COMMANDS.gesture,
+    ]),
   );
   expect(response.data?.availableCommands).not.toContain(PUBLIC_COMMANDS.capabilities);
   expect(response.data?.availableCommands).not.toContain(PUBLIC_COMMANDS.devices);