@phis/ui 0.2.1 → 0.4.0

package/plugins/runtime-modules/builder/{workspace-controller.js → controller/workspace-controller.js}

@@ -1,57 +1,60 @@
 "use client";
 import { Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
-import { usePathname, useRouter, useSearchParams } from "next/navigation";
-import { createPhiSignalAddress, createPhiSignalSubcontrolAddress, PHI_SIGNAL_VALUE_SCHEMAS } from "../../../types/signals";
-import { readPhiTableBindingParamsSignalValue } from "../../../types/table-signal-values";
-import { createPhiPresetCmsInstanceId, readPhiCmsInstanceId } from "../../../types/cms-instance-id";
-import { usePhiSignalDispatcher, usePhiSignalListener, } from "../../../components/runtime/runtime-signal-bus";
-import { usePhiApplicationFeedback } from "../../../components/runtime/use-phi-application-feedback";
-import { resolvePhiRuntimeModuleIdsForArea } from "../../../plugins/runtime-modules/settings";
-import { PHI_BUILDER_PREVIEW_SEARCH_PARAM, } from "./preview-transport";
-import { PHI_BUILDER_AREA_SEARCH_PARAM, PHI_BUILDER_NAVIGATION_KEY_SEARCH_PARAM, PHI_BUILDER_PAGE_SEARCH_PARAM, PHI_BUILDER_RUNTIME_MODULES_SEARCH_PARAM, normalizePhiBuilderAreaSearchParam, normalizePhiBuilderPageSearchParam, serializePhiBuilderRuntimeModuleIdsSearchParam, } from "../../../helpers/cms-scope-search-params";
-import { createPhiBuilderControllerAddress } from "./controller/address";
-import { readPhiBuilderInspectorAction, } from "./inspector-actions";
-import { createEmptyPhiBuilderModulePresetPagesByArea, resolvePhiBuilderActivePageCatalog, resolvePhiBuilderActivePageKey, } from "../../../helpers/cms-page-catalog";
-import { loadPhiBuilderPersistedPageCatalog } from "./page-catalog-client";
-import { resolvePhiBuilderOfferedPageKey, resolvePhiBuilderOfferedPageKeyFromCatalogPath, } from "./offered-page-catalog";
-import { isPhiBuilderAreaKey, resolvePhiBuilderAreaAsCmsArea, } from "../../../constants/cms-areas";
-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, createDefaultBuilderChromeControls, normalizePhiDeveloperBuilderArea as normalizeBuilderArea, previewPhiDeveloperBuilderEffects, selectPhiDeveloperBuilderNode, usePhiDeveloperRegionDraft, getPhiDeveloperBuilderStateSnapshot, setPhiDeveloperBuilderAreaRootRoute, readPhiBuilderEffectiveAreaRootRoute, setPhiDeveloperBuilderAreaRootRoutes, setPhiDeveloperBuilderAreaMeta, setPhiDeveloperBuilderAreaMetaBaseline, 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";
-import { getDefaultRegionDraft } from "./developer-region-drafts";
-import { isPhiAreaScopedBuilderPage, isPhiDebugScaffoldBuilderPage, readPhiDeveloperBuilderWorkspaceKey, resolvePhiDeveloperBuilderCommandWorkspace, resolvePhiDeveloperBuilderRouteScope, } from "./route-scope";
+import { useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { PHI_SIGNAL_VALUE_SCHEMAS, } from "../../../../types/signals";
+import { dispatchPhiSignalCapability } from "../../../../components/runtime/runtime-signal-identity";
+import { hasPhiConfigFlag } from "../../../../helpers/flags";
+import { PhiCmsFlags } from "../../../../constants/phi-cms";
+import { readPhiTableBindingParamsSignalValue } from "../../../../types/table-signal-values";
+import { readPhiCmsInstanceId } from "../../../../types/cms-instance-id";
+import { usePhiSignalDispatcher, usePhiSignalListener, } from "../../../../components/runtime/runtime-signal-bus";
+import { usePhiApplicationFeedback } from "../../../../components/runtime/use-phi-application-feedback";
+import { resolvePhiRuntimeModuleIdsForArea } from "../../../../plugins/runtime-modules/settings";
+import { PHI_BUILDER_PREVIEW_SEARCH_PARAM, } from "../preview-transport";
+import { PHI_BUILDER_AREA_SEARCH_PARAM, PHI_BUILDER_NAVIGATION_KEY_SEARCH_PARAM, PHI_BUILDER_PAGE_SEARCH_PARAM, PHI_BUILDER_RUNTIME_MODULES_SEARCH_PARAM, normalizePhiBuilderAreaSearchParam, normalizePhiBuilderPageSearchParam, serializePhiBuilderRuntimeModuleIdsSearchParam, } from "../../../../helpers/cms-scope-search-params";
+import { createPhiBuilderControllerAddress } from "../controller/address";
+import { readPhiBuilderInspectorAction, } from "../inspector-actions";
+import { createEmptyPhiBuilderModulePresetPagesByArea, resolvePhiBuilderActivePageCatalog, resolvePhiBuilderActivePageKey, } from "../../../../helpers/cms-page-catalog";
+import { loadPhiBuilderPersistedPageCatalog } from "../page-catalog-client";
+import { resolvePhiBuilderOfferedPageKey, resolvePhiBuilderOfferedPageKeyFromCatalogPath, } from "../offered-page-catalog";
+import { isPhiBuilderAreaKey, resolvePhiBuilderAreaAsCmsArea, } from "../../../../constants/cms-areas";
+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 {} from "../options-providers";
+import { PHI_AREA_META_PUBLIC_DEFAULTS } from "../../../../helpers/cms-area-config";
+import { getPhiBuilderRegionDraftKey } from "../region-keys";
+import { applyPhiBuilderAreaSettingsAnswer } from "../area-settings-answer";
+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 { PHI_BUILDER_SIGNAL_WIRING_FORM_CONTROLLER_ADDRESS, patchPhiBuilderSignalWiringSession, resetPhiBuilderSignalWiringSession, resolvePhiBuilderSignalWiringRoutes, resolvePhiBuilderSignalWiringRoutesWithout, } from "./signal-wiring-controller";
-import { readPhiTableActionSignalValue } from "../../../types/table-signal-values";
+import { patchPhiBuilderSignalWiringSession, resetPhiBuilderSignalWiringSession, 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";
-import { PHI_BUILDER_EFFECTS_FORM_WIDGET_IDS, PHI_BUILDER_INSPECTOR_DRAWER_OVERLAY_IDS, PHI_BUILDER_INSPECTOR_OVERLAY_IDS, PHI_BUILDER_INSPECTOR_WIDGET_IDS, } from "./inspector-overlay-addresses";
-import { PHI_BUILDER_MODULES_TABLE_WIDGET_ID, PHI_BUILDER_MODULE_DETAIL_OVERLAY_IDS, PHI_BUILDER_MODULE_DETAIL_WIDGET_IDS, PHI_BUILDER_PUBLIC_ROUTES_OVERLAY_IDS, PHI_BUILDER_PUBLIC_ROUTES_WIDGET_IDS, PHI_BUILDER_AREA_SETTINGS_OVERLAY_IDS, PHI_BUILDER_AREA_SETTINGS_WIDGET_IDS, PHI_BUILDER_MODULE_USAGE_OVERLAY_IDS, PHI_BUILDER_MODULE_USAGE_WIDGET_IDS, } from "./addresses";
-import { readPhiRuntimeFormValuesSignalValue } from "../../../components/forms/runtime-form-state";
-import { PHI_BUILDER_EFFECTS_SECTIONS, mergePhiBuilderEffectsFormValues, readPhiBuilderEffectsOpacity, splitPhiBuilderEffectsFormValues, } from "./effects-form-values";
+import { PHI_BUILDER_AREA_LANDING_PAGE_EMPTY, PHI_BUILDER_AREA_ROOT_ROUTE_AUTOMATIC, PHI_BUILDER_AREA_ROOT_ROUTE_LANDING, } from "../area-settings-values";
+import { readPhiRuntimeFormValuesSignalValue } from "../../../../components/forms/runtime-form-state";
+import { PHI_BUILDER_EFFECTS_SECTIONS, mergePhiBuilderEffectsFormValues, readPhiBuilderEffectsOpacity, splitPhiBuilderEffectsFormValues, } from "../effects-form-values";
 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 { applyPhiBuilderPublicRouteAssignments, findPhiBuilderPublicRouteAnswerProblem, } from "./public-route-collisions";
-import { createPhiCommandToolbarControlAddress } from "../../../components/widgets/signals/command-toolbar-address";
-import { PHI_BUILDER_RUNTIME_MODULE_ID } from "../../../plugins/runtime-modules/builder/ids";
-import { createPhiRuntimeFormControllerAddress } from "../../../components/forms/runtime-form-controller-address";
-import { phiWorkspaceCatalogStore } from "../../../components/workspace/catalog-store";
-import { PHI_BUILDER_PAGE_META_DEFAULT_PRESENTATION_LABELS, } from "./controller/definition";
+import { createPhiBuilderHistoryContext, phiBuilderHistory, } from "../history";
+import { applyPhiBuilderRuntimeModuleSelectionChange, applyPhiBuilderRuntimeModuleSelectionChanges, areRuntimeModuleIdsEqual, } from "../runtime-module-selection";
+import { applyPhiBuilderPublicRouteAssignments, findPhiBuilderPublicRouteAnswerProblem, } from "../public-route-collisions";
+import { phiWorkspaceCatalogStore } from "../../../../components/workspace/catalog-store";
+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 = {};
+const EMPTY_SERVER_UNAVAILABLE_MODULES = {};
 const EMPTY_MODULE_PRESET_PAGES_BY_AREA = createEmptyPhiBuilderModulePresetPagesByArea();
 const EMPTY_PUBLIC_ROUTE_CLAIMS = [];
 const EMPTY_PUBLIC_ROUTE_PATHS = [];
 const EMPTY_AREA_ROOT_ROUTES = {};
 const EMPTY_AREA_META = {};
+const EMPTY_AREA_CONTROLLER_SETTINGS = {};
+import { usePhiPathname } from "../../../../components/runtime/use-phi-pathname";
 function readPhiDeveloperBuilderToolbarCommand(value) {
     if (value === "save" ||
         value === "preview" ||
@@ -119,17 +122,26 @@ function filterBuilderModuleCatalogs(modulePresetPagesByArea, navigationSurfaces
         navigationSurfacesByArea: filteredNavigation,
     };
 }
-function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
+function usePhiDeveloperBuilderWorkspaceController(defaultArea, options) {
     const { showMessage } = usePhiApplicationFeedback();
     const dispatchSignal = usePhiSignalDispatcher();
     const effectsWorkflowCorrelationRef = useRef(null);
     const initializedEffectsCorrelationRef = useRef(null);
     const effectsFormSubmissionRef = useRef(null);
-    const { shellPresetDraftsByArea = {}, runtimeModuleDefinitions = [], runtimeModuleIdsByArea = {}, modulePresetPagesByArea = EMPTY_MODULE_PRESET_PAGES_BY_AREA, areaPresetSourcesByArea = {}, navigationSurfacesByArea = {}, unresolvedModuleIdsByArea = EMPTY_RUNTIME_MODULE_IDS_BY_AREA, publicRouteClaims = EMPTY_PUBLIC_ROUTE_CLAIMS, publicRoutePaths = EMPTY_PUBLIC_ROUTE_PATHS, areaRootRoutesByArea = EMPTY_AREA_ROOT_ROUTES, areaMetaByArea = EMPTY_AREA_META, pageMetaLabels = PHI_BUILDER_PAGE_META_DEFAULT_PRESENTATION_LABELS, } = options;
+    const { 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, } = options;
+    /*
+     * One declared output, delivered through every route written for it.
+     *
+     * The Inspector drawers, the Effects and wiring dialogs, the Area settings, Page metadata and Modules
+     * dialogs, the header switches -- every one of them was a preset id written into this file, so the
+     * Controller kept addressing them on Pages that did not carry them and could not follow a copy that
+     * did. The trees that hold them route them now (`PhiBuilderRuntimeControllerConfig`).
+     */
+    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 effectsOverlayAddress = createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_OVERLAY_IDS.effectsEditor);
     const router = useRouter();
-    const pathname = usePathname();
+    const pathname = usePhiPathname();
     const searchParams = useSearchParams();
     const commandWorkspace = resolvePhiDeveloperBuilderCommandWorkspace(pathname);
     const builderWorkspaceKey = readPhiDeveloperBuilderWorkspaceKey(pathname);
@@ -147,17 +159,18 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
     const resolvedSiderLeftDraft = siderLeftDraft ??
         shellPresetDraftsByArea[effectiveArea]?.[siderLeftDraftKey] ??
         getDefaultRegionDraft("sider_left");
-    const siderLeftFullHeight = resolvedSiderLeftDraft.regionConfig?.fullHeight === true;
+    const siderLeftFullHeight = hasPhiConfigFlag(resolvedSiderLeftDraft.regionConfig, PhiCmsFlags.FullHeight);
     const handledSiderLayoutRef = useRef(null);
     const effectiveNavKey = resolvePhiBuilderNavigationWidgetNavKey(null, searchParams.get(PHI_BUILDER_NAVIGATION_KEY_SEARCH_PARAM), effectiveArea);
     const { emitPageTitleInputValue, navigateToBuilderPage, openPageMetaDialog, pageMetaDialog, } = usePhiBuilderPageController({
+        emitCapability,
         defaultArea,
         effectiveArea,
         effectivePageKey,
         pageMetaLabels,
         state,
     });
-    const { reportSaved } = usePhiBuilderDraftStatusController({
+    const { captureHistoryHead, reportSaved, hasUnsavedChanges } = usePhiBuilderDraftStatusController({
         commandWorkspace,
         effectiveArea,
         effectiveNavKey,
@@ -170,9 +183,12 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         effectiveNavKey,
         effectivePageKey,
         pathname,
+        captureHistoryHead,
+        hasUnsavedChanges,
         reportSaved,
         shellPresetDraftsByArea,
         state,
+        historyLabels,
     });
     const currentRuntimeModuleIdsByArea = state.runtimeModuleIdsByArea ?? EMPTY_RUNTIME_MODULE_IDS_BY_AREA;
     const activePreloadCatalogs = useMemo(() => filterBuilderModuleCatalogs(modulePresetPagesByArea, navigationSurfacesByArea, runtimeModuleIdsByArea, runtimeModuleDefinitions), [
@@ -181,15 +197,21 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         runtimeModuleDefinitions,
         runtimeModuleIdsByArea,
     ]);
-    const runtimeModuleIdsPreloadKey = serializeRuntimeModuleIds(Object.values(runtimeModuleIdsByArea).flat());
-    const runtimeModuleDefinitionsPreloadKey = serializeRuntimeModuleDefinitions(runtimeModuleDefinitions);
-    const modulePresetPagesPreloadKey = JSON.stringify(activePreloadCatalogs.modulePresetPagesByArea);
-    const areaPresetSourcesPreloadKey = JSON.stringify(areaPresetSourcesByArea);
-    const navigationSurfacesPreloadKey = JSON.stringify(activePreloadCatalogs.navigationSurfacesByArea);
-    const unresolvedModuleIdsPreloadKey = JSON.stringify(unresolvedModuleIdsByArea);
-    const publicRouteClaimsPreloadKey = JSON.stringify(publicRouteClaims);
-    const publicRoutePathsPreloadKey = JSON.stringify(publicRoutePaths);
-    const areaRootRoutesPreloadKey = JSON.stringify(areaRootRoutesByArea);
+    /*
+     * The preload's identities, serialised once per preload and not once per render. The Controller
+     * re-renders on every Inspector keystroke and every slider step, and each render was stringifying the
+     * whole Module catalogue, every preset Page and every navigation surface to learn that nothing changed.
+     */
+    const runtimeModuleIdsPreloadKey = useMemo(() => serializeRuntimeModuleIds(Object.values(runtimeModuleIdsByArea).flat()), [runtimeModuleIdsByArea]);
+    const runtimeModuleDefinitionsPreloadKey = useMemo(() => serializeRuntimeModuleDefinitions(runtimeModuleDefinitions), [runtimeModuleDefinitions]);
+    const modulePresetPagesPreloadKey = useMemo(() => JSON.stringify(activePreloadCatalogs.modulePresetPagesByArea), [activePreloadCatalogs.modulePresetPagesByArea]);
+    const areaPresetSourcesPreloadKey = useMemo(() => JSON.stringify(areaPresetSourcesByArea), [areaPresetSourcesByArea]);
+    const navigationSurfacesPreloadKey = useMemo(() => JSON.stringify(activePreloadCatalogs.navigationSurfacesByArea), [activePreloadCatalogs.navigationSurfacesByArea]);
+    const unresolvedModuleIdsPreloadKey = useMemo(() => JSON.stringify(unresolvedModuleIdsByArea), [unresolvedModuleIdsByArea]);
+    const publicRouteClaimsPreloadKey = useMemo(() => JSON.stringify(publicRouteClaims), [publicRouteClaims]);
+    const serverUnavailableModulesPreloadKey = useMemo(() => JSON.stringify(serverUnavailableModules), [serverUnavailableModules]);
+    const publicRoutePathsPreloadKey = useMemo(() => JSON.stringify(publicRoutePaths), [publicRoutePaths]);
+    const areaRootRoutesPreloadKey = useMemo(() => JSON.stringify(areaRootRoutesByArea), [areaRootRoutesByArea]);
     /*
      * The Areas' root routes, handed to every workspace rather than to /shells alone.
      *
@@ -202,13 +224,17 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [areaRootRoutesPreloadKey]);
     // What the Areas said about being found, read from the same revision and set the same way.
-    const areaMetaPreloadKey = JSON.stringify(areaMetaByArea);
+    const areaMetaPreloadKey = useMemo(() => JSON.stringify(areaMetaByArea), [areaMetaByArea]);
     useEffect(() => {
         setPhiDeveloperBuilderAreaMetaBaseline(areaMetaByArea);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [areaMetaPreloadKey]);
-    const signalWiringOverlayAddress = createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_OVERLAY_IDS.signalWiring);
-    const signalWiringFormAddress = createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.signalWiringForm);
+    // What each Shell tells its Controllers, carried into every save that states the Shell whole.
+    const areaControllerSettingsPreloadKey = useMemo(() => JSON.stringify(areaControllerSettingsByArea), [areaControllerSettingsByArea]);
+    useEffect(() => {
+        setPhiDeveloperBuilderAreaControllerSettings(areaControllerSettingsByArea);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [areaControllerSettingsPreloadKey]);
     const openedSignalWiringCorrelationRef = useRef(null);
     useEffect(() => {
         const request = state.signalWiringRequest;
@@ -218,42 +244,12 @@ 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);
-        dispatchSignal({
-            scope: "area",
-            channel: "reset",
-            action: "activate",
-            value: null,
-            valueType: "none",
-            correlationId: request.correlationId,
-            sender: createPhiBuilderControllerAddress(),
-            receiver: signalWiringFormAddress,
-            timestamp: Date.now(),
-        });
+        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.
-        dispatchSignal({
-            scope: "area",
-            channel: "reload",
-            action: "activate",
-            value: null,
-            valueType: "none",
-            correlationId: request.correlationId,
-            sender: createPhiBuilderControllerAddress(),
-            receiver: createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.signalWiringRoutes),
-            timestamp: Date.now(),
-        });
-        queueMicrotask(() => dispatchSignal({
-            scope: "area",
-            channel: "dialog",
-            action: "activate",
-            value: null,
-            valueType: "none",
-            correlationId: request.correlationId,
-            sender: createPhiBuilderControllerAddress(),
-            receiver: signalWiringOverlayAddress,
-            timestamp: Date.now(),
-        }));
-    }, [defaultArea, dispatchSignal, signalWiringFormAddress, signalWiringOverlayAddress, state.signalWiringRequest]);
+        emitCapability("signalWiringRoutesReload", null, request.correlationId);
+        queueMicrotask(() => emitCapability("signalWiringOpen", null, request.correlationId));
+    }, [defaultArea, emitCapability, state.signalWiringRequest]);
     useEffect(() => {
         const request = state.effectsEditorRequest;
         if (!request || initializedEffectsCorrelationRef.current === request.correlationId)
@@ -262,32 +258,10 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         initializedEffectsCorrelationRef.current = request.correlationId;
         const valuesBySection = splitPhiBuilderEffectsFormValues(request.effects);
         for (const section of PHI_BUILDER_EFFECTS_SECTIONS) {
-            const widgetId = PHI_BUILDER_EFFECTS_FORM_WIDGET_IDS[section];
-            dispatchSignal({
-                scope: "area",
-                channel: "values",
-                action: "change",
-                value: { values: valuesBySection[section] },
-                valueType: "json",
-                valueSchema: PHI_SIGNAL_VALUE_SCHEMAS.formValues,
-                correlationId: request.correlationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiRuntimeFormControllerAddress(`widget-${widgetId}`),
-                timestamp: Date.now(),
-            });
+            emitCapability(resolvePhiBuilderEffectsCapabilityId(section, "Values"), { values: valuesBySection[section] }, request.correlationId);
         }
-        queueMicrotask(() => dispatchSignal({
-            scope: "area",
-            channel: "dialog",
-            action: "activate",
-            value: null,
-            valueType: "none",
-            correlationId: request.correlationId,
-            sender: createPhiBuilderControllerAddress(),
-            receiver: effectsOverlayAddress,
-            timestamp: Date.now(),
-        }));
-    }, [dispatchSignal, effectsOverlayAddress, state.effectsEditorRequest]);
+        queueMicrotask(() => emitCapability("effectsDialogOpen", null, request.correlationId));
+    }, [emitCapability, state.effectsEditorRequest]);
     /*
      * The collision dialog follows the request rather than a click.
      *
@@ -296,8 +270,6 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
      * cancelled, or replaced by the next one. Keeping the open state derived is what makes cancelling
      * leave the Site exactly as it was: there is only ever the request to undo.
      */
-    const publicRoutesOverlayAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_PUBLIC_ROUTES_OVERLAY_IDS.overlayPublicRoutes), []);
-    const publicRoutesTableAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_PUBLIC_ROUTES_WIDGET_IDS.publicRoutesTable), []);
     /*
      * The other half of the same switch: what turning a Module off stops drawing.
      *
@@ -305,44 +277,25 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
      * directions of one gesture behave alike: a question that must be answered, a consequence that must
      * be acknowledged.
      */
-    const moduleUsageOverlayAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_MODULE_USAGE_OVERLAY_IDS.overlayModuleUsage), []);
-    const moduleUsageTableAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_MODULE_USAGE_WIDGET_IDS.moduleUsageTable), []);
-    const openedModuleUsageCorrelationRef = useRef(null);
+    /*
+     * What was last said to the dialog, and through which routes. A question that stands when the Page
+     * holding the dialog arrives -- its routes come with it (`controllerSettings`) -- was said to nobody,
+     * so new routes say it again; the same question through the same routes is not repeated.
+     */
+    const openedModuleUsageRef = useRef(null);
     const moduleDeactivationRequest = state.moduleDeactivationRequest;
     useEffect(() => {
         const correlationId = moduleDeactivationRequest?.correlationId ?? null;
-        if (openedModuleUsageCorrelationRef.current === correlationId) {
+        const opened = openedModuleUsageRef.current;
+        if (opened && opened.correlationId === correlationId && (correlationId == null || opened.routes === emitRoutes)) {
             return;
         }
-        openedModuleUsageCorrelationRef.current = correlationId;
-        dispatchSignal({
-            scope: "page",
-            channel: "moduleUsageDialog",
-            action: correlationId ? "activate" : "close",
-            value: null,
-            valueType: "none",
-            sender: createPhiBuilderControllerAddress(),
-            receiver: moduleUsageOverlayAddress,
-            timestamp: Date.now(),
-        });
+        openedModuleUsageRef.current = { correlationId, routes: emitRoutes };
+        emitCapability(correlationId ? "moduleUsageOpen" : "moduleUsageClose", null);
         if (correlationId) {
-            dispatchSignal({
-                scope: "page",
-                channel: "reload",
-                action: "activate",
-                value: null,
-                valueType: "none",
-                sender: createPhiBuilderControllerAddress(),
-                receiver: moduleUsageTableAddress,
-                timestamp: Date.now(),
-            });
+            emitCapability("moduleUsageReload", null);
         }
-    }, [
-        dispatchSignal,
-        moduleDeactivationRequest,
-        moduleUsageOverlayAddress,
-        moduleUsageTableAddress,
-    ]);
+    }, [emitCapability, emitRoutes, moduleDeactivationRequest]);
     /*
      * What the Area settings dialog stands at, as the record its Form holds.
      *
@@ -363,10 +316,10 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
      * is on the screen -- the arrangement the Page metadata dialog fills itself with.
      */
     const [areaSettingsOpenCount, setAreaSettingsOpenCount] = useState(0);
