@phis/ui 0.2.1 → 0.3.0

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

@@ -1,28 +1,26 @@
 "use client";
-import { useState } from "react";
-import { usePhiConfirmDialog } from "../../../components/controls/phi-confirm-dialog";
-import { PHI_SIGNAL_VALUE_SCHEMAS } from "../../../types/signals";
-import { usePhiSignalDispatcher } from "../../../components/runtime/runtime-signal-bus";
-import { usePhiApplicationFeedback } from "../../../components/runtime/use-phi-application-feedback";
-import { createPhiBuilderControllerAddress } from "./controller/address";
-import { createPhiDefaultAreaRuntimeModuleIds } from "../area-module-defaults";
-import { getPhiBuilderDefaultRegionDraft } from "./region-defaults";
-import { getPhiBuilderRegionDraftKey, PHI_BUILDER_PAGE_REGION_KEYS, } from "./region-keys";
-import { resolvePhiBuilderCmsStoragePath } from "../../../helpers/cms-paths";
-import { resolvePhiBuilderActivePageCatalog, resolvePhiBuilderActivePageKey, resolvePhiBuilderPagePresetSource, } from "../../../helpers/cms-page-catalog";
-import { deleteCmsDraft } from "../../../helpers/cms-draft-delete";
-import { buildPhiBuilderLiveHref, clearPhiDeveloperBuilderDraftAllocation, createPhiDeveloperBuilderInitialPageDrafts, discardPhiDeveloperBuilderModulesDraft, getPhiDeveloperBuilderModulesDraftAllocation, savePhiDeveloperBuilderModulesDraft, publishPhiDeveloperBuilderModulesDraft, previewPhiDeveloperBuilderDraft, publishPhiDeveloperBuilderDraft, savePhiDeveloperBuilderDraft, } from "./persistence";
-import { clearPhiBuilderNavigationDraft, getPhiBuilderNavigationDraftSnapshot, updatePhiBuilderNavigationDraft, restorePhiBuilderNavigationDraft, setPhiBuilderNavigationDraft, } from "./navigation-store";
-import { deletePhiBuilderNavigationDraft, loadPhiBuilderNavigationDraft, loadPhiBuilderNavigationScope, publishPhiBuilderNavigationDraft, savePhiBuilderNavigationDraft, } from "./navigation-persistence";
-import { builderWorkspaceStore, splitWorkspacePatch, getPhiDeveloperRegionDraftsSnapshot, mergePhiDeveloperDeletedPageDrafts, mergePhiDeveloperRegionDrafts, restorePhiDeveloperBuilderAreaMeta, restorePhiDeveloperRegionDrafts, setPhiDeveloperBuilderAreaRootRoute, setPhiDeveloperRegionDraftsWithHistory, } from "./developer-workspace-store";
-import { findPhiBuilderNavigationSurface } from "../../../helpers/cms-navigation-catalog";
-import { createPhiBuilderHistoryContext, phiBuilderHistory, } from "./history";
-import { usePhiBuilderModuleMetas } from "./plugin-meta-store";
-import { clearPhiBuilderModuleAreasDirty } from "./runtime-module-selection";
-import { phiWorkspaceCatalogStore } from "../../../components/workspace/catalog-store";
-import { applyPhiBuilderNavigationFolderTargets, refreshPhiBuilderNavigationFolderAddresses, } from "./navigation-folder-address";
-import { createPhiBuilderNavigationPathContext } from "./navigation-path-context";
-export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea, effectiveNavKey, effectivePageKey, pathname, reportSaved, shellPresetDraftsByArea, state, }) {
+import { useRef } from "react";
+import { useRouter } from "next/navigation";
+import { usePhiConfirmDialog } from "../../../../components/controls/phi-confirm-dialog";
+import { formatPhiHistoryMoveMessage, } from "../../../../components/widgets/label-types/history";
+import { usePhiApplicationFeedback } from "../../../../components/runtime/use-phi-application-feedback";
+import { createPhiDefaultAreaRuntimeModuleIds } from "../../area-module-defaults";
+import { getPhiBuilderRegionDraftKey } from "../region-keys";
+import { resolvePhiBuilderCmsStoragePath } from "../../../../helpers/cms-paths";
+import { resolvePhiBuilderActivePageCatalog, resolvePhiBuilderActivePageKey, resolvePhiBuilderPagePresetSource, } from "../../../../helpers/cms-page-catalog";
+import { deleteCmsDraft } from "../../../../helpers/cms-draft-delete";
+import { buildPhiBuilderLiveHref, clearPhiDeveloperBuilderDraftAllocation, createPhiDeveloperBuilderInitialPageDrafts, getPhiDeveloperBuilderModulesDraftAllocation, savePhiDeveloperBuilderModulesDraft, publishPhiDeveloperBuilderModulesDraft, previewPhiDeveloperBuilderDraft, publishPhiDeveloperBuilderDraft, savePhiDeveloperBuilderDraft, } from "../persistence";
+import { clearPhiBuilderNavigationDraft, getPhiBuilderNavigationDraftSnapshot, updatePhiBuilderNavigationDraft, restorePhiBuilderNavigationDraft, setPhiBuilderNavigationDraft, } from "../navigation-store";
+import { deletePhiBuilderNavigationDraft, loadPhiBuilderNavigationDraft, loadPhiBuilderNavigationScope, publishPhiBuilderNavigationDraft, savePhiBuilderNavigationDraft, } from "../navigation-persistence";
+import { builderWorkspaceStore, splitWorkspacePatch, getPhiDeveloperRegionDraftsSnapshot, mergePhiDeveloperRegionDrafts, restorePhiDeveloperBuilderAreaMeta, restorePhiDeveloperRegionDrafts, setPhiDeveloperBuilderAreaRootRoute, } from "../developer-workspace-store";
+import { findPhiBuilderNavigationSurface } from "../../../../helpers/cms-navigation-catalog";
+import { createPhiBuilderHistoryContext, phiBuilderHistory, } from "../history";
+import { usePhiBuilderModuleMetas } from "../plugin-meta-store";
+import { clearPhiBuilderModuleAreasDirty } from "../runtime-module-selection";
+import { phiWorkspaceCatalogStore } from "../../../../components/workspace/catalog-store";
+import { applyPhiBuilderNavigationFolderTargets, refreshPhiBuilderNavigationFolderAddresses, } from "../navigation-folder-address";
+import { createPhiBuilderNavigationPathContext } from "../navigation-path-context";
+export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea, effectiveNavKey, effectivePageKey, pathname, captureHistoryHead, reportSaved, hasUnsavedChanges, shellPresetDraftsByArea, state, historyLabels, }) {
     /*
      * Every one of these is a command from a toolbar somewhere else, so there is nothing on screen to
      * hang a Popconfirm on. Drawn as a Dialog by this Controller rather than asked of Ant Design's
@@ -30,10 +28,17 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
      * only the Builder asks.
      */
     const { confirm, confirmDialog } = usePhiConfirmDialog();
+    const router = useRouter();
     const { showMessage } = usePhiApplicationFeedback();
-    const dispatchSignal = usePhiSignalDispatcher();
     const builderModuleMetas = usePhiBuilderModuleMetas(effectiveArea);
-    const [activeDraftAction, setActiveDraftAction] = useState(null);
+    /*
+     * The draft action in progress. A ref, not state: two commands arriving in one tick both read the
+     * state from before either set it, and both ran -- the second one into a 409.
+     */
+    const activeDraftActionRef = useRef(null);
+    const setActiveDraftAction = (next) => {
+        activeDraftActionRef.current = next;
+    };
     const currentPageTree = resolvePhiBuilderActivePageCatalog(effectiveArea, state.modulePresetPagesByArea, state.customPages, state.persistedPageCatalogByArea);
     const navigationSurface = findPhiBuilderNavigationSurface(state.navigationSurfacesByArea[effectiveArea] ?? [], effectiveNavKey);
     async function resolveCurrentNavigationDraft() {
@@ -118,20 +123,17 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
         if (local.length > 0) {
             return local;
         }
-        const areas = [];
-        for (const [area, source] of Object.entries(state.areaPresetSourcesByArea)) {
-            if (!source) {
-                continue;
-            }
-            const allocation = await getPhiDeveloperBuilderModulesDraftAllocation({
-                area: area,
-                areaPresetSource: source,
-            }).catch(() => null);
-            if (allocation) {
-                areas.push(area);
-            }
-        }
-        return areas;
+        /*
+         * Asked side by side, and a failed read is the command's failure: taking it for "no draft" told the
+         * author there was nothing to publish while a draft stood.
+         */
+        const asked = await Promise.all(Object.entries(state.areaPresetSourcesByArea).flatMap(([area, source]) => source
+            ? [getPhiDeveloperBuilderModulesDraftAllocation({
+                    area: area,
+                    areaPresetSource: source,
+                }).then((allocation) => allocation ? area : null)]
+            : []));
+        return asked.filter((area) => area !== null);
     }
     async function runSaveCommand(workspaceKind) {
         if (workspaceKind === "modules") {
@@ -140,6 +142,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
                 showMessage({ level: "info", content: "No module selection changes to save." });
                 return;
             }
+            const savedAt = captureHistoryHead();
             let lastRevisionId = null;
             for (const area of areas) {
                 const modulesResult = await savePhiDeveloperBuilderModulesDraft(state, getPhiDeveloperRegionDraftsSnapshot(), {
@@ -156,7 +159,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
                 });
                 lastRevisionId = modulesResult.revisionId;
             }
-            reportSaved("draft", lastRevisionId);
+            reportSaved("draft", lastRevisionId, savedAt);
             showMessage({
                 level: "success",
                 content: areas.length === 1
@@ -165,6 +168,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
             });
             return;
         }
+        const savedAt = captureHistoryHead();
         const result = workspaceKind === "navigation"
             ? await Promise.resolve().then(async () => {
                 const navigationDraft = await resolveCurrentNavigationDraft();
@@ -178,7 +182,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
                     pageKey: effectivePageKey,
                 },
             });
