Normalize UAT manifest and rename sample tool mapping file - PR_26140_058-normalize-uat-fixture-and-sample-tool-map

DavidQ · DavidQ · commit c561ea363b3b · 2026-05-20T17:23:40.000-04:00
diff --git a/docs/dev/reports/workspace_cleanup_normalization_report.md b/docs/dev/reports/workspace_cleanup_normalization_report.md
@@ -0,0 +1,59 @@
+# Workspace Cleanup Normalization Report
+
+PR: `PR_26140_058-normalize-uat-fixture-and-sample-tool-map`
+
+## Summary
+- Renamed the sample link registry from `samples/sample.to.workspace.json` to `samples/samples.to.tools.json`.
+- Preserved the tool-focused schema name `html-js-gaming.sample-tool-links/1`.
+- Converted the Workspace V2 UAT fixture to the current game manifest direction used by `games/_template/game.manifest.json`.
+- Kept UAT fixture data in `tests/fixtures/workspace-v2/`.
+- Preserved Workspace Manager V2 launch/save behavior.
+
+## Sample Tool Map
+- `samples/samples.to.tools.json` is the active sample/tool registry.
+- The registry uses a tool-first structure:
+  - `tools.<toolName>[]`
+  - each entry includes `sampleId` and `phase`
+  - related sample metadata remains on each link, including `sampleType`, `primaryTool`, and `palettePath`
+- Validation confirmed 35 sample/tool links and existing palette paths.
+- No unrelated sample JSON files were modified.
+
+## UAT Fixture
+- `tests/fixtures/workspace-v2/uat.manifest.json` now uses:
+  - `$schema: "tools/schemas/game.manifest.schema.json"`
+  - `schema: "html-js-gaming.game-manifest"`
+- Temporary UAT loading now requires a game-manifest-shaped fixture.
+- The Workspace Manager V2 runtime still generates the session/toolState context from the UAT game manifest at launch time.
+- Playwright coverage now validates the UAT fixture through `validateGameManifest()` and confirms the generated UAT session context loads.
+
+## Active Dependency Audit
+- PASS: no active dependency remains on `workspace.manifest.json` in:
+  - `tools`
+  - `scripts`
+  - `tests`
+  - `games`
+  - `samples`
+- PASS: no active dependency remains on `sample.to.workspace.json` in:
+  - `tools`
+  - `scripts`
+  - `tests`
+  - `games`
+  - `samples`
+- PASS: no active dependency remains on `html-js-gaming.workspace-manifest.palette-links/1`.
+- Historical docs/roadmaps still contain older terminology and were left untouched.
+
+## Validation
+- PASS: targeted JSON parse validation for:
+  - `samples/samples.to.tools.json`
+  - `tests/fixtures/workspace-v2/uat.manifest.json`
+- PASS: targeted syntax/import validation for changed files.
+- PASS: sample/tool mapping validation.
+- PASS: UAT game manifest validation and temporary UAT load validation.
+- PASS: `npm run test:workspace-v2` with 58 passed.
+- PASS: active dependency searches for removed schema/path references.
+- PASS: `git diff --check`.
+
+## Out Of Scope
+- Full samples smoke test was skipped as requested.
+- No compatibility shims were added.
+- No unrelated sample JSON files were touched.
diff --git a/samples/samples.to.tools.json b/samples/samples.to.tools.json
diff --git a/tests/fixtures/workspace-v2/uat.manifest.json b/tests/fixtures/workspace-v2/uat.manifest.json
@@ -1,13 +1,17 @@
 {
-  "schema": "html-js-gaming.project",
+  "$schema": "tools/schemas/game.manifest.schema.json",
+  "schema": "html-js-gaming.game-manifest",
   "version": 1,
-  "id": "workspace-manager-v2-UAT-template",
-  "name": "Workspace Manager V2 UAT Template Context",
-  "gameId": "_template",
-  "gameRoot": "games/_template/",
-  "assetsPath": "games/_template/assets",
-  "repoRoot": "HTML-JavaScript-Gaming",
-  "repoPath": "C:/Users/davidq/Documents/GitHub/HTML-JavaScript-Gaming",
+  "game": {
+    "id": "_template",
+    "name": "Template UAT",
+    "folder": "_template"
+  },
+  "launch": {
+    "directPath": "/games/_template/index.html",
+    "workspaceManagerPath": "/tools/workspace-manager-v2/index.html?workspace=uat",
+    "workspaceManagerOptional": true
+  },
   "tools": {
     "palette-manager-v2": {
       "$schema": "tools/schemas/tools/palette-manager-v2.schema.json",
@@ -24,21 +28,30 @@
           "hex": "#7C3AED",
           "name": "Signal Violet!",
           "source": "UAT Sample",
-          "tags": ["ui", "accent"]
+          "tags": [
+            "ui",
+            "accent"
+          ]
         },
         {
           "symbol": "G",
           "hex": "#22C55E",
           "name": "Success Green",
           "source": "UAT Sample",
-          "tags": ["success", "hud"]
+          "tags": [
+            "success",
+            "hud"
+          ]
         },
         {
           "symbol": "A",
           "hex": "#F59E0B",
           "name": "Alert Amber",
           "source": "UAT Sample",
-          "tags": ["warning", "hud"]
+          "tags": [
+            "warning",
+            "hud"
+          ]
         }
       ]
     },