-    const areaSettingsFormControllerAddress = useMemo(() => createPhiRuntimeFormControllerAddress(`widget-${PHI_BUILDER_AREA_SETTINGS_WIDGET_IDS.areaSettingsForm}`), []);
-    const areaMeta = readPhiBuilderEffectiveAreaMeta(state, state.area);
-    const areaRootRoute = readPhiBuilderEffectiveAreaRootRoute(state, state.area);
-    const seoAnswerable = state.area === "public";
+    // The Area on screen, as every other path here reads it; `state.area` lags a scope change by a render.
+    const areaMeta = readPhiBuilderEffectiveAreaMeta(state, effectiveArea);
+    const areaRootRoute = readPhiBuilderEffectiveAreaRootRoute(state, effectiveArea);
+    const seoAnswerable = effectiveArea === "public";
     /*
      * Only Public is ever asked: every other Area is authenticated and is not indexed whatever is
      * stored, so its switches stand at what is actually the case and are shown as unanswerable rather
@@ -393,7 +346,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         ? PHI_BUILDER_AREA_ROOT_ROUTE_AUTOMATIC
         : areaRootRoute.mode === "landing"
             ? PHI_BUILDER_AREA_ROOT_ROUTE_LANDING
-            : areaRootRoute.target;
+            : areaRootRoute.targetLinkTarget.reference;
     const areaLandingPageValue = areaRootRoute?.mode === "landing" && areaRootRoute.target
         ? areaRootRoute.target
         : PHI_BUILDER_AREA_LANDING_PAGE_EMPTY;
@@ -408,28 +361,17 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
      * values as though they were the Area's answer.
      */
     const publishAreaSettingsState = (correlationId) => {
-        dispatchSignal({
-            scope: "page",
-            channel: "values",
-            action: "change",
-            value: {
-                values: {
-                    areaRootRoute: areaRootRouteValue,
-                    areaLandingPage: areaLandingPageValue,
-                    areaTitleTemplate: titleTemplate,
-                    areaDefaultTitle: defaultTitle,
-                    areaMetaIndex: seoIndex,
-                    areaMetaSitemap: seoSitemap,
-                    seoLocked: seoAnswerable ? "false" : "true",
-                },
+        emitCapability("areaSettingsValues", {
+            values: {
+                areaRootRoute: areaRootRouteValue,
+                areaLandingPage: areaLandingPageValue,
+                areaTitleTemplate: titleTemplate,
+                areaDefaultTitle: defaultTitle,
+                areaMetaIndex: seoIndex,
+                areaMetaSitemap: seoSitemap,
+                seoLocked: seoAnswerable ? "false" : "true",
             },
-            valueType: "json",
-            valueSchema: PHI_SIGNAL_VALUE_SCHEMAS.formValues,
-            sender: createPhiBuilderControllerAddress(),
-            receiver: areaSettingsFormControllerAddress,
-            ...(correlationId ? { correlationId } : {}),
-            timestamp: Date.now(),
-        });
+        }, correlationId);
     };
     const publishAreaSettingsStateEvent = useEffectEvent(publishAreaSettingsState);
     useEffect(() => {
@@ -452,82 +394,37 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
      * while it stood in the header -- so the dialog is only a place, and the commands are the whole of
      * its lifecycle.
      */
-    const areaSettingsOverlayAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_AREA_SETTINGS_OVERLAY_IDS.overlayAreaSettings), []);
     const dispatchAreaSettingsDialog = (open, correlationId) => {
-        dispatchSignal({
-            scope: "page",
-            channel: "areaSettingsDialog",
-            action: open ? "activate" : "close",
-            value: null,
-            valueType: "none",
-            sender: createPhiBuilderControllerAddress(),
-            receiver: areaSettingsOverlayAddress,
-            correlationId,
-            timestamp: Date.now(),
-        });
+        emitCapability(open ? "areaSettingsOpen" : "areaSettingsClose", null, correlationId);
     };
-    const openedPublicRoutesCorrelationRef = useRef(null);
+    // Said again through new routes, like the Module usage dialog above.
+    const openedPublicRoutesRef = useRef(null);
     const publicRouteCollisionRequest = state.publicRouteCollisionRequest;
     useEffect(() => {
         const correlationId = publicRouteCollisionRequest?.correlationId ?? null;
-        if (openedPublicRoutesCorrelationRef.current === correlationId) {
+        const opened = openedPublicRoutesRef.current;
+        if (opened && opened.correlationId === correlationId && (correlationId == null || opened.routes === emitRoutes)) {
             return;
         }
-        openedPublicRoutesCorrelationRef.current = correlationId;
-        dispatchSignal({
-            scope: "page",
-            channel: "publicRoutesDialog",
-            action: correlationId ? "activate" : "close",
-            value: null,
-            valueType: "none",
-            sender: createPhiBuilderControllerAddress(),
-            receiver: publicRoutesOverlayAddress,
-            timestamp: Date.now(),
-        });
+        openedPublicRoutesRef.current = { correlationId, routes: emitRoutes };
+        emitCapability(correlationId ? "publicRoutesOpen" : "publicRoutesClose", null);
         if (correlationId) {
             /*
              * And a re-read afterwards, not before: the rows live inside the overlay body, which mounts when
              * the modal opens and is kept mounted after -- so a second question would otherwise show the
              * first one's rows.
              */
-            dispatchSignal({
-                scope: "page",
-                channel: "reload",
-                action: "activate",
-                value: null,
-                valueType: "none",
-                sender: createPhiBuilderControllerAddress(),
-                receiver: publicRoutesTableAddress,
-                timestamp: Date.now(),
-            });
+            emitCapability("publicRoutesReload", null);
         }
-    }, [
-        dispatchSignal,
-        publicRouteCollisionRequest,
-        publicRoutesOverlayAddress,
-        publicRoutesTableAddress,
-    ]);
+    }, [emitCapability, emitRoutes, publicRouteCollisionRequest]);
     useEffect(() => {
-        const selectedOverlayId = state.nodeKind === "region"
-            ? PHI_BUILDER_INSPECTOR_OVERLAY_IDS.regionInspector
-            : state.nodeKind === "layout"
-                ? PHI_BUILDER_INSPECTOR_OVERLAY_IDS.layoutInspector
-                : state.nodeKind === "widget"
-                    ? PHI_BUILDER_INSPECTOR_OVERLAY_IDS.widgetInspector
-                    : null;
-        for (const overlayId of PHI_BUILDER_INSPECTOR_DRAWER_OVERLAY_IDS) {
-            dispatchSignal({
-                scope: "area",
-                channel: "dialog",
-                action: state.inspectorOpen && overlayId === selectedOverlayId ? "activate" : "close",
-                value: null,
-                valueType: "none",
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalAddress("cms", overlayId),
-                timestamp: Date.now(),
-            });
+        const selectedInspector = state.nodeKind === "region" || state.nodeKind === "layout" || state.nodeKind === "widget"
+            ? state.nodeKind
+            : null;
+        for (const inspector of ["region", "layout", "widget"]) {
+            emitCapability(state.inspectorOpen && inspector === selectedInspector ? `${inspector}InspectorOpen` : `${inspector}InspectorClose`, null);
         }
-    }, [dispatchSignal, state.inspectorOpen, state.nodeKind]);
+    }, [emitCapability, state.inspectorOpen, state.nodeKind]);
     useEffect(() => {
         /*
          * Feeding the catalog is the Builder's job, but the catalog itself is not the Builder's state --
@@ -542,6 +439,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             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
@@ -569,7 +467,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                     nodeKey: `page:${initialPageKey}`,
                 }));
             }
-            return changed || definitionsChanged || modulePresetPagesChanged || areaPresetSourcesChanged || navigationSurfacesChanged || unresolvedModuleIdsChanged || publicRouteClaimsChanged || publicRoutePathsChanged || catalogHydrationChanged || initialPageChanged
+            return changed || definitionsChanged || modulePresetPagesChanged || areaPresetSourcesChanged || navigationSurfacesChanged || unresolvedModuleIdsChanged || serverUnavailableModulesChanged || publicRouteClaimsChanged || publicRoutePathsChanged || catalogHydrationChanged || initialPageChanged
                 ? {
                     ...current,
                     ...(initialPageChanged ? { pageKey: initialPageKey } : {}),
@@ -580,6 +478,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                     areaPresetSourcesByArea,
                     navigationSurfacesByArea: activePreloadCatalogs.navigationSurfacesByArea,
                     unresolvedModuleIdsByArea,
+                    serverUnavailableModules,
                     publicRouteClaims,
                     ...(publicRoutePathsChanged ? { publicRoutePaths } : {}),
                 }
@@ -595,6 +494,8 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         modulePresetPagesPreloadKey,
         unresolvedModuleIdsByArea,
         unresolvedModuleIdsPreloadKey,
+        serverUnavailableModules,
+        serverUnavailableModulesPreloadKey,
         publicRouteClaims,
         publicRouteClaimsPreloadKey,
         publicRoutePaths,
@@ -723,7 +624,6 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         builderWorkspaceStore.patch(defaultArea, (current) => ({
             ...current,
             commandWorkspace,
-            builderChromeControls: createDefaultBuilderChromeControls(),
         }));
     }, [commandWorkspace, defaultArea, state.commandWorkspace]);
     useEffect(() => {
@@ -739,36 +639,23 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             pageKey: effectivePageKey,
             navKey: effectiveNavKey,
         });
-        const presetKey = commandWorkspace === "structure"
-            ? "builder-shells-page"
-            : commandWorkspace === "pages"
-                ? "builder-pages-page"
-                : commandWorkspace === "modules"
-                    ? "builder-modules-page"
-                    : "builder-navigation-page";
+        /*
+         * Whether each button can move, and what it would move: the tooltip names the step an undo takes
+         * back, so the author knows which of their edits is next before pressing.
+         */
         const emitAvailability = () => {
             const availability = phiBuilderHistory.getAvailability(historyContext);
-            for (const [controlKey, enabled] of [
-                ["undo", availability.canUndo],
-                ["redo", availability.canRedo],
-            ]) {
-                dispatchSignal({
-                    scope: "area",
-                    channel: "enabled",
-                    action: "change",
-                    value: enabled,
-                    valueType: "boolean",
-                    sender: createPhiBuilderControllerAddress(),
-                    receiver: createPhiCommandToolbarControlAddress(PHI_BUILDER_RUNTIME_MODULE_ID, presetKey, controlKey),
-                    timestamp: Date.now(),
-                });
-            }
+            emitCapability("undoEnabled", availability.canUndo);
+            emitCapability("redoEnabled", availability.canRedo);
+            emitCapability("undoTooltip", formatPhiHistoryTooltip(historyLabels, "undo", availability.undoAction));
+            emitCapability("redoTooltip", formatPhiHistoryTooltip(historyLabels, "redo", availability.redoAction));
         };
         emitAvailability();
         return phiBuilderHistory.subscribe(historyContext, emitAvailability);
     }, [
         commandWorkspace,
-        dispatchSignal,
+        emitCapability,
+        historyLabels,
         effectiveArea,
         effectiveNavKey,
         effectivePageKey,
@@ -867,18 +754,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             area: nextArea,
             pageKey: nextPageKey,
         }));