-        reportSaved("draft", result.revisionId);
+        reportSaved("draft", result.revisionId, savedAt);
         if (!("savedScopes" in result)) {
             const navigationDraft = await resolveCurrentNavigationDraft();
             setPhiBuilderNavigationDraft(effectiveNavKey, {
@@ -201,6 +205,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
                 showMessage({ level: "info", content: "No module selection changes to publish." });
                 return;
             }
+            const savedAt = captureHistoryHead();
             for (const area of areas) {
                 await publishPhiDeveloperBuilderModulesDraft(state, getPhiDeveloperRegionDraftsSnapshot(), {
                     builderPlugins: builderModuleMetas.plugins,
@@ -208,7 +213,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
                 });
             }
             clearPhiBuilderModuleAreasDirty(defaultArea);
-            reportSaved("published", null);
+            reportSaved("published", null, savedAt);
             showMessage({
                 level: "success",
                 content: areas.length === 1
@@ -217,6 +222,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
             });
             return;
         }
+        const savedAt = captureHistoryHead();
         if (workspaceKind === "navigation") {
             const navigationDraft = await resolveCurrentNavigationDraft();
             const published = await publishPhiBuilderNavigationDraft(navigationDraft);
@@ -232,7 +238,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
                 },
             });
         }
-        reportSaved("published", null);
+        reportSaved("published", null, savedAt);
         showMessage({ level: "success", content: "Published CMS draft." });
     }
     async function runPreviewCommand(workspaceKind) {
@@ -263,106 +269,82 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
             area: effectiveArea,
             pageKey: effectivePageKey,
         };
