Fix Workspace Manager V2 return context and hydrate launched tool state - PR_26127_004-workspace-manager-v2-return-context-and-tool-launch-fixes

Author: DavidQ

docs/dev/reports/PR_26127_004-workspace-manager-v2-return-context-and-tool-launch-fixes.md

@@ -0,0 +1,34 @@
+# PR_26127_004-workspace-manager-v2-return-context-and-tool-launch-fixes
+
+## Scope
+- Updated Workspace Manager V2, workspace-launched V2 tool handoff, and related Playwright coverage.
+- Did not modify deprecated `tools/workspace-v2`.
+- Did not modify sample JSON.
+- Did not add fallback behavior.
+
+## Workspace Manager V2 Notes
+- Increased Workspace Context tile minimum height and removed internal tile scrolling.
+- Aligned Workspace Context tile content to the top.
+- Removed the self-launching Workspace Manager V2 tool tile from the Workspace Manager V2 tool launcher.
+- Preserved temporary UAT mode on Return to Workspace by passing a launch-only `workspaceMode=uat` marker and returning to `?workspace=uat`.
+
+## Tool Launch Notes
+- Palette Manager V2 now reads the Workspace Manager V2 session manifest on workspace launch and imports `tools.palette-manager-v2.swatches` into the active user palette.
+- Preview Generator V2 now hydrates workspace launch context by setting Repo selected display, Target Source `games`, asset folder from `assetsPath`, the active game path, and Status log hydration events.
+- Preview Generator V2 loads Last Generated Image from `/games/<game>/assets/preview.svg` when that preview file is present.
+- Asset Manager V2 launch guard now includes a Return to Tools button for unavailable/direct-launch states.
+
+## Validation
+- PASS: JS syntax checks for changed runtime and Playwright files.
+- PASS: `npx playwright test tests/playwright/tools/AssetManagerV2.spec.mjs tests/playwright/tools/WorkspaceManagerV2.spec.mjs --project=playwright --workers=1 --reporter=list` completed with 17 passed tests.
+- PASS: `npm run test:workspace-v2` completed with 24 passed tests.
+- PASS: `git diff --check`.
+- PASS: Scope check found no diffs under deprecated `tools/workspace-v2` or sample schema paths.
+- SKIPPED: Full samples smoke test, per PR instructions. This PR is Workspace Manager V2 context/tool launch scoped.
+
+## Manual Validation Notes
+- Open `tools/workspace-manager-v2/index.html?workspace=uat`, seed UAT, launch Asset Manager V2, then Return to Workspace; the Workspace Manager URL should preserve `workspace=uat`.
+- Load Asteroids in Workspace Manager V2; Tool tiles should omit Workspace Manager V2 and include Templates V2, Asset Manager V2, Palette Manager V2, and Preview Generator V2.
+- Launch Palette Manager V2 from Workspace Manager V2; active workspace palette swatches should display in the user palette.
+- Launch Preview Generator V2 from Workspace Manager V2; Repo selected, Target Source, asset folder, paths, Status log hydration, and existing preview image behavior should reflect the active workspace context.
+- Direct-launch Asset Manager V2 unavailable state should show Return to Tools.

tests/playwright/tools/AssetManagerV2.spec.mjs

