@phis/ui 0.1.0 → 0.2.0

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

@@ -1,8 +1,9 @@
 "use client";
-import { useEffect, useEffectEvent, useMemo, useRef } from "react";
+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-widget";
+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";
@@ -11,15 +12,15 @@ 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, resolvePhiBuilderPageKeyFromCatalogPath, } from "../../../helpers/cms-page-catalog";
+import { createEmptyPhiBuilderModulePresetPagesByArea, resolvePhiBuilderActivePageCatalog, resolvePhiBuilderActivePageKey, } from "../../../helpers/cms-page-catalog";
 import { loadPhiBuilderPersistedPageCatalog } from "./page-catalog-client";
-import { resolvePhiBuilderOfferedPageKey, } from "./offered-page-catalog";
+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, selectPhiDeveloperBuilderNode, usePhiDeveloperRegionDraft, getPhiDeveloperBuilderStateSnapshot, setPhiDeveloperBuilderAreaRootRoute, readPhiBuilderEffectiveAreaRootRoute, setPhiDeveloperBuilderAreaRootRoutes, setPhiDeveloperBuilderAreaMeta, setPhiDeveloperBuilderAreaMetaBaseline, readPhiBuilderEffectiveAreaMeta, closePhiBuilderModuleDeactivationRequest, closePhiBuilderPublicRouteCollisionRequest, } from "./developer-workspace-store";
-import { PHI_BUILDER_AREA_LANDING_PAGE_EMPTY, PHI_BUILDER_AREA_ROOT_ROUTE_AUTOMATIC, PHI_BUILDER_AREA_ROOT_ROUTE_LANDING, } from "./options-providers";
+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";
@@ -27,13 +28,15 @@ import { isPhiAreaScopedBuilderPage, isPhiDebugScaffoldBuilderPage, readPhiDevel
 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-widget";
+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_SHELLS_WIDGET_IDS, PHI_BUILDER_AREA_SETTINGS_OVERLAY_IDS, PHI_BUILDER_MODULE_USAGE_OVERLAY_IDS, PHI_BUILDER_MODULE_USAGE_WIDGET_IDS, } from "../../../helpers/cms-page-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, splitPhiBuilderEffectsFormValues, } from "./effects-form-values";
+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";
@@ -55,8 +58,7 @@ function readPhiDeveloperBuilderToolbarCommand(value) {
         value === "publish" ||
         value === "undo" ||
         value === "redo" ||
-        value === "reset" ||
-        value === "restorePreset") {
+        value === "reset") {
         return value;
     }
     return null;
@@ -148,20 +150,27 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
     const siderLeftFullHeight = resolvedSiderLeftDraft.regionConfig?.fullHeight === true;
     const handledSiderLayoutRef = useRef(null);
     const effectiveNavKey = resolvePhiBuilderNavigationWidgetNavKey(null, searchParams.get(PHI_BUILDER_NAVIGATION_KEY_SEARCH_PARAM), effectiveArea);