-        builderWorkspaceStore.patch(defaultArea, (current) => ({
-            ...current,
-            nodeKey: `page:${nextPageKey}`,
-            nodeId: null,
-            nodeKind: "page",
-            selectedRegionType: null,
-            selectedRegionKey: null,
-            selectedRootRegionKey: null,
-            inspectorOpen: false,
-            sidebarKey: "pages",
-            builderChromeControls: createDefaultBuilderChromeControls(),
-        }));
+        builderWorkspaceStore.patch(defaultArea, (current) => resetPhiBuilderSelectionToPage(current, nextPageKey));
     }, [
         defaultArea,
         isBuilderWorkspace,
@@ -894,28 +770,35 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         effectiveArea,
     ]);
     usePhiSignalListener((signal) => {
-        const effectsRequest = state.effectsEditorRequest;
-        if (effectsRequest &&
-            signal.correlationId === effectsRequest.correlationId &&
-            signal.channel === "effectsCommit" &&
-            signal.action === "change" &&
-            signal.valueSchema === PHI_SIGNAL_VALUE_SCHEMAS.formValues) {
-            const submitted = readPhiRuntimeFormValuesSignalValue(signal.value);
-            const nextEffects = submitted?.values.effects;
-            completePhiDeveloperBuilderEffectsEditor(defaultArea, effectsRequest, nextEffects && typeof nextEffects === "object" && !Array.isArray(nextEffects)
-                ? nextEffects
-                : undefined);
-            initializedEffectsCorrelationRef.current = null;
+        /*
+         * Never what this Controller sent itself. The workspace store announces every state change it
+         * applied -- `page`, `selection`, `builderMode`, `inspectorVisibility` -- under this address, and
+         * a branch below that took the announcement for a request did the change a second time: a Page
+         * chosen in `/pages` was navigated to twice, and a failed Preview's restoring `builderMode`
+         * entered the Editor again. Whoever asks this Controller for something sends under its own
+         * address (SIGNALS.md, "Self-receive").
+         */
+        if (signal.sender === createPhiBuilderControllerAddress()) {
             return;
         }
-        if (effectsRequest &&
-            signal.correlationId === effectsRequest.correlationId &&
-            signal.channel === "effectsCancel" &&
-            signal.action === "close") {
-            completePhiDeveloperBuilderEffectsEditor(defaultArea, effectsRequest);
+        /*
+         * What the branches below that name no receiver of their own may answer: a broadcast, or a signal
+         * addressed here. A `selection` or `page` change sent to some other Widget is that Widget's.
+         */
+        const addressedHere = signal.receiver === "broadcast" || signal.receiver === createPhiBuilderControllerAddress();
+        const effectsRequest = state.effectsEditorRequest;
+        /*
+         * Ends the Effects editor of one workflow: with the merged effects when they were taken, without
+         * when the editor was cancelled. Called in place, not sent: the Controller once told itself with
+         * an `effectsCommit` or `effectsCancel` broadcast, which stopped arriving the moment it stopped
+         * answering what it sends itself -- and the dialog closed with nothing taken.
+         */
+        const finishEffectsEditor = (correlationId, effects) => {
+            if (!effectsRequest || effectsRequest.correlationId !== correlationId)
+                return;
+            completePhiDeveloperBuilderEffectsEditor(defaultArea, effectsRequest, effects);
             initializedEffectsCorrelationRef.current = null;
-            return;
-        }
+        };
         /*
          * The Transparency as it is being dragged, drawn on the node and written nowhere.
          *
@@ -963,17 +846,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                     area: nextArea,
                     pageKey: nextPageKey,
                 }));
-                builderWorkspaceStore.patch(defaultArea, (current) => ({
-                    ...current,
-                    nodeKey: `page:${nextPageKey}`,
-                    nodeId: null,
-                    nodeKind: "page",
-                    selectedRegionType: null,
-                    selectedRegionKey: null,
-                    selectedRootRegionKey: null,
-                    inspectorOpen: false,
-                    sidebarKey: "pages",
-                }));
+                builderWorkspaceStore.patch(defaultArea, (current) => resetPhiBuilderSelectionToPage(current, nextPageKey));
             }
             return;
         }
@@ -992,21 +865,26 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                     selectedIds: (state.runtimeModuleIdsByArea?.[area] ?? [])
                         .filter((moduleId) => moduleId !== request.moduleId),
                 })), defaultArea);
-                dispatchSignal({
-                    scope: "area",
-                    channel: "reload",
-                    action: "activate",
-                    value: null,
-                    valueType: "none",
-                    sender: createPhiBuilderControllerAddress(),
-                    receiver: createPhiSignalAddress("cms", PHI_BUILDER_MODULES_TABLE_WIDGET_ID),
-                    correlationId: signal.correlationId,
-                    timestamp: Date.now(),
-                });
+                emitCapability("modulesTableReload", null, signal.correlationId);
             }
             closePhiBuilderModuleDeactivationRequest(defaultArea);
             return;
         }
+        /*
+         * The question's dialog closed by its own close button or Escape. It runs with `closeMode:
+         * "immediate"`, so it closes without asking, and that is a Cancel: the request goes, or it would
+         * stand behind a dialog nobody can see any more. Answering closes it too; the request is gone by
+         * then, and this finds nothing to withdraw.
+         */
+        if (signal.receiver === createPhiBuilderControllerAddress() &&
+            signal.channel === "publicRoutesVisibility" &&
+            signal.action === "change" &&
+            signal.value === false) {
+            if (state.publicRouteCollisionRequest) {
+                closePhiBuilderPublicRouteCollisionRequest(defaultArea);
+            }
+            return;
+        }
         /*
          * The answer to the one question enabling a Module can ask.
          *
@@ -1041,17 +919,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                 selectedIds: [...(state.runtimeModuleIdsByArea?.[area] ?? []), request.moduleId],
             })), defaultArea);
             closePhiBuilderPublicRouteCollisionRequest(defaultArea);
-            dispatchSignal({
-                scope: "area",
-                channel: "reload",
-                action: "activate",
-                value: null,
-                valueType: "none",
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_MODULES_TABLE_WIDGET_ID),
-                correlationId: signal.correlationId,
-                timestamp: Date.now(),
-            });
+            emitCapability("modulesTableReload", null, signal.correlationId);
             return;
         }
         if (signal.scope === "area" &&
@@ -1079,32 +947,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             router.replace(`${pathname}?${nextSearchParams.toString()}`, { scroll: false });
             return;
         }
-        if (signal.channel === "builderChrome" && signal.action === "change") {
-            const nextControls = signal.value && typeof signal.value === "object"
-                ? signal.value
-                : null;
-            const currentRouteScope = resolvePhiDeveloperBuilderRouteScope(pathname);
-            if (!nextControls || !currentRouteScope || nextControls.area !== currentRouteScope.area || nextControls.pageKey !== currentRouteScope.pageKey) {
-                return;
-            }
-            const currentBuilderChromeControls = state.builderChromeControls ?? createDefaultBuilderChromeControls();
-            builderWorkspaceStore.patch(defaultArea, (current) => ({
-                ...current,
-                builderChromeControls: {
-                    editorPreviewDisabled: typeof nextControls.editorPreviewDisabled === "boolean"
-                        ? nextControls.editorPreviewDisabled
-                        : currentBuilderChromeControls.editorPreviewDisabled,
-                    actionsDisabled: typeof nextControls.actionsDisabled === "boolean"
-                        ? nextControls.actionsDisabled
-                        : currentBuilderChromeControls.actionsDisabled,
-                    debugDisabled: typeof nextControls.debugDisabled === "boolean"
-                        ? nextControls.debugDisabled
-                        : currentBuilderChromeControls.debugDisabled,
-                },
-            }));
-            return;
-        }
-        if (signal.scope === "page" && signal.channel === "path" && signal.action === "change") {
+        if (addressedHere && signal.scope === "page" && signal.channel === "path" && signal.action === "change") {
             if (builderWorkspaceKey !== "pages" || typeof signal.value !== "string" || signal.value.length === 0) {
                 return;
             }
@@ -1116,7 +959,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             emitPageTitleInputValue(nextPageKey);
             return;
         }
-        if (signal.channel === "page" && signal.action === "change") {
+        if (addressedHere && signal.channel === "page" && signal.action === "change") {
             const rawValue = signal.value;
             const next = rawValue && typeof rawValue === "object"
                 ? rawValue
@@ -1142,19 +985,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                 ...current,
                 pageKey: nextPageKey,
             }));
-            builderWorkspaceStore.patch(defaultArea, (current) => ({
-                ...current,
-                nodeKey: `page:${nextPageKey}`,
-                nodeId: null,
-                nodeKind: "page",
-                selectedRegionType: null,
-                selectedRegionKey: null,
-                selectedRootRegionKey: null,
-                inspectorOpen: false,
-                sidebarKey: "pages",
-                pagesOpen: false,
-                builderChromeControls: createDefaultBuilderChromeControls(),
-            }));
+            builderWorkspaceStore.patch(defaultArea, (current) => resetPhiBuilderSelectionToPage(current, nextPageKey, { closePages: true }));
             return;
         }
         const builderControllerReceiver = createPhiBuilderControllerAddress();
@@ -1165,46 +996,23 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
          * route the Table could carry on its own.
          */
         if (signal.scope === "area" &&
-            signal.channel === "action" &&
+            signal.channel === "moduleTableAction" &&
             signal.action === "activate" &&
             signal.valueType === "json" &&
-            signal.receiver === builderControllerReceiver &&
-            signal.sender === createPhiSignalAddress("cms", PHI_BUILDER_MODULES_TABLE_WIDGET_ID)) {
+            signal.receiver === builderControllerReceiver) {
             const tableAction = readPhiTableActionSignalValue(signal.value);
             if (tableAction?.actionKey !== "details" || typeof tableAction.rowIdentity !== "string") {
                 return;
             }
-            dispatchSignal({
-                scope: "page",
-                channel: "bindingParams",
-                action: "change",
-                value: { params: { moduleId: tableAction.rowIdentity } },
-                valueType: "json",
-                valueSchema: PHI_SIGNAL_VALUE_SCHEMAS.tableBindingParams,
-                correlationId: signal.correlationId,
-                sender: builderControllerReceiver,
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_MODULE_DETAIL_WIDGET_IDS.fields),
-                timestamp: Date.now(),
-            });
-            dispatchSignal({
-                scope: "page",
-                channel: "dialog",
-                action: "activate",
-                value: null,
-                valueType: "none",
-                correlationId: signal.correlationId,
-                sender: builderControllerReceiver,
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_MODULE_DETAIL_OVERLAY_IDS.overlayModuleDetail),
-                timestamp: Date.now(),
-            });
+            emitCapability("moduleDetailParams", { params: { moduleId: tableAction.rowIdentity } }, signal.correlationId);
+            emitCapability("moduleDetailOpen", null, signal.correlationId);
             return;
         }
         if (signal.scope === "area" &&
             signal.channel === "runtimeModules" &&
             signal.action === "change" &&
             signal.valueType === "string[]" &&
-            signal.receiver === builderControllerReceiver &&
-            signal.sender !== builderControllerReceiver) {
+            signal.receiver === builderControllerReceiver) {
             const selectedIds = Array.isArray(signal.value)
                 ? signal.value.filter((value) => typeof value === "string")
                 : null;
@@ -1241,14 +1049,13 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             }
             const command = readPhiDeveloperBuilderToolbarCommand(commandValue);
             const commandWorkspace = state.commandWorkspace;
-            const builderChromeControls = state.builderChromeControls ?? createDefaultBuilderChromeControls();
-            if (!command || commandWorkspace == null || builderChromeControls.actionsDisabled) {
+            if (!command || commandWorkspace == null) {
                 return;
             }
             runBuilderCommand(command);
             return;
         }
-        if (signal.channel === "debugScaffold" && signal.action === "change") {
+        if (addressedHere && signal.channel === "debugScaffold" && signal.action === "change") {
             const nextDebugScaffold = typeof signal.value === "boolean" ? signal.value : null;
             if (nextDebugScaffold == null) {
                 return;
@@ -1259,41 +1066,34 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             }));
             return;
         }
