@phis/ui 0.4.2 → 0.4.3

package/plugins/runtime-modules/builder/controller/signal-wiring-controller.js

@@ -1,52 +1,8 @@
 "use client";
 import { createPhiSignalRouteKey, readPhiSignalRouteSet, PHI_SIGNAL_VALUE_SCHEMAS, } from "../../../../types/signals";
-import { builderWorkspaceStore, getPhiDeveloperBuilderStateSnapshot } from "../developer-workspace-store";
+import { getPhiDeveloperBuilderStateSnapshot } from "../developer-workspace-store";
 import { getPhiDeveloperSelectedSignalRoutes } from "../signal-route-selection";
 import { phiSignalCapabilitiesMatch, resolvePhiBuilderReceiverSignalEndpoints, resolvePhiBuilderSelectedSignalEndpoints, } from "../signal-wiring-options";
-const EMPTY_SESSION = {
-    senderAddress: null,
-    senderCapabilityId: null,
-    receiverAddress: null,
-    receiverCapabilityId: null,
-    fieldKey: null,
-};
-function readOptionalString(value) {
-    return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
-}
-export function patchPhiBuilderSignalWiringSession(defaultArea, values) {
-    builderWorkspaceStore.patch(defaultArea, (current) => {
-        const senderAddress = readOptionalString(values.senderAddress) ?? current.signalWiring.senderAddress;
-        // A cascade only holds if the values below the one that moved are dropped: keeping a capability that
-        // belongs to the previous endpoint would build a route the runtime silently ignores.
-        const senderChanged = senderAddress !== current.signalWiring.senderAddress;
-        const senderCapabilityId = senderChanged
-            ? null
-            : readOptionalString(values.senderCapabilityId) ?? current.signalWiring.senderCapabilityId;
-        const capabilityChanged = senderCapabilityId !== current.signalWiring.senderCapabilityId;
-        const receiverAddress = senderChanged || capabilityChanged
-            ? null
-            : readOptionalString(values.receiverAddress) ?? current.signalWiring.receiverAddress;
-        const receiverChanged = receiverAddress !== current.signalWiring.receiverAddress;
-        return {
-            ...current,
-            signalWiring: {
-                senderAddress,
-                senderCapabilityId,
-                receiverAddress,
-                receiverCapabilityId: senderChanged || capabilityChanged || receiverChanged
-                    ? null
-                    : readOptionalString(values.receiverCapabilityId) ?? current.signalWiring.receiverCapabilityId,
-                // The field belongs to the receiver's input, so it falls with everything above it.
-                fieldKey: senderChanged || capabilityChanged || receiverChanged
-                    ? null
-                    : readOptionalString(values.fieldKey) ?? current.signalWiring.fieldKey,
-            },
-        };
-    });
-}
-export function resetPhiBuilderSignalWiringSession(defaultArea) {
-    builderWorkspaceStore.patch(defaultArea, (current) => ({ ...current, signalWiring: { ...EMPTY_SESSION } }));
-}
 function routesAreEquivalent(left, right) {
     return left.capabilityId === right.capabilityId && left.scope === right.scope &&
         left.channel === right.channel && left.action === right.action && left.valueType === right.valueType &&
@@ -61,8 +17,8 @@ function routesAreEquivalent(left, right) {
  * selection change, and a route whose value the receiver cannot read is worse than no route at all --
  * nothing reports it at runtime.
  */
-export function resolvePhiBuilderSignalWiringRoutes(defaultArea) {
-    const state = getPhiDeveloperBuilderStateSnapshot(defaultArea);
+export function resolvePhiBuilderSignalWiringRoutes() {
+    const state = getPhiDeveloperBuilderStateSnapshot();
     const session = state.signalWiring;
     if (!session.senderAddress || !session.senderCapabilityId || !session.receiverAddress || !session.receiverCapabilityId) {
         return { kind: "incomplete" };
@@ -95,7 +51,7 @@ export function resolvePhiBuilderSignalWiringRoutes(defaultArea) {
         receiver: receiver.address,
         ...(wantsFieldKey && session.fieldKey ? { fieldKey: session.fieldKey } : {}),
     };
-    const current = getPhiDeveloperSelectedSignalRoutes(defaultArea) ?? {};
+    const current = getPhiDeveloperSelectedSignalRoutes() ?? {};
     if ([...(current.emits ?? []), ...(current.listens ?? [])].some((candidate) => routesAreEquivalent(candidate, route))) {
         return { kind: "duplicate" };
     }
@@ -112,8 +68,8 @@ export function resolvePhiBuilderSignalWiringRoutes(defaultArea) {
  * so its rows come straight from the draft config rather than from a staged copy. Removing therefore
  * writes to the same place Apply does, and the Table is reloaded afterwards.
  */
-export function resolvePhiBuilderSignalWiringRoutesWithout(defaultArea, routeKey) {
-    const current = getPhiDeveloperSelectedSignalRoutes(defaultArea) ?? {};
+export function resolvePhiBuilderSignalWiringRoutesWithout(routeKey) {
+    const current = getPhiDeveloperSelectedSignalRoutes() ?? {};
     const emits = (current.emits ?? []).filter((route) => route.routeKey !== routeKey);
     const listens = (current.listens ?? []).filter((route) => route.routeKey !== routeKey);
     if (emits.length === (current.emits ?? []).length && listens.length === (current.listens ?? []).length) {

package/plugins/runtime-modules/builder/controller/workspace-controller.d.ts

@@ -1,6 +1,6 @@
 import { type PhiSignalRouteSet } from "../../../../types/signals";
 import type { PhiRuntimeModuleDefinition, PhiRuntimeModuleId } from "../../../../types/cms-plugins";
-import type { PhiDeveloperBuilderArea, PhiDeveloperBuilderRegionDraft } from "../developer-workspace-types";
+import type { PhiDeveloperBuilderRegionDraft } from "../developer-workspace-types";
 import type { PhiAreaRootRoute, PhiAreaMeta } from "../../../../helpers/cms-area-config";
 import type { PhiWorkspaceCatalogState } from "../../../../components/workspace/catalog-state";
 import { type PhiBuilderPageMetaPresentationLabels } from "../controller/definition";
@@ -8,7 +8,6 @@ import type { PhiCmsTreeControllerSettings } from "../../../../types/cms";
 import { type PhiHistoryLabels } from "../../../../components/widgets/label-types/history";
 export type { PhiBuilderPageRegionKey, PhiBuilderRegionKey, PhiBuilderShellRegionKey, } from "../region-keys";
 export type PhiDeveloperBuilderWorkspaceControllerProps = {
-    defaultArea?: PhiDeveloperBuilderArea;
     shellPresetDraftsByArea?: Record<string, Record<string, PhiDeveloperBuilderRegionDraft>>;
     runtimeModuleDefinitions?: readonly PhiRuntimeModuleDefinition[];
     runtimeModuleIdsByArea?: Record<string, PhiRuntimeModuleId[]>;
@@ -27,4 +26,4 @@ export type PhiDeveloperBuilderWorkspaceControllerProps = {
     historyLabels: PhiHistoryLabels;
     signalRoutes?: PhiSignalRouteSet | null;
 };
-export declare function PhiDeveloperBuilderWorkspaceController({ defaultArea, shellPresetDraftsByArea, runtimeModuleDefinitions, runtimeModuleIdsByArea, modulePresetPagesByArea, areaPresetSourcesByArea, navigationSurfacesByArea, unresolvedModuleIdsByArea, serverUnavailableModules, publicRouteClaims, publicRoutePaths, areaRootRoutesByArea, areaMetaByArea, areaControllerSettingsByArea, pageMetaLabels, historyLabels, signalRoutes, }: PhiDeveloperBuilderWorkspaceControllerProps): import("react").JSX.Element;
+export declare function PhiDeveloperBuilderWorkspaceController({ shellPresetDraftsByArea, runtimeModuleDefinitions, runtimeModuleIdsByArea, modulePresetPagesByArea, areaPresetSourcesByArea, navigationSurfacesByArea, unresolvedModuleIdsByArea, serverUnavailableModules, publicRouteClaims, publicRoutePaths, areaRootRoutesByArea, areaMetaByArea, areaControllerSettingsByArea, pageMetaLabels, historyLabels, signalRoutes, }: PhiDeveloperBuilderWorkspaceControllerProps): import("react").JSX.Element;

package/plugins/runtime-modules/builder/controller/workspace-controller.js

@@ -22,7 +22,7 @@ import { isPhiBuilderAreaKey, resolvePhiBuilderAreaAsCmsArea, } from "../../../.
 import { resolvePhiRuntimeAreaDefinition } from "../../../../plugins/runtime-modules/area-definitions";
 import { resolvePhiBuilderNavigationWidgetNavKey } from "../navigation-widget-runtime";
 import { parsePhiBuilderNavigationScopeKey } from "../../../../helpers/cms-navigation-catalog";
-import { builderWorkspaceStore, usePhiDeveloperBuilderWorkspaceState, completePhiDeveloperBuilderEffectsEditor, normalizePhiDeveloperBuilderArea as normalizeBuilderArea, previewPhiDeveloperBuilderEffects, resetPhiBuilderSelectionToPage, selectPhiDeveloperBuilderNode, usePhiDeveloperRegionDraft, getPhiDeveloperBuilderStateSnapshot, getPhiDeveloperRegionDraftsSnapshot, readPhiBuilderEffectiveAreaRootRoute, setPhiDeveloperBuilderAreaRootRoutes, setPhiDeveloperBuilderAreaMetaBaseline, setPhiDeveloperBuilderAreaControllerSettings, readPhiBuilderEffectiveAreaMeta, closePhiBuilderModuleDeactivationRequest, closePhiBuilderPublicRouteCollisionRequest, } from "../developer-workspace-store";
+import { patchPhiBuilderSignalWiringSession, resetPhiBuilderSignalWiringSession, openPhiBuilderPage, openPhiBuilderPageInOpenArea, openPhiBuilderPagesPanel, selectPhiBuilderPageNode, setPhiBuilderCommandWorkspace, setPhiBuilderDebugScaffold, setPhiBuilderInspectorOpen, setPhiBuilderMode, usePhiDeveloperBuilderWorkspaceState, completePhiDeveloperBuilderEffectsEditor, normalizePhiDeveloperBuilderArea as normalizeBuilderArea, previewPhiDeveloperBuilderEffects, selectPhiDeveloperBuilderNode, usePhiDeveloperRegionDraft, getPhiDeveloperBuilderStateSnapshot, getPhiDeveloperRegionDraftsSnapshot, readPhiBuilderEffectiveAreaRootRoute, setPhiDeveloperBuilderAreaRootRoutes, setPhiDeveloperBuilderAreaMetaBaseline, setPhiDeveloperBuilderAreaControllerSettings, readPhiBuilderEffectiveAreaMeta, closePhiBuilderModuleDeactivationRequest, closePhiBuilderPublicRouteCollisionRequest, } from "../developer-workspace-store";
 import {} from "../options-providers";
 import { PHI_AREA_META_PUBLIC_DEFAULTS } from "../../../../helpers/cms-area-config";
 import { getPhiBuilderRegionDraftKey } from "../region-keys";
@@ -31,7 +31,7 @@ import { getDefaultRegionDraft } from "../developer-region-drafts";
 import { isPhiAreaScopedBuilderPage, isPhiDebugScaffoldBuilderPage, readPhiDeveloperBuilderWorkspaceKey, resolvePhiDeveloperBuilderCommandWorkspace, resolvePhiDeveloperBuilderRouteScope, } from "../route-scope";
 import { usePhiDeveloperBuilderPreviewModeController, } from "./preview-controller";
 import { runPhiDeveloperBuilderInspectorAction } from "./inspector-controller";
-import { patchPhiBuilderSignalWiringSession, resetPhiBuilderSignalWiringSession, resolvePhiBuilderSignalWiringRoutes, resolvePhiBuilderSignalWiringRoutesWithout, } from "./signal-wiring-controller";
+import { resolvePhiBuilderSignalWiringRoutes, resolvePhiBuilderSignalWiringRoutesWithout, } from "./signal-wiring-controller";
 import { readPhiTableActionSignalValue } from "../../../../types/table-signal-values";
 import { usePhiBuilderPageController } from "./page-controller";
 import { PHI_BUILDER_AREA_LANDING_PAGE_EMPTY, PHI_BUILDER_AREA_ROOT_ROUTE_AUTOMATIC, PHI_BUILDER_AREA_ROOT_ROUTE_LANDING, } from "../area-settings-values";
@@ -41,9 +41,9 @@ import { usePhiBuilderDraftCommandController, } from "./draft-command-controller
 import { usePhiBuilderDraftStatusController } from "./draft-status-controller";
 import { applyPhiDeveloperBuilderSiderLeftMode, } from "./region-controller";
 import { createPhiBuilderHistoryContext, phiBuilderHistory, } from "../history";
-import { applyPhiBuilderRuntimeModuleSelectionChange, applyPhiBuilderRuntimeModuleSelectionChanges, areRuntimeModuleIdsEqual, } from "../runtime-module-selection";
+import { applyPhiBuilderRuntimeModuleSelectionChange, applyPhiBuilderRuntimeModuleSelectionChanges, } from "../runtime-module-selection";
 import { applyPhiBuilderPublicRouteAssignments, findPhiBuilderPublicRouteAnswerProblem, } from "../public-route-collisions";
-import { phiWorkspaceCatalogStore } from "../../../../components/workspace/catalog-store";
+import { applyPhiWorkspaceCatalogPreload, setPhiWorkspaceActiveCatalogs, storePhiWorkspacePersistedPages, } from "../workspace-catalog-actions";
 import { PHI_BUILDER_PAGE_META_DEFAULT_PRESENTATION_LABELS, resolvePhiBuilderEffectsCapabilityId, } from "../controller/definition";
 import { formatPhiHistoryTooltip, } from "../../../../components/widgets/label-types/history";
 const EMPTY_RUNTIME_MODULE_IDS_BY_AREA = {};
@@ -122,7 +122,7 @@ function filterBuilderModuleCatalogs(modulePresetPagesByArea, navigationSurfaces
         navigationSurfacesByArea: filteredNavigation,
     };
 }
-function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
+function usePhiDeveloperBuilderWorkspaceController(options) {
     const { showMessage } = usePhiApplicationFeedback();
     const dispatchSignal = usePhiSignalDispatcher();
     const effectsWorkflowCorrelationRef = useRef(null);
@@ -139,7 +139,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
      */
     const emitRoutes = useMemo(() => signalRoutes?.emits ?? [], [signalRoutes?.emits]);
     const emitCapability = useCallback((capabilityId, value, correlationId) => dispatchPhiSignalCapability(dispatchSignal, createPhiBuilderControllerAddress(), emitRoutes, capabilityId, value, correlationId), [dispatchSignal, emitRoutes]);
-    const state = usePhiDeveloperBuilderWorkspaceState(defaultArea);
+    const state = usePhiDeveloperBuilderWorkspaceState();
     const router = useRouter();
     const pathname = usePhiPathname();
     const searchParams = useSearchParams();
@@ -164,7 +164,6 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
     const effectiveNavKey = resolvePhiBuilderNavigationWidgetNavKey(null, searchParams.get(PHI_BUILDER_NAVIGATION_KEY_SEARCH_PARAM), effectiveArea);
     const { emitPageTitleInputValue, navigateToBuilderPage, openPageMetaDialog, pageMetaDialog, } = usePhiBuilderPageController({
         emitCapability,
-        defaultArea,
         effectiveArea,
         effectivePageKey,
         pageMetaLabels,
@@ -178,7 +177,6 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
         state,
     });
     const { confirmResetPage, runBuilderCommand, confirmDialog } = usePhiBuilderDraftCommandController({
-        defaultArea,
         effectiveArea,
         effectiveNavKey,
         effectivePageKey,
@@ -243,13 +241,13 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
         }
         openedSignalWiringCorrelationRef.current = request.correlationId;
         // A wiring session belongs to the block it was opened on, so it starts empty every time.
-        resetPhiBuilderSignalWiringSession(defaultArea);
+        resetPhiBuilderSignalWiringSession();
         emitCapability("signalWiringReset", null, request.correlationId);
         // The Table is mounted eagerly with the overlay, so its rows may still belong to the block wired
         // last time; opening on a new one has to ask for them again.
         emitCapability("signalWiringRoutesReload", null, request.correlationId);
         queueMicrotask(() => emitCapability("signalWiringOpen", null, request.correlationId));
-    }, [defaultArea, emitCapability, state.signalWiringRequest]);
+    }, [emitCapability, state.signalWiringRequest]);
     useEffect(() => {
         const request = state.effectsEditorRequest;
         if (!request || initializedEffectsCorrelationRef.current === request.correlationId)
@@ -431,61 +429,32 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
          * it lives in the Foundation so that revisions, and later the Editor, can read it without going
          * through here.
          */
-        phiWorkspaceCatalogStore.patch(defaultArea, (current) => {
-            let changed = false;
-            const definitionsChanged = serializeRuntimeModuleDefinitions(current.runtimeModuleDefinitions) !== runtimeModuleDefinitionsPreloadKey;
-            const modulePresetPagesChanged = JSON.stringify(current.modulePresetPagesByArea) !== modulePresetPagesPreloadKey;
-            const areaPresetSourcesChanged = JSON.stringify(current.areaPresetSourcesByArea) !== areaPresetSourcesPreloadKey;
-            const navigationSurfacesChanged = JSON.stringify(current.navigationSurfacesByArea) !== navigationSurfacesPreloadKey;
-            const unresolvedModuleIdsChanged = JSON.stringify(current.unresolvedModuleIdsByArea) !== unresolvedModuleIdsPreloadKey;
-            const publicRouteClaimsChanged = JSON.stringify(current.publicRouteClaims) !== publicRouteClaimsPreloadKey;
-            const serverUnavailableModulesChanged = JSON.stringify(current.serverUnavailableModules) !== serverUnavailableModulesPreloadKey;
-            /*
-             * The assignments arrive with the Modules draft and are edited by the collision dialog, so this
-             * follows the same rule as the Module selection beside it: what the server sent replaces what is
-             * here when the server's answer changed, and an unsaved answer survives a re-render.
-             */
-            const publicRoutePathsChanged = JSON.stringify(current.publicRoutePaths) !== publicRoutePathsPreloadKey;
-            const catalogHydrationChanged = !current.catalogHydrated;
-            const initialPageKey = current.pageKey ||
-                resolvePhiBuilderActivePageKey(null, activePreloadCatalogs.modulePresetPagesByArea[current.area]) || "";
-            const initialPageChanged = initialPageKey !== current.pageKey;
-            const nextModuleIdsByArea = {
-                ...(current.runtimeModuleIdsByArea ?? {}),
-            };
-            for (const [area, moduleIds] of Object.entries(runtimeModuleIdsByArea)) {
-                const builderArea = normalizeBuilderArea(area);
-                if (!areRuntimeModuleIdsEqual(nextModuleIdsByArea[builderArea], moduleIds)) {
-                    nextModuleIdsByArea[builderArea] = moduleIds;
-                    changed = true;
-                }
-            }
-            if (initialPageChanged) {
-                // The selected node follows the page, and that selection is Builder tool state.
-                builderWorkspaceStore.patch(defaultArea, (tool) => ({
-                    ...tool,
-                    nodeKey: `page:${initialPageKey}`,
-                }));
-            }
-            return changed || definitionsChanged || modulePresetPagesChanged || areaPresetSourcesChanged || navigationSurfacesChanged || unresolvedModuleIdsChanged || serverUnavailableModulesChanged || publicRouteClaimsChanged || publicRoutePathsChanged || catalogHydrationChanged || initialPageChanged
-                ? {
-                    ...current,
-                    ...(initialPageChanged ? { pageKey: initialPageKey } : {}),
-                    runtimeModuleDefinitions: [...runtimeModuleDefinitions],
-                    runtimeModuleIdsByArea: nextModuleIdsByArea,
-                    catalogHydrated: true,
-                    modulePresetPagesByArea: activePreloadCatalogs.modulePresetPagesByArea,
-                    areaPresetSourcesByArea,
-                    navigationSurfacesByArea: activePreloadCatalogs.navigationSurfacesByArea,
-                    unresolvedModuleIdsByArea,
-                    serverUnavailableModules,
-                    publicRouteClaims,
-                    ...(publicRoutePathsChanged ? { publicRoutePaths } : {}),
-                }
-                : current;
+        const openedPageKey = applyPhiWorkspaceCatalogPreload({
+            runtimeModuleDefinitions,
+            runtimeModuleIdsByArea,
+            areaPresetSourcesByArea,
+            unresolvedModuleIdsByArea,
+            serverUnavailableModules,
+            publicRouteClaims,
+            publicRoutePaths,
+            activeCatalogs: activePreloadCatalogs,
+            keys: {
+                runtimeModuleDefinitions: runtimeModuleDefinitionsPreloadKey,
+                modulePresetPagesByArea: modulePresetPagesPreloadKey,
+                areaPresetSourcesByArea: areaPresetSourcesPreloadKey,
+                navigationSurfacesByArea: navigationSurfacesPreloadKey,
+                unresolvedModuleIdsByArea: unresolvedModuleIdsPreloadKey,
+                publicRouteClaims: publicRouteClaimsPreloadKey,
+                serverUnavailableModules: serverUnavailableModulesPreloadKey,
+                publicRoutePaths: publicRoutePathsPreloadKey,
+            },
+            normalizeArea: normalizeBuilderArea,
         });
+        if (openedPageKey != null) {
+            // The selected node follows the page, and that selection is Builder tool state.
+            selectPhiBuilderPageNode(openedPageKey);
+        }
     }, [
-        defaultArea,
         runtimeModuleDefinitions,
         runtimeModuleDefinitionsPreloadKey,
         runtimeModuleIdsByArea,
@@ -517,17 +486,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             .then((pages) => {
             if (cancelled)
                 return;
-            phiWorkspaceCatalogStore.patch(defaultArea, (current) => ({
-                ...current,
-                persistedPageCatalogByArea: {
-                    ...current.persistedPageCatalogByArea,
-                    [effectiveArea]: pages,
-                },
-                pageCatalogHydratedByArea: {
-                    ...current.pageCatalogHydratedByArea,
-                    [effectiveArea]: true,
-                },
-            }));
+            storePhiWorkspacePersistedPages(effectiveArea, pages);
         })
             .catch((error) => {
             if (!cancelled) {
@@ -541,7 +500,6 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             cancelled = true;
         };
     }, [
-        defaultArea,
         effectiveArea,
         isBuilderWorkspace,
         showMessage,
@@ -551,23 +509,13 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
     const currentRuntimeModuleIdsKey = JSON.stringify(currentRuntimeModuleIdsByArea);
     useEffect(() => {
         const activeCatalogs = filterBuilderModuleCatalogs(modulePresetPagesByArea, navigationSurfacesByArea, currentRuntimeModuleIdsByArea, runtimeModuleDefinitions);
-        phiWorkspaceCatalogStore.patch(defaultArea, (current) => {
-            if (JSON.stringify(current.modulePresetPagesByArea) ===
-                JSON.stringify(activeCatalogs.modulePresetPagesByArea) &&
-                JSON.stringify(current.navigationSurfacesByArea) ===
-                    JSON.stringify(activeCatalogs.navigationSurfacesByArea)) {
-                return current;
-            }
-            return {
-                ...current,
-                modulePresetPagesByArea: activeCatalogs.modulePresetPagesByArea,
-                navigationSurfacesByArea: activeCatalogs.navigationSurfacesByArea,
-            };
+        setPhiWorkspaceActiveCatalogs({
+            modulePresetPagesByArea: activeCatalogs.modulePresetPagesByArea,
+            navigationSurfacesByArea: activeCatalogs.navigationSurfacesByArea,
         });
     }, [
         currentRuntimeModuleIdsByArea,
         currentRuntimeModuleIdsKey,
-        defaultArea,
         modulePresetPagesByArea,
         navigationSurfacesByArea,
         runtimeModuleDefinitions,
@@ -594,10 +542,15 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
         if (builderWorkspaceKey !== "shells") {
             return;
         }
+        /*
+         * The switch's own change is not told back to it -- once. The note is consumed whatever this run
+         * finds: kept until it matched, it outlived a change of Area, and on the way back it matched again
+         * and swallowed the very report that would have set the switch to this Area's draft.
+         */
         const handledSiderLayout = handledSiderLayoutRef.current;
+        handledSiderLayoutRef.current = null;
         if (handledSiderLayout?.draftKey === siderLeftDraftKey &&
             handledSiderLayout.fullHeight === siderLeftFullHeight) {
-            handledSiderLayoutRef.current = null;
             return;
         }
         dispatchSignal({
@@ -621,11 +574,8 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
         if (state.commandWorkspace === commandWorkspace) {
             return;
         }
-        builderWorkspaceStore.patch(defaultArea, (current) => ({
-            ...current,
-            commandWorkspace,
-        }));
-    }, [commandWorkspace, defaultArea, state.commandWorkspace]);
+        setPhiBuilderCommandWorkspace(commandWorkspace);
+    }, [commandWorkspace, state.commandWorkspace]);
     useEffect(() => {
         if (commandWorkspace !== "structure" &&
             commandWorkspace !== "pages" &&
@@ -668,11 +618,8 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
         if (state.builderMode === nextBuilderMode) {
             return;
         }
-        builderWorkspaceStore.patch(defaultArea, (current) => ({
-            ...current,
-            builderMode: nextBuilderMode,
-        }));
-    }, [defaultArea, hasPreviewSnapshot, isBuilderWorkspace, isNavigationWorkspace, state.builderMode]);
+        setPhiBuilderMode(nextBuilderMode);
+    }, [hasPreviewSnapshot, isBuilderWorkspace, isNavigationWorkspace, state.builderMode]);
     /*
      * The workspace, narrowed to what deciding the offered Pages actually reads.
      *
@@ -749,14 +696,8 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
         if (nextArea === state.area && nextPageKey === state.pageKey) {
             return;
         }
-        phiWorkspaceCatalogStore.patch(defaultArea, (current) => ({
-            ...current,
-            area: nextArea,
-            pageKey: nextPageKey,
-        }));
-        builderWorkspaceStore.patch(defaultArea, (current) => resetPhiBuilderSelectionToPage(current, nextPageKey));
+        openPhiBuilderPage(nextArea, nextPageKey);
     }, [
-        defaultArea,
         isBuilderWorkspace,
         offeredCatalogState,
         pathname,
@@ -796,7 +737,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
         const finishEffectsEditor = (correlationId, effects) => {
             if (!effectsRequest || effectsRequest.correlationId !== correlationId)
                 return;
-            completePhiDeveloperBuilderEffectsEditor(defaultArea, effectsRequest, effects);
+            completePhiDeveloperBuilderEffectsEditor(effectsRequest, effects);
             initializedEffectsCorrelationRef.current = null;
         };
         /*
@@ -815,7 +756,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             const live = readPhiRuntimeFormValuesSignalValue(signal.value);
             if (!live)
                 return;
-            previewPhiDeveloperBuilderEffects(defaultArea, effectsRequest.correlationId, {
+            previewPhiDeveloperBuilderEffects(effectsRequest.correlationId, {
                 ...effectsRequest.effects,
                 opacity: readPhiBuilderEffectsOpacity(live.values),
             });
@@ -841,12 +782,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
                 router.replace(`${pathname}?${nextSearchParams.toString()}`, { scroll: false });
             }
             else {
-                phiWorkspaceCatalogStore.patch(defaultArea, (current) => ({
-                    ...current,
-                    area: nextArea,
-                    pageKey: nextPageKey,
-                }));
-                builderWorkspaceStore.patch(defaultArea, (current) => resetPhiBuilderSelectionToPage(current, nextPageKey));
+                openPhiBuilderPage(nextArea, nextPageKey);
             }
             return;
         }
@@ -864,10 +800,10 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
                     area,
                     selectedIds: (state.runtimeModuleIdsByArea?.[area] ?? [])
                         .filter((moduleId) => moduleId !== request.moduleId),
-                })), defaultArea);
+                })));
                 emitCapability("modulesTableReload", null, signal.correlationId);
             }
-            closePhiBuilderModuleDeactivationRequest(defaultArea);
+            closePhiBuilderModuleDeactivationRequest();
             return;
         }
         /*
@@ -881,7 +817,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             signal.action === "change" &&
             signal.value === false) {
             if (state.publicRouteCollisionRequest) {
-                closePhiBuilderPublicRouteCollisionRequest(defaultArea);
+                closePhiBuilderPublicRouteCollisionRequest();
             }
             return;
         }
@@ -902,7 +838,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
                 return;
             }
             if (signal.value === "cancel") {
-                closePhiBuilderPublicRouteCollisionRequest(defaultArea);
+                closePhiBuilderPublicRouteCollisionRequest();
                 return;
             }
             if (signal.value !== "assign") {
@@ -913,12 +849,12 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
                 showMessage({ level: "error", content: rejection }, { correlationId: signal.correlationId });
                 return;
             }
-            applyPhiBuilderPublicRouteAssignments(defaultArea, request);
+            applyPhiBuilderPublicRouteAssignments(request);
             applyPhiBuilderRuntimeModuleSelectionChanges(request.areas.map((area) => ({
                 area,
                 selectedIds: [...(state.runtimeModuleIdsByArea?.[area] ?? []), request.moduleId],
-            })), defaultArea);
-            closePhiBuilderPublicRouteCollisionRequest(defaultArea);
+            })));
+            closePhiBuilderPublicRouteCollisionRequest();
             emitCapability("modulesTableReload", null, signal.correlationId);
             return;
         }
@@ -931,7 +867,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             const binding = readPhiTableBindingParamsSignalValue(signal.value);
             const navKey = typeof binding?.params.navKey === "string" ? binding.params.navKey : null;
             const parsed = parsePhiBuilderNavigationScopeKey(navKey);
-            const current = getPhiDeveloperBuilderStateSnapshot(defaultArea);
+            const current = getPhiDeveloperBuilderStateSnapshot();
             const cmsArea = resolvePhiBuilderAreaAsCmsArea(current.area);
             const normalizedNavKey = parsed ? `${parsed.area}:${parsed.key}` : null;
             if (!parsed || parsed.area !== cmsArea ||
@@ -981,11 +917,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
                 return;
             }
             emitPageTitleInputValue(nextPageKey);
-            phiWorkspaceCatalogStore.patch(defaultArea, (current) => ({
-                ...current,
-                pageKey: nextPageKey,
-            }));
-            builderWorkspaceStore.patch(defaultArea, (current) => resetPhiBuilderSelectionToPage(current, nextPageKey, { closePages: true }));
+            openPhiBuilderPageInOpenArea(nextPageKey, { closePages: true });
             return;
         }
         const builderControllerReceiver = createPhiBuilderControllerAddress();
@@ -1020,7 +952,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
                 return;
             }
             try {
-                applyPhiBuilderRuntimeModuleSelectionChange(effectiveArea, selectedIds, defaultArea);
+                applyPhiBuilderRuntimeModuleSelectionChange(effectiveArea, selectedIds);
             }
             catch (error) {
                 showMessage({ level: "error", content: error instanceof Error ? error.message : "Invalid runtime module selection." }, { correlationId: signal.correlationId });
@@ -1060,10 +992,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             if (nextDebugScaffold == null) {
                 return;
             }
-            builderWorkspaceStore.patch(defaultArea, (current) => ({
-                ...current,
-                debugScaffold: nextDebugScaffold,
-            }));
+            setPhiBuilderDebugScaffold(nextDebugScaffold);
             return;
         }
         if (addressedHere && signal.channel === "selection" && signal.action === "change") {
@@ -1074,24 +1003,31 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             }
             let nextNodeKey = next.nodeKey;
             let nextNodeId = readPhiCmsInstanceId(next.nodeId);
-            const nextPageKey = typeof next.pageKey === "string" ? next.pageKey : undefined;
+            /*
+             * A selection names the Area and Page its node is on, or the open ones. A node on another Area or
+             * Page is not on the canvas and cannot be selected; opening that Page is the URL's business, not a
+             * selection's. The selection used to write both into the tool store, where the catalog's values
+             * always won, so the node was selected on a Page that was not open.
+             */
+            const openState = getPhiDeveloperBuilderStateSnapshot();
+            if ((typeof next.area === "string" && next.area !== openState.area) ||
+                (typeof next.pageKey === "string" && next.pageKey !== openState.pageKey)) {
+                return;
+            }
             /*
              * A Layout named only by its Region is that Region's root Layout, read from its draft. A sender that
              * cannot know a Site's node ids -- a Tour step showing the Layout Inspector -- names it this way. A
              * Region without a root Layout selects nothing.
              */
             if (next.nodeKind === "layout" && nextNodeId == null && typeof next.regionKey === "string") {
-                const current = getPhiDeveloperBuilderStateSnapshot(defaultArea);
-                const rootNode = getPhiDeveloperRegionDraftsSnapshot()[getPhiBuilderRegionDraftKey(typeof next.area === "string" ? next.area : current.area, next.regionKey, nextPageKey ?? current.pageKey)]?.rootNode;
+                const rootNode = getPhiDeveloperRegionDraftsSnapshot()[getPhiBuilderRegionDraftKey(openState.area, next.regionKey, openState.pageKey)]?.rootNode;
                 if (!rootNode) {
                     return;
                 }
                 nextNodeId = rootNode.id;
                 nextNodeKey = rootNode.widgetType;
             }
-            selectPhiDeveloperBuilderNode(defaultArea, {
-                ...(typeof next.area === "string" ? { area: next.area } : {}),
-                ...(nextPageKey ? { pageKey: nextPageKey } : {}),
+            selectPhiDeveloperBuilderNode({
                 nodeKey: nextNodeKey,
                 nodeId: nextNodeId,
                 nodeKind: next.nodeKind,
@@ -1253,7 +1189,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             return;
         }
         if (addressedHere && signal.channel === "command" && signal.action === "activate" && signal.value === "pagesOpen") {
-            builderWorkspaceStore.patch(defaultArea, (current) => ({ ...current, pagesOpen: true }));
+            openPhiBuilderPagesPanel();
             return;
         }
         if (signal.receiver === createPhiBuilderControllerAddress() && signal.channel === "effects") {
@@ -1297,7 +1233,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             signal.valueSchema === PHI_SIGNAL_VALUE_SCHEMAS.formValues) {
             const submitted = readPhiRuntimeFormValuesSignalValue(signal.value);
             if (submitted)
-                patchPhiBuilderSignalWiringSession(defaultArea, submitted.values);
+                patchPhiBuilderSignalWiringSession(submitted.values);
             return;
         }
         if (signal.receiver === createPhiBuilderControllerAddress() &&
@@ -1308,11 +1244,11 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             if (tableAction?.actionKey !== "delete" || typeof tableAction.rowIdentity !== "string") {
                 return;
             }
-            const routes = resolvePhiBuilderSignalWiringRoutesWithout(defaultArea, tableAction.rowIdentity);
+            const routes = resolvePhiBuilderSignalWiringRoutesWithout(tableAction.rowIdentity);
             if (!routes)
                 return;
-            const routeState = getPhiDeveloperBuilderStateSnapshot(defaultArea);
-            runPhiDeveloperBuilderInspectorAction(defaultArea, routeState.nodeKind === "layout"
+            const routeState = getPhiDeveloperBuilderStateSnapshot();
+            runPhiDeveloperBuilderInspectorAction(routeState.nodeKind === "layout"
                 ? { kind: "patchSelectedLayoutConfig", patch: { signalRoutes: routes } }
                 : { kind: "patchSelectedWidgetConfig", patch: { signalRoutes: routes } });
             emitCapability("signalWiringRoutesReload", null, signal.correlationId);
@@ -1338,7 +1274,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             if (!isCloseRequest) {
                 return;
             }
-            resetPhiBuilderSignalWiringSession(defaultArea);
+            resetPhiBuilderSignalWiringSession();
             emitCapability("signalWiringReset", null, signal.correlationId);
             emitCapability("signalWiringClose", null, signal.correlationId);
             return;
@@ -1350,15 +1286,15 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             const submitted = readPhiRuntimeFormValuesSignalValue(signal.value);
             if (!submitted)
                 return;
-            patchPhiBuilderSignalWiringSession(defaultArea, submitted.values);
-            const result = resolvePhiBuilderSignalWiringRoutes(defaultArea);
+            patchPhiBuilderSignalWiringSession(submitted.values);
+            const result = resolvePhiBuilderSignalWiringRoutes();
             if (result.kind !== "applied")
                 return;
-            const wiringState = getPhiDeveloperBuilderStateSnapshot(defaultArea);
-            runPhiDeveloperBuilderInspectorAction(defaultArea, wiringState.nodeKind === "layout"
+            const wiringState = getPhiDeveloperBuilderStateSnapshot();
+            runPhiDeveloperBuilderInspectorAction(wiringState.nodeKind === "layout"
                 ? { kind: "patchSelectedLayoutConfig", patch: { signalRoutes: result.routes } }
                 : { kind: "patchSelectedWidgetConfig", patch: { signalRoutes: result.routes } });
-            resetPhiBuilderSignalWiringSession(defaultArea);
+            resetPhiBuilderSignalWiringSession();
             emitCapability("signalWiringClose", null, signal.correlationId);
             return;
         }
@@ -1425,7 +1361,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
                  */
                 phiBuilderHistory.endGesture();
             }
-            builderWorkspaceStore.patch(defaultArea, (current) => ({ ...current, inspectorOpen: signal.value }));
+            setPhiBuilderInspectorOpen(signal.value);
             return;
         }
         if (signal.channel === "inspector" && signal.action === "change") {
@@ -1436,7 +1372,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
             }
             const action = readPhiBuilderInspectorAction(signal.value);
             if (action) {
-                runPhiDeveloperBuilderInspectorAction(defaultArea, action);
+                runPhiDeveloperBuilderInspectorAction(action);
             }
             return;
         }
@@ -1484,8 +1420,8 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
      */
     return _jsxs(_Fragment, { children: [pageMetaDialog, confirmDialog] });
 }
-export function PhiDeveloperBuilderWorkspaceController({ defaultArea = "public", shellPresetDraftsByArea = {}, runtimeModuleDefinitions = [], runtimeModuleIdsByArea = {}, modulePresetPagesByArea = EMPTY_MODULE_PRESET_PAGES_BY_AREA, areaPresetSourcesByArea = {}, navigationSurfacesByArea = {}, unresolvedModuleIdsByArea = EMPTY_RUNTIME_MODULE_IDS_BY_AREA, serverUnavailableModules = EMPTY_SERVER_UNAVAILABLE_MODULES, publicRouteClaims = EMPTY_PUBLIC_ROUTE_CLAIMS, publicRoutePaths = EMPTY_PUBLIC_ROUTE_PATHS, areaRootRoutesByArea = EMPTY_AREA_ROOT_ROUTES, areaMetaByArea = EMPTY_AREA_META, areaControllerSettingsByArea = EMPTY_AREA_CONTROLLER_SETTINGS, pageMetaLabels = PHI_BUILDER_PAGE_META_DEFAULT_PRESENTATION_LABELS, historyLabels, signalRoutes = null, }) {
-    const controller = usePhiDeveloperBuilderWorkspaceController(defaultArea, {
+export function PhiDeveloperBuilderWorkspaceController({ shellPresetDraftsByArea = {}, runtimeModuleDefinitions = [], runtimeModuleIdsByArea = {}, modulePresetPagesByArea = EMPTY_MODULE_PRESET_PAGES_BY_AREA, areaPresetSourcesByArea = {}, navigationSurfacesByArea = {}, unresolvedModuleIdsByArea = EMPTY_RUNTIME_MODULE_IDS_BY_AREA, serverUnavailableModules = EMPTY_SERVER_UNAVAILABLE_MODULES, publicRouteClaims = EMPTY_PUBLIC_ROUTE_CLAIMS, publicRoutePaths = EMPTY_PUBLIC_ROUTE_PATHS, areaRootRoutesByArea = EMPTY_AREA_ROOT_ROUTES, areaMetaByArea = EMPTY_AREA_META, areaControllerSettingsByArea = EMPTY_AREA_CONTROLLER_SETTINGS, pageMetaLabels = PHI_BUILDER_PAGE_META_DEFAULT_PRESENTATION_LABELS, historyLabels, signalRoutes = null, }) {
+    const controller = usePhiDeveloperBuilderWorkspaceController({
         shellPresetDraftsByArea,
         runtimeModuleDefinitions,
         runtimeModuleIdsByArea,

package/plugins/runtime-modules/builder/data-providers.d.ts

@@ -482,6 +482,7 @@ export declare const PHI_BUILDER_RUNTIME_DATA_PROVIDER_DESCRIPTORS: ({
             filterFields: string[];
             sorting: "none";
             pagination: "offset";
+            total: true;
         };
         actions: ({
             key: string;