Rebuild Input Mapping V2 from template using engine input sources - PR_26140_087-rebuild-input-mapping-v2-from-template

Author: DavidQ

docs/dev/reports/input_mapping_v2_template_rebuild_report.md

@@ -0,0 +1,44 @@
+# Input Mapping V2 Template Rebuild Report
+
+Task: PR_26140_087-rebuild-input-mapping-v2-from-template
+
+## Summary
+- Removed the prior hand-built Input Mapping V2 app structure and rebuilt the tool shell from the current `tools/templates-v2/` template.
+- Kept the template header, menus, accordion, panel, and status conventions with external JS/CSS only.
+- Added the Input Mapping V2 feature layer on top of the copied template instead of hand-rolling the shell.
+- Preserved Workspace Manager V2 launch behavior and workspace header return behavior.
+
+## Engine Input Alignment
+- `EngineInputSourceService` imports existing engine sources from `/src/engine/input/`:
+  - `InputService`
+  - `GamepadInputAdapter`
+- `InputMappingState` imports the existing engine `InputMap` model.
+- Surfaced supported source groups represented by engine input code:
+  - Keyboard via `InputService` / `KeyboardState`
+  - Mouse via `InputService` / `MouseState`
+  - Gamepad buttons via `InputService` / `GamepadState` / `GamepadInputAdapter`
+  - Gamepad axes via `GamepadInputAdapter`
+- No duplicate standalone input model was introduced.
+
+## Behavior Updates
+- Expanded default actions to generic engine-style actions for movement, confirm/cancel, menu, interaction, jump/fire/thrust, and rotation.
+- Removed `Pause` from the default action list.
+- Keyboard capture records labels such as `Keyboard KeyA`.
+- Captured input chips are buttons; clicking a chip removes that captured input.
+- Gamepad capture uses the engine gamepad adapter when live browser gamepad data is available.
+- If the browser cannot provide a live gamepad value, the tool logs an actionable WARN explaining the unavailable capture reason.
+- Mapping JSON export/import uses the current template command/status flow.
+
+## State/Storage Inspector Audit
+- Storage Inspector V2 and State Inspector references were not changed by this PR.
+- This PR is limited to rebuilding Input Mapping V2 from the template and validating its launch and capture behavior.
+
+## Scope Guardrails
+- No schema files were changed.
+- No sample JSON files were changed.
+- Full samples smoke test was not run, per request.
+
+## Validation
+- Targeted syntax/import validation for changed Input Mapping V2 files: PASS.
+- Focused Playwright validation for Input Mapping V2 launch/capture/delete/gamepad-WARN behavior: PASS.
+- `npm run test:workspace-v2`: PASS, 60 tests.

docs/tools/input-mapping-v2/uat.md

@@ -10,18 +10,24 @@
 
 - Select `Move Left`.
 - Click `Capture Keyboard`.
-- Press `ArrowLeft`.
-- Confirm the mapping list and JSON output include `moveLeft` with `ArrowLeft`.
+- Press `KeyA`.
+- Confirm the mapping list and JSON output include `moveLeft` with `Keyboard KeyA`.
+- Click the `Keyboard KeyA` captured input token.
+- Confirm the mapping is deleted.
+
+## Default Actions
+
+- Confirm the default actions include movement, confirm/cancel, fire, thrust, and rotation actions.
+- Confirm `Pause` is not present in the default action dropdown.
 
 ## Gamepad Capture
 
 - Connect a gamepad.
 - Press or hold a button or axis.
 - Click `Capture Gamepad`.
 - Confirm the mapping list and JSON output include the detected gamepad input.
+- If the browser does not expose a live gamepad value, confirm the Status log shows an actionable WARN.
 
 ## Device Refresh
 
-- Click `Refresh Devices`.
-- Confirm keyboard availability is shown.
-- Confirm connected gamepads are listed with button and axis counts.
+- Confirm Engine Input Sources lists `InputService + KeyboardState`, `InputService + MouseState`, `InputService + GamepadState + GamepadInputAdapter`, and `GamepadInputAdapter`.

tests/playwright/tools/WorkspaceManagerV2.spec.mjs