-        if (signal.channel === "content") {
-            const rawValue = signal.value;
-            const next = rawValue && typeof rawValue === "object" ? rawValue : null;
-            if (!next || next.nodeKind !== "region" || typeof next.regionKey !== "string" || !next.draft || typeof next.draft !== "object") {
-                return;
-            }
-            const regionKey = next.regionKey;
-            const nextDraft = next.draft;
-            const catalog = phiWorkspaceCatalogStore.getSnapshot(defaultArea);
-            const nextArea = typeof next.area === "string" ? next.area : catalog.area;
-            const nextPageKey = typeof next.pageKey === "string" && next.pageKey.length > 0 ? next.pageKey : catalog.pageKey;
-            builderWorkspaceStore.patch(defaultArea, (current) => {
-                return {
-                    ...current,
-                    regionDrafts: {
-                        ...current.regionDrafts,
-                        [getPhiBuilderRegionDraftKey(nextArea, regionKey, nextPageKey)]: nextDraft,
-                    },
-                };
-            });
-            return;
-        }
-        if (signal.channel === "selection" && signal.action === "change") {
+        if (addressedHere && signal.channel === "selection" && signal.action === "change") {
             const rawValue = signal.value;
             const next = rawValue && typeof rawValue === "object" ? rawValue : null;
             if (!next || typeof next.nodeKey !== "string" || typeof next.nodeKind !== "string") {
                 return;
             }
-            const nextNodeKey = next.nodeKey;
+            let nextNodeKey = next.nodeKey;
+            let nextNodeId = readPhiCmsInstanceId(next.nodeId);
             const nextPageKey = typeof next.pageKey === "string" ? next.pageKey : undefined;
+            /*
+             * 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;
+                if (!rootNode) {
+                    return;
+                }
+                nextNodeId = rootNode.id;
+                nextNodeKey = rootNode.widgetType;
+            }
             selectPhiDeveloperBuilderNode(defaultArea, {
                 ...(typeof next.area === "string" ? { area: next.area } : {}),
                 ...(nextPageKey ? { pageKey: nextPageKey } : {}),
                 nodeKey: nextNodeKey,
-                nodeId: readPhiCmsInstanceId(next.nodeId),
+                nodeId: nextNodeId,
                 nodeKind: next.nodeKind,
                 regionType: typeof next.regionType === "number" ? next.regionType : null,
                 regionKey: typeof next.regionKey === "string" ? next.regionKey : null,
@@ -1304,7 +1104,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             });
             return;
         }
-        if (signal.channel === "builderMode" && signal.action === "change") {
+        if (addressedHere && signal.channel === "builderMode" && signal.action === "change") {
             const rawValue = signal.value;
             if (rawValue === "editor") {
                 enterEditor();
@@ -1352,7 +1152,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             const values = submitted.values;
             const historyContext = createPhiBuilderHistoryContext({
                 workspace: "structure",
-                area: state.area,
+                area: effectiveArea,
             });
             const rootRouteAnswer = typeof values.areaRootRoute === "string"
                 ? values.areaRootRoute
@@ -1367,32 +1167,32 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                 values.areaLandingPage !== PHI_BUILDER_AREA_LANDING_PAGE_EMPTY
                 ? values.areaLandingPage
                 : null;
-            if (rootRouteAnswer != null) {
-                setPhiDeveloperBuilderAreaRootRoute(state.area, rootRouteAnswer === PHI_BUILDER_AREA_ROOT_ROUTE_AUTOMATIC
-                    ? null
-                    : rootRouteAnswer === PHI_BUILDER_AREA_ROOT_ROUTE_LANDING
-                        ? { mode: "landing", ...(landingAnswer ? { target: landingAnswer } : {}) }
-                        : { mode: "redirect", target: rootRouteAnswer }, { historyContext, historyLabel: "Change root route" });
-            }
             /*
              * The indexing answers are taken only where they were asked. Outside Public the switches are
              * disabled and show the fact rather than the record, so reading them back would write that
              * fact into an Area that never said it.
              */
-            setPhiDeveloperBuilderAreaMeta(state.area, {
-                titleTemplate: typeof values.areaTitleTemplate === "string"
-                    ? values.areaTitleTemplate.trim()
-                    : "",
-                defaultTitle: typeof values.areaDefaultTitle === "string"
-                    ? values.areaDefaultTitle.trim()
-                    : "",
-                ...(state.area === "public"
-                    ? {
-                        index: values.areaMetaIndex !== false,
-                        sitemap: values.areaMetaSitemap !== false,
-                    }
-                    : {}),
-            }, { historyContext, historyLabel: "Change area settings" });
+            applyPhiBuilderAreaSettingsAnswer({
+                area: effectiveArea,
+                historyContext,
+                rootRoute: rootRouteAnswer == null
+                    ? undefined
+                    : rootRouteAnswer === PHI_BUILDER_AREA_ROOT_ROUTE_AUTOMATIC
+                        ? null
+                        : rootRouteAnswer === PHI_BUILDER_AREA_ROOT_ROUTE_LANDING
+                            ? { mode: "landing", ...(landingAnswer ? { target: landingAnswer } : {}) }
+                            : {
+                                mode: "redirect",
+                                targetLinkTarget: { kind: "page", reference: rootRouteAnswer },
+                            },
+                meta: {
+                    titleTemplate: values.areaTitleTemplate,
+                    defaultTitle: values.areaDefaultTitle,
+                    ...(effectiveArea === "public"
+                        ? { index: values.areaMetaIndex !== false, sitemap: values.areaMetaSitemap !== false }
+                        : {}),
+                },
+            });
             dispatchAreaSettingsDialog(false, signal.correlationId);
             return;
         }
@@ -1420,17 +1220,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
              * states on opening, half of one record and half of another.
              */
             const leaving = signal.value === "cancel";
-            dispatchSignal({
-                scope: "page",
-                channel: leaving ? "reset" : "submit",
-                action: "activate",
-                value: null,
-                valueType: "none",
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_AREA_SETTINGS_WIDGET_IDS.areaSettingsForm),
-                correlationId: signal.correlationId,
-                timestamp: Date.now(),
-            });
+            emitCapability(leaving ? "areaSettingsReset" : "areaSettingsSubmit", null, signal.correlationId);
             if (leaving) {
                 dispatchAreaSettingsDialog(false, signal.correlationId);
             }