diff --git a/tests/playwright/tools/WorkspaceManagerV2.spec.mjs b/tests/playwright/tools/WorkspaceManagerV2.spec.mjs
@@ -12444,7 +12444,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await page.locator("#seedUatManifestButton").click();
       const uatManifestValidation = await page.evaluate(async (manifest) => {
         const { WorkspaceManagerV2ContextService } = await import("/tools/workspace-manager-v2/js/services/WorkspaceManagerV2ContextService.js");
-        return new WorkspaceManagerV2ContextService().validateGeneratedManifest(manifest);
+        return new WorkspaceManagerV2ContextService().validateGameManifest(manifest);
       }, uatManifest);
       expect(uatManifestValidation).toEqual({ ok: true });
       await expect(page.locator("#activeGameSelect")).toHaveValue("_template");
@@ -12457,12 +12457,12 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator('[data-workspace-tool-id="palette-manager-v2"]')).toContainText("3 palette swatches");
       await expect(page.locator('[data-workspace-tool-id="preview-generator-v2"]')).toContainText("Preview Not Found");
       await expect(page.locator('[data-workspace-tool-id="storage-inspector-v2"]')).toContainText("Storage Inspector V2");
-      await expect(page.locator("#workspaceContextOutput")).toHaveValue(/"id": "workspace-manager-v2-UAT-template"/);
+      await expect(page.locator("#workspaceContextOutput")).toHaveValue(/"id": "workspace-manager-v2-_template"/);
       await expect(page.locator("#workspaceContextOutput")).toHaveValue(/"gameRoot": "games\/_template\/"/);
       await expect(page.locator("#workspaceContextOutput")).toHaveValue(/"assetsPath": "games\/_template\/assets"/);
-      expect(JSON.parse(await page.locator("#workspaceContextOutput").inputValue()).repoPath).toBe(manifestRepoPath(server));
+      expect(JSON.parse(await page.locator("#workspaceContextOutput").inputValue()).repoPath).toBeUndefined();
       await expect(page.locator("#workspaceContextOutput")).toHaveValue(/"sourceId": "tests\/fixtures\/workspace-v2\/uat.manifest.json"/);
-      await expect(page.locator("#statusLog")).toHaveValue(/OK Loaded UAT Workspace Manager V2 manifest workspace-manager-v2-UAT-template from \/tests\/fixtures\/workspace-v2\/uat\.manifest\.json\./);
+      await expect(page.locator("#statusLog")).toHaveValue(/OK Loaded UAT game manifest fixture workspace-manager-v2-_template from \/tests\/fixtures\/workspace-v2\/uat\.manifest\.json\./);
 
       await page.locator('[data-workspace-tool-id="asset-manager-v2"]').click();
       await expect(page).toHaveURL(/asset-manager-v2\/index\.html.*launch=workspace/);
diff --git a/tools/workspace-manager-v2/README.md b/tools/workspace-manager-v2/README.md
@@ -2,4 +2,4 @@
 
 Workspace Manager V2 is the first-class games-only context surface for Workspace V2 tool launch.
 
-It owns the active game, active palette, validated asset registry context, and sessionStorage launch handoff used by workspace-launched V2 tools. Direct production launch uses manifest/toolState context only; temporary `?workspace=UAT` access is owned here and loads `tests/fixtures/workspace-v2/uat.manifest.json` before launching tools.
+It owns the active game, active palette, validated asset registry context, and sessionStorage launch handoff used by workspace-launched V2 tools. Direct production launch uses manifest/toolState context only; temporary `?workspace=UAT` access is owned here and loads the game-manifest-shaped fixture at `tests/fixtures/workspace-v2/uat.manifest.json` before launching tools.
diff --git a/tools/workspace-manager-v2/js/WorkspaceManagerV2App.js b/tools/workspace-manager-v2/js/WorkspaceManagerV2App.js
@@ -989,6 +989,6 @@
       this.statusLog.info(`Warning: ${result.assetWarning}`);
     }
     this.reportToolStateHydration();
