Fix Input Mapping V2 gesture-specific capture behavior - PR_26140_111-fix-input-mapping-v2-gesture-specific-capture

Author: ToolboxAid

docs/dev/reports/input_mapping_v2_gesture_specific_capture_report.md

@@ -0,0 +1,62 @@
+# PR_26140_111-fix-input-mapping-v2-gesture-specific-capture
+
+## Source Reading
+- Read `docs/dev/PROJECT_INSTRUCTIONS.md` before implementation.
+- Read `.codex/skills/repo-build/SKILL.md` for the repo BUILD workflow.
+- Read `docs/pr/BUILD_PR.md`; it still references unrelated Level 18 overlay runtime hardening, so this report treats the explicit PR_26140_111 request as the authoritative BUILD scope.
+- Read the targeted Input Mapping V2 files and immediate engine input dependency used by capture behavior.
+
+## Implementation Summary
+- Updated `ToolStarterApp` capture sessions so completion clears the active Capture button and a single Capture click can commit only one valid mapping.
+- Made Keyboard Release capture wait for key down, show pending release feedback, and commit on matching key up.
+- Made Combo capture visibly pending after the first input and commit only after the second input.
+- Made Mouse Double Click capture wait for two same-button clicks within a threshold, with pending feedback after the first click.
+- Made Mouse Wheel gestures require a matching live wheel event after Capture Mouse; mismatched clicks or opposite wheel directions warn without creating mappings.
+- Tightened game controller capture validation so Button, Trigger, Stick, and DPad gestures only accept matching controller input kinds.
+- Preserved selected tile requirements, token deletion, scroll preservation, capture gating, schema shape, and sample JSON.
+
+## Playwright Impact
+Playwright impacted: Yes.
+
+Validated behavior:
+- Capture buttons unhighlight after successful capture.
+- Combo capture shows first-input pending state and commits after the second input.
+- Keyboard Release commits on release and displays Release.
+- Mouse Double Click commits only after the second click and rejects wheel input.
+- Wheel gestures reject click/opposite wheel input and commit matching wheel direction.
+- Game Controller Trigger rejects non-trigger button input.
+- Game Controller Button rejects standard trigger input.
+- Invalid gesture/input mismatches do not create mappings.
+
+Expected pass behavior: all targeted and workspace-v2 Playwright tests pass with no page errors.
+Expected fail behavior: mismatched gestures produce actionable WARN status/log text and do not create mapping tokens.
+
+## Validation
+PASS `node --check tools/input-mapping-v2/js/ToolStarterApp.js`
+PASS `node --check tools/input-mapping-v2/js/services/EngineInputSourceService.js`
+PASS `node --check tests/playwright/tools/WorkspaceManagerV2.spec.mjs`
+PASS `npx playwright test tests/playwright/tools/WorkspaceManagerV2.spec.mjs -g "Input Mapping V2"` - 8 passed.
+PASS `npm run test:workspace-v2` - 67 passed.
+PASS `git diff --check` - no whitespace errors; PowerShell reported the existing LF to CRLF working-copy warning for the Playwright spec.
+
+## V8 Coverage
+Runtime JavaScript changed, so Playwright V8 coverage artifacts were produced:
+- `docs/dev/reports/playwright_v8_coverage_report.txt`
+- `docs/dev/reports/coverage_changed_js_guardrail.txt`
+
+Coverage guardrail status: advisory only, no threshold enforced, no missing changed-runtime-JS warnings.
+
+## Manual Test Notes
+1. Open Input Mapping V2, select an action, click Add, select Keyboard Release, click Capture Keyboard, press and release a key. Expected: no mapping until release; tile displays Release; Capture Keyboard unhighlights.
+2. Select Keyboard Combo, click Capture Keyboard, press Ctrl then S. Expected: first input shows pending feedback; second input commits one combo token.
+3. Select Mouse Double Click, click Capture Mouse, scroll the wheel, then double-click. Expected: wheel logs WARN and creates no token; double-click commits Double Click.
+4. Select Mouse Wheel Up, click Capture Mouse, click mouse, wheel down, then wheel up. Expected: invalid inputs warn; wheel up commits.
+5. With a standard mocked/connected controller, select Trigger and press a face button, then trigger; select Button and press a trigger, then face button. Expected: mismatches warn and only matching controls commit.
+
+## Delta ZIP
+- `tmp/PR_26140_111-fix-input-mapping-v2-gesture-specific-capture_20260523_093905_delta.zip` created and verified with 10 repo-relative entries.
+
+## Samples Smoke
+Full samples smoke test was not run, per request. Sample JSON was not touched.
+
+

tests/playwright/tools/WorkspaceManagerV2.spec.mjs