@@ -1462,37 +1252,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             });
             return;
         }
-        if ((signal.channel === "region" || signal.channel === "selection") &&
-            signal.action === "change") {
-            const rawValue = signal.value;
-            const next = rawValue && typeof rawValue === "object"
-                ? rawValue
-                : null;
-            if (!next || typeof next.regionKey !== "string" || typeof next.nodeKind !== "string") {
-                return;
-            }
-            const nextRegionKey = next.regionKey;
-            const nextNodeKind = next.nodeKind === "slot" ? "slot" : "region";
-            const nextNodeKey = typeof next.nodeKey === "string"
-                ? next.nodeKey
-                : `${nextNodeKind}:${nextRegionKey}`;
-            builderWorkspaceStore.patch(defaultArea, (current) => ({
-                ...current,
-                nodeKey: nextNodeKey,
-                nodeId: null,
-                nodeKind: nextNodeKind,
-                selectedRegionType: typeof next.regionType === "number"
-                    ? next.regionType
-                    : current.selectedRegionType,
-                selectedRegionKey: nextRegionKey,
-                selectedRootRegionKey: null,
-                inspectorOpen: nextNodeKind === "region",
-                sidebarKey: "structure",
-                pagesOpen: false,
-            }));
-            return;
-        }
-        if (signal.channel === "command" && signal.action === "activate" && signal.value === "pagesOpen") {
+        if (addressedHere && signal.channel === "command" && signal.action === "activate" && signal.value === "pagesOpen") {
             builderWorkspaceStore.patch(defaultArea, (current) => ({ ...current, pagesOpen: true }));
             return;
         }
@@ -1504,30 +1264,9 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             else if (signal.action === "activate" && signal.valueType === "string" && signal.value === "save") {
                 const correlationId = effectsWorkflowCorrelationRef.current ?? signal.correlationId;
                 effectsFormSubmissionRef.current = { correlationId, values: {} };
-                dispatchSignal({
-                    scope: "area",
-                    channel: "effectsSubmitting",
-                    action: "change",
-                    value: true,
-                    valueType: "boolean",
-                    correlationId,
-                    sender: createPhiBuilderControllerAddress(),
-                    receiver: createPhiSignalSubcontrolAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.effectsCommands, "save"),
-                    timestamp: Date.now(),
-                });
+                emitCapability("effectsSubmitting", true, correlationId);
                 for (const section of PHI_BUILDER_EFFECTS_SECTIONS) {
-                    const widgetId = PHI_BUILDER_EFFECTS_FORM_WIDGET_IDS[section];
-                    dispatchSignal({
-                        scope: "area",
-                        channel: "submit",
-                        action: "activate",
-                        value: null,
-                        valueType: "none",
-                        correlationId,
-                        sender: createPhiBuilderControllerAddress(),
-                        receiver: createPhiSignalAddress("cms", widgetId),
-                        timestamp: Date.now(),
-                    });
+                    emitCapability(resolvePhiBuilderEffectsCapabilityId(section, "Submit"), null, correlationId);
                 }
             }
             else if ((signal.action === "activate" && signal.valueType === "string" && signal.value === "cancel") ||
@@ -1537,54 +1276,13 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                             signal.valueSchema === PHI_SIGNAL_VALUE_SCHEMAS.overlayCloseRequest)))) {
                 const correlationId = effectsWorkflowCorrelationRef.current ?? signal.correlationId;
                 for (const section of PHI_BUILDER_EFFECTS_SECTIONS) {
-                    const widgetId = PHI_BUILDER_EFFECTS_FORM_WIDGET_IDS[section];
-                    dispatchSignal({
-                        scope: "area",
-                        channel: "reset",
-                        action: "activate",
-                        value: null,
-                        valueType: "none",
-                        correlationId,
-                        sender: createPhiBuilderControllerAddress(),
-                        receiver: createPhiSignalAddress("cms", widgetId),
-                        timestamp: Date.now(),
-                    });
+                    emitCapability(resolvePhiBuilderEffectsCapabilityId(section, "Reset"), null, correlationId);
                 }
-                dispatchSignal({
-                    scope: "area",
-                    channel: "dialog",
-                    action: "close",
-                    value: null,
-                    valueType: "none",
-                    correlationId,
-                    sender: createPhiBuilderControllerAddress(),
-                    receiver: createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_OVERLAY_IDS.effectsEditor),
-                    timestamp: Date.now(),
-                });
-                dispatchSignal({
-                    scope: "area",
-                    channel: "effectsCancel",
-                    action: "close",
-                    value: null,
-                    valueType: "none",
-                    correlationId,
-                    sender: createPhiBuilderControllerAddress(),
-                    receiver: "broadcast",
-                    timestamp: Date.now(),
-                });
+                emitCapability("effectsDialogClose", null, correlationId);
+                finishEffectsEditor(correlationId);
                 effectsWorkflowCorrelationRef.current = null;
                 effectsFormSubmissionRef.current = null;