+        /*
+         * A preview is of the saved draft or of nothing. Opening the live page when there was none -- or when
+         * the read failed -- let the author take what is published for their draft; the failure is the
+         * command's error now. What the saved draft leaves out is said before it opens.
+         */
         const result = await previewPhiDeveloperBuilderDraft(state, workspaceKind, {
             pathname,
             scope: previewScope,
-        }).catch(() => null);
-        const href = result?.previewHref ??
-            buildPhiBuilderLiveHref(previewScope.area, previewScope.pageKey, currentPageTree, workspaceKind);
-        window.open(href, "_blank", "noopener,noreferrer");
-    }
-    /**
-     * Puts the Module's shell back into the draft, as an edit rather than as an erasure.
-     *
-     * It used to delete the draft on the server and clear the history behind it, which made "start over"
-     * the one gesture in this workspace that could not be taken back -- and it promised the wrong thing
-     * twice over: the dialog said what is published stays live while the editor came back showing the
-     * preset, two different answers that only agreed while nobody had published.
-     *
-     * Nothing is deleted now. The preset's Regions are written into the draft as one recorded step, so
-     * undo returns what was there, the previous draft stays in the revision history, and what is live
-     * stays live until somebody publishes. That also makes this the only way back to where a Module
-     * started: revisions know the states this Site has been in, and if it was customised before it was
-     * first published, the Module's own starting point was never one of them.
-     *
-     * The Area's root route and its SEO answers are deliberately untouched. They say where the Area lives
-     * and how it describes itself, which is not what its shell looks like; the old command dropped them
-     * only because it had deleted the draft that held them.
-     */
-    function confirmResetShell() {
-        const presetDrafts = shellPresetDraftsByArea[effectiveArea] ?? null;
-        if (!presetDrafts) {
-            showMessage({ level: "warning", content: "No shell preset found for the current area." });
-            return;
-        }
-        confirm({
-            title: "Start from the Module's shell?",
-            content: "This puts the Module's shell into the draft, replacing what the editor is showing. " +
-                "Nothing is deleted -- undo takes it back, and what is published stays live until you publish.",
-            confirmLabel: "Start from the preset",
-            cancelLabel: "Cancel",
-            onConfirm: () => {
-                setPhiDeveloperRegionDraftsWithHistory(presetDrafts, {
-                    historyContext: createPhiBuilderHistoryContext({
-                        workspace: "structure",
-                        area: effectiveArea,
-                    }),
-                    historyLabel: "Start from the Module's shell",
-                });
-                showMessage({ level: "success", content: "The Module's shell is in the draft." });
-            },
         });
+        if (hasUnsavedChanges) {
+            showMessage({
+                level: "warning",
+                content: "The preview shows the last saved draft. Save to include your latest changes.",
+            });
+        }
+        window.open(result.previewHref, "_blank", "noopener,noreferrer");
     }
     /**
-     * Discards the Area's Module draft and puts the selection back to what a fresh Area would run with.
+     * Throws away the open draft of the Area's shell or of a Page, and shows what is published again.
+     *
+     * A draft is the only thing this deletes: nothing live changes, and the revision history keeps what was
+     * published. Going back to a Module's preset is a different act -- it deletes the Site's override and
+     * changes what is live at once -- and it lives in Revisions, with the history it discards in view
+     * (phis-server CONTENT.md, Reset). Putting the preset into the draft instead, as this command once did,
+     * published a frozen copy of the preset that no later Module update would reach.
      *
-     * Deliberately the code-owned default rather than a re-fetch of the published selection. The Shell
-     * reset above does ask the server again, because what it discards -- the Area's root route -- decides
-     * which Pages another workspace may open, and a stale answer there is a Page list describing a Site
-     * that is not served. A Module selection has no such reader: "back to the start" is a complete answer
-     * once there is no draft left to describe something in between.
+     * The workspace is read again afterwards rather than patched: what stands now is the published state,
+     * which only the server holds.
      */
