Audit final Input Mapping V2 engine ownership - PR_26140_119-final-input-mapping-v2-ownership-audit

Author: ToolboxAid

docs/dev/reports/input_mapping_v2_final_ownership_audit_report.md

@@ -0,0 +1,57 @@
+# Input Mapping V2 Final Ownership Audit Report
+
+PR: `PR_26140_119-final-input-mapping-v2-ownership-audit`
+
+Playwright impacted: Yes. This PR verifies and lightly stabilizes Input Mapping V2 runtime capture, Action Mapping(s) rendering, and Workspace V2 manifest launch behavior.
+
+## Summary
+
+- Final ownership audit passed after small cleanup fixes.
+- Input Mapping V2 continues to consume engine input services for capture/combo/release/hold/double-click/drag/device compatibility behavior.
+- Export and Copy JSON both use the filtered payload and exclude empty actions.
+- Active `games/Asteroids/game.manifest.json` contains `tools.input-mapping-v2`, and Workspace Manager V2 references/discovers the tool through the manifest/tool registry path.
+- Import remains intentionally disabled with an actionable UI reason, because Input Mapping V2 imports through Workspace Manager manifest launch data.
+
+## Cleanup Applied
+
+- `src/engine/input/PointerDragState.js`: mouse drag state now ignores move events when the originally pressed mouse button is no longer held, preventing accidental drag completion from unrelated mouse movement.
+- `src/engine/input/InputCaptureSession.js`: invalid gamepad inputs keep strict validation but refresh the capture timeout so users can correct the input without the original timer expiring mid-flow.
+- `tools/input-mapping-v2/js/ToolStarterApp.js`: gamepad button release bindings are displayed as transient live highlights so release gestures are visible long enough to verify.
+- `tools/input-mapping-v2/js/controls/PreviewPanelControl.js`: Action Mapping(s) card elements are preserved across refreshes when the action set is unchanged, preventing transient card detach during visual-state refreshes.
+- `tools/input-mapping-v2/styles/inputMappingV2.css`: center-column non-fill accordions size to content so Action Mapping(s) keeps the remaining vertical space.
+
+## Audit Results
+
+- JSON export/copy empty action filtering: PASS. `InputMappingState.payload()` filters actions with `inputs.length > 0`; explicit browser validation produced `emptyExportActions: 0`, `mappedExportActions: 1`, and matching copied/exported JSON.
+- Active manifest wiring: PASS. `games/Asteroids/game.manifest.json` contains `tools.input-mapping-v2` with `toolId: "input-mapping-v2"` and `engineInputModel: "src/engine/input/InputMap"`.
+- Workspace Manager discovery/load path: PASS. `tools/workspace-manager-v2/js/services/WorkspaceManagerV2ContextService.js`, `tools/toolRegistry.js`, and `tests/playwright/tools/WorkspaceManagerV2.spec.mjs` reference `input-mapping-v2`.
+- Local-only lifecycle audit: PASS. Search for local-only capture/combo/gesture lifecycle patterns in `tools/input-mapping-v2/js` returned no matches.
+- Engine ownership audit: PASS. Reusable capture/combo/release/hold/double-click/drag/device compatibility behavior is under `src/engine/input/**`.
+- Import behavior: PASS. Import controls are disabled with the actionable reason that Input Mapping V2 imports through Workspace Manager `game.manifest` launch data.
+- Schemas and sample JSON: unchanged.
+
+## Validation
+
+- Targeted syntax validation: PASS.
+- Engine input module import validation: PASS.
+- Input Mapping V2 focused Playwright tests: PASS, `12 passed`.
+- Workspace V2 suite: PASS, `71 passed`.
+- Export/copy JSON empty-action confirmation: PASS.
+- Active manifest check: PASS, `tools.input-mapping-v2` present.
+- Workspace Manager load-path reference check: PASS.
+- `git diff --check`: PASS, no whitespace errors. Git reported the existing CRLF normalization warning for `tools/input-mapping-v2/styles/inputMappingV2.css`.
+
+## Manual Validation
+
+1. Launch Workspace Manager V2 and select the Asteroids manifest.
+2. Open Input Mapping V2 from the manifest-backed tool list.
+3. Add an Action Mapping(s) tile, capture keyboard/mouse/gamepad inputs, and confirm mappings render on the selected tile.
+4. Click JSON and Copy JSON; confirm only actions with inputs are present.
+5. Use Import; confirm it is disabled with the manifest-launch-data reason.
+
+Expected outcome: Input Mapping V2 loads from manifest wiring, captures through engine-backed flows, highlights live used inputs, and exports filtered JSON with no empty actions.
+
+## Out Of Scope
+
+- Full samples smoke test was not run. This PR is scoped to Input Mapping V2 and Workspace V2 validation, and sample JSON remains explicitly out of scope.
+- No sample JSON was touched.

