Fix workspace handoff sync: remove source-tool-state lock for tool surfaces and force Palette Browser to follow shared palette handoff on launch/update. v2

Author: DavidQ

tools/Palette Browser/main.js

@@ -2,6 +2,7 @@ import {
   createPaletteHandoff,
   getSharedLaunchContext,
   getToolDisplayName,
+  SHARED_PALETTE_HANDOFF_EVENT,
   readSharedPaletteHandoff,
   writeSharedPaletteHandoff
 } from "../shared/assetUsageIntegration.js";
@@ -283,6 +284,24 @@ function selectSharedPaletteFromHandoff() {
   return true;
 }
 
+function syncSelectionFromSharedHandoff(options = {}) {
+  const shouldRender = options.render === true;
+  const previousPaletteId = state.selectedPaletteId;
+  const selected = selectSharedPaletteFromHandoff();
+  if (!selected) {
+    return false;
+  }
+  if (previousPaletteId !== state.selectedPaletteId) {
+    state.selectedSwatchIndex = 0;
+  }
+  if (shouldRender) {
+    renderPaletteList();
+    renderSelectedPalette();
+    renderStoredSelection();
+  }
+  return true;
+}
+
 function isCustomPalette(palette) {
   return Boolean(palette && palette.source === "custom");
 }
@@ -871,10 +890,13 @@ function bindEvents() {
   refs.copyPaletteJsonButton.addEventListener("click", copyPaletteJson);
   refs.exportPaletteJsonButton.addEventListener("click", exportPaletteJson);
   refs.usePaletteButton.addEventListener("click", usePaletteInActiveTools);
+  window.addEventListener(SHARED_PALETTE_HANDOFF_EVENT, () => {
+    syncSelectionFromSharedHandoff({ render: true });
+  });
 }
 
 function init() {
-  const selectedFromHandoff = selectSharedPaletteFromHandoff();
+  const selectedFromHandoff = syncSelectionFromSharedHandoff();
   if (!selectedFromHandoff) {
     const firstPalette = getAllPalettes()[0] ?? null;
     state.selectedPaletteId = firstPalette?.id ?? "";
@@ -884,6 +906,9 @@ function init() {
   renderSelectedPalette();
   renderStoredSelection();
   bindEvents();
+  window.setTimeout(() => {
+    syncSelectionFromSharedHandoff({ render: true });
+  }, 400);
 }
 
 let initialized = false;
@@ -903,7 +928,7 @@ const paletteBrowserApi = {
     state.selectedSwatchIndex = Number.isInteger(snapshot?.selectedSwatchIndex) ? snapshot.selectedSwatchIndex : 0;
     state.customPalettes = Array.isArray(snapshot?.customPalettes) ? structuredClone(snapshot.customPalettes) : [];
     if (isWorkspaceContext()) {
-      selectSharedPaletteFromHandoff();
+      syncSelectionFromSharedHandoff();
     }
     saveCustomPalettes();
     refs.searchInput.value = state.search;

tools/shared/assetUsageIntegration.js

@@ -2,6 +2,8 @@ import { getToolById } from "../toolRegistry.js";
 
 export const SHARED_ASSET_HANDOFF_KEY = "toolboxaid.shared.assetHandoff";
 export const SHARED_PALETTE_HANDOFF_KEY = "toolboxaid.shared.paletteHandoff";
+export const SHARED_ASSET_HANDOFF_EVENT = "toolboxaid.shared.assetHandoff.changed";
+export const SHARED_PALETTE_HANDOFF_EVENT = "toolboxaid.shared.paletteHandoff.changed";
 
 export const SHARED_ACTION_LABELS = Object.freeze({
   browseAssets: "Browse Assets",
@@ -65,6 +67,13 @@ function normalizePaletteColors(value) {
     }));
 }
 
+function dispatchHandoffChanged(eventName, detail = {}) {
+  if (typeof window === "undefined" || typeof window.dispatchEvent !== "function") {
+    return;
+  }
+  window.dispatchEvent(new CustomEvent(eventName, { detail }));
+}
+
 export function normalizeSharedAssetHandoff(raw) {
   if (!isRecord(raw)) {
     return null;
@@ -235,6 +244,11 @@ export function writeSharedAssetHandoff(handoff) {
     return false;
   }
   window.localStorage.setItem(SHARED_ASSET_HANDOFF_KEY, JSON.stringify(normalized));
+  dispatchHandoffChanged(SHARED_ASSET_HANDOFF_EVENT, {
+    key: SHARED_ASSET_HANDOFF_KEY,
+    action: "write",
+    handoff: normalized
+  });
   return true;
 }
 
@@ -247,6 +261,11 @@ export function writeSharedPaletteHandoff(handoff) {
     return false;
   }
   window.localStorage.setItem(SHARED_PALETTE_HANDOFF_KEY, JSON.stringify(normalized));
+  dispatchHandoffChanged(SHARED_PALETTE_HANDOFF_EVENT, {
+    key: SHARED_PALETTE_HANDOFF_KEY,
+    action: "write",
+    handoff: normalized
+  });
   return true;
 }
 
@@ -255,6 +274,10 @@ export function clearSharedAssetHandoff() {
     return false;
   }
   window.localStorage.removeItem(SHARED_ASSET_HANDOFF_KEY);
+  dispatchHandoffChanged(SHARED_ASSET_HANDOFF_EVENT, {
+    key: SHARED_ASSET_HANDOFF_KEY,
+    action: "clear"
+  });
   return true;
 }
 
@@ -263,5 +286,9 @@ export function clearSharedPaletteHandoff() {
     return false;
   }
   window.localStorage.removeItem(SHARED_PALETTE_HANDOFF_KEY);
+  dispatchHandoffChanged(SHARED_PALETTE_HANDOFF_EVENT, {
+    key: SHARED_PALETTE_HANDOFF_KEY,
+    action: "clear"
+  });
   return true;
 }