-    const { currentPageTree, emitPageTitleInputValue, navigateToBuilderPage, openPageMetaDialog, pageMetaDialog, } = usePhiBuilderPageController({
+    const { emitPageTitleInputValue, navigateToBuilderPage, openPageMetaDialog, pageMetaDialog, } = usePhiBuilderPageController({
         defaultArea,
         effectiveArea,
         effectivePageKey,
         pageMetaLabels,
         state,
     });
-    const { confirmResetPage, runBuilderCommand } = usePhiBuilderDraftCommandController({
+    const { reportSaved } = usePhiBuilderDraftStatusController({
         commandWorkspace,
+        effectiveArea,
+        effectiveNavKey,
+        effectivePageKey,
+        state,
+    });
+    const { confirmResetPage, runBuilderCommand, confirmDialog } = usePhiBuilderDraftCommandController({
         defaultArea,
         effectiveArea,
         effectiveNavKey,
         effectivePageKey,
         pathname,
+        reportSaved,
         shellPresetDraftsByArea,
         state,
     });
@@ -335,59 +344,36 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
         moduleUsageTableAddress,
     ]);
     /*
-     * Whether the landing Select can be answered at all.
+     * What the Area settings dialog stands at, as the record its Form holds.
      *
-     * A Select emits its value as a string and nothing turns "the value is landing" into the boolean the
-     * enabled channel carries, so the controller says it: the capability is the one every renderable
-     * block inherits, and the Select only had to listen. Sent on mount as well as on every change,
-     * because a workspace that opens with the root forwarding must not start out answerable.
-     */
-    const landingSelectAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_SHELLS_WIDGET_IDS.widgetAreaLandingPage), []);
-    /*
-     * Answerable whenever the root is a landing, and not only when somebody offers one.
+     * One address and one message, where there used to be five addresses and three channels: the Form
+     * owns its fields, so the controller states the whole record rather than reaching each Control to
+     * tell it what it shows and whether it may be answered.
      *
-     * "None -- I will author it myself" is one of the answers, so there is always something to say. The
-     * older rule asked whether any Page carried the application flag, which after built-in Pages stopped
-     * applying left the Select switched off for good in an Area whose landing nobody had applied for.
+     * It goes to the Form's own headless controller rather than to the Widget. That is the address
+     * `values` is heard on, and the Form Controller hands it to the mounted instance -- the way the
+     * Page metadata dialog is filled.
      */
-    const landingSelectEnabled = readPhiBuilderEffectiveAreaRootRoute(state, state.area)?.mode === "landing";
     /*
-     * Said in the Select's own scope, and said once.
+     * How often the dialog has been asked for, which is what turns opening it into a change.
      *
-     * The workspace header belongs to the Page, so the Select is registered as a Page-scoped receiver;
-     * an Area-scoped signal to it is not late, it is wrong, and the bus drops it rather than holding
-     * it. Held is what happens with the right scope: the controller mounts before the Control's chunk
-     * arrives, and the bus keeps the statement until somebody is there to hear it.
+     * The Form's own controller is materialized on demand rather than standing with the Overlay, so a
+     * record sent in the same tick as the open command can arrive before there is anybody to hold it.
+     * Counting the opens puts the send in an effect, which runs once the render that opened the dialog
+     * is on the screen -- the arrangement the Page metadata dialog fills itself with.
      */
-    useEffect(() => {
-        dispatchSignal({
-            scope: "page",
-            channel: "enabled",
-            action: "change",
-            value: landingSelectEnabled,
-            valueType: "boolean",
-            sender: createPhiBuilderControllerAddress(),
-            receiver: landingSelectAddress,
-            timestamp: Date.now(),
-        });
-    }, [dispatchSignal, landingSelectAddress, landingSelectEnabled]);
+    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";
     /*
-     * What the Area currently says about being found, and whether it may be answered here.
-     *
      * Only Public is ever asked: every other Area is authenticated and is not indexed whatever is
-     * stored, so its switches stand at the Public default and are shown as unanswerable rather than
-     * hidden -- the dialog is the same dialog in every Area, and a control that vanishes reads as a
-     * feature that is missing. Said in the switches' own Page scope, for the reason the landing Select
-     * is: the workspace header belongs to the Page.
+     * stored, so its switches stand at what is actually the case and are shown as unanswerable rather
+     * than hidden -- the dialog is the same dialog in every Area, and a control that vanishes reads as
+     * a feature that is missing. `seoLocked` is how the Form is told which Area this is, because a
+     * field may only ask its own record.
      */