@@ -143,7 +143,10 @@ test.describe("Asset Manager V2", () => {
       await expect(page.locator("#assetLaunchGuard")).toBeVisible();
       await expect(page.locator("#assetLaunchGuardMessage")).toHaveText("Asset Manager V2 is only available through Workspace Manager with a game workspace and palette.");
       await expect(page.locator("#assetLaunchGuardReason")).toContainText("Launch context is missing.");
+      await expect(page.locator("#assetLaunchGuardReturnToToolsButton")).toHaveText("Return to Tools");
       await expect(page.locator("body")).toHaveClass(/asset-manager-v2--launch-blocked/);
+      await page.locator("#assetLaunchGuardReturnToToolsButton").click();
+      await expect(page).toHaveURL(/\/tools\/index\.html$/);
       expect(pageErrors).toEqual([]);
     } finally {
       await coverageReporter.stop(page);
@@ -1243,7 +1246,8 @@ test.describe("Asset Manager V2", () => {
     });
 
     try {
-      await expect(page.locator("#workspaceToolTiles [data-workspace-tool-id]")).toHaveCount(5);
+      await expect(page.locator("#workspaceToolTiles [data-workspace-tool-id]")).toHaveCount(4);
+      await expect(page.locator('[data-workspace-tool-id="workspace-manager-v2"]')).toHaveCount(0);
       await page.locator("#activeGameSelect").selectOption("Asteroids");
       await expect(page.locator("#workspaceContextOutput")).toContainText('"gameRoot": "games/Asteroids/"');
       await expect(page.locator("#workspaceContextOutput")).toContainText('"assetsPath": "games/Asteroids/assets"');

tests/playwright/tools/WorkspaceManagerV2.spec.mjs

@@ -175,7 +175,8 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       const centerControlLabels = await page.locator(".workspace-manager-v2__panel--center > .accordion-v2 > .accordion-v2__header span:first-child")
         .evaluateAll((labels) => labels.map((label) => label.textContent.trim()));
       expect(centerControlLabels.slice(0, 3)).toEqual(["Tools", "Workspace Context", "Workspace JSON"]);
-      await expect(page.locator("#workspaceToolTiles [data-workspace-tool-id]")).toHaveCount(5);
+      await expect(page.locator("#workspaceToolTiles [data-workspace-tool-id]")).toHaveCount(4);
+      await expect(page.locator('[data-workspace-tool-id="workspace-manager-v2"]')).toHaveCount(0);
       expect(await page.locator("#workspaceToolTiles [data-workspace-tool-id]").evaluateAll((tiles) => tiles.every((tile) => tile.disabled))).toBe(true);
       const compactCenterLayout = await page.evaluate(() => {
         const getRect = (selector) => {
@@ -214,7 +215,16 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator("#launchContextSummary")).toHaveText("Schema-valid manifest is ready for Asteroids.");
       const workspaceContextTileHeights = await page.locator(".workspace-manager-v2__summary-card").evaluateAll((tiles) => tiles.map((tile) => Math.round(tile.getBoundingClientRect().height)));
       expect(new Set(workspaceContextTileHeights).size).toBe(1);
-      expect(workspaceContextTileHeights.every((height) => height >= 118)).toBe(true);
+      expect(workspaceContextTileHeights.every((height) => height >= 148)).toBe(true);
+      const workspaceContextTileScrollState = await page.locator(".workspace-manager-v2__summary-card").evaluateAll((tiles) => tiles.map((tile) => ({
+        alignItems: getComputedStyle(tile).alignItems,
+        justifyContent: getComputedStyle(tile).justifyContent,
+        overflowY: getComputedStyle(tile).overflowY,
+        scrolls: tile.scrollHeight > tile.clientHeight
+      })));
+      expect(workspaceContextTileScrollState.every((tile) => tile.justifyContent === "flex-start")).toBe(true);
+      expect(workspaceContextTileScrollState.every((tile) => tile.overflowY === "visible")).toBe(true);
+      expect(workspaceContextTileScrollState.every((tile) => tile.scrolls === false)).toBe(true);
       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('"source": "manifest"');
@@ -232,7 +242,6 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator("#exportManifestButton")).toBeEnabled();
       const templateTile = page.locator('[data-workspace-tool-id="templates-v2"]');
       const assetTile = page.locator('[data-workspace-tool-id="asset-manager-v2"]');
-      const workspaceTile = page.locator('[data-workspace-tool-id="workspace-manager-v2"]');
       const paletteTile = page.locator('[data-workspace-tool-id="palette-manager-v2"]');
       const previewTile = page.locator('[data-workspace-tool-id="preview-generator-v2"]');
       await expect(templateTile).toBeEnabled();
@@ -242,8 +251,6 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(assetTile).toContainText("Asset Manager V2");
       await expect(assetTile).toContainText("Ready to launch");
       await expect(assetTile).toContainText("13 managed assets");
-      await expect(workspaceTile).toContainText("Workspace Manager V2");
-      await expect(workspaceTile).toContainText("Active workspace surface");
       await expect(paletteTile).toContainText("11 palette swatches");
       await expect(previewTile).toContainText("Schema-valid manifest");
       const tileLayout = await page.locator("#workspaceToolTiles [data-workspace-tool-id]").evaluateAll((tiles) => tiles.map((tile) => ({
@@ -254,7 +261,6 @@ test.describe("Workspace Manager V2 bootstrap", () => {
         { height: 118, width: 180 },
         { height: 118, width: 180 },
         { height: 118, width: 180 },
-        { height: 118, width: 180 },
         { height: 118, width: 180 }
       ]);
       await expect(page.locator("#statusLog")).toHaveValue(/OK Loaded Asteroids from \/games\/Asteroids\/game\.manifest\.json with 11 active palette colors and 13 managed assets\./);
@@ -400,21 +406,37 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator('[data-launch-mode-nav="workspace"]').getByRole("button")).toHaveText(["Return to Workspace"]);
       await page.locator("#returnToWorkspaceButton").click();
       await expect(page).toHaveURL(/workspace-manager-v2\/index\.html\?hostContextId=workspace-manager-v2-/);
-      await page.locator('[data-workspace-tool-id="workspace-manager-v2"]').click();
-      await expect(page).toHaveURL(/workspace-manager-v2\/index\.html\?hostContextId=workspace-manager-v2-/);
-      await expect(page.locator("#activeGameSelect")).toHaveValue("Asteroids");
       await page.locator('[data-workspace-tool-id="palette-manager-v2"]').click();
       await expect(page).toHaveURL(/palette-manager-v2\/index\.html.*launch=workspace/);
       await expect(page.locator('[data-launch-mode-nav="tool"]')).toBeHidden();
       await expect(page.locator('[data-launch-mode-nav="workspace"]')).toBeVisible();
       await expect(page.locator('[data-launch-mode-nav="workspace"] button')).toHaveText(["Return to Workspace"]);
+      await expect(page.locator("#userPaletteCount")).toHaveText("11 user swatches");
+      await expect(page.locator('#userSwatchList [aria-label="Edit Space Black"]')).toBeVisible();
+      await expect(page.locator('#userSwatchList [aria-label="Edit Space Black"]')).toHaveAttribute("title", /Name: Space Black/);
+      await expect(page.locator("#paletteStatus")).toHaveText("Loaded active workspace palette Asteroids Palette.");
       await page.locator("#returnToWorkspaceButton").click();
       await expect(page).toHaveURL(/workspace-manager-v2\/index\.html\?hostContextId=workspace-manager-v2-/);
+      await page.route("**/games/Asteroids/assets/preview.svg", async (route) => {
+        await route.fulfill({
+          body: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><rect width="8" height="8"/></svg>',
+          contentType: "image/svg+xml",
+          status: 200
+        });
+      });
       await page.locator('[data-workspace-tool-id="preview-generator-v2"]').click();
       await expect(page).toHaveURL(/preview-generator-v2\/index\.html.*launch=workspace/);
       await expect(page.locator('[data-launch-mode-nav="tool"]')).toBeHidden();
       await expect(page.locator('[data-launch-mode-nav="workspace"]')).toBeVisible();
       await expect(page.locator('[data-launch-mode-nav="workspace"] button')).toHaveText(["Return to Workspace"]);
+      await expect(page.locator("#repoSelectedValue")).toHaveText("Asteroids workspace (games/Asteroids)");
+      await expect(page.locator("#targetTypeGames")).toBeChecked();
+      await expect(page.locator("#assetFolder")).toHaveValue("assets");
+      await expect(page.locator("#sampleList")).toHaveValue("Asteroids");
+      await expect(page.locator("#lastGeneratedImagePreview")).toBeVisible();
+      await expect(page.locator("#lastGeneratedImageMeta")).toHaveText("Last generated: Asteroids preview.svg");
+      await expect(page.locator("#log")).toContainText("OK Workspace launch context hydrated for Asteroids.");
+      await expect(page.locator("#log")).toContainText("OK Loaded existing preview image from /games/Asteroids/assets/preview.svg.");
       await page.locator("#returnToWorkspaceButton").click();
       await expect(page).toHaveURL(/workspace-manager-v2\/index\.html\?hostContextId=workspace-manager-v2-/);
       expect(pageErrors).toEqual([]);
@@ -541,7 +563,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator("#activeAssetRegistrySummary")).toHaveText("Schema-ready Asset Manager V2 manifest payload contains 0 managed assets.");
       await expect(page.locator('[data-workspace-tool-id="templates-v2"]')).toContainText("Canonical V2 template");
       await expect(page.locator('[data-workspace-tool-id="asset-manager-v2"]')).toContainText("0 managed assets");
-      await expect(page.locator('[data-workspace-tool-id="workspace-manager-v2"]')).toContainText("Active workspace surface");
+      await expect(page.locator('[data-workspace-tool-id="workspace-manager-v2"]')).toHaveCount(0);
       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("Schema-valid manifest");
       await expect(page.locator("#workspaceContextOutput")).toContainText('"id": "workspace-manager-v2-UAT-Asteroids"');
@@ -556,7 +578,9 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       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 3 palette colors from active palette context/);
       await page.locator("#returnToWorkspaceButton").click();
-      await expect(page).toHaveURL(/workspace-manager-v2\/index\.html\?hostContextId=workspace-manager-v2-/);
+      await expect(page).toHaveURL(/workspace-manager-v2\/index\.html.*hostContextId=workspace-manager-v2-/);
+      await expect(page).toHaveURL(/workspace=uat/);
+      await expect(page.locator("#seedUatManifestButton")).toBeVisible();
       await expect(page.locator("#activeAssetRegistrySummary")).toHaveText("Schema-ready Asset Manager V2 manifest payload contains 0 managed assets.");
       expect(pageErrors).toEqual([]);
     } finally {
@@ -577,6 +601,7 @@ test.describe("Workspace Manager V2 bootstrap", () => {
       await expect(page.locator("#assetLaunchGuard")).toBeVisible();
       await expect(page.locator("#assetLaunchGuardMessage")).toHaveText("Asset Manager V2 is only available through Workspace Manager with a game workspace and palette.");
       await expect(page.locator("#assetLaunchGuardReason")).toContainText("Temporary workspace query launches are no longer supported; launch through Workspace Manager V2.");
+      await expect(page.locator("#assetLaunchGuardReturnToToolsButton")).toHaveText("Return to Tools");
       await expect(page.locator("body")).toHaveClass(/asset-manager-v2--launch-blocked/);
       expect(pageErrors).toEqual([]);
     } finally {

tools/asset-manager-v2/index.html

@@ -16,6 +16,7 @@
         <h1 id="assetLaunchGuardTitle">Asset Manager V2 unavailable</h1>
         <p id="assetLaunchGuardMessage">Asset Manager V2 is only available through Workspace Manager with a game workspace and palette.</p>
         <p id="assetLaunchGuardReason"></p>
+        <button id="assetLaunchGuardReturnToToolsButton" class="asset-manager-v2__launch-guard-return" type="button">Return to Tools</button>
       </div>
     </div>
 

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

@@ -137,6 +137,13 @@ export class AssetManagerV2App {
     if (reasonNode) {
       reasonNode.textContent = reason ? `Reason: ${reason}` : "";
     }
+    const returnToToolsButton = this.launchGuard.querySelector("#assetLaunchGuardReturnToToolsButton");
+    if (returnToToolsButton && !returnToToolsButton.dataset.assetManagerV2Bound) {
+      returnToToolsButton.dataset.assetManagerV2Bound = "true";
+      returnToToolsButton.addEventListener("click", () => {
+        this.window.location.href = new URL("../index.html", this.window.location.href).href;
+      });
+    }
     this.launchGuard.hidden = false;
     this.window.document.body.classList.add("asset-manager-v2--launch-blocked");
   }

tools/asset-manager-v2/js/services/WorkspaceBridge.js

@@ -50,10 +50,14 @@ export class WorkspaceBridge {
 
   workspaceManagerUrl() {
     const url = new URL("../workspace-manager-v2/index.html", this.window.location.href);
+    const params = new URLSearchParams(this.window.location.search);
     const hostContextId = this.hostContextId();
     if (hostContextId) {
       url.searchParams.set("hostContextId", hostContextId);
     }
+    if (params.get("workspaceMode")?.toLowerCase() === "uat") {
+      url.searchParams.set("workspace", "uat");
+    }
     return url.href;
   }
 

tools/asset-manager-v2/styles/assetManager.css

@@ -118,6 +118,10 @@ textarea:disabled {
   line-height: 1.45;
 }
 
+.asset-manager-v2__launch-guard-return {
+  margin-top: 16px;
+}
+
 body.asset-manager-v2--launch-blocked > :not(.asset-manager-v2__launch-guard) {
   pointer-events: none;
 }