src/engine/input/InputCaptureSession.js

@@ -249,6 +249,9 @@ export default class InputCaptureSession {
             };
         }
         if (!result?.ok) {
+            if (result?.invalid === true) {
+                this.scheduleCaptureTimeout();
+            }
             return {
                 ...warning(result?.message ?? 'Gamepad capture unavailable.'),
                 cancel: result?.invalid !== true

src/engine/input/PointerDragState.js

@@ -54,7 +54,7 @@ export default class PointerDragState {
     }
 
     pointerMove(event = {}) {
-        if (!this.isDown || !this.matchesActivePointer(event)) {
+        if (!this.isDown || !this.matchesActivePointer(event) || !isButtonStillPressed(event, this.button)) {
             return;
         }
 
@@ -178,6 +178,31 @@ function pointFromEvent(event) {
     };
 }
 
+function isButtonStillPressed(event, button) {
+    if (event.buttons === undefined || event.buttons === null) {
+        return true;
+    }
+    const buttons = Number(event.buttons);
+    if (!Number.isFinite(buttons)) {
+        return true;
+    }
+    return (buttons & buttonMask(button)) !== 0;
+}
+
+function buttonMask(button) {
+    const normalizedButton = Number(button);
+    if (normalizedButton === 1) {
+        return 4;
+    }
+    if (normalizedButton === 2) {
+        return 2;
+    }
+    if (normalizedButton > 2) {
+        return 1 << normalizedButton;
+    }
+    return 1;
+}
+
 function pointerIdFromEvent(event) {
     const pointerId = Number(event.pointerId);
     return Number.isFinite(pointerId) ? pointerId : null;

tools/input-mapping-v2/js/ToolStarterApp.js

@@ -631,10 +631,22 @@ export class ToolStarterApp {
   }
 
   syncGamepadActiveInputBindings() {
+    const activeBindings = this.engineInputSources.activeGamepadBindings();
+    const releaseBindings = activeBindings.filter(isGamepadReleaseBinding);
+    const continuousBindings = activeBindings.filter((binding) => !isGamepadReleaseBinding(binding));
+    const releaseChanged = this.engineInputSources.activateInputBindings(releaseBindings, {
+      durationMs: 360,
+      transient: true
+    });
+    if (releaseChanged) {
+      this.window.setTimeout?.(() => {
+        this.refreshActions();
+      }, 360);
+    }
     return this.replaceActiveInputBindings(
-      (binding) => binding.startsWith("Pad"),
-      this.engineInputSources.activeGamepadBindings()
-    );
+      (binding) => binding.startsWith("Pad") && !isGamepadReleaseBinding(binding),
+      continuousBindings
+    ) || releaseChanged;
   }
 
   replaceActiveInputBindings(shouldReplace, nextBindings) {
@@ -985,6 +997,10 @@ function allCaptureAvailable() {
   };
 }
 
+function isGamepadReleaseBinding(binding) {
+  return String(binding || "").includes(":GameControllerButtonRelease");
+}
+
 function mouseCaptureMessage(gesture, actionLabel) {
   if (gesture?.binding === "MouseDoubleClick") {
     return `Double-click a mouse button to bind it to ${actionLabel}.`;

tools/input-mapping-v2/js/controls/PreviewPanelControl.js

@@ -29,6 +29,14 @@ export class PreviewPanelControl {
       this.output.replaceChildren(this.createEmptyState());
       return;
     }
+    const currentCards = this.actionCards();
+    if (cardsMatchActions(currentCards, visibleActions)) {
+      currentCards.forEach((card, index) => {
+        this.updateActionCard(card, visibleActions[index], selectedActionId);
+      });
+      this.restoreSelectedCardScrollTop(selectedActionId, selectedScrollTop);
+      return;
+    }
     this.output.replaceChildren(...visibleActions.map((action) => this.createActionCard(action, selectedActionId)));
     this.restoreSelectedCardScrollTop(selectedActionId, selectedScrollTop);
   }
@@ -40,19 +48,26 @@ export class PreviewPanelControl {
     card.dataset.inputMappingTileActionId = action.id;
     card.tabIndex = 0;
     card.role = "button";
-    card.ariaCurrent = isSelected ? "true" : "false";
-    card.setAttribute("aria-label", `Select ${action.label} mapping`);
     card.addEventListener("click", () => {
-      this.onSelectAction(action.id);
+      this.onSelectAction(card.dataset.inputMappingTileActionId);
     });
     card.addEventListener("keydown", (event) => {
       if (event.key !== "Enter" && event.key !== " ") {
         return;
       }
       event.preventDefault();
-      this.onSelectAction(action.id);
+      this.onSelectAction(card.dataset.inputMappingTileActionId);
     });
 
+    return this.updateActionCard(card, action, selectedActionId);
+  }
+
+  updateActionCard(card, action, selectedActionId) {
+    const isSelected = action.id === selectedActionId;
+    card.className = `input-mapping-v2__mapping-card${isSelected ? " is-selected" : ""}`;
+    card.dataset.inputMappingTileActionId = action.id;
+    card.ariaCurrent = isSelected ? "true" : "false";
+    card.setAttribute("aria-label", `Select ${action.label} mapping`);
     const actionLabel = document.createElement("strong");
     actionLabel.className = "input-mapping-v2__tile-action-label";
     actionLabel.dataset.inputMappingTileActionId = action.id;
@@ -69,7 +84,7 @@ export class PreviewPanelControl {
       tokens.append(...this.createInputTokens(action, isSelected));
     }
 
-    card.append(actionLabel, tokens);
+    card.replaceChildren(actionLabel, tokens);
     return card;
   }
 
@@ -135,9 +150,18 @@ export class PreviewPanelControl {
     if (!actionId) {
       return null;
     }
-    return Array.from(this.output.querySelectorAll(".input-mapping-v2__mapping-card"))
+    return this.actionCards()
       .find((card) => card.dataset.inputMappingTileActionId === actionId) ?? null;
   }
+
+  actionCards() {
+    return Array.from(this.output.querySelectorAll(".input-mapping-v2__mapping-card"));
+  }
+}
+
+function cardsMatchActions(cards, actions) {
+  return cards.length === actions.length
+    && cards.every((card, index) => card.dataset.inputMappingTileActionId === actions[index].id);
 }
 
 function inputLabelLines(input) {

tools/input-mapping-v2/styles/inputMappingV2.css

@@ -266,6 +266,10 @@
   min-height: 300px;
 }
 
+.input-mapping-v2 .tool-starter__panel--center > .tool-starter__accordion:not(.tool-starter__accordion--fill) {
+  flex: 0 0 auto;
+}
+
 .input-mapping-v2 .tool-starter__panel--right > .tool-starter__accordion.is-open {
   flex: 1 1 0;
 }