-    const seoIndexAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_SHELLS_WIDGET_IDS.widgetAreaSeoIndex), []);
-    const seoSitemapAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_SHELLS_WIDGET_IDS.widgetAreaSeoSitemap), []);
-    const titleTemplateAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_SHELLS_WIDGET_IDS.widgetAreaTitleTemplate), []);
-    const defaultTitleAddress = useMemo(() => createPhiSignalAddress("cms", PHI_BUILDER_SHELLS_WIDGET_IDS.widgetAreaDefaultTitle), []);
-    const areaMeta = readPhiBuilderEffectiveAreaMeta(state, state.area);
-    const seoAnswerable = state.area === "public";
-    // Outside Public the switches state the fact rather than the default: those Areas are not indexed
-    // and are in no sitemap, whatever a stored value from some earlier Area would suggest.
     const seoIndex = seoAnswerable && (areaMeta?.index ?? PHI_AREA_META_PUBLIC_DEFAULTS.index);
     const seoSitemap = seoAnswerable && (areaMeta?.sitemap ?? PHI_AREA_META_PUBLIC_DEFAULTS.sitemap);
     /*
@@ -398,65 +384,66 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
      */
     const titleTemplate = areaMeta?.titleTemplate ?? "";
     const defaultTitle = areaMeta?.defaultTitle ?? "";
