Fix Asset Browser schema for flat manifest assets and sample 1902 preview id - PR 11.97

Author: DavidQ

docs/dev/codex_commands.md

@@ -1,8 +1,26 @@
-# Codex Command — PR 11.96
+# Codex Command - PR 11.97
 
 Model: GPT-5.4
 Reasoning: high
 
-```bash
-codex exec --model gpt-5.4 --reasoning high "Apply PR 11.96. Update the manifest/schema/workspace contract so asset-browser.assets is a flat asset-id map for all asset kinds. Do not restore media. Fix runtime/tool loaders and sample 1902 workspace usage that still expect media. Update schemas. Preserve Asteroids bezel.png/background/font manifest loading. No aliases, no compatibility shims, no fallback data. Add reports under docs/dev/reports and keep targeted validation only."
+```text
+Run BUILD_PR_LEVEL_11_97_FIX_ASSET_BROWSER_SCHEMA_PROPERLY.
+
+Goal:
+Fix the Asset Browser schema to match the flat asset-browser.assets contract and update sample 1902 workspace data accordingly.
+
+Requirements:
+- Update tools/schemas/tools/asset-browser.schema.json.
+- asset-browser.assets must be a flat map of asset ids to entries.
+- Asset ids must follow <kind>.<domain>.<name>, for example image.sample1902.preview.
+- Asset entries require path, kind, and source.
+- Allow optional stretchOverride.uniformEdgeStretchPx on image.*.bezel asset entries.
+- Do not restore nested media.
+- Do not remove existing compatibility properties unless proven obsolete.
+- Fix sample 1902 preview asset to image.sample1902.preview.
+- Search for generic asset-browser asset id preview and fix if found.
+- Add/update docs/dev/reports/PR_11_97_schema_validation.md with exact validation results.
+- Run targeted validation only; do not run full sample suite.
+
+Return a ZIP artifact at <project folder>/tmp/PR_11_97_FIX_ASSET_BROWSER_SCHEMA_PROPERLY.zip.
 ```

docs/dev/commit_comment.txt

@@ -1 +1 @@
-Flatten asset manifest schema and align sample 1902 workspace loaders - PR 11.96
+Fix Asset Browser schema for flat manifest assets and sample 1902 preview id - PR 11.97

docs/dev/reports/PR_11_97_expected_validation.md

@@ -0,0 +1,14 @@
+# PR 11.97 Expected Validation Report
+
+Codex must fill this file with actual command outputs.
+
+Required checks:
+
+- Schema JSON parses.
+- `asset-browser.assets` exists in schema.
+- Asset entries require `path`, `kind`, and `source`.
+- Optional `stretchOverride.uniformEdgeStretchPx` is accepted for bezel entries.
+- No generic `preview` asset id remains for sample 1902 asset-browser assets.
+- `image.sample1902.preview` exists where sample 1902 declares workspace preview assets.
+- Nested `media` was not restored as the Asset Browser asset contract.
+- Full samples test skipped unless a shared loader/framework was changed; reason must be recorded.

docs/dev/reports/PR_11_97_schema_validation.md

@@ -0,0 +1,50 @@
+# PR 11.97 Schema Validation
+
+## Scope
+Implemented `BUILD_PR_LEVEL_11_97_FIX_ASSET_BROWSER_SCHEMA_PROPERLY` with targeted schema + sample 1902 data updates only.
+
+## Files Changed
+- `tools/schemas/tools/asset-browser.schema.json`
+- `samples/phase-19/1902/sample.1902.workspace-all-tools.json`
+
+## Contract Fixes Applied
+1. `asset-browser.assets` remains a flat map (no nested `media`).
+2. Asset id format enforced as `<kind>.<domain>.<name>` using strict key patterns.
+3. Asset entry now requires:
+   - `path`
+   - `kind`
+   - `source`
+4. `stretchOverride.uniformEdgeStretchPx` remains allowed only for `image.*.bezel` entries.
+5. Compatibility payload properties preserved:
+   - `assetBrowserPreset`
+   - `approvedAssets`
+   - `importHubPreset`
+6. Sample 1902 preview asset id updated:
+   - `sample-1902-preview` -> `image.sample1902.preview`
+7. Sample 1902 asset-browser workspace preset id normalized to schema pattern:
+   - `sample-1902-workspace-preset` -> `other.sample1902.workspace-preset`
+
+## Search/Fix Evidence
+- Search for stale preview id:
+  - Command: `rg -n -F "sample-1902-preview" samples tools games tests`
+  - Result: no matches
+- Generic asset-browser id `preview` scan:
+  - Command: custom JSON scan over repo JSON files for `tools["asset-browser"].assets.preview`
+  - Result: `NO_GENERIC_PREVIEW_ASSET_ID_FOUND`
+
+## Targeted Validation Commands
+1. Strict schema + sample contract validation:
+   - `node -e "import('./tests/tools/ToolSchemaStrictModeValidation.test.mjs').then(async (m)=>{await m.run(); console.log('ToolSchemaStrictModeValidation: PASS');})"`
+   - Result: `ToolSchemaStrictModeValidation: PASS`
+2. Sample 1902 targeted launch smoke:
+   - `node ./tests/runtime/LaunchSmokeAllEntries.test.mjs --samples --sample-range=1902-1902 --tools`
+   - Result: PASS (`19/19`)
+3. Sample 1902 asset id pattern check:
+   - Command: custom JSON check script
+   - Result:
+     - `assetKeys=["other.sample1902.workspace-preset","image.sample1902.preview"]`
+     - `allKeysValid=true`
+     - `previewEntryExists=true`
+
+## Full Suite
+Skipped by design (targeted schema/sample scope only).

docs/pr/PR_11_97_FIX_ASSET_BROWSER_SCHEMA.md

@@ -0,0 +1,101 @@
+# PR 11.97 - Fix Asset Browser Schema Properly
+
+## Purpose
+Update the Asset Browser schema so it matches the current flat manifest contract:
+
+- `asset-browser.assets` is the single source of truth for all asset kinds.
+- No nested `media` contract.
+- No generic asset keys like `preview`.
+- Asset ids must use a predictable namespaced form such as `image.sample1902.preview`, `image.asteroids.bezel`, `font.asteroids.vector-battle`, or `audio.asteroids.fire`.
+
+## Scope
+- Update `tools/schemas/tools/asset-browser.schema.json`.
+- Add an `assets` property under the asset-browser payload/model where this repo expects Asset Browser payload validation.
+- Validate each asset entry requires `path`, `kind`, and `source`.
+- Allow optional per-asset fields such as `stretchOverride` for bezel assets.
+- Align sample 1902 workspace usage to the flat asset-id model.
+- Do not restore `media`.
+- Do not move runtime loaders back to nested media.
+
+## Required schema behavior
+The schema must accept:
+
+```json
+"assets": {
+  "image.sample1902.preview": {
+    "path": "/samples/phase-19/1902/assets/images/preview.svg",
+    "kind": "image",
+    "source": "workspace-manager"
+  },
+  "image.asteroids.bezel": {
+    "path": "/games/Asteroids/assets/images/bezel.png",
+    "kind": "image",
+    "source": "workspace-manager",
+    "stretchOverride": {
+      "uniformEdgeStretchPx": 10
+    }
+  }
+}
+```
+
+The schema must reject or flag generic keys such as:
+
+```json
+"assets": {
+  "preview": {}
+}
+```
+
+## Asset id rule
+Use this shape:
+
+```text
+<kind>.<domain>.<name>
+```
+
+Examples:
+
+```text
+image.sample1902.preview
+image.asteroids.bezel
+image.asteroids.background
+font.asteroids.vector-battle
+audio.asteroids.fire
+```
+
+## Implementation notes for Codex
+1. Open `tools/schemas/tools/asset-browser.schema.json`.
+2. Add an `assets` property in the correct schema location used by asset-browser payload validation.
+3. Define `$defs.assetMap` and `$defs.assetEntry` rather than leaving `assets` as unconstrained `jsonValue`.
+4. Keep compatibility fields currently present unless they are explicitly obsolete.
+5. Do not remove `assetCatalog`, `assetBrowserPreset`, `approvedAssets`, or `importHubPreset` unless current code proves they are obsolete.
+6. Ensure `additionalProperties: false` does not block the new `assets` property.
+7. Update sample 1902 manifest/workspace data so its preview uses `image.sample1902.preview`, not `preview`.
+8. Search the repo for `"assets": { "preview"` and generic `"preview"` asset ids and fix them if they are Asset Browser asset entries.
+
+## Validation
+Run targeted validation only:
+
+```powershell
+# Schema parses
+Get-Content .\tools\schemas\tools\asset-browser.schema.json | ConvertFrom-Json | Out-Null
+
+# No nested media contract in asset-browser assets
+Select-String -Path .\samples\**\*.json, .\games\**\*.json -Pattern '"media"'
+
+# No generic preview asset id under asset-browser.assets
+Select-String -Path .\samples\**\*.json, .\games\**\*.json -Pattern '"preview"\s*:'
+
+# Confirm sample 1902 preview asset id
+Select-String -Path .\samples\phase-19\1902\*.json -Pattern 'image.sample1902.preview'
+```
+
+Do not run the full sample suite unless a shared loader/framework change requires it.
+
+## Acceptance
+- Asset Browser schema defines flat `assets`.
+- Asset entries require `path`, `kind`, and `source`.
+- Bezel `stretchOverride.uniformEdgeStretchPx` is valid only on asset entries such as `image.*.bezel`.
+- Sample 1902 uses `image.sample1902.preview`.
+- Runtime/tool loaders remain aligned to flat `asset-browser.assets`.
+- No `media` restoration.

samples/phase-19/1902/sample.1902.workspace-all-tools.json

@@ -381,7 +381,7 @@
             "status": "registered"
           },
           {
-            "id": "sample-1902-preview",
+            "id": "image.sample1902.preview",
             "label": "1902 Preview Art",
             "type": "image",
             "category": "Preview Art",
@@ -533,18 +533,18 @@
       "payload": {
         "assetBrowserPreset": {
           "selectedCategory": "All",
-          "selectedAssetId": "sample-1902-workspace-preset",
+          "selectedAssetId": "other.sample1902.workspace-preset",
           "search": "",
           "importCategory": "Workflow JSON"
         }
       },
       "assets": {
-        "sample-1902-workspace-preset": {
+        "other.sample1902.workspace-preset": {
           "path": "/samples/phase-19/1902/sample.1902.workspace-all-tools.json",
           "kind": "other",
           "source": "workspace-manager"
         },
-        "sample-1902-preview": {
+        "image.sample1902.preview": {
           "path": "/samples/phase-19/1902/assets/images/preview.svg",
           "kind": "image",
           "source": "workspace-manager"

tools/schemas/tools/asset-browser.schema.json

@@ -30,13 +30,33 @@
       "type": "object",
       "additionalProperties": false,
       "patternProperties": {
-        "^.+$": {
+        "^image\\.[a-z0-9][a-z0-9-]*\\.bezel$": {
           "$ref": "#/$defs/assetEntry"
+        },
+        "^(?!image\\.[a-z0-9][a-z0-9-]*\\.bezel$)[a-z][a-z0-9-]*\\.[a-z0-9][a-z0-9-]*\\.[a-z0-9][a-z0-9-]*$": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/assetEntry"
+            },
+            {
+              "not": {
+                "required": [
+                  "stretchOverride"
+                ]
+              }
+            }
+          ]
         }
       },
       "propertyNames": {
-        "type": "string",
-        "minLength": 1
+        "anyOf": [
+          {
+            "pattern": "^image\\.[a-z0-9][a-z0-9-]*\\.bezel$"
+          },
+          {
+            "pattern": "^(?!image\\.[a-z0-9][a-z0-9-]*\\.bezel$)[a-z][a-z0-9-]*\\.[a-z0-9][a-z0-9-]*\\.[a-z0-9][a-z0-9-]*$"
+          }
+        ]
       }
     },
     "payload": {
@@ -61,7 +81,8 @@
       "type": "object",
       "required": [
         "path",
-        "kind"
+        "kind",
+        "source"
       ],
       "additionalProperties": false,
       "properties": {