-    function confirmResetModules() {
-        void confirmResetModulesForAreas();
-    }
-    async function confirmResetModulesForAreas() {
-        const areas = await resolveModulesCommandAreasWithServer();
-        if (areas.length === 0) {
-            showMessage({ level: "info", content: "No module selection changes to reset." });
-            return;
-        }
+    function confirmDiscardDraft(workspaceKind) {
         confirm({
-            title: "Delete Module drafts?",
-            content: "This removes the open DB Module drafts and restores the shared default selection for every touched area.",
-            confirmLabel: "Delete and reset",
+            title: "Discard the draft?",
+            content: "This deletes the open draft. The editor shows what is published again, and nothing live changes.",
+            confirmLabel: "Discard draft",
             danger: true,
             cancelLabel: "Cancel",
             onConfirm: async () => {
+                if (activeDraftActionRef.current != null) {
+                    return;
+                }
                 setActiveDraftAction("reset");
                 try {
-                    for (const area of areas) {
-                        await discardPhiDeveloperBuilderModulesDraft({
-                            area,
-                            areaPresetSource: state.areaPresetSourcesByArea[area] ?? null,
+                    if (workspaceKind === "structure") {
+                        const source = state.areaPresetSourcesByArea[effectiveArea] ?? null;
+                        await deleteCmsDraft("/api/site/cms/area", {
+                            area: effectiveArea,
+                            ownerModuleId: source?.ownerModuleId,
+                            presetKey: source?.presetKey,
                         });
                     }
-                    phiWorkspaceCatalogStore.patch(defaultArea, (current) => ({
-                        ...current,
-                        runtimeModuleIdsByArea: {
-                            ...(current.runtimeModuleIdsByArea ?? {}),
-                            ...Object.fromEntries(areas.map((area) => [area, createPhiDefaultAreaRuntimeModuleIds(area)])),
-                        },
-                    }));
-                    clearPhiBuilderModuleAreasDirty(defaultArea);
+                    else {
+                        const pages = resolvePhiBuilderActivePageCatalog(effectiveArea, state.modulePresetPagesByArea, state.customPages, state.persistedPageCatalogByArea);
+                        const sourcePreset = resolvePhiBuilderPagePresetSource(effectivePageKey, pages);
+                        await deleteCmsDraft("/api/site/cms/page", {
+                            area: effectiveArea,
+                            ...(sourcePreset
+                                ? { ownerModuleId: sourcePreset.ownerModuleId, presetKey: sourcePreset.presetKey }
+                                : { path: resolvePhiBuilderCmsStoragePath(effectiveArea, effectivePageKey, pages) }),
+                        });
+                    }
+                    clearPhiDeveloperBuilderDraftAllocation({
+                        area: effectiveArea,
+                        pageKey: effectivePageKey,
+                        workspaceKind,
+                    });
                     phiBuilderHistory.clear(createPhiBuilderHistoryContext({
-                        workspace: "modules",
-                        area: defaultArea,
+                        workspace: workspaceKind,
+                        area: effectiveArea,
+                        pageKey: effectivePageKey,
                     }));
-                    reportSaved("published", null);
-                    showMessage({ level: "success", content: "Reset Module drafts." });
+                    reportSaved("published", null, captureHistoryHead());
+                    showMessage({ level: "success", content: "Discarded the draft." });
+                    router.refresh();
                 }
                 catch (error) {
-                    showMessage({ level: "error", content: error instanceof Error ? error.message : "Module reset failed." });
+                    showMessage({ level: "error", content: error instanceof Error ? error.message : "Discarding the draft failed." });
                     throw error;
                 }
                 finally {
@@ -371,105 +353,74 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
             },
         });
     }
+    /**
+     * Deletes a Page the Site made, as a draft the next publish carries out.
+     *
+     * A Module's Page cannot be deleted -- its address is the Module's -- and taking it back to its preset is
+     * Revisions' act, not this one.
+     */
     function confirmResetPage() {
-        const presetDrafts = Object.fromEntries(PHI_BUILDER_PAGE_REGION_KEYS.flatMap((regionKey) => {
-            const draftKey = getPhiBuilderRegionDraftKey(effectiveArea, regionKey, effectivePageKey);
-            const draft = state.pagePresetDrafts[draftKey];
-            return draft ? [[draftKey, draft]] : [];
-        }));
-        const hasPreset = Object.keys(presetDrafts).length > 0;
+        const pages = resolvePhiBuilderActivePageCatalog(effectiveArea, state.modulePresetPagesByArea, state.customPages, state.persistedPageCatalogByArea);
+        if (resolvePhiBuilderPagePresetSource(effectivePageKey, pages)) {
+            showMessage({
+                level: "info",
+                content: "A Module's page cannot be deleted. Its revisions can take it back to the Module's preset.",
+            });
+            return;
+        }
         confirm({
-            title: hasPreset ? "Delete page override?" : "Delete page?",
-            content: hasPreset
-                ? "This removes the current DB page override and restores the shared preset."
-                : "This prepares a delete draft. The live page returns 404 after the draft is published.",
-            confirmLabel: hasPreset ? "Delete and reset" : "Create delete draft",
+            title: "Delete page?",
+            content: "This prepares a delete draft. The live page returns 404 after the draft is published.",
+            confirmLabel: "Create delete draft",
             danger: true,
             cancelLabel: "Cancel",
             onConfirm: async () => {
+                if (activeDraftActionRef.current != null) {
+                    return;
+                }
                 setActiveDraftAction("reset");
                 try {
-                    if (!hasPreset) {
-                        const nextDrafts = createPhiDeveloperBuilderInitialPageDrafts({
-                            area: effectiveArea,
-                            pageKey: effectivePageKey,
-                            title: "",
-                        });
-                        const pageDeleteDraftKey = getPhiBuilderRegionDraftKey(effectiveArea, "page_delete", effectivePageKey);
-                        mergePhiDeveloperRegionDrafts(nextDrafts);
-                        builderWorkspaceStore.patch(defaultArea, (current) => ({
-                            ...current,
-                            deletedPageDrafts: {
-                                ...current.deletedPageDrafts,
-                                [pageDeleteDraftKey]: true,
-                            },
-                        }));
-                        const result = await savePhiDeveloperBuilderDraft({
-                            ...state,
-                            deletedPageDrafts: {
-                                ...state.deletedPageDrafts,
-                                [pageDeleteDraftKey]: true,
-                            },
-                        }, {
-                            ...getPhiDeveloperRegionDraftsSnapshot(),
-                            ...nextDrafts,
-                        }, "pages", {
-                            builderPlugins: builderModuleMetas.plugins,
-                            pathname,
-                            scope: {
-                                area: effectiveArea,
-                                pageKey: effectivePageKey,
-                            },
-                        });
-                        phiBuilderHistory.clear(createPhiBuilderHistoryContext({
-                            workspace: "pages",
-                            area: effectiveArea,
-                            pageKey: effectivePageKey,
-                        }));
-                        reportSaved("draft", result.revisionId);
-                        showMessage({ level: "success", content: "Saved page delete draft." });
-                        return;
-                    }
-                    const pages = resolvePhiBuilderActivePageCatalog(effectiveArea, state.modulePresetPagesByArea, state.customPages, state.persistedPageCatalogByArea);
-                    const sourcePreset = resolvePhiBuilderPagePresetSource(effectivePageKey, pages);
-                    await deleteCmsDraft("/api/site/cms/page", {
-                        area: effectiveArea,
-                        ...(sourcePreset
-                            ? {
-                                ownerModuleId: sourcePreset.ownerModuleId,
-                                presetKey: sourcePreset.presetKey,
-                            }
-                            : {
-                                path: resolvePhiBuilderCmsStoragePath(effectiveArea, effectivePageKey, pages),
-                            }),
-                    });
-                    clearPhiDeveloperBuilderDraftAllocation({
+                    const nextDrafts = createPhiDeveloperBuilderInitialPageDrafts({
                         area: effectiveArea,
                         pageKey: effectivePageKey,
-                        workspaceKind: "pages",
+                        title: "",
                     });
-                    const nextDrafts = {};
-                    for (const regionKey of PHI_BUILDER_PAGE_REGION_KEYS) {
-                        const draftKey = getPhiBuilderRegionDraftKey(effectiveArea, regionKey, effectivePageKey);
-                        nextDrafts[draftKey] = {
-                            ...getPhiBuilderDefaultRegionDraft(regionKey),
-                            ...(presetDrafts[draftKey] ?? {}),
-                        };
-                    }
+                    const pageDeleteDraftKey = getPhiBuilderRegionDraftKey(effectiveArea, "page_delete", effectivePageKey);
                     mergePhiDeveloperRegionDrafts(nextDrafts);
-                    mergePhiDeveloperDeletedPageDrafts(effectiveArea, {
-                        [getPhiBuilderRegionDraftKey(effectiveArea, "page_delete", effectivePageKey)]: false,
+                    builderWorkspaceStore.patch(defaultArea, (current) => ({
+                        ...current,
+                        deletedPageDrafts: {
+                            ...current.deletedPageDrafts,
+                            [pageDeleteDraftKey]: true,
+                        },
+                    }));
+                    const result = await savePhiDeveloperBuilderDraft({
+                        ...state,
+                        deletedPageDrafts: {
+                            ...state.deletedPageDrafts,
+                            [pageDeleteDraftKey]: true,
+                        },
+                    }, {
+                        ...getPhiDeveloperRegionDraftsSnapshot(),
+                        ...nextDrafts,
+                    }, "pages", {
+                        builderPlugins: builderModuleMetas.plugins,
+                        pathname,
+                        scope: {
+                            area: effectiveArea,
+                            pageKey: effectivePageKey,
+                        },
                     });
                     phiBuilderHistory.clear(createPhiBuilderHistoryContext({
                         workspace: "pages",
                         area: effectiveArea,
                         pageKey: effectivePageKey,
                     }));
-                    reportSaved("published", null);
-                    showMessage({ level: "success", content: "Reset page draft." });
+                    reportSaved("draft", result.revisionId, captureHistoryHead());
+                    showMessage({ level: "success", content: "Saved page delete draft." });
                 }
                 catch (error) {
-                    showMessage({ level: "error", content: error instanceof Error ? error.message : "Page reset failed." });
+                    showMessage({ level: "error", content: error instanceof Error ? error.message : "Page delete failed." });
                     throw error;
                 }
                 finally {
@@ -486,6 +437,9 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
             danger: true,
             cancelLabel: "Cancel",
             onConfirm: async () => {
+                if (activeDraftActionRef.current != null) {
+                    return;
+                }
                 setActiveDraftAction("reset");
                 try {
                     await deletePhiBuilderNavigationDraft(effectiveNavKey);
@@ -495,19 +449,13 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
                         area: effectiveArea,
                         navKey: effectiveNavKey,
                     }));
-                    reportSaved("published", null);
-                    dispatchSignal({
-                        scope: "area",
-                        channel: "navigation",
-                        action: "reload",
-                        value: {
-                            navKey: effectiveNavKey,
-                        },
-                        valueType: "json",
-                        valueSchema: PHI_SIGNAL_VALUE_SCHEMAS.builderNavigation,
-                        sender: createPhiBuilderControllerAddress(),
-                        receiver: createPhiBuilderControllerAddress(),
-                    });
+                    reportSaved("published", null, captureHistoryHead());
+                    /*
+                     * Clearing the Draft is the reload: the Navigation table re-reads a scope with no Draft from
+                     * Core, which is the published tree now, and the canvas falls back to the surface. This sent a
+                     * `navigation/reload` to the Controller's own address once, which nothing ever answered -- and
+                     * a Controller does not hear its own echo (SIGNALS.md, "Addresses").
+                     */
                     showMessage({ level: "success", content: "Reset navigation draft." });
                 }
                 catch (error) {
@@ -521,16 +469,12 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
         });
     }
     function runResetCommand(workspaceKind) {
-        if (workspaceKind === "structure") {
-            confirmResetShell();
-            return;
-        }
-        if (workspaceKind === "pages") {
-            confirmResetPage();
+        if (workspaceKind === "structure" || workspaceKind === "pages") {
+            confirmDiscardDraft(workspaceKind);
             return;
         }
+        // A Module selection has no reset: its draft is published or changed, never set back (B4).
         if (workspaceKind === "modules") {
-            confirmResetModules();
             return;
         }
         confirmResetNavigation();
@@ -543,7 +487,7 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
         if (workspaceKind === "theme") {
             return;
         }
-        if (activeDraftAction != null) {
+        if (activeDraftActionRef.current != null) {
             return;
         }
         if (command === "reset") {
@@ -557,6 +501,11 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
             navKey: effectiveNavKey,
         });
         const applyHistorySnapshot = (snapshot) => {
+            if (snapshot.kind === "composite") {
+                for (const part of snapshot.parts)
+                    applyHistorySnapshot(part);
+                return;
+            }
             if (snapshot.kind === "regionDrafts") {
                 restorePhiDeveloperRegionDrafts(snapshot.drafts);
                 return;
@@ -600,12 +549,17 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
                 builderWorkspaceStore.patch(defaultArea, (current) => ({ ...current, ...tool }));
             }
         };
-        if (command === "undo") {
-            phiBuilderHistory.undo(historyContext, applyHistorySnapshot);
-            return;
-        }
-        if (command === "redo") {
-            phiBuilderHistory.redo(historyContext, applyHistorySnapshot);
+        /*
+         * An undo says what it took back. The canvas changes in place, and a step that moved a node out of
+         * view -- or changed a Region nobody is looking at -- would otherwise look like nothing happened.
+         */
+        if (command === "undo" || command === "redo") {
+            const entry = command === "undo"
+                ? phiBuilderHistory.undo(historyContext, applyHistorySnapshot)
+                : phiBuilderHistory.redo(historyContext, applyHistorySnapshot);
+            if (entry) {
+                showMessage({ level: "info", content: formatPhiHistoryMoveMessage(historyLabels, command, entry.action) });
+            }
             return;
         }
         setActiveDraftAction(command);
@@ -627,5 +581,5 @@ export function usePhiBuilderDraftCommandController({ defaultArea, effectiveArea
             setActiveDraftAction(null);
         });
     }
-    return { confirmResetPage, confirmResetModules, runBuilderCommand, confirmDialog };
+    return { confirmResetPage, runBuilderCommand, confirmDialog };
 }

package/plugins/runtime-modules/builder/{draft-status-controller.d.ts → controller/draft-status-controller.d.ts}

@@ -1,4 +1,9 @@
-import type { PhiDeveloperBuilderArea, PhiDeveloperBuilderCommandWorkspace, PhiDeveloperBuilderWorkspaceState } from "./developer-workspace-types";
+import type { PhiDeveloperBuilderArea, PhiDeveloperBuilderCommandWorkspace, PhiDeveloperBuilderWorkspaceState } from "../developer-workspace-types";
+/** A history scope nothing records into, for the screens that report no draft. */
+/** What `captureHistoryHead` hands out and `reportSaved` takes back; opaque to everyone in between. */
+export type PhiBuilderSavedHistoryHead = {
+    readonly head: unknown;
+};
 /**
  * The draft state of the workspace on screen, stated for the Core Draft Status Widget.
  *
@@ -19,5 +24,7 @@ export declare function usePhiBuilderDraftStatusController({ commandWorkspace, e
     effectivePageKey: string;
     state: PhiDeveloperBuilderWorkspaceState;
 }): {
-    reportSaved: (status: "draft" | "published", revisionId: number | null) => void;
+    captureHistoryHead: () => PhiBuilderSavedHistoryHead;
+    reportSaved: (status: "draft" | "published", revisionId: number | null, savedAt: PhiBuilderSavedHistoryHead) => void;
+    hasUnsavedChanges: boolean;
 };