-                dispatchSignal({
-                    scope: "area",
-                    channel: "effectsSubmitting",
-                    action: "change",
-                    value: false,
-                    valueType: "boolean",
-                    correlationId,
-                    sender: createPhiBuilderControllerAddress(),
-                    receiver: createPhiSignalSubcontrolAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.effectsCommands, "save"),
-                    timestamp: Date.now(),
-                });
+                emitCapability("effectsSubmitting", false, correlationId);
             }
             return;
         }
@@ -1593,7 +1291,8 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
          * edits, which is what keeps the four cascading selects answerable; Apply routes through the
          * Form's own submit so its validation runs before a route is written.
          */
-        if (signal.receiver === PHI_BUILDER_SIGNAL_WIRING_FORM_CONTROLLER_ADDRESS &&
+        if (signal.receiver === createPhiBuilderControllerAddress() &&
+            signal.channel === "signalWiringValues" &&
             signal.action === "change" &&
             signal.valueSchema === PHI_SIGNAL_VALUE_SCHEMAS.formValues) {
             const submitted = readPhiRuntimeFormValuesSignalValue(signal.value);
@@ -1614,35 +1313,15 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                 return;
             const routeState = getPhiDeveloperBuilderStateSnapshot(defaultArea);
             runPhiDeveloperBuilderInspectorAction(defaultArea, routeState.nodeKind === "layout"
-                ? { kind: "patchSelectedLayoutConfig", key: "signalRoutes", value: routes }
+                ? { kind: "patchSelectedLayoutConfig", patch: { signalRoutes: routes } }
                 : { kind: "patchSelectedWidgetConfig", patch: { signalRoutes: routes } });
-            dispatchSignal({
-                scope: "area",
-                channel: "reload",
-                action: "activate",
-                value: null,
-                valueType: "none",
-                correlationId: signal.correlationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.signalWiringRoutes),
-                timestamp: Date.now(),
-            });
+            emitCapability("signalWiringRoutesReload", null, signal.correlationId);
             return;
         }
         if (signal.receiver === createPhiBuilderControllerAddress() &&
             signal.channel === "signalWiring") {
             if (signal.action === "activate" && signal.valueType === "string" && signal.value === "apply") {
-                dispatchSignal({
-                    scope: "area",
-                    channel: "submit",
-                    action: "activate",
-                    value: null,
-                    valueType: "none",
-                    correlationId: signal.correlationId,
-                    sender: createPhiBuilderControllerAddress(),
-                    receiver: createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.signalWiringForm),
-                    timestamp: Date.now(),
-                });
+                emitCapability("signalWiringSubmit", null, signal.correlationId);
                 return;
             }
             /*
@@ -1660,28 +1339,8 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                 return;
             }
             resetPhiBuilderSignalWiringSession(defaultArea);
-            dispatchSignal({
-                scope: "area",
-                channel: "reset",
-                action: "activate",
-                value: null,
-                valueType: "none",
-                correlationId: signal.correlationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.signalWiringForm),
-                timestamp: Date.now(),
-            });
-            dispatchSignal({
-                scope: "area",
-                channel: "dialog",
-                action: "close",
-                value: null,
-                valueType: "none",
-                correlationId: signal.correlationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_OVERLAY_IDS.signalWiring),
-                timestamp: Date.now(),
-            });
+            emitCapability("signalWiringReset", null, signal.correlationId);
+            emitCapability("signalWiringClose", null, signal.correlationId);
             return;
         }
         if (signal.receiver === createPhiBuilderControllerAddress() &&
@@ -1697,20 +1356,10 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                 return;
             const wiringState = getPhiDeveloperBuilderStateSnapshot(defaultArea);
             runPhiDeveloperBuilderInspectorAction(defaultArea, wiringState.nodeKind === "layout"
-                ? { kind: "patchSelectedLayoutConfig", key: "signalRoutes", value: result.routes }
+                ? { kind: "patchSelectedLayoutConfig", patch: { signalRoutes: result.routes } }
                 : { kind: "patchSelectedWidgetConfig", patch: { signalRoutes: result.routes } });
             resetPhiBuilderSignalWiringSession(defaultArea);
-            dispatchSignal({
-                scope: "area",
-                channel: "dialog",
-                action: "close",
-                value: null,
-                valueType: "none",
-                correlationId: signal.correlationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_OVERLAY_IDS.signalWiring),
-                timestamp: Date.now(),
-            });
+            emitCapability("signalWiringClose", null, signal.correlationId);
             return;
         }
         if (signal.receiver === createPhiBuilderControllerAddress() &&
@@ -1721,17 +1370,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             if (!pending || signal.correlationId !== pending.correlationId)
                 return;
             effectsFormSubmissionRef.current = null;
-            dispatchSignal({
-                scope: "area",
-                channel: "effectsSubmitting",
-                action: "change",
-                value: false,
-                valueType: "boolean",
-                correlationId: pending.correlationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalSubcontrolAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.effectsCommands, "save"),
-                timestamp: Date.now(),
-            });
+            emitCapability("effectsSubmitting", false, pending.correlationId);
             return;
         }
         if (signal.receiver === createPhiBuilderControllerAddress() &&
@@ -1741,43 +1380,12 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             effectsWorkflowCorrelationRef.current) {
             const correlationId = effectsWorkflowCorrelationRef.current;
             for (const section of PHI_BUILDER_EFFECTS_SECTIONS) {
-                const widgetId = PHI_BUILDER_EFFECTS_FORM_WIDGET_IDS[section];
-                dispatchSignal({
-                    scope: "area",
-                    channel: "reset",
-                    action: "activate",
-                    value: null,
-                    valueType: "none",
-                    correlationId,
-                    sender: createPhiBuilderControllerAddress(),
-                    receiver: createPhiSignalAddress("cms", widgetId),
-                    timestamp: Date.now(),
-                });
+                emitCapability(resolvePhiBuilderEffectsCapabilityId(section, "Reset"), null, correlationId);
             }
-            dispatchSignal({
-                scope: "area",
-                channel: "effectsCancel",
-                action: "close",
-                value: null,
-                valueType: "none",
-                correlationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: "broadcast",
-                timestamp: Date.now(),
-            });
+            finishEffectsEditor(correlationId);
             effectsWorkflowCorrelationRef.current = null;
             effectsFormSubmissionRef.current = null;
-            dispatchSignal({
-                scope: "area",
-                channel: "effectsSubmitting",
-                action: "change",
-                value: false,
-                valueType: "boolean",
-                correlationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalSubcontrolAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.effectsCommands, "save"),
-                timestamp: Date.now(),
-            });
+            emitCapability("effectsSubmitting", false, correlationId);
             return;
         }
         if (signal.receiver === createPhiBuilderControllerAddress() &&
@@ -1800,45 +1408,23 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
                 transitions: pending.values.transitions,
                 viewport: pending.values.viewport,
             });
-            dispatchSignal({
-                scope: "area",
-                channel: "effectsCommit",
-                action: "change",
-                value: { values: { effects } },
-                valueType: "json",
-                valueSchema: PHI_SIGNAL_VALUE_SCHEMAS.formValues,
-                correlationId: effectsCorrelationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: "broadcast",
-                timestamp: Date.now(),
-            });
-            dispatchSignal({
-                scope: "area",
-                channel: "dialog",
-                action: "close",
-                value: null,
-                valueType: "none",
-                correlationId: effectsCorrelationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalAddress("cms", PHI_BUILDER_INSPECTOR_OVERLAY_IDS.effectsEditor),
-                timestamp: Date.now(),
-            });
+            finishEffectsEditor(effectsCorrelationId, effects);
+            emitCapability("effectsDialogClose", null, effectsCorrelationId);
             effectsWorkflowCorrelationRef.current = null;
             effectsFormSubmissionRef.current = null;
-            dispatchSignal({
-                scope: "area",
-                channel: "effectsSubmitting",
-                action: "change",
-                value: false,
-                valueType: "boolean",
-                correlationId: effectsCorrelationId,
-                sender: createPhiBuilderControllerAddress(),
-                receiver: createPhiSignalSubcontrolAddress("cms", PHI_BUILDER_INSPECTOR_WIDGET_IDS.effectsCommands, "save"),
-                timestamp: Date.now(),
-            });
+            emitCapability("effectsSubmitting", false, effectsCorrelationId);
             return;
         }
-        if (signal.channel === "inspectorVisibility" && signal.action === "change" && typeof signal.value === "boolean") {
+        if (addressedHere && signal.channel === "inspectorVisibility" && signal.action === "change" && typeof signal.value === "boolean") {
+            if (signal.value === false) {
+                /*
+                 * Putting the Inspector away ends whatever was being adjusted in it. Everything a control
+                 * emitted while it was open is one edit, and the value standing when it closes is the one
+                 * history keeps -- so undo takes back the adjustment rather than one step of a slider still
+                 * being dragged.
+                 */
+                phiBuilderHistory.endGesture();
+            }
             builderWorkspaceStore.patch(defaultArea, (current) => ({ ...current, inspectorOpen: signal.value }));
             return;
         }
