Clean up Asteroids vector map SSoT and restore older manifest geometry - PR_26133_116-asteroids-vector-map-ssoT-cleanup

Author: DavidQ

docs/dev/reports/PR_26133_116-asteroids-vector-map-ssoT-cleanup_report.md

@@ -0,0 +1,67 @@
+# PR_26133_116 Asteroids Vector Map SSoT Cleanup Report
+
+## Summary
+- Read `docs/dev/PROJECT_INSTRUCTIONS.md` before implementation.
+- Used PR_26133_115 as the prior reference from committed `HEAD` (`1d22d12c7`) and `docs/dev/reports/PR_26133_115-object-vector-studio-manifest-map-cleanup_report.md`; the local PR115 delta ZIP was not present under `tmp/`.
+- Replaced collision-suffixed Asteroids vector map IDs with unsuffixed manifest-owned IDs:
+  - `vector.asteroids.ship`
+  - `vector.asteroids.ufo.large`
+  - `vector.asteroids.ufo.small`
+- Removed `ASTEROIDS_REQUIRED_OBJECT_VECTOR_MAP_IDS`; `ASTEROIDS_REQUIRED_VECTOR_MAP_IDS` is now the single required-ID validation list for manifest vector entries and required Object Vector object IDs.
+- Restored older Asteroids vector geometry from git history:
+  - ship path/points from pre-Object-Vector manifest vector data (`3fc7bbce7`)
+  - UFO polylines and Bullet square geometry from the original Asteroids runtime (`31ca1521e`)
+- Removed the active workspace manifest schema `$ref` to `vector-map-editor.schema.json`; the deprecated schema remains only as historical metadata.
+
+## Changed Files
+- `games/Asteroids/game.manifest.json`
+- `games/Asteroids/game/AsteroidsGameScene.js`
+- `games/Asteroids/game/AsteroidsWorld.js`
+- `games/Asteroids/game/asteroidsVectorMaps.js`
+- `tests/games/AsteroidsAssetReferenceAdoption.test.mjs`
+- `tests/games/AsteroidsPlatformDemo.test.mjs`
+- `tests/games/AsteroidsValidation.test.mjs`
+- `tests/games/AsteroidsVectorTransforms.test.mjs`
+- `tests/playwright/tools/WorkspaceManagerV2.spec.mjs`
+- `tests/tools/ToolWorkspaceSchemaManifestBoundaries.test.mjs`
+- `tools/schemas/tools/README.md`
+- `tools/schemas/workspace.manifest.schema.json`
+- `docs/dev/reports/PR_26133_116-asteroids-vector-map-ssoT-cleanup_report.md`
+
+## Validation
+- PASS: `node --check games/Asteroids/game/asteroidsVectorMaps.js`
+- PASS: `node --check games/Asteroids/game/AsteroidsWorld.js`
+- PASS: `node --check games/Asteroids/game/AsteroidsGameScene.js`
+- PASS: syntax checks for changed targeted test files.
+- PASS: JSON parse validation for Asteroids manifest and impacted schemas.
+- PASS: targeted Asteroids required vector map SSoT validation confirmed all `ASTEROIDS_REQUIRED_VECTOR_MAP_IDS` resolve and collision-suffixed IDs are absent.
+- PASS: targeted Asteroids tests:
+  - `AsteroidsValidation`
+  - `AsteroidsVectorTransforms`
+  - `AsteroidsAssetReferenceAdoption`
+  - `AsteroidsPlatformDemo`
+  - `AsteroidsPresentation`
+  - `AsteroidsHardening`
+  - `AsteroidsCollisionTimingStress`
+- PASS: targeted Object Vector runtime loader validation accepted the migrated Asteroids payload.
+- PASS: targeted Object Vector Studio schema validation accepted the migrated Asteroids payload.
+- PASS: targeted workspace schema audit confirmed `tools/schemas/workspace.manifest.schema.json` no longer allows `vector-map-editor`.
+- PASS: targeted Playwright impacted tool validation:
+  - `loads Object Vector Studio V2 runtime assets into Asteroids gameplay rendering`
+  - `uses header lifecycle controls and launches tools from fixed Workspace Manager V2 tiles`
+- PASS: `git diff --check` (line-ending warnings only)
+- WARN: attempted non-targeted `ToolWorkspaceSchemaManifestBoundaries` execution fails on an unrelated stale Palette Manager assertion; the schema file itself still passes syntax/JSON and targeted vector-map-editor reference checks.
+
+## Skipped
+- Skipped `npm run test:workspace-v2` by request; this PR requested targeted Asteroids and impacted tool validation only.
+- Skipped full samples smoke test by request.
+
+## Expected Behavior
+- Asteroids vector map runtime loading uses manifest data only.
+- Required manifest IDs resolve from `ASTEROIDS_REQUIRED_VECTOR_MAP_IDS`.
+- `vector.asteroids.ship.collision`, `vector.asteroids.ship.life`, `vector.asteroids.ufo.large.collision`, and `vector.asteroids.ufo.small.collision` are no longer active Asteroids vector map IDs.
+- Missing required manifest vector entries or required Object Vector objects fail validation with the missing ID named.
+- Current workspace schemas do not actively depend on `vector-map-editor.schema.json`.
+
+## ZIP
+- Output path: `tmp/PR_26133_116-asteroids-vector-map-ssoT-cleanup_delta.zip`

