Fix V2 schema naming workspace launch and manifest save flow - PR_26126_116-v2-tool-schema-naming-and-workspace-launch-fix

Author: DavidQ

docs/dev/reports/PR_26126_116_manual_validation_notes.md

@@ -0,0 +1,11 @@
+# PR_26126_116 Manual Validation Notes
+
+- `npm run test:asset-manager-v2`: PASS, 8 tests.
+- `npm run test:workspace-v2`: PASS, 20 tests.
+- Verified Asset Manager V2 loads `asset-manager-v2.schema.json`.
+- Verified Workspace Manager V2 generated manifests use `tools.palette-manager-v2` and `tools.asset-manager-v2`.
+- Verified Save exports schema-valid Workspace Manager V2 manifest JSON.
+- Verified Save blocks when generated context fails schema validation and logs the exact failure.
+- Verified Asset Manager V2 launched from Workspace Manager V2 shows only `Return to Workspace` in workspace nav.
+- Verified `Return to Workspace` navigates back to Workspace Manager V2.
+- Verified `tools/workspace-v2` and sample JSON were not modified.

docs/dev/reports/PR_26126_116_save_manifest_notes.md

@@ -0,0 +1,8 @@
+# PR_26126_116 Save Manifest Notes
+
+- Added a Workspace Manager V2 `Save` button beside `Launch Asset Manager V2`.
+- Save is disabled until a valid game workspace context is selected.
+- Save validates the generated manifest against `tools/schemas/workspace.manifest.schema.json` and referenced V2 payload schemas before export.
+- Validation failures block export and log exact schema failures to Status.
+- Successful save exports `<manifest-id>.workspace.manifest.json`.
+- Playwright coverage validates successful export and blocked save behavior for schema-invalid generated context.

docs/dev/reports/PR_26126_116_v2_schema_naming_audit_notes.md

@@ -0,0 +1,12 @@
+# PR_26126_116 V2 Schema Naming Audit Notes
+
+- Added canonical V2 tool payload schemas:
+  - `tools/schemas/tools/asset-manager-v2.schema.json`
+  - `tools/schemas/tools/palette-manager-v2.schema.json`
+- Updated `tools/schemas/workspace.manifest.schema.json` so generated Workspace Manager V2 manifests require `tools.palette-manager-v2` and `tools.asset-manager-v2`.
+- Updated Asset Manager V2 schema loading and validation messages from `asset-browser.schema.json` to `asset-manager-v2.schema.json`.
+- Updated Workspace Manager V2 generated JSON and tests to reject old generated `palette-browser`/`asset-browser` tool keys.
+- Updated visible V2 registry/shell naming for Asset Manager V2 and Palette Manager V2 where this lane directly references them.
+- Preview Generator V2 remains under its existing `preview-generator-v2` tool ID and dedicated Playwright spec path; this lane only revalidated that reference through `test:workspace-v2`.
+- Deprecated `tools/workspace-v2` was not modified.
+- Sample JSON was not modified.

docs/dev/reports/PR_26126_116_workspace_launch_fix_notes.md

@@ -0,0 +1,13 @@
+# PR_26126_116 Workspace Launch Fix Notes
+
+- Workspace Manager V2 now builds a schema-valid workspace manifest as the launch context.
+- Asset Manager V2 production launch receives the manifest through sessionStorage using `hostContextId`; no `?workspace=prod` path is supported.
+- Asset Manager V2 launch validation now requires:
+  - root workspace manifest shape
+  - games-only `gameRoot`
+  - matching `assetsPath`
+  - `tools.palette-manager-v2.swatches`
+  - `tools.asset-manager-v2.assets`
+- Workspace nav in Asset Manager V2 now shows only `Return to Workspace`.
+- `Return to Workspace` navigates back to `tools/workspace-manager-v2/index.html`.
+- Direct launch and `?workspace=prod` remain blocked by the launch guard overlay.

tests/playwright/tools/AssetManagerV2.spec.mjs