@@ -1400,20 +1400,30 @@ test.describe("Workspace Manager V2 bootstrap", () => {
 
     try {
       await expect(page.locator("body[data-tool-id='input-mapping-v2']")).toBeVisible();
-      await expect(page.locator("[data-input-mapping-v2-summary]")).toContainText("Input Mapping V2");
-      await expect(page.locator(".input-mapping-v2__tool-menu")).toBeVisible();
-      await expect(page.locator(".input-mapping-v2__workspace-menu")).toBeHidden();
-      await expect(page.locator("#inputMappingV2ActionSelect")).toContainText("Move Left");
+      await expect(page.locator("[data-tool-starter-summary]")).toBeVisible();
+      await expect(page.locator(".tools-platform-frame__title[data-tool-id='input-mapping-v2']")).toHaveText("Input Mapping V2");
+      await expect(page.locator(".tool-starter__tool__menu")).toBeVisible();
+      await expect(page.locator(".tool-starter__workspace__menu")).toBeHidden();
+      await expect(page.locator("#inputMappingV2SourceList")).toContainText("InputService + KeyboardState");
+      await expect(page.locator("#inputMappingV2SourceList")).toContainText("InputService + MouseState");
+      await expect(page.locator("#inputMappingV2SourceList")).toContainText("InputService + GamepadState + GamepadInputAdapter");
+      await expect(page.locator("#inputMappingV2SourceList")).toContainText("GamepadInputAdapter");
+      const actionOptions = await page.locator("#inputMappingV2ActionSelect option").allTextContents();
+      expect(actionOptions).toEqual(expect.arrayContaining(["Move Left", "Confirm", "Cancel", "Fire", "Thrust", "Rotate Left", "Rotate Right"]));
+      expect(actionOptions).not.toContain("Pause");
       await page.locator("#inputMappingV2ActionSelect").selectOption("moveLeft");
       await page.locator("#inputMappingV2CaptureKeyboardButton").click();
-      await expect(page.locator("[data-input-mapping-v2-banner]")).toContainText("Press a keyboard key");
-      await page.keyboard.press("ArrowLeft");
-      await expect(page.locator("#inputMappingV2MappingList")).toContainText("Move Left");
-      await expect(page.locator("#inputMappingV2MappingList")).toContainText("Keyboard ArrowLeft");
-      await expect(page.locator("#inputMappingV2JsonOutput")).toContainText('"action": "moveLeft"');
-      await expect(page.locator("#inputMappingV2JsonOutput")).toContainText('"code": "ArrowLeft"');
-      await expect(page.locator("#inputMappingV2LastInput")).toContainText('"type": "keyboard"');
-      await expect(page.locator("#inputMappingV2DeviceList")).toContainText("Keyboard");
+      await expect(page.locator("#inputMappingV2CaptureMessage")).toContainText("Press a keyboard key");
+      await page.keyboard.press("KeyA");
+      await expect(page.locator("#previewOutput")).toContainText("Move Left");
+      await expect(page.locator("#previewOutput")).toContainText("Keyboard KeyA");
+      await expect(page.locator("#inspectorOutput")).toContainText('"action": "moveLeft"');
+      await expect(page.locator("#inspectorOutput")).toContainText('"binding": "KeyA"');
+      await page.locator(".input-mapping-v2__input-token", { hasText: "Keyboard KeyA" }).click();
+      await expect(page.locator(".input-mapping-v2__input-token", { hasText: "Keyboard KeyA" })).toHaveCount(0);
+      await expect(page.locator("#previewOutput")).toContainText("No inputs captured yet.");
+      await page.locator("#inputMappingV2CaptureGamepadButton").click();
+      await expect(page.locator("#statusLog")).toHaveValue(/WARN Gamepad capture unavailable:/);
       await page.evaluate(() => {
         Object.defineProperty(navigator, "clipboard", {
           configurable: true,
@@ -1424,9 +1434,9 @@ test.describe("Workspace Manager V2 bootstrap", () => {
           }
         });
       });
-      await page.locator("#inputMappingV2CopyJsonButton").click();
+      await page.locator("#toolCopyJsonButton").click();
       expect(await page.evaluate(() => window.__inputMappingV2Clipboard)).toContain('"toolId": "input-mapping-v2"');
-      await expect(page.locator("#statusLog")).toContainText("[OK] Copied mapping JSON to clipboard.");
+      await expect(page.locator("#statusLog")).toHaveValue(/OK Mapping JSON copied\./);
       expect(pageErrors).toEqual([]);
     } finally {
       await workspaceV2CoverageReporter.stop(page);
@@ -11226,7 +11236,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator("#statusLog")).toHaveValue(/OK Restored repo destination from workspace\.repo\.reference for HTML-JavaScript-Gaming\./);
       await inputMappingTile.click();
       await expect(page).toHaveURL(/input-mapping-v2\/index\.html.*launch=workspace/);
-      await expect(page.locator(".input-mapping-v2__workspace-menu")).toBeVisible();
+      await expect(page.locator(".tool-starter__workspace__menu")).toBeVisible();
       await expect(page.locator("#inputMappingV2CaptureKeyboardButton")).toBeVisible();
       await page.locator("#returnToWorkspaceButton").click();
       await expect(page).toHaveURL(/workspace-manager-v2\/index\.html\?.*hostContextId=workspace-manager-v2-/);

tools/input-mapping-v2/README.md

@@ -1,12 +1,15 @@
 # Input Mapping V2
 
-Input Mapping V2 is a generic keyboard and gamepad binding tool for games, tools, and samples.
+Input Mapping V2 is a First-Class Tool V2 surface for mapping keyboard, mouse, and gamepad inputs to reusable actions.
 
 ## Scope
 
-- Captures keyboard keys for named actions.
-- Captures currently pressed gamepad buttons or axes.
-- Shows live device availability, current mappings, and exportable mapping JSON.
-- Supports workspace-launched return behavior.
+- Uses the official `tools/templates-v2/` shell, menu, panel, accordion, and status conventions.
+- Imports engine input sources from `src/engine/input/**`.
+- Captures keyboard keys, mouse buttons, gamepad buttons, and gamepad axes where the browser exposes live values.
+- Uses `InputMap` as the action-to-physical-input mapping model.
+- Supports captured input deletion by clicking the captured input token.
 
-The tool does not provide hidden fallback action sets. Default actions are only starter bindings for interactive mapping and can be cleared or extended in the UI.
+## Template Source
+
+Input Mapping V2 was rebuilt from the current official Tool Template V2 for PR_26140_087.

tools/input-mapping-v2/how_to_use.html

@@ -1,36 +1,31 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Input Mapping V2 - How To Use</title>
-  <link rel="stylesheet" href="../../src/engine/theme/main.css">
-  <link rel="stylesheet" href="../../src/engine/ui/hubCommon.css">
-  <link rel="stylesheet" href="../common/toolShellCommon.css">
-</head>
-<body class="tools-platform-tool-page">
-  <main class="tool-shell-common__app-shell">
-    <header class="tool-shell-common__header">
-      <div>
-        <p class="tool-shell-common__eyebrow">How to use</p>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Input Mapping V2 - How To Use</title>
+    <link rel="stylesheet" href="../../src/engine/theme/main.css">
+    <link rel="stylesheet" href="../../src/engine/ui/hubCommon.css">
+    <link rel="stylesheet" href="./styles/toolStarter.css">
+  </head>
+  <body class="tools-platform-tool-page tools-platform-surface hub-page-tools" data-tool-id="input-mapping-v2">
+    <main class="tool-starter app-shell" data-tool-id="input-mapping-v2">
+      <section class="tool-starter__panel" aria-label="Input Mapping V2 workflow">
         <h1>Input Mapping V2</h1>
-        <p class="tool-shell-common__description">Create keyboard and gamepad bindings for games, tools, and samples.</p>
-      </div>
-      <nav class="tool-shell-common__menu" aria-label="Input Mapping V2 links">
-        <a href="./index.html">Open Tool</a>
-        <a href="./README.md">Read Me</a>
-        <a href="../index.html">Tools</a>
-      </nav>
-    </header>
-    <section class="tool-shell-common__panel">
-      <h2>Workflow</h2>
-      <ol>
-        <li>Select an action from the Actions panel.</li>
-        <li>Use Capture Keyboard, then press the key to map.</li>
-        <li>Use Capture Gamepad after pressing or holding the gamepad input to map.</li>
-        <li>Review the generated mapping JSON and copy it when needed.</li>
-      </ol>
-    </section>
-  </main>
-</body>
+        <p>Select an action, capture a keyboard key, mouse button, or gamepad input, then review the generated mapping JSON.</p>
+        <ol>
+          <li>Open Input Mapping V2.</li>
+          <li>Select an action from the Actions panel.</li>
+          <li>Use Capture Keyboard, Capture Mouse, or Capture Gamepad.</li>
+          <li>Click a captured input token to delete that binding.</li>
+          <li>Use Copy JSON or Export toolState when the mapping is ready.</li>
+        </ol>
+        <nav class="tool-starter__menu" aria-label="Input Mapping V2 links">
+          <a href="./index.html">Open Tool</a>
+          <a href="./README.md">Read Me</a>
+          <a href="../index.html">Tools</a>
+        </nav>
+      </section>
+    </main>
+  </body>
 </html>