Scope Controls mappings by profile and use shared engine input services - PR_26161_031-controls-engine-input-and-profile-scope

Author: ToolboxAid

assets/theme-v2/css/typography.css

@@ -131,7 +131,8 @@ dd {
   padding-block: var(--space-6)
 }
 
-.text-gold {
+.text-gold,
+.btn.text-gold {
   color: var(--gold)
 }
 

docs_build/dev/reports/codex_changed_files.txt

@@ -1,9 +1,12 @@
 assets/theme-v2/css/typography.css
 docs_build/dev/reports/codex_changed_files.txt
 docs_build/dev/reports/codex_review.diff
-docs_build/dev/reports/controls-device-refresh-profile-polish-report.md
+docs_build/dev/reports/controls-engine-input-and-profile-scope-report.md
 docs_build/dev/reports/coverage_changed_js_guardrail.txt
 docs_build/dev/reports/playwright_v8_coverage_report.txt
+src/engine/input/GamepadInputClassifier.js
+src/engine/input/GamepadState.js
+src/engine/input/InputService.js
 tests/playwright/tools/InputMappingV2Tool.spec.mjs
 toolbox/controls/controls.js
 toolbox/controls/index.html

docs_build/dev/reports/codex_review.diff

@@ -0,0 +1,85 @@
+# PR_26161_031 Controls Engine Input And Profile Scope Report
+
+## Scope
+- Routed Controls keyboard, mouse, wheel, and gamepad detection through shared `src/engine/input` services.
+- Removed local gamepad polling and local gamepad input interpretation from Controls.
+- Removed Mapping Profile from Input Mapping rows.
+- Scoped mappings by `controllerProfileId`: Keyboard/Mouse mappings use the Keyboard/Mouse profile scope, and Gamepad mappings use the selected saved Controller Profile.
+- Relaxed Controller Profile saving so generated inputs may remain unassigned.
+
+## Branch Validation
+- PASS: current branch verified as `main` before edits.
+
+## Impacted Lane
+- Controls / Input Mapping.
+- Shared input helper lane for `src/engine/input`.
+
+## Playwright Impacted
+- Yes.
+
+## Validation Performed
+- PASS: `node --check src/engine/input/GamepadInputClassifier.js`
+- PASS: `node --check src/engine/input/InputService.js`
+- PASS: `node --check src/engine/input/GamepadState.js`
+- PASS: `node --check toolbox/controls/controls.js`
+- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
+- PASS: `node tests/input/GamepadState.test.mjs`
+- PASS: `node tests/input/InputService.test.mjs`
+- PASS: `node tests/input/GamepadInputAdapter.test.mjs`
+- PASS: `Select-String -Path toolbox/controls/index.html -Pattern '<style',' onclick=',' onchange=',' oninput=',' onsubmit='`
+- PASS: `git diff --check`
+- PASS: `rg -n "navigator\\.getGamepads|Array\\.from\\(navigator" toolbox/controls/controls.js` returned no matches.
+- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs`
+
+## Manual Validation Steps
+- Open Controls.
+- Confirm Input Mapping table columns are Object, Action, Input Device, Input, State, Actions.
+- Add a Keyboard mapping, capture a key, and confirm the selected input text turns Theme V2 gold while editing.
+- Add a Mouse mapping, capture a mouse button or wheel input, and confirm the selected input text turns Theme V2 gold while editing.
+- Refresh devices with a gamepad available and confirm diagnostics report multiple active controller inputs when multiple inputs are pressed.
+- Add a Controller Profile, edit it, leave generated inputs unassigned, save, and confirm the profile saves without invalid or blocking status.
+- Reopen the profile, assign Actions, press controller inputs, and confirm only selected Action text turns Theme V2 gold.
+- Add a Gamepad mapping after selecting a saved Controller Profile and confirm the saved mapping stores the selected `controllerProfileId` without displaying Mapping Profile in the row.
+- Reload and confirm mappings and profiles persist.
+
+## Shared Input Gap / Extension
+- PASS: Controls needed shared generated controller profile labels and active profile input names. Added the smallest shared extension to `src/engine/input/GamepadInputClassifier.js`.
+- PASS: Controls needed browser gamepad button `value` support through the shared input path. Updated `InputService` and `GamepadState` to treat button value above threshold as active.
+- PASS: No local Controls workaround or duplicate controller polling remains.
+
+## Skipped Lanes
+- Full samples validation skipped by request.
+- Auth, production DB, production game runtime, and sample JSON lanes skipped because this PR only changes Controls UI/runtime behavior plus targeted shared input helpers used by Controls.
+- Broad engine/game validation skipped because the shared input changes were narrow and covered by targeted input unit tests plus Controls Playwright.
+
+## Runtime Engine Behavior
+- PASS: no production game runtime wiring or sample behavior changed.
+- PASS: shared input helpers were extended only to expose existing browser input state to Controls.
+
+## Coverage Notes
+- PASS: Playwright V8 coverage report produced.
+- WARN: `src/engine/input/InputService.js` reports advisory low function coverage in V8 coverage, but changed lines were executed and targeted input unit tests passed.
+
+## Requirement Checklist
+- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before edits.
+- PASS: Verified branch `main` before edits.
+- PASS: Continued from PR_26161_030.
+- PASS: Controls status remains Wireframe.
+- PASS: Controls data remains DB-backed through the shared DB/mock adapter only.
+- PASS: Controller Profile can save with no Action assignments.
+- PASS: Generated controller inputs may remain unassigned.
+- PASS: Unassigned generated inputs display as unassigned, not invalid.
+- PASS: Controls uses `src/engine/input` classes/services for keyboard, mouse, and game controller input detection.
+- PASS: Controls no longer performs duplicate local controller polling or input interpretation.
+- PASS: Missing shared input capability was addressed with the smallest shared input extension.
+- PASS: Multiple simultaneous game controller input states are reported when exposed by `src/engine/input`.
+- PASS: Keyboard selected input text changes to Theme V2 gold during capture/edit.
+- PASS: Mouse button and wheel selected input text changes to Theme V2 gold during capture/edit.
+- PASS: Controller selected Action text remains Theme V2 gold only.
+- PASS: Mapping Profile no longer appears in Input Mapping rows.
+- PASS: Mappings are scoped by selected Controller Profile through `controllerProfileId`.
+- PASS: Keyboard and Mouse mappings use the Keyboard/Mouse profile scope.
+- PASS: Gamepad mappings use the selected saved controller profile scope.
+- PASS: Controller profile generation, device refresh guidance, Create Profile From Default edit mode, custom Actions, accordions, reset confirmation, DB persistence, and object-aware action filtering are preserved.
+- PASS: No sample JSON alignment, auth behavior, production game runtime behavior, or unrelated rewrites were added.
+- PASS: Theme V2 only; no inline CSS, inline JS, script/style blocks, or inline event handlers were added.

docs_build/dev/reports/controls-engine-input-and-profile-scope-report.md

@@ -6,7 +6,10 @@ Missing changed runtime JS files are WARN, not FAIL.
 Source: Playwright/Chromium built-in V8 coverage from the active Playwright run.
 
 Changed runtime JS files considered:
-(94%) toolbox/controls/controls.js - executed lines 1698/1698; executed functions 187/198
+(37%) src/engine/input/InputService.js - executed lines 425/425; executed functions 22/60
+(74%) src/engine/input/GamepadInputClassifier.js - executed lines 412/412; executed functions 31/42
+(80%) src/engine/input/GamepadState.js - executed lines 100/100; executed functions 16/20
+(95%) toolbox/controls/controls.js - executed lines 1684/1684; executed functions 181/190
 
 Guardrail warnings:
-(100%) none - no changed runtime JS coverage warnings
+(37%) src/engine/input/InputService.js - WARNING: advisory low coverage below 50%; executed lines 425/425; executed functions 22/60

docs_build/dev/reports/coverage_changed_js_guardrail.txt

@@ -12,25 +12,42 @@ Note: entry percentages use function coverage when available, otherwise line cov
 Note: coverage entries are aggregated across every page/tool where coverageReporter.start(page) and coverageReporter.stop(page) ran.
 
 Exercised tool entry points detected:
-(92%) Toolbox Index - exercised 4 runtime JS files
+(93%) Toolbox Index - exercised 4 runtime JS files
 (0%) Tool Template V2 - not exercised by this Playwright run
 (59%) Theme V2 Shared JS - exercised 2 runtime JS files
 
 Changed runtime JS files covered:
-(94%) toolbox/controls/controls.js - executed lines 1698/1698; executed functions 187/198
+(37%) src/engine/input/InputService.js - executed lines 425/425; executed functions 22/60
+(74%) src/engine/input/GamepadInputClassifier.js - executed lines 412/412; executed functions 31/42
+(80%) src/engine/input/GamepadState.js - executed lines 100/100; executed functions 16/20
+(95%) toolbox/controls/controls.js - executed lines 1684/1684; executed functions 181/190
 
 Files with executed line/function counts where available:
+(11%) src/engine/input/InputMappingManifest.js - executed lines 78/78; executed functions 1/9
+(23%) src/engine/input/InputComboState.js - executed lines 173/173; executed functions 3/13
+(33%) src/engine/input/InputMap.js - executed lines 62/62; executed functions 3/9
+(37%) src/engine/input/InputService.js - executed lines 425/425; executed functions 22/60
+(40%) src/engine/input/MouseState.js - executed lines 57/57; executed functions 4/10
+(43%) src/engine/input/KeyboardState.js - executed lines 34/34; executed functions 3/7
 (53%) src/engine/api/server-api-client.js - executed lines 159/159; executed functions 10/19
+(57%) src/engine/input/InputCaptureService.js - executed lines 163/163; executed functions 8/14
 (58%) assets/theme-v2/js/gamefoundry-partials.js - executed lines 603/603; executed functions 30/52
+(59%) src/engine/input/PointerDragState.js - executed lines 225/225; executed functions 13/22
 (64%) assets/theme-v2/js/tool-display-mode.js - executed lines 209/209; executed functions 9/14
+(73%) src/engine/input/InputCapabilityDescriptors.js - executed lines 261/261; executed functions 11/15
+(74%) src/engine/input/GamepadInputClassifier.js - executed lines 412/412; executed functions 31/42
 (75%) toolbox/tool-registry-api-client.js - executed lines 152/152; executed functions 21/28
-(94%) toolbox/controls/controls.js - executed lines 1698/1698; executed functions 187/198
+(80%) src/engine/input/GamepadState.js - executed lines 100/100; executed functions 16/20
+(95%) toolbox/controls/controls.js - executed lines 1684/1684; executed functions 181/190
 (100%) toolbox/controls/controls-api-client.js - executed lines 12/12; executed functions 2/2
 (100%) toolbox/objects/objects-api-client.js - executed lines 10/10; executed functions 2/2
 
 Uncovered or low-coverage changed JS files:
-(100%) none - no low-coverage changed runtime JS files
+(37%) src/engine/input/InputService.js - WARNING: advisory low coverage; executed lines 425/425
 
 Changed JS files considered:
 (0%) tests/playwright/tools/InputMappingV2Tool.spec.mjs - changed JS file not collected as browser runtime coverage
-(94%) toolbox/controls/controls.js - changed JS file with browser V8 coverage
+(37%) src/engine/input/InputService.js - changed JS file with browser V8 coverage
+(74%) src/engine/input/GamepadInputClassifier.js - changed JS file with browser V8 coverage
+(80%) src/engine/input/GamepadState.js - changed JS file with browser V8 coverage
+(95%) toolbox/controls/controls.js - changed JS file with browser V8 coverage

docs_build/dev/reports/playwright_v8_coverage_report.txt

@@ -140,6 +140,36 @@ export function activeGamepadBindings(gamepad) {
     return [...buttonBindings, ...buttonReleaseBindings, ...axisBindings];
 }
 
+export function gamepadProfileInputNames(gamepad) {
+    const deviceInfo = gamepadDeviceInfo(gamepad);
+    const buttonCount = Math.max(
+        gamepad?.buttonsDown?.length ?? 0,
+        gamepad?.buttons?.length ?? 0
+    );
+    const buttonNames = Array.from({ length: buttonCount }).map((_, buttonIndex) =>
+        gamepadProfileButtonLabel(deviceInfo, buttonIndex)
+    );
+    const axisNames = (gamepad?.axes ?? []).map((_, axisIndex) => `Axis${axisIndex}`);
+    return [...buttonNames, ...axisNames];
+}
+
+export function activeGamepadProfileInputNames(gamepad) {
+    return [...new Set(activeGamepadBindings(gamepad)
+        .map((binding) => gamepadProfileInputNameFromBinding(binding, gamepad))
+        .filter(Boolean))];
+}
+
+export function gamepadProfileInputNameFromBinding(binding, gamepad = {}) {
+    const match = /^Pad\d+:(Button|Axis)(\d+)/.exec(String(binding || ''));
+    if (!match) {
+        return '';
+    }
+    if (match[1] === 'Axis') {
+        return `Axis${Number(match[2])}`;
+    }
+    return gamepadProfileButtonLabel(gamepadDeviceInfo(gamepad), Number(match[2]));
+}
+
 function captureLines({ vendorProductLine }) {
     return ['Capture Game', vendorProductLine].filter(Boolean);
 }
@@ -338,6 +368,19 @@ function gamepadButtonLabel(deviceInfo, buttonIndex) {
     return `Button ${buttonIndex}`;
 }
 
+function gamepadProfileButtonLabel(deviceInfo, buttonIndex) {
+    if (buttonIndex === 6) {
+        return 'Trigger Left';
+    }
+    if (buttonIndex === 7) {
+        return 'Trigger Right';
+    }
+    if (buttonIndex >= 12 && buttonIndex <= 15) {
+        return STANDARD_GAMEPAD_BUTTON_NAMES[buttonIndex];
+    }
+    return `Button${buttonIndex}`;
+}
+
 function gamepadGestureDetail(gesture, defaultDetail) {
     const details = {
         GameControllerButton: 'Button',

src/engine/input/GamepadInputClassifier.js

@@ -55,7 +55,7 @@ export default class GamepadState {
 
         const axes = Array.isArray(gamepad.axes) ? [...gamepad.axes] : [];
         const buttonsDown = Array.isArray(gamepad.buttons)
-            ? gamepad.buttons.map((button) => Boolean(button?.pressed))
+            ? gamepad.buttons.map((button) => Boolean(button?.pressed) || Number(button?.value ?? 0) > 0.5)
             : [];
 
         return {

src/engine/input/GamepadState.js

@@ -451,7 +451,10 @@ export default class InputService {
                 timestamp: gamepad.timestamp ?? 0,
                 axes: Array.isArray(gamepad.axes) ? [...gamepad.axes] : [],
                 buttons: Array.isArray(gamepad.buttons)
-                    ? gamepad.buttons.map((button) => ({ pressed: Boolean(button?.pressed) }))
+                    ? gamepad.buttons.map((button) => ({
+                        pressed: Boolean(button?.pressed) || Number(button?.value ?? 0) > 0.5,
+                        value: Number(button?.value ?? 0)
+                    }))
                     : [],
             }));
     }