@@ -379,7 +379,7 @@ test.describe("Asset Manager V2", () => {
       await expect(page.locator("#jsonInput")).toHaveCount(0);
       await expect(page.locator("#validateJsonButton")).toHaveCount(0);
       await expect(page.locator('button[aria-controls="assetsContent"] span').first()).toHaveText("Assets");
-      await expect(page.locator("#statusLog")).toHaveValue(/INFO Loaded asset-browser\.schema\.json/);
+      await expect(page.locator("#statusLog")).toHaveValue(/INFO Loaded asset-manager-v2\.schema\.json/);
 
       await page.locator("#assetKindAudio").check();
       await expect(page.locator("#assetFileInput")).toHaveAttribute("accept", /audio\/wav/);
@@ -1168,7 +1168,8 @@ test.describe("Asset Manager V2", () => {
       gameRoot: "games/Asteroids/",
       assetsPath: "games/Asteroids/assets",
       tools: {
-        "palette-browser": {
+        "palette-manager-v2": {
+          "$schema": "tools/schemas/tools/palette-manager-v2.schema.json",
           schema: "html-js-gaming.palette",
           version: 1,
           name: "Asteroids Palette",
@@ -1246,7 +1247,7 @@ test.describe("Asset Manager V2", () => {
     }
   });
 
-  test("launches Asset Manager V2 from Workspace Manager V2 and inserts only Workspace asset entries", async ({ page }) => {
+  test("launches Asset Manager V2 from Workspace Manager V2 with schema-valid context and workspace return nav", async ({ page }) => {
     const server = await openWorkspaceManagerV2(page, {
       assetFiles: [
         {
@@ -1290,6 +1291,10 @@ test.describe("Asset Manager V2", () => {
       await expect(page).not.toHaveURL(/gameId=Asteroids/);
       await expect(page.locator(".asset-manager-v2__tool__menu")).toBeHidden();
       await expect(page.locator(".asset-manager-v2__workspace__menu")).toBeVisible();
+      await expect(page.locator(".asset-manager-v2__workspace__menu button")).toHaveText(["Return to Workspace"]);
+      await expect(page.locator("#returnToWorkspaceButton")).toBeEnabled();
+      await expect(page.locator("#workspaceInsertAssetsButton")).toHaveCount(0);
+      await expect(page.locator("#workspaceCopyManifestButton")).toHaveCount(0);
       await expect(page.locator("#statusLog")).toHaveValue(/Workspace Manager V2 loaded 0 validated assets from tools\.asset-manager-v2\.assets/);
       await expect(page.locator("#statusLog")).toHaveValue(/Workspace Manager V2 loaded \d+ palette colors from active palette context/);
       const hostContextId = await page.evaluate(() => new URL(window.location.href).searchParams.get("hostContextId"));
@@ -1397,53 +1402,20 @@ test.describe("Asset Manager V2", () => {
       await expect(page.locator("#inspectorOutput")).toContainText("\"kind\": \"hex\"");
       await expect(page.locator("#inspectorOutput")).toContainText("\"name\": \"HUD Blue\"");
 
-      await expect(page.locator("#workspaceInsertAssetsButton")).toBeEnabled();
-      await page.locator("#workspaceInsertAssetsButton").click();
-      await expect(page.locator("#statusLog")).toHaveValue(/OK Inserted 4 validated assets into Workspace Manager V2 tools\.asset-manager-v2\.assets/);
-
       const storedContext = await page.evaluate((id) => JSON.parse(sessionStorage.getItem(id)), hostContextId);
       expect(storedContext.documentKind).toBe("workspace-manifest");
       expect(storedContext.toolId).toBeUndefined();
       expect(storedContext.activePalette).toBeUndefined();
       expect(storedContext.workspaceManifest).toBeUndefined();
       expect(storedContext.tools["asset-browser"]).toBeUndefined();
-      expect(storedContext.tools["asset-manager-v2"].assets["assets.audio.sound.fire"]).toEqual({
-        path: "assets/audio/fire.wav",
-        type: "audio",
-        kind: "wav",
-        role: "sound",
-        source: "asset-manager-v2"
-      });
-      expect(storedContext.tools["asset-manager-v2"].assets["assets.font.ui.vector-battle"]).toEqual({
-        path: "assets/fonts/vector_battle.ttf",
-        type: "font",
-        kind: "ttf",
-        role: "ui",
-        source: "asset-manager-v2"
-      });
-      expect(storedContext.tools["asset-manager-v2"].assets["assets.image.sprite.preview"]).toEqual({
-        path: "assets/images/preview.png",
-        type: "image",
-        kind: "png",
-        role: "sprite",
-        source: "asset-manager-v2"
-      });
-      expect(storedContext.tools["asset-manager-v2"].assets["assets.color.hud.primary-hud.hud-blue"]).toEqual({
-        path: "palette://workspace/hud-blue",
-        type: "color",
-        kind: "hex",
-        role: "hud",
-        source: "asset-manager-v2",
-        color: {
-          hex: "#78B7FF",
-          name: "HUD Blue",
-          symbol: "*"
-        }
-      });
-      expect(storedContext.tools["palette-browser"].source).toBe("workspace-manager-v2");
-      expect(storedContext.tools["palette-browser"].swatches.length).toBeGreaterThan(0);
+      expect(storedContext.tools["palette-browser"]).toBeUndefined();
+      expect(storedContext.tools["asset-manager-v2"].assets).toEqual({});
+      expect(storedContext.tools["palette-manager-v2"].source).toBe("workspace-manager-v2");
+      expect(storedContext.tools["palette-manager-v2"].swatches.length).toBeGreaterThan(0);
       expect(storedContext.tools["workspace-v2"]).toBeUndefined();
-      expect(Object.keys(storedContext.tools).sort()).toEqual(["asset-manager-v2", "palette-browser"]);
+      expect(Object.keys(storedContext.tools).sort()).toEqual(["asset-manager-v2", "palette-manager-v2"]);
+      await page.locator("#returnToWorkspaceButton").click();
+      await expect(page).toHaveURL(/workspace-manager-v2\/index\.html$/);
 
       expect(pageErrors).toEqual([]);
     } finally {

tests/playwright/tools/WorkspaceManagerV2.spec.mjs

@@ -1,4 +1,5 @@
 import { expect, test } from "@playwright/test";
+import { readFile } from "node:fs/promises";
 import { startRepoServer } from "../../helpers/playwrightRepoServer.mjs";
 import { workspaceV2CoverageReporter as coverageReporter } from "../../helpers/workspaceV2CoverageReporter.mjs";
 
@@ -135,6 +136,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
     try {
       await expect(page.locator("body[data-tool-id='workspace-manager-v2']")).toBeVisible();
       await expect(page.locator("#launchAssetManagerV2Button")).toBeDisabled();
+      await expect(page.locator("#saveWorkspaceManifestButton")).toBeDisabled();
       await expect(page.locator("#activeGameSelect option")).toHaveText([
         "Select a game",
         "Asteroids",
@@ -152,13 +154,27 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator("#workspaceContextOutput")).toContainText('"assetsPath": "games/Asteroids/assets"');
       await expect(page.locator("#workspaceContextOutput")).toContainText('"source": "workspace-manager-v2"');
       await expect(page.locator("#workspaceContextOutput")).toContainText('"asset-manager-v2"');
+      await expect(page.locator("#workspaceContextOutput")).toContainText('"palette-manager-v2"');
+      await expect(page.locator("#workspaceContextOutput")).not.toContainText('"palette-browser"');
+      await expect(page.locator("#workspaceContextOutput")).not.toContainText('"asset-browser"');
       await expect(page.locator("#workspaceContextOutput")).not.toContainText('"activePalette"');
       await expect(page.locator("#workspaceContextOutput")).not.toContainText('"toolId"');
       await expect(page.locator("#workspaceContextOutput")).not.toContainText('"workspaceManifest"');
       await expect(page.locator("#workspaceContextOutput")).not.toContainText('"workspaceMetadata"');
       await expect(page.locator("#workspaceContextOutput")).not.toContainText("samples/");
-      await expect(page.locator("#workspaceContextOutput")).not.toContainText("tools/");
       await expect(page.locator("#launchAssetManagerV2Button")).toBeEnabled();
+      await expect(page.locator("#saveWorkspaceManifestButton")).toBeEnabled();
+
+      const downloadPromise = page.waitForEvent("download");
+      await page.locator("#saveWorkspaceManifestButton").click();
+      const download = await downloadPromise;
+      expect(download.suggestedFilename()).toBe("workspace-manager-v2-Asteroids.workspace.manifest.json");
+      const savedManifest = JSON.parse(await readFile(await download.path(), "utf8"));
+      expect(savedManifest.documentKind).toBe("workspace-manifest");
+      expect(Object.keys(savedManifest.tools).sort()).toEqual(["asset-manager-v2", "palette-manager-v2"]);
+      expect(savedManifest.tools["palette-manager-v2"].swatches.length).toBeGreaterThan(0);
+      expect(savedManifest.tools["asset-manager-v2"].assets).toEqual({});
+      await expect(page.locator("#statusLog")).toHaveValue(/OK Saved schema-valid Workspace Manager V2 manifest workspace-manager-v2-Asteroids\./);
 
       await page.locator("#launchAssetManagerV2Button").click();
       await expect(page).toHaveURL(/asset-manager-v2\/index\.html.*launch=workspace/);
@@ -170,6 +186,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator("#assetLaunchGuard")).toBeHidden();
       await expect(page.locator(".asset-manager-v2__tool__menu")).toBeHidden();
       await expect(page.locator(".asset-manager-v2__workspace__menu")).toBeVisible();
+      await expect(page.locator(".asset-manager-v2__workspace__menu button")).toHaveText(["Return to Workspace"]);
       await expect(page.locator("#statusLog")).toHaveValue(/Workspace Manager V2 loaded 0 validated assets from tools\.asset-manager-v2\.assets/);
       await expect(page.locator("#statusLog")).toHaveValue(/Workspace Manager V2 loaded \d+ palette colors from active palette context/);
 
@@ -197,20 +214,21 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       expect(storedContext.gameId).toBe("Asteroids");
       expect(storedContext.gameRoot).toBe("games/Asteroids/");
       expect(storedContext.assetsPath).toBe("games/Asteroids/assets");
-      expect(storedContext.tools["palette-browser"].swatches.length).toBeGreaterThan(0);
+      expect(storedContext.tools["palette-manager-v2"].swatches.length).toBeGreaterThan(0);
       expect(storedContext.tools["asset-manager-v2"].assets).toEqual({});
       expect(storedContext.workspaceMetadata).toBeUndefined();
       expect(storedContext.tools["asset-browser"]).toBeUndefined();
+      expect(storedContext.tools["palette-browser"]).toBeUndefined();
       expect(storedContext.tools["asset-manager-v2"]).toEqual({ assets: {} });
       const schemaValidation = await page.evaluate(async () => {
         const [workspaceSchema, paletteSchema, assetSchema] = await Promise.all([
           fetch("/tools/schemas/workspace.manifest.schema.json", { cache: "no-store" }).then((response) => response.json()),
-          fetch("/tools/schemas/tools/palette-browser.schema.json", { cache: "no-store" }).then((response) => response.json()),
-          fetch("/tools/schemas/tools/asset-browser.schema.json", { cache: "no-store" }).then((response) => response.json())
+          fetch("/tools/schemas/tools/palette-manager-v2.schema.json", { cache: "no-store" }).then((response) => response.json()),
+          fetch("/tools/schemas/tools/asset-manager-v2.schema.json", { cache: "no-store" }).then((response) => response.json())
         ]);
         const url = new URL(window.location.href);
         const manifest = JSON.parse(sessionStorage.getItem(url.searchParams.get("hostContextId")));
-        const palettePayload = manifest.tools["palette-browser"];
+        const palettePayload = manifest.tools["palette-manager-v2"];
         const assetPayload = manifest.tools["asset-manager-v2"];
         const extraKeys = (value, schema) => Object.keys(value).filter((key) => !Object.hasOwn(schema.properties || {}, key));
         const missingKeys = (value, schema) => (schema.required || []).filter((key) => !Object.hasOwn(value, key));
@@ -242,7 +260,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
         paletteMissingKeys: [],
         swatchExtraKeys: [],
         swatchMissingKeys: [],
-        toolKeys: ["asset-manager-v2", "palette-browser"],
+        toolKeys: ["asset-manager-v2", "palette-manager-v2"],
         unsupportedToolKeys: []
       });
       expect(JSON.stringify(storedContext)).not.toMatch(/samples\//i);
@@ -253,6 +271,29 @@ test.describe("Workspace Manager V2 bootstrap", () => {
     }
   });
 
+  test("blocks Workspace Manager V2 save when the generated manifest fails schema validation", async ({ page }) => {
+    const server = await openWorkspaceManagerV2(page);
+    const pageErrors = [];
+
+    page.on("pageerror", (error) => {
+      pageErrors.push(error.message);
+    });
+
+    try {
+      await page.locator("#activeGameSelect").selectOption("Asteroids");
+      await expect(page.locator("#saveWorkspaceManifestButton")).toBeEnabled();
+      await page.evaluate(() => {
+        window.__workspaceManagerV2App.activeContext.tools["asset-manager-v2"].unexpected = true;
+      });
+      await page.locator("#saveWorkspaceManifestButton").click();
+      await expect(page.locator("#statusLog")).toHaveValue(/FAIL Save blocked: Generated Workspace Manager V2 manifest failed schema validation: root\.tools\.asset-manager-v2\.unexpected is not allowed/);
+      expect(pageErrors).toEqual([]);
+    } finally {
+      await coverageReporter.stop(page);
+      await server.close();
+    }
+  });
+
   test("keeps direct Asset Manager V2 workspace prod launch blocked", async ({ page }) => {
     const server = await openAssetManagerV2(page, "?workspace=prod");
     const pageErrors = [];

tools/asset-manager-v2/README.md

@@ -1,6 +1,6 @@
 # Asset Manager V2
 
-Asset Manager V2 is an asset-only First-Class Tool V2 surface. It creates and validates audio, color, data, font, image, localization, shader, and video entries against `tools/schemas/tools/asset-browser.schema.json`.
+Asset Manager V2 is an asset-only First-Class Tool V2 surface. It creates and validates audio, color, data, font, image, localization, shader, and video entries against `tools/schemas/tools/asset-manager-v2.schema.json`.
 
 The Type radios choose the asset type before picking an asset. File-backed types use the selected type's accept filter, preserve the selected path filename exactly from the project root, default the role from the selected type, and persist only schema-valid `path`, `type`, `kind`, `role`, and `source` metadata. Color assets use only active Workspace Manager V2 palette swatches and persist schema-valid palette color metadata. The visible Assets list and Output Summary use compact `id`, `type`, `kind`, `role`, and `path` display fields. The tool has no dependency on the legacy asset browsing implementation and does not discover or enumerate all tools. In Workspace Manager V2 launch mode, validated entries are written only to the canonical `tools.asset-manager-v2.assets` schema location in the workspace manifest context.
 

tools/asset-manager-v2/index.html

@@ -51,8 +51,7 @@ <h2 class="tools-platform-frame__eyebrow">Asset-only First-Class Tool V2</h2>
     </nav>
 
     <nav class="asset-manager-v2__menu asset-manager-v2__workspace__menu" aria-label="Workspace asset actions" data-launch-mode-nav="workspace" hidden>
-      <button id="workspaceInsertAssetsButton" type="button" disabled>Insert Assets</button>
-      <button id="workspaceCopyManifestButton" type="button" disabled>Copy Manifest</button>
+      <button id="returnToWorkspaceButton" type="button">Return to Workspace</button>
     </nav>
 
     <main class="asset-manager-v2 app-shell" data-tool-id="asset-manager-v2">