Integrate Workspace Manager V2 session launch with Asset Manager V2 - PR_26126_113-workspace-manager-v2-session-launch-integration

Author: DavidQ

docs/dev/reports/PR_26126_113_asset_manager_integration_notes.md

@@ -0,0 +1,23 @@
+# PR_26126_113 Asset Manager Integration Notes
+
+## Workspace Bridge
+- `WorkspaceBridge` now accepts production session context only from Workspace Manager V2.
+- Legacy Workspace V2-style context is rejected before Asset Manager V2 enters workspace mode.
+- Palette swatches are read from Workspace Manager V2 `activePalette`, not from fallback query parameters.
+- Preview context now carries `workspaceAssetsPath`, `workspaceGameId`, and `workspaceGameRoot`.
+
+## Preview Path Integration
+- Asset Manager V2 preview helpers resolve asset-backed preview URLs through the Workspace Manager-owned `assetsPath`.
+- Workspace preview paths resolve under `/games/<game>/assets/...` when a valid session context is active.
+- Missing or invalid Workspace Manager V2 preview context logs a visible Status failure.
+
+## Asset Insert Integration
+- Workspace insert continues to target the Workspace V2 asset schema location inside the active manifest payload.
+- Insert success/failure messages are routed through Status and now identify the Workspace Manager V2 session path.
+- The temporary `?workspace=UAT` path is unchanged and remains isolated for UAT-only testing.
+
+## Scope
+- Deprecated `tools/workspace-v2/` was not modified.
+- Sample JSON was not modified.
+- No samples/tools workspace roots were added.
+

docs/dev/reports/PR_26126_113_manual_validation_notes.md

@@ -0,0 +1,28 @@
+# PR_26126_113 Manual Validation Notes
+
+## Automated Validation
+- `npm run test:asset-manager-v2` passed.
+- Result: 8 Playwright tests passed.
+- `npm run test:workspace-v2` passed.
+- Result: 19 Playwright tests passed.
+
+## Manual Checks
+1. Open `tools/workspace-manager-v2/index.html`.
+   - Expected: Workspace Manager V2 can select the active Asteroids game context.
+   - Expected: Workspace Manager V2 session output includes `gameRoot`, `assetsPath`, and top-level `activePalette`.
+2. Launch Asset Manager V2 from Workspace Manager V2.
+   - Expected: URL includes `launch=workspace` and `fromTool=workspace-manager-v2`.
+   - Expected: URL does not use `?workspace=prod`.
+   - Expected: Asset Manager V2 loads active game, palette, and assets path context from session state.
+3. Open `tools/asset-manager-v2/index.html`.
+   - Expected: direct launch hard-fails to the launch guard overlay.
+4. Open `tools/asset-manager-v2/index.html?workspace=prod`.
+   - Expected: direct production launch hard-fails to the launch guard overlay.
+5. Open `tools/asset-manager-v2/index.html?workspace=UAT`.
+   - Expected: temporary UAT launch continues to seed the isolated Asteroids game root, assets path, and sample palette.
+
+## Scope Checks
+- No changed files under `tools/workspace-v2/`.
+- No sample JSON changes.
+- No samples/tools workspace roots were added.
+

docs/dev/reports/PR_26126_113_workspace_session_launch_notes.md

@@ -0,0 +1,31 @@
+# PR_26126_113 Workspace Session Launch Notes
+
+## Session Ownership
+- Workspace Manager V2 now writes the production Asset Manager V2 launch context as a Workspace Manager-owned session payload.
+- The session context owns:
+  - `gameId`
+  - `gameRoot`
+  - `assetsPath`
+  - `activePalette`
+  - `workspaceManifest`
+- `activePalette` is persisted as a top-level context value with `source: "workspace-manager-v2"` and the active palette swatches.
+- `assetsPath` is derived from the active game root as `games/<game>/assets`.
+
+## Production Launch Contract
+- Asset Manager V2 production launch requires:
+  - `launch=workspace`
+  - `fromTool=workspace-manager-v2`
+  - a valid `hostContextId`
+  - a session payload with `version: "workspace-manager-v2"`
+  - `toolId: "asset-manager-v2"`
+  - games-only `gameRoot` and `assetsPath`
+  - non-empty active palette swatches
+- Direct launch without valid Workspace Manager V2 session/context continues to show the launch guard overlay.
+- `?workspace=prod` remains unsupported and is treated as an invalid direct-launch state.
+- `?workspace=UAT` remains the only temporary URL-based UAT path.
+
+## Games-Only Guard
+- Context validation rejects workspace roots outside `games/`.
+- Context validation rejects paths containing `samples/` or `tools/`.
+- `assetsPath` must match the active game root plus `/assets`.
+