+    /*
+     * The two Selects answer one question between them, which is why both are filled from the same
+     * sentence: the first says what the root does, the second which application is answered, and a
+     * landing whose applicant was cleared is "the Builder authors it" rather than nothing said.
+     */
+    const areaRootRouteValue = !areaRootRoute
+        ? PHI_BUILDER_AREA_ROOT_ROUTE_AUTOMATIC
+        : areaRootRoute.mode === "landing"
+            ? PHI_BUILDER_AREA_ROOT_ROUTE_LANDING
+            : areaRootRoute.target;
+    const areaLandingPageValue = areaRootRoute?.mode === "landing" && areaRootRoute.target
+        ? areaRootRoute.target
+        : PHI_BUILDER_AREA_LANDING_PAGE_EMPTY;
     /**
      * Everything the Area settings dialog shows, said in one place.
      *
-     * Called from two moments, and it has to be both. The effect below covers a value that changes while
-     * the dialog stands open -- an undo, a switch between Areas. The dialog opening covers the far more
-     * common case: the controls live inside an Overlay and do not exist until it opens, so the state
-     * this controller stated at page load reached nobody. A signal is delivered once and is then spent;
-     * the mount that comes minutes later hears nothing, and the control would show its resting value as
-     * though it were the Area's answer.
+     * Called from two moments, and it has to be both. The effect below covers a value that changes
+     * while the dialog stands open -- an undo, a switch between Areas. The dialog opening covers the
+     * far more common case: the Form lives inside an Overlay and does not exist until it opens, so the
+     * record this controller stated at page load reached nobody. A signal is delivered once and is then
+     * spent; the mount that comes minutes later hears nothing, and the Form would show its resting
+     * values as though they were the Area's answer.
      */
     const publishAreaSettingsState = (correlationId) => {
-        for (const [receiver, checked] of [
-            [seoIndexAddress, seoIndex],
-            [seoSitemapAddress, seoSitemap],
-        ]) {
-            dispatchSignal({
-                scope: "page",
-                channel: "seoValue",
-                action: "change",
-                value: checked,
-                valueType: "boolean",
-                sender: createPhiBuilderControllerAddress(),
-                receiver,
-                ...(correlationId ? { correlationId } : {}),
-                timestamp: Date.now(),
-            });
-            dispatchSignal({
-                scope: "page",
-                channel: "enabled",
-                action: "change",
-                value: seoAnswerable,
-                valueType: "boolean",
-                sender: createPhiBuilderControllerAddress(),
-                receiver,
-                ...(correlationId ? { correlationId } : {}),
-                timestamp: Date.now(),
-            });
-        }
-        for (const [receiver, text] of [
-            [titleTemplateAddress, titleTemplate],
-            [defaultTitleAddress, defaultTitle],
-        ]) {
-            dispatchSignal({
-                scope: "page",
-                channel: "titleValue",
-                action: "change",
-                value: text,
-                valueType: "string",
-                sender: createPhiBuilderControllerAddress(),
-                receiver,
-                ...(correlationId ? { correlationId } : {}),
-                timestamp: Date.now(),
-            });
-        }
+        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",
+                },
+            },
+            valueType: "json",
+            valueSchema: PHI_SIGNAL_VALUE_SCHEMAS.formValues,
+            sender: createPhiBuilderControllerAddress(),
+            receiver: areaSettingsFormControllerAddress,
+            ...(correlationId ? { correlationId } : {}),
+            timestamp: Date.now(),
+        });
     };
     const publishAreaSettingsStateEvent = useEffectEvent(publishAreaSettingsState);
     useEffect(() => {
         publishAreaSettingsStateEvent();
-    }, [defaultTitle, seoAnswerable, seoIndex, seoSitemap, titleTemplate]);
+    }, [
+        areaLandingPageValue,
+        areaRootRouteValue,
+        areaSettingsOpenCount,
+        defaultTitle,
+        seoAnswerable,
+        seoIndex,
+        seoSitemap,
+        titleTemplate,
+    ]);
     /*
      * The Area settings dialog, opened and closed by the two commands that ask for it.
      *
@@ -929,6 +916,28 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             initializedEffectsCorrelationRef.current = null;
             return;
         }
+        /*
+         * The Transparency as it is being dragged, drawn on the node and written nowhere.
+         *
+         * No correlation to check: this rides no workflow, it is the open editor talking, and the store
+         * only keeps the picture while the request it names is the one that stands. The base is what the
+         * editor opened with, so the one value being chosen is the only one that moves -- and cancelling
+         * needs nothing put back, because the request going away takes the picture with it.
+         */
+        if (effectsRequest &&
+            signal.receiver === createPhiBuilderControllerAddress() &&
+            signal.channel === "effectsPreview:appearance" &&
+            signal.action === "change" &&
+            signal.valueSchema === PHI_SIGNAL_VALUE_SCHEMAS.formValues) {
+            const live = readPhiRuntimeFormValuesSignalValue(signal.value);
+            if (!live)
+                return;
+            previewPhiDeveloperBuilderEffects(defaultArea, effectsRequest.correlationId, {
+                ...effectsRequest.effects,
+                opacity: readPhiBuilderEffectsOpacity(live.values),
+            });
+            return;
+        }
         if (signal.scope === "area" &&
             signal.channel === "area" &&
             signal.action === "change" &&
@@ -1099,7 +1108,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             if (builderWorkspaceKey !== "pages" || typeof signal.value !== "string" || signal.value.length === 0) {
                 return;
             }
-            const nextPageKey = resolvePhiBuilderPageKeyFromCatalogPath(effectiveArea, signal.value, currentPageTree);
+            const nextPageKey = resolvePhiBuilderOfferedPageKeyFromCatalogPath(offeredCatalogState, effectiveArea, signal.value);
             if (!nextPageKey) {
                 return;
             }
@@ -1118,7 +1127,7 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             const nextPageKey = typeof next.pageKey === "string" && next.pageKey.length > 0
                 ? next.pageKey
                 : typeof next.value === "string" && next.value.length > 0
-                    ? resolvePhiBuilderPageKeyFromCatalogPath(state.area, next.value, resolvePhiBuilderActivePageCatalog(state.area, state.modulePresetPagesByArea, state.customPages, state.persistedPageCatalogByArea))
+                    ? resolvePhiBuilderOfferedPageKeyFromCatalogPath(offeredCatalogState, state.area, next.value)
                     : null;
             if (!nextPageKey) {
                 return;
@@ -1320,116 +1329,110 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             return;
         }
         /*
-         * Where the target Area's root goes.
+         * Everything the Area settings dialog was asked, arriving at once.
          *
-         * The Select emits one string: a sentinel for the two answers that are not a Page, or a Page
-         * reference. It lands in the structure draft, which states `config.shell` whole on every save.
+         * One message instead of the four channels the separate Controls each had, because a Form
+         * answers as a record: what the root does, which application it answers, the two titles and
+         * the two search-engine switches are read out of it here and written into the structure draft.
+         *
+         * Recorded like every other edit in this workspace, and for the same reason. What the Shell
+         * says about itself is not in its Region tree, so it used to pass the history by -- the front
+         * door was the one thing in `/shells` that could be changed and not taken back. The scope is
+         * the structure workspace because that is the only surface this dialog opens on.
          */
         if (signal.scope === "area" &&
-            signal.channel === "rootRoute" &&
+            signal.channel === "areaSettingsForm" &&
             signal.action === "change" &&
+            signal.valueSchema === PHI_SIGNAL_VALUE_SCHEMAS.formValues &&
             signal.receiver === createPhiBuilderControllerAddress()) {
-            if (typeof signal.value !== "string") {
+            const submitted = readPhiRuntimeFormValuesSignalValue(signal.value);
+            if (!submitted) {
                 return;
             }
-            const currentRootRoute = readPhiBuilderEffectiveAreaRootRoute(state, state.area);
+            const values = submitted.values;
+            const historyContext = createPhiBuilderHistoryContext({
+                workspace: "structure",
+                area: state.area,
+            });
+            const rootRouteAnswer = typeof values.areaRootRoute === "string"
+                ? values.areaRootRoute
+                : null;
             /*
-             * Recorded like every other edit in this workspace, and for the same reason.
-             *
-             * What the Shell says about itself is not in its Region tree, so it used to pass the history by
-             * -- the front door was the one thing in `/shells` that could be changed and not taken back.
-             * The scope is the structure workspace because that is the only surface these Selects appear on.
+             * The landing applicant is read only where it was asked. A root that forwards leaves that
+             * field out of the Form entirely, and reading it back would store an applicant against a
+             * root that has no slot to fill.
              */
-            setPhiDeveloperBuilderAreaRootRoute(state.area, signal.value === PHI_BUILDER_AREA_ROOT_ROUTE_AUTOMATIC
-                ? null
-                : signal.value === PHI_BUILDER_AREA_ROOT_ROUTE_LANDING
-                    // Switching back to a landing keeps the applicant that was chosen before, if there was
-                    // one: the two Selects answer one question between them, and the second one's answer is
-                    // not something the first one just unsaid.
-                    ? { mode: "landing", ...(currentRootRoute?.mode === "landing" && currentRootRoute.target
-                            ? { target: currentRootRoute.target }
-                            : {}) }
-                    : { mode: "redirect", target: signal.value }, {
-                historyContext: createPhiBuilderHistoryContext({ workspace: "structure", area: state.area }),
-                historyLabel: "Change root route",
-            });
-            return;
-        }
-        /*
-         * Which landing stands at the root, among those offered.
-         *
-         * Only reachable while the Area is set to a landing, because that is when the Select is enabled.
-         * Clearing it is an answer of its own -- a landing without an applicant, whose tree the Site
-         * authors itself -- so an empty value stores the mode without a target rather than nothing.
-         */
-        if (signal.scope === "area" &&
-            signal.channel === "landingPage" &&
-            signal.action === "change" &&
-            signal.receiver === createPhiBuilderControllerAddress()) {
-            const target = typeof signal.value === "string" &&
-                signal.value.length > 0 &&
-                signal.value !== PHI_BUILDER_AREA_LANDING_PAGE_EMPTY
-                ? signal.value
+            const landingAnswer = rootRouteAnswer === PHI_BUILDER_AREA_ROOT_ROUTE_LANDING &&
+                typeof values.areaLandingPage === "string" &&
+                values.areaLandingPage !== PHI_BUILDER_AREA_LANDING_PAGE_EMPTY
+                ? values.areaLandingPage
                 : null;
-            setPhiDeveloperBuilderAreaRootRoute(state.area, target ? { mode: "landing", target } : { mode: "landing" }, {
-                historyContext: createPhiBuilderHistoryContext({ workspace: "structure", area: state.area }),
-                historyLabel: "Change landing page",
-            });
-            return;
-        }
-        /*
-         * Whether the Area may be found, and whether its Pages are listed.
-         *
-         * Two switches, one sentence each, stored key by key: the answers are given one at a time and
-         * the one nobody touched has to keep saying what it said. Only Public can reach here at all,
-         * because only there are the switches enabled.
-         */
-        if (signal.scope === "area" &&
-            (signal.channel === "seoIndex" || signal.channel === "seoSitemap") &&
-            signal.action === "change" &&
-            signal.receiver === createPhiBuilderControllerAddress()) {
-            if (typeof signal.value !== "boolean") {
-                return;
+            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" });
             }
-            setPhiDeveloperBuilderAreaMeta(state.area, signal.channel === "seoIndex" ? { index: signal.value } : { sitemap: signal.value }, {
-                historyContext: createPhiBuilderHistoryContext({ workspace: "structure", area: state.area }),
-                historyLabel: "Change area SEO",
-            });
+            /*
+             * 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" });
+            dispatchAreaSettingsDialog(false, signal.correlationId);
             return;
         }
         /*
-         * What the Area puts in the title of its Pages.
+         * The dialog the Form stands in, opened from the workspace header and closed from its footer.
          *
-         * Stored key by key like the switches above, and for the same reason. Empty is stored as empty
-         * rather than removed: the Area was asked and answered "the Site's name", which is what the
-         * reader resolves an absent template to anyway -- but an Area that has never been asked must
-         * stay distinguishable from one that was, or the next unrelated save would write a guess.
+         * Closing is not the controller's own move any more. The footer button asks the Form for what
+         * it holds, the Form answers on `areaSettingsForm`, and the handler above writes it and closes
+         * -- so the dialog cannot go while the answers are still only on the screen.
          */
-        if (signal.scope === "area" &&
-            (signal.channel === "titleTemplate" || signal.channel === "defaultTitle") &&
-            signal.action === "change" &&
-            signal.receiver === createPhiBuilderControllerAddress()) {
-            if (typeof signal.value !== "string") {
-                return;
-            }
-            setPhiDeveloperBuilderAreaMeta(state.area, signal.channel === "titleTemplate"
-                ? { titleTemplate: signal.value }
-                : { defaultTitle: signal.value }, {
-                historyContext: createPhiBuilderHistoryContext({ workspace: "structure", area: state.area }),
-                historyLabel: "Change area title",
-            });
-            return;
-        }
-        /* The dialog those switches stand in, opened from the workspace header and closed from its footer. */
         if (signal.scope === "area" &&
             signal.channel === "areaSettings" &&
             signal.action === "activate" &&
             signal.valueType === "string" &&
             signal.receiver === createPhiBuilderControllerAddress()) {
-            const open = signal.value === "open";
-            dispatchAreaSettingsDialog(open, signal.correlationId);
-            if (open) {
-                publishAreaSettingsState(signal.correlationId);
+            if (signal.value === "open") {
+                dispatchAreaSettingsDialog(true, signal.correlationId);
+                setAreaSettingsOpenCount((count) => count + 1);
+                return;
+            }
+            /*
+             * Leaving without answering. The Form is told to drop what was typed rather than only being
+             * hidden: it is mounted with the Overlay and stays mounted, so an unsent answer left in it
+             * would be sitting there the next time the dialog opens -- beside the values the controller
+             * 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(),
+            });
+            if (leaving) {
+                dispatchAreaSettingsDialog(false, signal.correlationId);
             }
             return;
         }
@@ -1919,7 +1922,11 @@ function usePhiDeveloperBuilderWorkspaceController(defaultArea, options = {}) {
             timestamp: Date.now(),
         });
     }, [debugSwitchArmed, debugSwitchAddress, dispatchSignal]);
-    return pageMetaDialog;
+    /*
+     * 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, }) {
     const controller = usePhiDeveloperBuilderWorkspaceController(defaultArea, {

package/plugins/runtime-modules/client-area-contributions/accounting.d.ts

@@ -1 +1 @@
-export declare const PHI_ACCOUNTING_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS: readonly [import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution, ...import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution[], import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution, import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution];
+export declare const PHI_ACCOUNTING_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS: readonly [import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution, ...import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution[], import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution];

package/plugins/runtime-modules/client-area-contributions/accounting.js

@@ -1,14 +1,7 @@
 "use client";
-import { definePhiRuntimeModuleControllerClientAreaContribution } from "../area-contributions-controller-client";
-import { PHI_ACCOUNTING_RUNTIME_MODULE_ID } from "../accounting/ids";
 import { PHI_COMMON_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS } from "./common";
 import { PHI_DASHBOARD_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTION } from "../dashboard/client";
-import { PhiLazyAccountingRuntimeControllerClient } from "../accounting/client";
 export const PHI_ACCOUNTING_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS = [
     ...PHI_COMMON_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS,
     PHI_DASHBOARD_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTION,
-    definePhiRuntimeModuleControllerClientAreaContribution({
-        moduleId: PHI_ACCOUNTING_RUNTIME_MODULE_ID,
-        Controller: PhiLazyAccountingRuntimeControllerClient,
-    }),
 ];

package/plugins/runtime-modules/client-area-contributions/app.js

@@ -1,13 +1,13 @@
 "use client";
 import { definePhiRuntimeModuleControllerClientAreaContribution } from "../area-contributions-controller-client";
-import { PHI_APP_RUNTIME_MODULE_ID } from "../app/ids";
 import { PHI_AUTH_RUNTIME_MODULE_ID } from "../auth/ids";
 import { PHI_GROUPS_RUNTIME_MODULE_ID } from "../groups/ids";
+import { PHI_THREADS_RUNTIME_MODULE_ID } from "../threads/ids";
 import { PHI_COMMON_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS } from "./common";
 import { PHI_DASHBOARD_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTION } from "../dashboard/client";
 import { PhiLazyAuthRuntimeControllerClient } from "../auth/client";
 import { PhiLazyGroupsRuntimeControllerClient } from "../groups/client";
-import { PhiLazyAppRuntimeControllerClient } from "../app/client";
+import { PhiLazyThreadsRuntimeControllerClient } from "../threads/client";
 export const PHI_APP_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS = [
     ...PHI_COMMON_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS,
     PHI_DASHBOARD_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTION,
@@ -20,7 +20,7 @@ export const PHI_APP_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS = [
         Controller: PhiLazyGroupsRuntimeControllerClient,
     }),
     definePhiRuntimeModuleControllerClientAreaContribution({
-        moduleId: PHI_APP_RUNTIME_MODULE_ID,
-        Controller: PhiLazyAppRuntimeControllerClient,
+        moduleId: PHI_THREADS_RUNTIME_MODULE_ID,
+        Controller: PhiLazyThreadsRuntimeControllerClient,
     }),
 ];

package/plugins/runtime-modules/client-area-contributions/public.d.ts

@@ -1 +1 @@
-export declare const PHI_PUBLIC_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS: readonly [import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution, ...import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution[], import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution, import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution];
+export declare const PHI_PUBLIC_RUNTIME_MODULE_CONTROLLER_CLIENT_AREA_CONTRIBUTIONS: readonly [import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution, ...import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution[], import("../area-contributions-controller-client").PhiRuntimeModuleControllerClientAreaContribution];