@@ -1883,52 +1469,22 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
      * stored tree says, the live page decides. It is stated once and held by the bus until the
      * selector exists, so a late-mounting Shell hears it without anybody waiting for it here.
      */
-    const areaSelectorAddress = useMemo(() => createPhiSignalAddress("cms", createPhiPresetCmsInstanceId({
-        domain: "area",
-        ownerModuleId: PHI_BUILDER_RUNTIME_MODULE_ID,
-        presetKey: "builder-area-preset",
-        nodeKey: "widgetBuilderAreaSelector",
-    })), []);
     const areaSelectorArmed = isPhiAreaScopedBuilderPage(resolvePhiDeveloperBuilderRouteScope(pathname)?.pageKey ?? "root");
     useEffect(() => {
-        dispatchSignal({
-            scope: "area",
-            channel: "enabled",
-            action: "change",
-            value: areaSelectorArmed,
-            valueType: "boolean",
-            sender: createPhiBuilderControllerAddress(),
-            receiver: areaSelectorAddress,
-            timestamp: Date.now(),
-        });
-    }, [areaSelectorArmed, areaSelectorAddress, dispatchSignal]);
+        emitCapability("areaSelectorEnabled", areaSelectorArmed);
+    }, [areaSelectorArmed, emitCapability]);
     // The debug switch rests disabled the same way, armed only where a canvas is drawn.