tests/playwright/tools/AssetManagerV2.spec.mjs

@@ -150,6 +150,8 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator("#launchContextSummary")).toHaveText("Session launch context is ready for Asteroids.");
       await expect(page.locator("#workspaceContextOutput")).toContainText('"gameRoot": "games/Asteroids/"');
       await expect(page.locator("#workspaceContextOutput")).toContainText('"assetsPath": "games/Asteroids/assets"');
+      await expect(page.locator("#workspaceContextOutput")).toContainText('"activePalette"');
+      await expect(page.locator("#workspaceContextOutput")).toContainText('"source": "workspace-manager-v2"');
       await expect(page.locator("#workspaceContextOutput")).toContainText('"owner": "workspace-manager-v2"');
       await expect(page.locator("#workspaceContextOutput")).not.toContainText("samples/");
       await expect(page.locator("#workspaceContextOutput")).not.toContainText("tools/");
@@ -165,15 +167,16 @@ 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("#statusLog")).toHaveValue(/Workspace mode loaded 0 validated assets from tools\.asset-browser\.assets/);
-      await expect(page.locator("#statusLog")).toHaveValue(/Workspace mode loaded \d+ palette colors from tools\.palette-browser\.swatches/);
+      await expect(page.locator("#statusLog")).toHaveValue(/Workspace Manager V2 loaded 0 validated assets from tools\.asset-browser\.assets/);
+      await expect(page.locator("#statusLog")).toHaveValue(/Workspace Manager V2 loaded \d+ palette colors from active palette context/);
 
       const workspacePreviewContext = await page.evaluate(async () => {
         const { WorkspaceBridge } = await import("/tools/asset-manager-v2/js/services/WorkspaceBridge.js");
         return new WorkspaceBridge({ windowRef: window }).readWorkspacePreviewContext();
       });
       expect(workspacePreviewContext).toEqual({
         workspaceMode: true,
+        workspaceAssetsPath: "games/Asteroids/assets",
         workspaceGameId: "Asteroids",
         workspaceGameRoot: "games/Asteroids/"
       });
@@ -187,6 +190,8 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       expect(storedContext.version).toBe("workspace-manager-v2");
       expect(storedContext.gameRoot).toBe("games/Asteroids/");
       expect(storedContext.assetsPath).toBe("games/Asteroids/assets");