@@ -1772,6 +1772,13 @@ test.describe("Workspace Manager V2 bootstrap", () => {
         .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='MouseWheelUp']")
         .click();
       await page.locator("#inputMappingV2CaptureMouseButton").click();
+      await page.evaluate(() => {
+        window.dispatchEvent(new WheelEvent("wheel", {
+          bubbles: true,
+          cancelable: true,
+          deltaY: -120
+        }));
+      });
 
       await page.locator(".input-mapping-v2__gesture-group", { hasText: "Game Controller" })
         .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='GameControllerButton']")
@@ -1950,7 +1957,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseButton0']")).toHaveText("Mouse, Left Button, Click");
 
       await page.locator(".input-mapping-v2__gesture-group", { hasText: "Game Controller" })
-        .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='GameControllerButton']")
+        .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='GameControllerStick']")
         .click();
       expect(await captureDisabledState()).toEqual({
         gamepads: [false],
@@ -1983,14 +1990,14 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(fireTile.locator(".input-mapping-v2__input-token")).toHaveText([
         "Keyboard, KeyH, Hold",
         "Mouse, Left Button, Click",
-        "Game Controller, Axis 0+, Button"
+        "Game Controller, Axis 0+, Stick"
       ]);
       await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='KeyH:KeyboardHold']")).toHaveText("Keyboard, KeyH, Hold");
       await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseButton0']")).toHaveText("Mouse, Left Button, Click");
-      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Pad0:Axis0+:GameControllerButton']")).toHaveText("Game Controller, Axis 0+, Button");
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Pad0:Axis0+']")).toHaveText("Game Controller, Axis 0+, Stick");
       await expect(fireTile.locator(".input-mapping-v2__input-token[data-input-mapping-binding='KeyH:KeyboardHold']")).toHaveAttribute("title", "Keyboard\nKeyH\nHold");
       await expect(fireTile.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseButton0']")).toHaveAttribute("title", "Mouse\nMouse Left Button");
-      await expect(fireTile.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Pad0:Axis0+:GameControllerButton']")).toHaveAttribute("title", /Arcade Flight Stick[\s\S]*Axis 0\+[\s\S]*Button/);
+      await expect(fireTile.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Pad0:Axis0+']")).toHaveAttribute("title", /Arcade Flight Stick[\s\S]*Axis 0\+/);
       const tokenMetrics = await fireTile.locator(".input-mapping-v2__input-token").evaluateAll((tokens) => tokens.map((token) => ({
         cardWidth: Math.round(token.closest(".input-mapping-v2__mapping-card").getBoundingClientRect().width),
         flexBasis: getComputedStyle(token).flexBasis,
@@ -2090,7 +2097,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
           key: "Control"
         }));
       });
-      await expect(page.locator("#inputMappingV2CaptureMessage")).toContainText(/Combo capture recorded Keyboard ControlLeft\. Press one more/);
+      await expect(page.locator("#inputMappingV2CaptureMessage")).toContainText(/Combo capture recorded Keyboard ControlLeft\. Waiting for second input\./);
       await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Combo:ControlLeft+KeyS']")).toHaveCount(0);
       await expect(page.locator("#inspectorOutput")).not.toContainText('"binding": "Combo:ControlLeft+KeyS"');
       await expect.poll(() => fireTile.evaluate((card) => card.scrollTop)).toBe(selectedScrollTop);
@@ -2130,6 +2137,208 @@ test.describe("Workspace Manager V2 bootstrap", () => {
     }
   });
 
+  test("honors Input Mapping V2 gesture-specific capture sessions", async ({ page }) => {
+    await page.setViewportSize({ width: 1600, height: 900 });
+    await page.addInitScript(() => {
+      const buttons = Array.from({ length: 16 }, () => ({ pressed: false }));
+      window.__inputMappingV2MockGamepads = [{
+        axes: [0, 0, 0, 0],
+        buttons,
+        connected: true,
+        id: "Standard Controller",
+        index: 0,
+        mapping: "standard",
+        timestamp: 70
+      }];
+      Object.defineProperty(navigator, "getGamepads", {
+        configurable: true,
+        value: () => window.__inputMappingV2MockGamepads
+      });
+    });
+    const pageErrors = [];
+    page.on("pageerror", (error) => {
+      pageErrors.push(error.message);
+    });
+    const server = await openInputMappingV2(page);
+    try {
+      await expect(page.locator("body[data-tool-id='input-mapping-v2']")).toBeVisible();
+      await expect(page.locator(".input-mapping-v2__gamepad-capture-button[data-input-mapping-gamepad-index='0']")).toBeVisible();
+
+      await page.locator("#inputMappingV2ActionSelect").selectOption("cancel");
+      await page.locator("#inputMappingV2AddActionButton").click();
+      await page.locator(".input-mapping-v2__gesture-group", { hasText: "Keyboard" })
+        .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='KeyboardRelease']")
+        .click();
+      await page.locator("#inputMappingV2CaptureKeyboardButton").click();
+      await page.keyboard.down("KeyP");
+      await expect(page.locator("#inputMappingV2CaptureMessage")).toContainText("Keyboard Release recorded KeyP. Waiting for release.");
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='KeyP:KeyboardRelease']")).toHaveCount(0);
+      await expect(page.locator("#inputMappingV2CaptureKeyboardButton")).toHaveClass(/is-capturing/);
+      await page.keyboard.up("KeyP");
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='KeyP:KeyboardRelease']")).toHaveText("Keyboard, KeyP, Release");
+      await expect(page.locator("#inputMappingV2CaptureKeyboardButton")).not.toHaveClass(/is-capturing/);
+
+      await page.locator("#inputMappingV2ActionSelect").selectOption("confirm");
+      await page.locator("#inputMappingV2AddActionButton").click();
+      await page.locator(".input-mapping-v2__gesture-group", { hasText: "Keyboard" })
+        .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='KeyboardCombo']")
+        .click();
+      await page.locator("#inputMappingV2CaptureKeyboardButton").click();
+      await page.evaluate(() => {
+        window.dispatchEvent(new KeyboardEvent("keydown", {
+          bubbles: true,
+          cancelable: true,
+          code: "ControlLeft",
+          ctrlKey: true,
+          key: "Control"
+        }));
+      });
+      await expect(page.locator("#inputMappingV2CaptureMessage")).toContainText("Combo capture recorded Keyboard ControlLeft. Waiting for second input.");
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Combo:ControlLeft+KeyS']")).toHaveCount(0);
+      await expect(page.locator("#inputMappingV2CaptureKeyboardButton")).toHaveClass(/is-capturing/);
+      await page.evaluate(() => {
+        window.dispatchEvent(new KeyboardEvent("keydown", {
+          bubbles: true,
+          cancelable: true,
+          code: "KeyS",
+          ctrlKey: true,
+          key: "s"
+        }));
+      });
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Combo:ControlLeft+KeyS']")).toHaveText("Combo, Ctrl + S");
+      await expect(page.locator("#inputMappingV2CaptureKeyboardButton")).not.toHaveClass(/is-capturing/);
+
+      await page.locator("#inputMappingV2ActionSelect").selectOption("fire");
+      await page.locator("#inputMappingV2AddActionButton").click();
+      await page.locator(".input-mapping-v2__gesture-group", { hasText: "Mouse" })
+        .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='MouseDoubleClick']")
+        .click();
+      await page.locator("#inputMappingV2CaptureMouseButton").click();
+      await page.evaluate(() => {
+        window.dispatchEvent(new WheelEvent("wheel", {
+          bubbles: true,
+          cancelable: true,
+          deltaY: -120
+        }));
+      });
+      await expect(page.locator("#statusLog")).toHaveValue(/WARN Mouse Double Click capture expects mouse button input; wheel input ignored\./);
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseButton0:MouseDoubleClick']")).toHaveCount(0);
+      await page.evaluate(() => {
+        window.dispatchEvent(new MouseEvent("mousedown", {
+          bubbles: true,
+          button: 0,
+          cancelable: true
+        }));
+      });
+      await expect(page.locator("#inputMappingV2CaptureMessage")).toContainText("Mouse Double Click recorded first click on Left Button. Waiting for second click.");
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseButton0:MouseDoubleClick']")).toHaveCount(0);
+      await page.evaluate(() => {
+        window.dispatchEvent(new MouseEvent("mousedown", {
+          bubbles: true,
+          button: 0,
+          cancelable: true
+        }));
+      });
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseButton0:MouseDoubleClick']")).toHaveText("Mouse, Left Button, Double Click");
+      await expect(page.locator("#inputMappingV2CaptureMouseButton")).not.toHaveClass(/is-capturing/);
+
+      await page.locator("#inputMappingV2ActionSelect").selectOption("jump");
+      await page.locator("#inputMappingV2AddActionButton").click();
+      await page.locator(".input-mapping-v2__gesture-group", { hasText: "Mouse" })
+        .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='MouseWheelUp']")
+        .click();
+      await page.locator("#inputMappingV2CaptureMouseButton").click();
+      await page.evaluate(() => {
+        window.dispatchEvent(new MouseEvent("mousedown", {
+          bubbles: true,
+          button: 0,
+          cancelable: true
+        }));
+      });
+      await expect(page.locator("#statusLog")).toHaveValue(/WARN Mouse Wheel Up capture expects wheel input; mouse click ignored\./);
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseWheelUp']")).toHaveCount(0);
+      await page.evaluate(() => {
+        window.dispatchEvent(new WheelEvent("wheel", {
+          bubbles: true,
+          cancelable: true,
+          deltaY: 120
+        }));
+      });
+      await expect(page.locator("#statusLog")).toHaveValue(/WARN Mouse Wheel Up capture expects Wheel Up; Wheel Down was ignored\./);
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseWheelUp']")).toHaveCount(0);
+      await page.evaluate(() => {
+        window.dispatchEvent(new WheelEvent("wheel", {
+          bubbles: true,
+          cancelable: true,
+          deltaY: -120
+        }));
+      });
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='MouseWheelUp']")).toHaveText("Mouse, Wheel Up, Wheel");
+      await expect(page.locator("#inputMappingV2CaptureMouseButton")).not.toHaveClass(/is-capturing/);
+
+      await page.locator("#inputMappingV2ActionSelect").selectOption("menu");
+      await page.locator("#inputMappingV2AddActionButton").click();
+      await page.locator(".input-mapping-v2__gesture-group", { hasText: "Game Controller" })
+        .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='GameControllerTrigger']")
+        .click();
+      await page.evaluate(() => {
+        window.__inputMappingV2MockGamepads[0] = {
+          ...window.__inputMappingV2MockGamepads[0],
+          buttons: window.__inputMappingV2MockGamepads[0].buttons.map((button, index) => ({ pressed: index === 0 })),
+          timestamp: 71
+        };
+      });
+      await page.locator(".input-mapping-v2__gamepad-capture-button[data-input-mapping-gamepad-index='0']").click();
+      await expect(page.locator("#statusLog")).toHaveValue(/WARN Game Controller Trigger capture expects trigger input; A is button input\./, { timeout: 2500 });
+      await expect(page.locator(".input-mapping-v2__mapping-card[data-input-mapping-tile-action-id='menu'] .input-mapping-v2__input-token")).toHaveCount(0);
+      await page.evaluate(() => {
+        window.__inputMappingV2MockGamepads[0] = {
+          ...window.__inputMappingV2MockGamepads[0],
+          buttons: window.__inputMappingV2MockGamepads[0].buttons.map((button, index) => ({ pressed: index === 6 })),
+          timestamp: 72
+        };
+      });
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Pad0:Button6']")).toHaveText("Game Controller, LT, Trigger", { timeout: 2500 });
+      await expect(page.locator(".input-mapping-v2__gamepad-capture-button[data-input-mapping-gamepad-index='0']")).not.toHaveClass(/is-capturing/);
+
+      await page.evaluate(() => {
+        window.__inputMappingV2MockGamepads[0] = {
+          ...window.__inputMappingV2MockGamepads[0],
+          buttons: window.__inputMappingV2MockGamepads[0].buttons.map(() => ({ pressed: false })),
+          timestamp: 73
+        };
+      });
+      await page.locator("#inputMappingV2ActionSelect").selectOption("start");
+      await page.locator("#inputMappingV2AddActionButton").click();
+      await page.locator(".input-mapping-v2__gesture-group", { hasText: "Game Controller" })
+        .locator(".input-mapping-v2__gesture-button[data-input-mapping-gesture-binding='GameControllerButton']")
+        .click();
+      await page.evaluate(() => {
+        window.__inputMappingV2MockGamepads[0] = {
+          ...window.__inputMappingV2MockGamepads[0],
+          buttons: window.__inputMappingV2MockGamepads[0].buttons.map((button, index) => ({ pressed: index === 6 })),
+          timestamp: 74
+        };
+      });
+      await page.locator(".input-mapping-v2__gamepad-capture-button[data-input-mapping-gamepad-index='0']").click();
+      await expect(page.locator("#statusLog")).toHaveValue(/WARN Game Controller Button capture expects button input; LT is trigger input\./, { timeout: 2500 });
+      await expect(page.locator(".input-mapping-v2__mapping-card[data-input-mapping-tile-action-id='start'] .input-mapping-v2__input-token")).toHaveCount(0);
+      await page.evaluate(() => {
+        window.__inputMappingV2MockGamepads[0] = {
+          ...window.__inputMappingV2MockGamepads[0],
+          buttons: window.__inputMappingV2MockGamepads[0].buttons.map((button, index) => ({ pressed: index === 1 })),
+          timestamp: 75
+        };
+      });
+      await expect(page.locator(".input-mapping-v2__input-token[data-input-mapping-binding='Pad0:Button1']")).toHaveText("Game Controller, B, Button", { timeout: 2500 });
+      await expect(page.locator(".input-mapping-v2__gamepad-capture-button[data-input-mapping-gamepad-index='0']")).not.toHaveClass(/is-capturing/);
+      expect(pageErrors).toEqual([]);
+    } finally {
+      await workspaceV2CoverageReporter.stop(page);
+      await server.close();
+    }
+  });
+
   test("launches Input Mapping V2 and captures keyboard mappings", async ({ page }) => {
     await page.setViewportSize({ width: 1920, height: 900 });
     const server = await openInputMappingV2(page);