-    const debugSwitchAddress = useMemo(() => createPhiSignalAddress("cms", createPhiPresetCmsInstanceId({
-        domain: "area",
-        ownerModuleId: PHI_BUILDER_RUNTIME_MODULE_ID,
-        presetKey: "builder-area-preset",
-        nodeKey: "widgetHeaderMainDebugSwitch",
-    })), []);
     const debugSwitchArmed = isPhiDebugScaffoldBuilderPage(resolvePhiDeveloperBuilderRouteScope(pathname)?.pageKey ?? "root");
     useEffect(() => {
-        dispatchSignal({
-            scope: "area",
-            channel: "enabled",
-            action: "change",
-            value: debugSwitchArmed,
-            valueType: "boolean",
-            sender: createPhiBuilderControllerAddress(),
-            receiver: debugSwitchAddress,
-            timestamp: Date.now(),
-        });
-    }, [debugSwitchArmed, debugSwitchAddress, dispatchSignal]);
+        emitCapability("debugSwitchEnabled", debugSwitchArmed);
+    }, [debugSwitchArmed, emitCapability]);
     /*
      * Two Dialogs, one return. The workspace Controller renders nothing of its own except the dialogs its
      * commands need: the Page-meta editor, and the confirmation a reset command asks for.
      */
     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, publicRouteClaims = EMPTY_PUBLIC_ROUTE_CLAIMS, publicRoutePaths = EMPTY_PUBLIC_ROUTE_PATHS, areaRootRoutesByArea = EMPTY_AREA_ROOT_ROUTES, areaMetaByArea = EMPTY_AREA_META, pageMetaLabels = PHI_BUILDER_PAGE_META_DEFAULT_PRESENTATION_LABELS, }) {
+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, {
         shellPresetDraftsByArea,
         runtimeModuleDefinitions,
@@ -1937,11 +1493,15 @@ export function PhiDeveloperBuilderWorkspaceController({ defaultArea = "public",
         areaPresetSourcesByArea,
         navigationSurfacesByArea,
         unresolvedModuleIdsByArea,
+        serverUnavailableModules,
         publicRouteClaims,
         publicRoutePaths,
         areaRootRoutesByArea,
         areaMetaByArea,
+        areaControllerSettingsByArea,
         pageMetaLabels,
+        historyLabels,
+        signalRoutes,
     });
     return controller;
 }