-    this.statusLog.ok(`Loaded UAT Workspace Manager V2 manifest ${result.context.id} from /tests/fixtures/workspace-v2/uat.manifest.json.`);
+    this.statusLog.ok(`Loaded UAT game manifest fixture ${result.context.id} from /tests/fixtures/workspace-v2/uat.manifest.json.`);
   }
 }
diff --git a/tools/workspace-manager-v2/js/services/WorkspaceManagerV2ContextService.js b/tools/workspace-manager-v2/js/services/WorkspaceManagerV2ContextService.js
@@ -1310,11 +1310,10 @@ export class WorkspaceManagerV2ContextService {
     if (!manifestResult.ok) {
       return manifestResult;
     }
-    const game = temporaryUatGameFromManifest(manifestResult.manifest);
-    if (!game) {
-      return { ok: false, message: `${TEMPORARY_UAT_MANIFEST_PATH} is not a valid Workspace Manager V2 UAT template manifest.` };
+    if (!isGameManifest(manifestResult.manifest)) {
+      return { ok: false, message: `${TEMPORARY_UAT_MANIFEST_PATH} is not a valid Workspace Manager V2 UAT game manifest fixture.` };
     }
-    return this.contextResultFromManifest(game, manifestResult.manifest, TEMPORARY_UAT_MANIFEST_PATH);
+    return this.buildContextFromManifest(manifestResult.manifest, TEMPORARY_UAT_MANIFEST_PATH);
   }
 
   async restorePersistedContext() {

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`Workspace Manager V2 is the first-class games-only context surface for Workspace V2 tool launch.`
`4`	`4`
`5`		-It owns the active game, active palette, validated asset registry context, and sessionStorage launch handoff used by workspace-launched V2 tools. Direct production launch uses manifest/toolState context only; temporary `?workspace=UAT` access is owned here and loads `tests/fixtures/workspace-v2/uat.manifest.json` before launching tools.
	`5`	+It owns the active game, active palette, validated asset registry context, and sessionStorage launch handoff used by workspace-launched V2 tools. Direct production launch uses manifest/toolState context only; temporary `?workspace=UAT` access is owned here and loads the game-manifest-shaped fixture at `tests/fixtures/workspace-v2/uat.manifest.json` before launching tools.
Original file line number	Diff line number	Diff line change
`@@ -989,6 +989,6 @@`
`989`	`989`	this.statusLog.info(`Warning: ${result.assetWarning}`);
`990`	`990`	`}`
`991`	`991`	`this.reportToolStateHydration();`
`992`		- this.statusLog.ok(`Loaded UAT Workspace Manager V2 manifest ${result.context.id} from /tests/fixtures/workspace-v2/uat.manifest.json.`);
	`992`	+ this.statusLog.ok(`Loaded UAT game manifest fixture ${result.context.id} from /tests/fixtures/workspace-v2/uat.manifest.json.`);
`993`	`993`	`}`
`994`	`994`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1310,11 +1310,10 @@ export class WorkspaceManagerV2ContextService {`
`1310`	`1310`	`if (!manifestResult.ok) {`
`1311`	`1311`	`return manifestResult;`
`1312`	`1312`	`}`
`1313`		`- const game = temporaryUatGameFromManifest(manifestResult.manifest);`
`1314`		`- if (!game) {`
`1315`		- return { ok: false, message: `${TEMPORARY_UAT_MANIFEST_PATH} is not a valid Workspace Manager V2 UAT template manifest.` };
	`1313`	`+ if (!isGameManifest(manifestResult.manifest)) {`
	`1314`	+ return { ok: false, message: `${TEMPORARY_UAT_MANIFEST_PATH} is not a valid Workspace Manager V2 UAT game manifest fixture.` };
`1316`	`1315`	`}`
`1317`		`- return this.contextResultFromManifest(game, manifestResult.manifest, TEMPORARY_UAT_MANIFEST_PATH);`
	`1316`	`+ return this.buildContextFromManifest(manifestResult.manifest, TEMPORARY_UAT_MANIFEST_PATH);`
`1318`	`1317`	`}`
`1319`	`1318`
`1320`	`1319`	`async restorePersistedContext() {`