+      expect(storedContext.activePalette.source).toBe("workspace-manager-v2");
+      expect(storedContext.activePalette.swatches.length).toBeGreaterThan(0);
       expect(storedContext.workspaceManifest.tools["palette-browser"].swatches.length).toBeGreaterThan(0);
       expect(storedContext.workspaceManifest.tools["asset-browser"].assets).toEqual({});
       expect(JSON.stringify(storedContext)).not.toMatch(/samples\//i);

tests/playwright/tools/WorkspaceManagerV2.spec.mjs

@@ -125,8 +125,8 @@ export class AssetManagerV2App {
     }
 
     const previewContext = this.workspaceBridge.readWorkspacePreviewContext();
-    if (!previewContext.workspaceGameId || !previewContext.workspaceGameRoot) {
-      return { ok: false, reason: "Workspace game context is missing." };
+    if (!previewContext.workspaceGameId || !previewContext.workspaceGameRoot || !previewContext.workspaceAssetsPath) {
+      return { ok: false, reason: "Workspace Manager V2 gameRoot or assetsPath context is missing." };
     }
 
     const paletteResult = this.workspaceBridge.readWorkspacePaletteSwatches();
@@ -193,7 +193,7 @@ export class AssetManagerV2App {
     this.selectedAssetId = Object.keys(this.assets)[0] || "";
     this.undoStack = [];
     this.redoStack = [];
-    this.statusLog.ok(`Workspace mode loaded ${Object.keys(this.assets).length} validated assets from tools.asset-browser.assets.`);
+    this.statusLog.ok(`Workspace Manager V2 loaded ${Object.keys(this.assets).length} validated assets from tools.asset-browser.assets.`);
     this.missingFileAssetIds = await this.logMissingReferencedFiles(this.assets);
   }
 
@@ -220,7 +220,7 @@ export class AssetManagerV2App {
       return;
     }
     this.assetForm.setPaletteSwatches(result.swatches);
-    this.statusLog.ok(`Workspace mode loaded ${result.swatches.length} palette colors from tools.palette-browser.swatches.`);
+    this.statusLog.ok(`Workspace Manager V2 loaded ${result.swatches.length} palette colors from active palette context.`);
   }
 
   previewOptions() {
@@ -555,10 +555,10 @@ export class AssetManagerV2App {
 
   async copyWorkspaceManifest() {
     if (!this.lastWorkspaceManifest) {
-      this.statusLog.fail("No Workspace V2 manifest has been inserted in this session.");
+      this.statusLog.fail("No Workspace Manager V2 manifest has been inserted in this session.");
       return;
     }
-    await this.copyText(JSON.stringify(this.lastWorkspaceManifest, null, 2), "Workspace V2 manifest JSON copied.");
+    await this.copyText(JSON.stringify(this.lastWorkspaceManifest, null, 2), "Workspace Manager V2 manifest JSON copied.");
   }
 
   async copyText(value, successMessage) {
@@ -588,7 +588,7 @@ export class AssetManagerV2App {
     }
     this.lastWorkspaceManifest = result.workspaceManifest;
     this.inspector.showObject(result.workspaceManifest);
-    this.statusLog.ok(`Inserted ${Object.keys(validation.payload.assets).length} validated assets into Workspace V2 tools.asset-browser.assets.`);
+    this.statusLog.ok(`Inserted ${Object.keys(validation.payload.assets).length} validated assets into Workspace Manager V2 tools.asset-browser.assets.`);
     this.refreshActions();
   }
 

tools/asset-manager-v2/js/AssetManagerV2App.js

@@ -22,16 +22,25 @@ function workspaceGameRoot(options = {}) {
   return gameId ? `games/${gameId}/` : "";
 }
 
+function workspaceAssetsPath(options = {}) {
+  const explicitAssetsPath = sanitizeText(options.workspaceAssetsPath || options.assetsPath).replace(/\\/g, "/").replace(/^\/+|\/+$/g, "");
+  return /^games\/[^/]+\/assets$/i.test(explicitAssetsPath) ? explicitAssetsPath : "";
+}
+
 function workspaceGameAssetPath(path, options = {}) {
   const normalizedPath = sanitizeText(path).replace(/\\/g, "/").replace(/^\/+/, "");
   if (!options.workspaceMode || hasUrlProtocol(normalizedPath) || /^games\//i.test(normalizedPath) || !/^assets\//i.test(normalizedPath)) {
     return { path, error: "" };
   }
+  const assetsPath = workspaceAssetsPath(options);
+  if (assetsPath) {
+    return { path: `${assetsPath}/${normalizedPath.replace(/^assets\//i, "")}`, error: "" };
+  }
   const gameRoot = workspaceGameRoot(options);
   if (!gameRoot) {
     return {
       path: "",
-      error: `Preview path ${normalizedPath} cannot be resolved because Workspace V2 game context is missing.`
+      error: `Preview path ${normalizedPath} cannot be resolved because Workspace Manager V2 game context is missing.`
     };
   }
   return { path: `${gameRoot}${normalizedPath}`, error: "" };

tools/asset-manager-v2/js/assetPreviewHelpers.js

@@ -39,7 +39,7 @@ export class ActionNavControl {
 
   applyLaunchMode() {
     const params = new URLSearchParams(this.location.search);
-    const mode = params.get("launch") === "workspace" || params.get("fromTool") === "workspace-v2"
+    const mode = params.get("launch") === "workspace" && params.get("fromTool") === "workspace-manager-v2"
       ? "workspace"
       : "tool";
     this.toolNav.hidden = mode !== "tool";

tools/asset-manager-v2/js/controls/ActionNavControl.js

@@ -1,5 +1,5 @@
 // Temporary UAT-only workspace session loader. Keep this isolated so
-// ?workspace=UAT can be removed without touching normal Workspace V2 loading.
+// ?workspace=UAT can be removed without touching normal Workspace Manager V2 loading.
 const TEMPORARY_UAT_GAME_ROOT = "games/Asteroids/";
 const TEMPORARY_UAT_ASSETS_PATH = "games/Asteroids/assets";