fix: preserve multi-touch recording semantics

Author: thymikee

src/daemon/__tests__/recording-gestures.test.ts

@@ -314,37 +314,63 @@ test('canonical rotate records centroid visualization telemetry', () => {
   ]);
 });
 
-test('canonical transform records centroid travel visualization telemetry', () => {
+test('canonical multi-touch travel does not acquire one-finger back-swipe semantics', () => {
   const session = makeSession();
 
   recordTouchVisualizationEvent(
     session,
     'gesture',
-    ['transform', '201', '437', '40', '-30', '1.4', '25', '600'],
+    ['transform', '10', '437', '170', '0', '1.4', '25', '600'],
     {
       kind: 'transform',
-      from: { x: 201, y: 437 },
-      to: { x: 241, y: 407 },
+      from: { x: 10, y: 437 },
+      to: { x: 180, y: 437 },
       durationMs: 600,
       pointerCount: 2,
     },
     {},
     1_500,
     2_100,
   );
+  recordTouchVisualizationEvent(
+    session,
+    'gesture',
+    ['pan', '392', '437', '-170', '0', '400'],
+    {
+      kind: 'pan',
+      from: { x: 392, y: 437 },
+      to: { x: 222, y: 437 },
+      durationMs: 400,
+      pointerCount: 2,
+    },
+    {},
+    2_200,
+    2_600,
+  );
 
   assert.deepEqual(session.recording?.gestureEvents, [
     {
       kind: 'swipe',
       tMs: 500,
-      x: 201,
+      x: 10,
       y: 437,
-      x2: 241,
-      y2: 407,
+      x2: 180,
+      y2: 437,
       referenceWidth: 402,
       referenceHeight: 874,
       durationMs: 600,
     },
+    {
+      kind: 'swipe',
+      tMs: 1_200,
+      x: 392,
+      y: 437,
+      x2: 222,
+      y2: 437,
+      referenceWidth: 402,
+      referenceHeight: 874,
+      durationMs: 400,
+    },
   ]);
 });
 

src/daemon/recording-gesture-events.ts

@@ -5,6 +5,11 @@ import { readRecordingNumber } from './recording-values.ts';
 const DEFAULT_GESTURE_TRAVEL_DURATION_MS = 250;
 const DEFAULT_PINCH_DURATION_MS = 280;
 
+type SwipeTravelEventOptions = {
+  referenceFrame?: ReferenceFrame;
+  classifyBackSwipe?: boolean;
+};
+
 export function buildCanonicalGestureEvents(
   positionals: string[],
   result: Record<string, unknown>,
@@ -20,6 +25,9 @@ export function buildCanonicalGestureEvents(
       const from = readPoint(result.from);
       const to = readPoint(result.to);
       if (!from || !to) return [];
+      const allowBackSwipeClassification =
+        (result.kind === 'pan' || result.kind === 'fling') &&
+        readRecordingNumber(result.pointerCount) !== 2;
       return [
         buildSwipeTravelEvent(
           tMs,
@@ -32,7 +40,10 @@ export function buildCanonicalGestureEvents(
             result.durationMs,
             DEFAULT_GESTURE_TRAVEL_DURATION_MS,
           ),
-          referenceFrame,
+          {
+            referenceFrame,
+            classifyBackSwipe: allowBackSwipeClassification,
+          },
         ),
       ];
     }
@@ -68,9 +79,10 @@ export function buildSwipeTravelEvent(
   x2: number,
   y2: number,
   durationMs: number,
-  referenceFrame?: ReferenceFrame,
+  options: SwipeTravelEventOptions = {},
 ): RecordingGestureEvent {
-  const kind = classifySwipeKind(x, y, x2, y2, referenceFrame);
+  const { referenceFrame, classifyBackSwipe = true } = options;
+  const kind = classifyBackSwipe ? classifySwipeKind(x, y, x2, y2, referenceFrame) : 'swipe';
   if (kind === 'back-swipe') {
     return {
       kind,

src/daemon/recording-gestures.ts

@@ -311,7 +311,9 @@ function buildSwipeEvents(
   return Array.from({ length: count }, (_, index) => {
     const { startX, startY, endX, endY } = resolveSwipePathForIndex(index, pattern, x1, y1, x2, y2);
     const startTime = tMs + index * (durationMs + pauseMs);
-    return buildSwipeTravelEvent(startTime, startX, startY, endX, endY, durationMs, referenceFrame);
+    return buildSwipeTravelEvent(startTime, startX, startY, endX, endY, durationMs, {
+      referenceFrame,
+    });
   });
 }