games/Asteroids/game.manifest.json

@@ -263,68 +263,35 @@
         },
         "vectors": [
           {
-            "id": "vector.asteroids.ship.collision",
-            "label": "Ship Collision",
-            "kind": "polygon",
-            "usage": [
-              "gameplay",
-              "collision"
-            ],
-            "points": [
-              {
-                "x": 14,
-                "y": 0
-              },
-              {
-                "x": -10,
-                "y": -8
-              },
-              {
-                "x": -6,
-                "y": -3
-              },
-              {
-                "x": -6,
-                "y": 3
-              },
-              {
-                "x": -10,
-                "y": 8
-              },
-              {
-                "x": 14,
-                "y": 0
-              }
-            ]
-          },
-          {
-            "id": "vector.asteroids.ship.life",
-            "label": "Ship Life Icon",
+            "id": "vector.asteroids.ship",
+            "label": "Ship",
             "kind": "polygon",
             "usage": [
               "gameplay",
+              "collision",
               "ui"
             ],
+            "viewBox": "-24 -24 48 48",
+            "paths": [
+              "M 0 -18 L 14 16 L 0 8 L -14 16 Z",
+              "M -6 14 L 0 6 L 6 14"
+            ],
             "points": [
               {
-                "x": 14,
-                "y": 0
-              },
-              {
-                "x": -10,
-                "y": -8
+                "x": 0,
+                "y": -18
               },
               {
-                "x": -6,
-                "y": -3
+                "x": 14,
+                "y": 16
               },
               {
-                "x": -6,
-                "y": 3
+                "x": 0,
+                "y": 8
               },
               {
-                "x": -10,
-                "y": 8
+                "x": -14,
+                "y": 16
               }
             ]
           },
@@ -357,8 +324,8 @@
             ]
           },
           {
-            "id": "vector.asteroids.ufo.small.collision",
-            "label": "Small UFO Collision",
+            "id": "vector.asteroids.ufo.small",
+            "label": "Small UFO",
             "kind": "polyline",
             "usage": [
               "gameplay",
@@ -428,8 +395,8 @@
             ]
           },
           {
-            "id": "vector.asteroids.ufo.large.collision",
-            "label": "Large UFO Collision",
+            "id": "vector.asteroids.ufo.large",
+            "label": "Large UFO",
             "kind": "polyline",
             "usage": [
               "gameplay",

games/Asteroids/game/AsteroidsGameScene.js

@@ -876,7 +876,7 @@ export default class AsteroidsGameScene extends Scene {
 
     const startX = centerX - ((lives - 1) * LIFE_SPACING) / 2;
     Array.from({ length: lives }).forEach((_, index) => {
-      this.drawManifestVectorMap(renderer, ASTEROIDS_VECTOR_MAP_IDS.shipLife, {
+      this.drawManifestVectorMap(renderer, ASTEROIDS_VECTOR_MAP_IDS.ship, {
         color: '#ffffff',
         lineWidth: 1,
         rotation: -Math.PI / 2,

games/Asteroids/game/AsteroidsWorld.js

@@ -151,10 +151,10 @@ export default class AsteroidsWorld {
       throw new Error('AsteroidsWorld requires manifest-loaded vector maps for ship, UFO, and bullet gameplay geometry.');
     }
     this.bulletCollisionPoints = requireAsteroidsVectorPoints(this.vectorMaps, ASTEROIDS_VECTOR_MAP_IDS.bullet, 'bullet geometry');
-    this.shipCollisionPoints = requireAsteroidsVectorPoints(this.vectorMaps, ASTEROIDS_VECTOR_MAP_IDS.shipCollision, 'ship collision geometry');
+    this.shipCollisionPoints = requireAsteroidsVectorPoints(this.vectorMaps, ASTEROIDS_VECTOR_MAP_IDS.ship, 'ship collision geometry');
     this.ufoCollisionPoints = {
-      large: requireAsteroidsVectorPoints(this.vectorMaps, ASTEROIDS_VECTOR_MAP_IDS.ufoLargeCollision, 'large UFO collision geometry'),
-      small: requireAsteroidsVectorPoints(this.vectorMaps, ASTEROIDS_VECTOR_MAP_IDS.ufoSmallCollision, 'small UFO collision geometry'),
+      large: requireAsteroidsVectorPoints(this.vectorMaps, ASTEROIDS_VECTOR_MAP_IDS.ufoLarge, 'large UFO collision geometry'),
+      small: requireAsteroidsVectorPoints(this.vectorMaps, ASTEROIDS_VECTOR_MAP_IDS.ufoSmall, 'small UFO collision geometry'),
     };
     this.rng = typeof rng === 'function' ? rng : Math.random;
     this.bounds = sanitizeBounds(bounds);

games/Asteroids/game/asteroidsVectorMaps.js

@@ -6,26 +6,21 @@ export const ASTEROIDS_VECTOR_MAP_IDS = Object.freeze({
   attractShip: 'object.asteroids.ship',
   attractUfo: 'object.asteroids.large-ufo',
   bullet: 'vector.asteroids.bullet',
-  shipCollision: 'vector.asteroids.ship.collision',
-  shipLife: 'vector.asteroids.ship.life',
-  ufoLargeCollision: 'vector.asteroids.ufo.large.collision',
-  ufoSmallCollision: 'vector.asteroids.ufo.small.collision',
+  ship: 'vector.asteroids.ship',
+  ufoLarge: 'vector.asteroids.ufo.large',
+  ufoSmall: 'vector.asteroids.ufo.small',
   uiTitle: 'vector.asteroids.ui.title',
 });
 
 export const ASTEROIDS_REQUIRED_VECTOR_MAP_IDS = Object.freeze([
-  ASTEROIDS_VECTOR_MAP_IDS.bullet,
-  ASTEROIDS_VECTOR_MAP_IDS.shipCollision,
-  ASTEROIDS_VECTOR_MAP_IDS.shipLife,
-  ASTEROIDS_VECTOR_MAP_IDS.ufoLargeCollision,
-  ASTEROIDS_VECTOR_MAP_IDS.ufoSmallCollision,
-  ASTEROIDS_VECTOR_MAP_IDS.uiTitle,
-]);
-
-export const ASTEROIDS_REQUIRED_OBJECT_VECTOR_MAP_IDS = Object.freeze([
   ASTEROIDS_VECTOR_MAP_IDS.attractAsteroid,
   ASTEROIDS_VECTOR_MAP_IDS.attractShip,
   ASTEROIDS_VECTOR_MAP_IDS.attractUfo,
+  ASTEROIDS_VECTOR_MAP_IDS.bullet,
+  ASTEROIDS_VECTOR_MAP_IDS.ship,
+  ASTEROIDS_VECTOR_MAP_IDS.ufoLarge,
+  ASTEROIDS_VECTOR_MAP_IDS.ufoSmall,
+  ASTEROIDS_VECTOR_MAP_IDS.uiTitle,
 ]);
 
 export const ASTEROIDS_REQUIRED_OBJECT_VECTOR_ROLE_IDS = Object.freeze([
@@ -49,6 +44,10 @@ function normalizeString(value) {
   return String(value || '').trim();
 }
 
+function isObjectVectorId(id) {
+  return normalizeString(id).startsWith('object.');
+}
+
 function normalizeTags(value) {
   return Array.isArray(value)
     ? value.map((tag) => normalizeString(tag).toLowerCase()).filter(Boolean)
@@ -168,6 +167,17 @@ export function loadAsteroidsVectorMapsFromManifest(manifest, {
     : [];
   const objectVectorMapsById = new Map(objectVectorMaps.map((object) => [object.id, object]));
   ASTEROIDS_REQUIRED_VECTOR_MAP_IDS.forEach((id) => {
+    if (isObjectVectorId(id)) {
+      const object = objectVectorMapsById.get(id);
+      if (!object) {
+        errors.push(`Asteroids Object Vector manifest map ${id} is missing from root.tools.${ASTEROIDS_OBJECT_VECTOR_TOOL_KEY}.objects.`);
+        return;
+      }
+      if (!Array.isArray(object.shapes) || !object.shapes.length) {
+        errors.push(`Asteroids Object Vector manifest map ${id} must contain at least one shape.`);
+      }
+      return;
+    }
     const vector = vectorsById.get(id);
     if (!vector) {
       errors.push(`Asteroids vector map manifest is missing ${id}.`);
@@ -178,16 +188,6 @@ export function loadAsteroidsVectorMapsFromManifest(manifest, {
       errors.push(`Asteroids vector map ${id} must contain at least ${minimumPoints} points.`);
     }
   });
-  ASTEROIDS_REQUIRED_OBJECT_VECTOR_MAP_IDS.forEach((id) => {
-    const object = objectVectorMapsById.get(id);
-    if (!object) {
-      errors.push(`Asteroids Object Vector manifest map ${id} is missing from root.tools.${ASTEROIDS_OBJECT_VECTOR_TOOL_KEY}.objects.`);
-      return;
-    }
-    if (!Array.isArray(object.shapes) || !object.shapes.length) {
-      errors.push(`Asteroids Object Vector manifest map ${id} must contain at least one shape.`);
-    }
-  });
   const objectVectorRoles = normalizeObjectVectorRoleBindings(document, errors);
   if (errors.length) {
     errors.forEach((message) => logValidation(logger, 'FAIL', message, { sourceLabel }));

tests/games/AsteroidsAssetReferenceAdoption.test.mjs

@@ -55,7 +55,8 @@ export async function run() {
 
   assert.equal(manifest.tools["vector-map-editor"], undefined);
   assert.equal(Array.isArray(manifest.tools["object-vector-studio-v2"].vectorMaps.vectors), true);
-  assert.equal(vectorMaps.vectorsById.has("vector.asteroids.ship.collision"), true);
+  assert.equal(vectorMaps.vectorsById.has("vector.asteroids.ship"), true);
+  assert.equal(vectorMaps.vectorsById.has("vector.asteroids.ship.collision"), false);
   assert.equal(vectorMaps.vectorsById.has("vector.asteroids.ui.title"), true);
   assert.equal(manifest.game["workspace"], undefined);
   assert.equal(manifest.game.gameData, undefined);

tests/games/AsteroidsPlatformDemo.test.mjs

@@ -74,7 +74,8 @@ export async function run() {
 
   assert.equal(manifest.tools['vector-map-editor'], undefined);
   assert.equal(Array.isArray(manifest.tools['object-vector-studio-v2'].vectorMaps.vectors), true);
-  assert.equal(vectorMaps.vectorsById.has('vector.asteroids.ship.collision'), true);
+  assert.equal(vectorMaps.vectorsById.has('vector.asteroids.ship'), true);
+  assert.equal(vectorMaps.vectorsById.has('vector.asteroids.ship.collision'), false);
   assert.equal(vectorMaps.vectorsById.has('vector.asteroids.ui.title'), true);
   assert.equal(manifest.game["workspace"], undefined);
   assert.equal(manifest.game.gameData, undefined);

tests/games/AsteroidsValidation.test.mjs

@@ -18,6 +18,7 @@ import {
   loadAsteroidsVectorMaps
 } from './asteroidsManifestObjectVectors.mjs';
 import {
+  ASTEROIDS_REQUIRED_VECTOR_MAP_IDS,
   ASTEROIDS_VECTOR_MAP_IDS,
   loadAsteroidsVectorMapsFromManifest
 } from '../../games/Asteroids/game/asteroidsVectorMaps.js';
@@ -157,6 +158,13 @@ export async function run() {
   const objectVectorPayload = manifestPayload.tools['object-vector-studio-v2'];
   const manifestVectorIds = objectVectorPayload.vectorMaps.vectors.map((vector) => vector.id);
   assert.equal(manifestVectorIds.includes(ASTEROIDS_VECTOR_MAP_IDS.bullet), true);
+  assert.equal(manifestVectorIds.includes(ASTEROIDS_VECTOR_MAP_IDS.ship), true);
+  assert.equal(manifestVectorIds.includes(ASTEROIDS_VECTOR_MAP_IDS.ufoLarge), true);
+  assert.equal(manifestVectorIds.includes(ASTEROIDS_VECTOR_MAP_IDS.ufoSmall), true);
+  assert.equal(manifestVectorIds.includes('vector.asteroids.ship.collision'), false);
+  assert.equal(manifestVectorIds.includes('vector.asteroids.ship.life'), false);
+  assert.equal(manifestVectorIds.includes('vector.asteroids.ufo.large.collision'), false);
+  assert.equal(manifestVectorIds.includes('vector.asteroids.ufo.small.collision'), false);
   assert.equal(manifestVectorIds.includes('vector.asteroids.attract.ship'), false);
   assert.equal(manifestVectorIds.includes('vector.asteroids.attract.asteroid'), false);
   assert.equal(manifestVectorIds.includes('vector.asteroids.attract.ufo'), false);
@@ -166,6 +174,15 @@ export async function run() {
   assert.equal(vectorMaps.objectVectorMapsById.get(ASTEROIDS_VECTOR_MAP_IDS.attractAsteroid).id, 'object.asteroids.large-asteroid');
   assert.equal(vectorMaps.objectVectorMapsById.get(ASTEROIDS_VECTOR_MAP_IDS.attractShip).id, 'object.asteroids.ship');
   assert.equal(vectorMaps.objectVectorMapsById.get(ASTEROIDS_VECTOR_MAP_IDS.attractUfo).id, 'object.asteroids.large-ufo');
+  ASTEROIDS_REQUIRED_VECTOR_MAP_IDS.forEach((id) => {
+    assert.equal(
+      id.startsWith('object.')
+        ? vectorMaps.objectVectorMapsById.has(id)
+        : vectorMaps.vectorsById.has(id),
+      true,
+      `required Asteroids manifest vector id ${id} should resolve`,
+    );
+  });
   assert.deepEqual(
     vectorMaps.vectorsById.get(ASTEROIDS_VECTOR_MAP_IDS.bullet).points,
     [
@@ -175,6 +192,32 @@ export async function run() {
       { x: -2, y: 2 },
     ],
   );
+  assert.deepEqual(
+    vectorMaps.vectorsById.get(ASTEROIDS_VECTOR_MAP_IDS.ship).points,
+    [
+      { x: 0, y: -18 },
+      { x: 14, y: 16 },
+      { x: 0, y: 8 },
+      { x: -14, y: 16 },
+    ],
+  );
+  assert.deepEqual(
+    vectorMaps.vectorsById.get(ASTEROIDS_VECTOR_MAP_IDS.ship).paths,
+    [
+      'M 0 -18 L 14 16 L 0 8 L -14 16 Z',
+      'M -6 14 L 0 6 L 6 14',
+    ],
+  );
+  assert.deepEqual(
+    vectorMaps.vectorsById.get(ASTEROIDS_VECTOR_MAP_IDS.ufoSmall).points.slice(0, 5),
+    [
+      { x: -14, y: 3 },
+      { x: 14, y: 3 },
+      { x: 9, y: 9 },
+      { x: -9, y: 9 },
+      { x: -14, y: 3 },
+    ],
+  );
   const shipObject = loadAsteroidsObjectVectorPayload().objects.find((object) => object.id === 'object.asteroids.ship');
   const shipHull = shipObject.shapes.find((shape) => shape.tool === 'polygon');
   assert.deepEqual(shipHull.geometry.points, [
@@ -199,6 +242,12 @@ export async function run() {
   const missingBulletValidation = loadAsteroidsVectorMapsFromManifest(missingBulletManifest);
   assert.equal(missingBulletValidation.ok, false);
   assert.equal(missingBulletValidation.errors.some((message) => message.includes(ASTEROIDS_VECTOR_MAP_IDS.bullet)), true);
+  const missingShipObjectManifest = structuredClone(manifestPayload);
+  missingShipObjectManifest.tools['object-vector-studio-v2'].objects = missingShipObjectManifest.tools['object-vector-studio-v2'].objects
+    .filter((object) => object.id !== ASTEROIDS_VECTOR_MAP_IDS.attractShip);
+  const missingShipObjectValidation = loadAsteroidsVectorMapsFromManifest(missingShipObjectManifest);
+  assert.equal(missingShipObjectValidation.ok, false);
+  assert.equal(missingShipObjectValidation.errors.some((message) => message.includes(ASTEROIDS_VECTOR_MAP_IDS.attractShip)), true);
   const createdDocumentShim = typeof globalThis.document === 'undefined';
   const createdWindowShim = typeof globalThis.window === 'undefined';
   const shimCanvas = createCanvas();