tools/shared/platformShell.js

@@ -35,15 +35,6 @@ const PRESERVED_TOOL_STATE_KEYS = new Set([
   HEADER_EXPANDED_STORAGE_KEY,
   WORKSPACE_LAUNCH_SIGNATURE_STORAGE_KEY
 ]);
-const TOOLS_REQUIRING_WORKSPACE_TOOL_STATE = new Set([
-  "skin-editor",
-  "sprite-editor",
-  "tile-map-editor",
-  "parallax-editor",
-  "vector-map-editor",
-  "vector-asset-studio"
-]);
-
 function getPageMode() {
   return document.body.dataset.toolsPlatformPage || "tool";
 }
@@ -982,30 +973,18 @@ function applyDocumentMetadata(currentTool) {
   document.body.classList.add("tools-platform-surface");
   const workspaceContext = isWorkspaceManagerContext();
   const lockState = resolveWorkspaceToolLockState();
-  const searchParams = typeof window !== "undefined"
-    ? new URLSearchParams(window.location.search)
-    : null;
-  const launchHasSourcePreset = searchParams?.has("samplePresetPath") === true;
   const isToolSurfacePage = getPageMode() !== "landing";
   const isPaletteBrowser = currentTool?.id === "palette-browser";
-  const toolRequiresState = TOOLS_REQUIRING_WORKSPACE_TOOL_STATE.has(currentTool?.id || "");
-  const toolStateMissingLock = workspaceContext
-    && isToolSurfacePage
-    && toolRequiresState
-    && !launchHasSourcePreset
-    && !lockState.hasToolState(currentTool?.id);
   const workspaceMissingLock = workspaceContext && isToolSurfacePage && !lockState.workspaceReady;
   const paletteMissingLock = workspaceContext
     && isToolSurfacePage
     && lockState.workspaceReady
     && !lockState.paletteReady
     && !isPaletteBrowser;
-  const shouldLockToolSurface = workspaceMissingLock || paletteMissingLock || toolStateMissingLock;
+  const shouldLockToolSurface = workspaceMissingLock || paletteMissingLock;
   const lockMessage = workspaceMissingLock
     ? "Create or open a workspace to use this tool."
-    : toolStateMissingLock
-      ? "Workspace loaded with no source tool JSON for this tool. Load workspace JSON that includes this tool state."
-      : "Select a shared palette in Palette Browser to use this tool.";
+    : "Select a shared palette in Palette Browser to use this tool.";
   document.body.classList.toggle("tools-platform-workspace-context", workspaceContext);
   document.body.classList.toggle("tools-platform-workspace-tool-locked", shouldLockToolSurface);
   if (lastLockedSurfaceElement) {