@parhelia/core 0.4.12818 → 0.4.12871

package/dist/editor/client/SessionExpiredOverlay.js

@@ -1,7 +1,8 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, } from "../../components/ui/dialog";
+import { LockKeyhole } from "lucide-react";
+import { Dialog, DialogContent, DialogDescription, DialogTitle, } from "../../components/ui/dialog";
 import { Button } from "../../components/ui/button";
 import { ParheliaIcon } from "../ui/ParheliaIcon";
 export function SessionExpiredOverlay() {
@@ -20,6 +21,12 @@ export function SessionExpiredOverlay() {
     };
     return (_jsx(Dialog, { open: expired, 
         // Block dismissal — the only way out is to log in again.
-        onOpenChange: () => undefined, children: _jsxs(DialogContent, { "data-testid": "session-expired-overlay", showCloseButton: false, className: "sm:max-w-[460px]", onEscapeKeyDown: (event) => event.preventDefault(), onPointerDownOutside: (event) => event.preventDefault(), onInteractOutside: (event) => event.preventDefault(), children: [_jsx(DialogHeader, { children: _jsxs("div", { className: "flex items-start gap-4", children: [_jsx("div", { className: "flex size-10 shrink-0 items-center justify-center", children: _jsx(ParheliaIcon, { size: 22 }) }), _jsxs("div", { className: "flex min-w-0 flex-1 flex-col gap-1", children: [_jsx(DialogTitle, { children: "Your session has expired" }), _jsx(DialogDescription, { children: "For your security you have been signed out. Please log in again to continue." })] })] }) }), _jsx(DialogFooter, { children: _jsx(Button, { onClick: goToLogin, autoFocus: true, className: "min-w-[120px]", children: "Login" }) })] }) }));
+        onOpenChange: () => undefined, children: _jsx(DialogContent, { "data-testid": "session-expired-overlay", showCloseButton: false, className: "border-border-default/70 text-neutral-grey-100 max-w-[min(400px,calc(100%-2rem))] rounded-[18px] outline-none", overlayClassName: "bg-neutral-grey-100/45 backdrop-blur-md", 
+            // The overlay opens without user input, so an auto-focused button would
+            // show its focus ring straight away. Focus the dialog; Tab reaches Login.
+            onOpenAutoFocus: (event) => {
+                event.preventDefault();
+                event.currentTarget?.focus();
+            }, onEscapeKeyDown: (event) => event.preventDefault(), onPointerDownOutside: (event) => event.preventDefault(), onInteractOutside: (event) => event.preventDefault(), children: _jsxs("div", { className: "flex flex-col items-center px-8 pt-10 pb-8 text-center", children: [_jsxs("div", { className: "relative mb-6", children: [_jsx(ParheliaIcon, { size: 56, animated: false }), _jsx("span", { className: "text-neutral-grey-100 absolute -right-2 -bottom-2 flex size-7 items-center justify-center rounded-full border-2 border-white bg-neutral-grey-5", children: _jsx(LockKeyhole, { size: 14, strokeWidth: 1.75 }) })] }), _jsx(DialogTitle, { className: "text-xl leading-tight font-semibold", children: "Your session has expired" }), _jsx(DialogDescription, { className: "text-neutral-grey-50 mt-2 text-sm leading-relaxed text-balance", children: "For your security you have been signed out. Please log in again to continue." }), _jsx(Button, { size: "lg", onClick: goToLogin, className: "mt-7 w-full", children: "Login" })] }) }) }));
 }
 //# sourceMappingURL=SessionExpiredOverlay.js.map

package/dist/editor/client/SessionExpiredOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionExpiredOverlay.js","sourceRoot":"","sources":["../../../src/editor/client/SessionExpiredOverlay.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EACL,MAAM,EACN,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,WAAW,GACZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,UAAU,qBAAqB;IACnC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAO;QAE1C,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,CAAC,gBAAgB,CACrB,0BAA0B,EAC1B,aAA8B,CAC/B,CAAC;QACF,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CACxB,0BAA0B,EAC1B,aAA8B,CAC/B,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAC3C,CAAC,CAAC;IAEF,OAAO,CACL,KAAC,MAAM,IACL,IAAI,EAAE,OAAO;QACb,yDAAyD;QACzD,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS,YAE7B,MAAC,aAAa,mBACA,yBAAyB,EACrC,eAAe,EAAE,KAAK,EACtB,SAAS,EAAC,kBAAkB,EAC5B,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAClD,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EACvD,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,aAEpD,KAAC,YAAY,cACX,eAAK,SAAS,EAAC,wBAAwB,aACrC,cAAK,SAAS,EAAC,mDAAmD,YAChE,KAAC,YAAY,IAAC,IAAI,EAAE,EAAE,GAAI,GACtB,EACN,eAAK,SAAS,EAAC,oCAAoC,aACjD,KAAC,WAAW,2CAAuC,EACnD,KAAC,iBAAiB,+FAGE,IAChB,IACF,GACO,EAEf,KAAC,YAAY,cACX,KAAC,MAAM,IAAC,OAAO,EAAE,SAAS,EAAE,SAAS,QAAC,SAAS,EAAC,eAAe,sBAEtD,GACI,IACD,GACT,CACV,CAAC;AACJ,CAAC"}
+{"version":3,"file":"SessionExpiredOverlay.js","sourceRoot":"","sources":["../../../src/editor/client/SessionExpiredOverlay.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACL,MAAM,EACN,aAAa,EACb,iBAAiB,EACjB,WAAW,GACZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,UAAU,qBAAqB;IACnC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAO;QAE1C,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,CAAC,gBAAgB,CACrB,0BAA0B,EAC1B,aAA8B,CAC/B,CAAC;QACF,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CACxB,0BAA0B,EAC1B,aAA8B,CAC/B,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAC3C,CAAC,CAAC;IAEF,OAAO,CACL,KAAC,MAAM,IACL,IAAI,EAAE,OAAO;QACb,yDAAyD;QACzD,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS,YAE7B,KAAC,aAAa,mBACA,yBAAyB,EACrC,eAAe,EAAE,KAAK,EACtB,SAAS,EAAC,+GAA+G,EACzH,gBAAgB,EAAC,yCAAyC;YAC1D,wEAAwE;YACxE,0EAA0E;YAC1E,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE;gBACzB,KAAK,CAAC,cAAc,EAAE,CAAC;gBACtB,KAAK,CAAC,aAAoC,EAAE,KAAK,EAAE,CAAC;YACvD,CAAC,EACD,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAClD,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EACvD,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,YAEpD,eAAK,SAAS,EAAC,wDAAwD,aACrE,eAAK,SAAS,EAAC,eAAe,aAC5B,KAAC,YAAY,IAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,GAAI,EAC3C,eAAM,SAAS,EAAC,gJAAgJ,YAC9J,KAAC,WAAW,IAAC,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,GAAI,GACvC,IACH,EAEN,KAAC,WAAW,IAAC,SAAS,EAAC,qCAAqC,yCAE9C,EACd,KAAC,iBAAiB,IAAC,SAAS,EAAC,gEAAgE,6FAGzE,EAEpB,KAAC,MAAM,IAAC,IAAI,EAAC,IAAI,EAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAC,aAAa,sBAEpD,IACL,GACQ,GACT,CACV,CAAC;AACJ,CAAC"}

package/dist/editor/client/clipboardStorage.d.ts

@@ -0,0 +1,10 @@
+import type { ClipboardState } from "./editContext";
+/**
+ * The editor clipboard survives page switches and reloads so a component copied on
+ * one page can be pasted on another, even in a second browser tab.
+ */
+export declare const CLIPBOARD_STORAGE_KEY = "editor.clipboard";
+export declare function loadPersistedClipboard(): ClipboardState;
+export declare function persistClipboard(clipboard: ClipboardState): void;
+/** Parses a cross-tab `storage` event for the clipboard key; undefined when unrelated. */
+export declare function readClipboardFromStorageEvent(event: StorageEvent): ClipboardState | undefined;

package/dist/editor/client/clipboardStorage.js

@@ -0,0 +1,57 @@
+import { localStorageService } from "../services/localStorageService";
+/**
+ * The editor clipboard survives page switches and reloads so a component copied on
+ * one page can be pasted on another, even in a second browser tab.
+ */
+export const CLIPBOARD_STORAGE_KEY = "editor.clipboard";
+function isValidClipboardState(value) {
+    if (value === null)
+        return true;
+    if (!value || typeof value !== "object")
+        return false;
+    const candidate = value;
+    if (candidate.kind === "items") {
+        return Array.isArray(candidate.items) && candidate.items.length > 0;
+    }
+    if (candidate.kind === "components") {
+        return (Array.isArray(candidate.components) &&
+            candidate.components.length > 0 &&
+            !!candidate.sourcePageItem &&
+            typeof candidate.sourcePageItem === "object");
+    }
+    return false;
+}
+export function loadPersistedClipboard() {
+    const raw = localStorageService.getString(CLIPBOARD_STORAGE_KEY);
+    if (!raw)
+        return null;
+    try {
+        const parsed = JSON.parse(raw);
+        return isValidClipboardState(parsed) ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+export function persistClipboard(clipboard) {
+    if (!clipboard) {
+        localStorageService.removeItem(CLIPBOARD_STORAGE_KEY);
+        return;
+    }
+    localStorageService.setString(CLIPBOARD_STORAGE_KEY, JSON.stringify(clipboard));
+}
+/** Parses a cross-tab `storage` event for the clipboard key; undefined when unrelated. */
+export function readClipboardFromStorageEvent(event) {
+    if (event.key !== `parhelia.${CLIPBOARD_STORAGE_KEY}`)
+        return undefined;
+    if (!event.newValue)
+        return null;
+    try {
+        const parsed = JSON.parse(event.newValue);
+        return isValidClipboardState(parsed) ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=clipboardStorage.js.map

package/dist/editor/client/clipboardStorage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clipboardStorage.js","sourceRoot":"","sources":["../../../src/editor/client/clipboardStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AAExD,SAAS,qBAAqB,CAAC,KAAc;IAC3C,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,SAAS,GAAG,KAAgC,CAAC;IACnD,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACpC,OAAO,CACL,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;YACnC,SAAS,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YAC/B,CAAC,CAAC,SAAS,CAAC,cAAc;YAC1B,OAAO,SAAS,CAAC,cAAc,KAAK,QAAQ,CAC7C,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,MAAM,GAAG,GAAG,mBAAmB,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;IACjE,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;QAC1C,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAAyB;IACxD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,mBAAmB,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;QACtD,OAAO;IACT,CAAC;IACD,mBAAmB,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,6BAA6B,CAC3C,KAAmB;IAEnB,IAAI,KAAK,CAAC,GAAG,KAAK,YAAY,qBAAqB,EAAE;QAAE,OAAO,SAAS,CAAC;IACxE,IAAI,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAY,CAAC;QACrD,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/editor/client/editContext.d.ts

@@ -1,7 +1,9 @@
+import type { RecentConversion } from "../component-conversion/convertComponentsCommand";
 import React, { MouseEvent, ReactNode } from "react";
 import { EditorConfiguration, WorkspaceDefinition, SidebarDefinition, ResolvedSidebar } from "../../config/types";
 import type { FieldAction, WebSocketMessage } from "./EditorShell";
 import type { EditorSocketDiagnostics } from "./socketDiagnostics";
+import type { ValueStore } from "./valueStore";
 import type { QuotaInfo } from "./hooks/useQuota";
 import { MenuItem } from "../../config/types";
 import { Command, CommandData } from "../commands/commands";
@@ -43,10 +45,31 @@ export type AddComponentOptions = {
     showIndicator?: boolean;
     color?: ComponentFrameInsertColor;
 };
-export type ClipboardState = {
+/** Content-tree items placed on the editor clipboard (Ctrl+C / Ctrl+X or the item menu). */
+export type ItemClipboardState = {
+    kind: "items";
     items: ItemDescriptor[];
     operation: "copy" | "cut";
-} | null;
+};
+/** One page component on the editor clipboard; enough to validate and paste it elsewhere. */
+export type ClipboardComponent = {
+    id: string;
+    name: string;
+    type: string;
+    typeId: string;
+};
+/**
+ * Page components placed on the editor clipboard. They stay on their source page; pasting
+ * copies them into another placeholder, parent or page.
+ */
+export type ComponentClipboardState = {
+    kind: "components";
+    sourcePageItem: ItemDescriptor;
+    sourcePageName?: string;
+    components: ClipboardComponent[];
+    operation: "copy";
+};
+export type ClipboardState = ItemClipboardState | ComponentClipboardState | null;
 export type ContextMenuSource = "placeholder-insert";
 export type SelectionRange = {
     itemId: string;
@@ -87,12 +110,23 @@ export type SelectionRange = {
         orderedList?: boolean;
         unorderedList?: boolean;
         blockTag?: string;
+        cssClass?: {
+            inline?: string;
+            block?: string;
+        };
+        formatBlock?: string;
     };
     /** Callback for replacing the selected text - each editing context provides its own implementation */
     replaceText?: (newText: string) => void;
 };
 export type AddCommentOptions = {
+    /** Comment on this field (a text selection inside it becomes the range). */
     field?: FieldDescriptor;
+    /**
+     * Comment on this item as a whole (a component picked on the canvas). With
+     * an explicit target, the focused field and unrelated selections are ignored.
+     */
+    itemId?: string;
 };
 type BridgeTextRangeQuery = NonNullable<QueryGeometryCommandPayload["textRanges"]>[number];
 export type ScrollIntoViewTarget = string | {
@@ -160,6 +194,18 @@ export type EditContextType = {
         duplicateComponents: ({ componentIds }: {
             componentIds: string[];
         }) => void;
+        /**
+         * Copies components from the clipboard's source page into a placeholder of the
+         * current page. Resolves to the executed operation (or undefined when nothing ran).
+         */
+        pasteComponents: (args: {
+            sourcePageItem: ItemDescriptor;
+            sourceComponentIds: string[];
+            placeholderKey: string;
+            placeholderIndex: number;
+            targetParentComponentId?: string;
+            title?: string;
+        }) => Promise<EditOperation | undefined>;
         ensureLock: (field: FieldDescriptor, options?: {
             force?: boolean;
         }) => Promise<boolean>;
@@ -283,6 +329,14 @@ export type EditContextType = {
     mobileEditorPanelOpen: boolean;
     /** Open or close the mobile editor form panel */
     setMobileEditorPanelOpen: (open: boolean) => void;
+    /** Whether the mobile comments panel is open; the form may cover it. */
+    mobileCommentsPanelOpen: boolean;
+    setMobileCommentsPanelOpen: (open: boolean) => void;
+    /**
+     * Bring the comments panel to the front on mobile: opens it and closes the
+     * form panel and sidebars that would cover it. No-op on desktop.
+     */
+    revealMobileCommentsPanel: () => void;
     compareMode: boolean;
     setCompareMode: (compareMode: boolean) => void;
     /** Fullscreen mode for the editor shell (active slot). */
@@ -368,8 +422,21 @@ export type EditContextType = {
     contentTreeSelection: string[];
     setContentTreeSelection: React.Dispatch<React.SetStateAction<string[]>>;
     selectedForInsertion: string;
+    /**
+     * The published text selection, or else the last caret position recorded
+     * with `setCaretRange`, read live. Neither re-renders EditContext
+     * consumers: read this when acting (event handlers, commands); components
+     * that render from the selection use `useSelectedRange()`.
+     */
     selectedRange?: SelectionRange;
+    /** The published text selection (never a caret); see `useSelectedRange`. */
+    selectedRangeStore?: ValueStore<SelectionRange | undefined>;
     setSelectedRange: React.Dispatch<React.SetStateAction<SelectionRange | undefined>>;
+    /**
+     * Records a caret-only (collapsed) range without re-rendering the editor.
+     * It replaces any published selection, exactly as publishing it would.
+     */
+    setCaretRange: (range: SelectionRange | undefined) => void;
     /** Replace the currently selected text with new text */
     replaceSelectedText?: (newText: string, selectionOverride?: SelectionRange) => Promise<void>;
     insertTextAtCursor?: (newText: string) => Promise<void>;
@@ -378,6 +445,9 @@ export type EditContextType = {
     setInsertMode: React.Dispatch<React.SetStateAction<boolean>>;
     inserting: InsertingState | undefined;
     removingComponentIds: string[];
+    /** Components a conversion just created; the canvas badges them until the next edit. */
+    recentConversion?: RecentConversion;
+    setRecentConversion?: (conversion: RecentConversion | undefined) => void;
     dragStart: (dragObject: DragObject) => void;
     dragEnd: () => void;
     dragObject?: DragObject;
@@ -403,7 +473,6 @@ export type EditContextType = {
     }, color?: ComponentFrameInsertColor) => Promise<{
         committed: boolean;
     }>;
-    lockedField: FieldDescriptor | undefined;
     /**
      * Re-render the canvas. Every mode bumps the edit revision; the canvas then
      * picks the cheapest path that can deliver it (bridge patch when available,
@@ -446,8 +515,6 @@ export type EditContextType = {
     setActiveSlot: (slotId: string) => void;
     setScrollIntoView: React.Dispatch<React.SetStateAction<ScrollIntoViewTarget | undefined>>;
     scrollIntoView?: ScrollIntoViewTarget;
-    focusedField?: FieldDescriptor;
-    setFocusedField: (field: FieldDescriptor | undefined, requestLock: boolean) => Promise<boolean>;
     unlockField: (field: FieldDescriptor) => void;
     readonly: boolean;
     triggerFieldAction: (field: FieldDescriptor, action: FieldButton, parameters?: Record<string, string>, event?: React.SyntheticEvent | globalThis.MouseEvent) => void;
@@ -480,7 +547,13 @@ export type EditContextType = {
         /** Force the slot to reload even if the item appears to be already loaded. */
         forceRefresh?: boolean;
     }) => Promise<FullItem | undefined>;
+    /**
+     * The edit history (newest first), read live. It changes with every
+     * operation update without re-rendering EditContext consumers: components
+     * that render it use `useEditHistory()`.
+     */
     editHistory: EditOperation[];
+    editHistoryStore?: ValueStore<EditOperation[]>;
     historyMode: "global" | "page-centric" | "current-version" | "timeline";
     setHistoryMode: React.Dispatch<React.SetStateAction<"global" | "page-centric" | "current-version" | "timeline">>;
     showOnlyMyChanges: boolean;
@@ -495,8 +568,14 @@ export type EditContextType = {
     canLoadMoreHistory: boolean;
     isHistoryLoadingMore: boolean;
     loadMoreHistory: () => Promise<void>;
+    /**
+     * The current session list, read live. Changes do not re-render EditContext
+     * consumers: components that render sessions use `useActiveSessions()`.
+     */
     activeSessions: EditSession[];
-    remoteCarets: Record<string, RemoteCaretPosition>;
+    activeSessionsStore?: ValueStore<EditSession[]>;
+    /** Live carets per session, this session's form-field caret included. */
+    remoteCaretsStore?: ValueStore<Record<string, RemoteCaretPosition>>;
     validating: boolean;
     isCommandDisabled: <T extends CommandData>({ command, data, }: {
         command: Command<T>;
@@ -537,12 +616,9 @@ export type EditContextType = {
     }) => void;
     /** Increments on each WebSocket reconnection, used to trigger re-subscriptions */
     socketConnectionVersion: number;
-    socketDiagnostics: EditorSocketDiagnostics;
+    /** Updated on every socket event; subscribe with `useValueStore`. */
+    socketDiagnosticsStore: ValueStore<EditorSocketDiagnostics>;
     revision?: string;
-    /** Called by editor slots when their page model finishes building, to trigger isRefreshing re-evaluation. */
-    notifyPageModelReady?: () => void;
-    /** Increments whenever a slot reports that a page model finished building. */
-    pageModelReadyToken?: number;
     user?: User;
     statusMessage: React.ReactNode;
     setStatusMessage: React.Dispatch<React.SetStateAction<React.ReactNode>>;
@@ -581,6 +657,9 @@ export type EditContextType = {
     dismissEditorFormHint: () => void;
     /** Ref registered by the toolbar toggle button; used to anchor the hint popover. */
     editorFormToggleButtonRef: React.MutableRefObject<HTMLButtonElement | null>;
+    /** Whether the user has inserted a component before; the palette hides its how-to hint once true. */
+    componentInsertionHintSeen: boolean;
+    markComponentInsertionHintSeen: () => void;
     showMinimap: boolean;
     setShowMinimap: React.Dispatch<React.SetStateAction<boolean>>;
     showHelpTerminal: boolean;
@@ -655,6 +734,8 @@ export type FieldsEditContextType = {
     addRecentEdit: (edit: EditedField) => void;
     focusedField?: FieldDescriptor;
     setFocusedField: (field: FieldDescriptor | undefined, requestLock: boolean) => Promise<boolean>;
+    /** The field this session currently holds the edit lock on. */
+    lockedField: FieldDescriptor | undefined;
     unlockField: (field: FieldDescriptor) => void;
 };
 export type EditedField = FieldDescriptor & {

package/dist/editor/client/editContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"editContext.js","sourceRoot":"","sources":["../../../src/editor/client/editContext.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,KAAK,EAAE,EAGZ,UAAU,EAEV,MAAM,GACP,MAAM,OAAO,CAAC;AAw3Bf,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAA8B,SAAS,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,QAAQ,CAAC;AAExD,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAE5D,MAAM,UAAU,iBAAiB;IAC/B,MAAM,YAAY,GAAG,cAAc,EAAE,CAAC;IACtC,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IACxC,UAAU,CAAC,OAAO,GAAG,YAAY,CAAC;IAElC,OAAO,UAAU,CAAC;AACpB,CAAC;AAYD,MAAM,gBAAgB,GAAG,KAAK,CAAC,aAAa,CAC1C,SAAS,CACV,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,gBAAgB,CAAC,QAAQ,CAAC;AAElE,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AAEtE,8EAA8E;AAC9E,MAAM,UAAU,kBAAkB;IAChC,OAAO,mBAAmB,EAAE,EAAE,SAAS,IAAI,eAAe,CAAC;AAC7D,CAAC;AAED,MAAM,eAAe,GAAa,EAAE,CAAC;AAoCrC,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAE3C,SAAS,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,QAAQ,CAAC;AAEpE,mDAAmD;AACnD,MAAM,UAAU,uBAAuB;IACrC,MAAM,YAAY,GAAG,oBAAoB,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IACxC,UAAU,CAAC,OAAO,GAAG,YAAY,CAAC;IAElC,OAAO,UAAU,CAAC;AACpB,CAAC;AAiBD,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAE3C,SAAS,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,QAAQ,CAAC"}
+{"version":3,"file":"editContext.js","sourceRoot":"","sources":["../../../src/editor/client/editContext.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,KAAK,EAAE,EAGZ,UAAU,EAEV,MAAM,GACP,MAAM,OAAO,CAAC;AA68Bf,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAA8B,SAAS,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,QAAQ,CAAC;AAExD,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAE5D,MAAM,UAAU,iBAAiB;IAC/B,MAAM,YAAY,GAAG,cAAc,EAAE,CAAC;IACtC,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IACxC,UAAU,CAAC,OAAO,GAAG,YAAY,CAAC;IAElC,OAAO,UAAU,CAAC;AACpB,CAAC;AAYD,MAAM,gBAAgB,GAAG,KAAK,CAAC,aAAa,CAC1C,SAAS,CACV,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,gBAAgB,CAAC,QAAQ,CAAC;AAElE,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AAEtE,8EAA8E;AAC9E,MAAM,UAAU,kBAAkB;IAChC,OAAO,mBAAmB,EAAE,EAAE,SAAS,IAAI,eAAe,CAAC;AAC7D,CAAC;AAED,MAAM,eAAe,GAAa,EAAE,CAAC;AAuCrC,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAE3C,SAAS,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,QAAQ,CAAC;AAEpE,mDAAmD;AACnD,MAAM,UAAU,uBAAuB;IACrC,MAAM,YAAY,GAAG,oBAAoB,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IACxC,UAAU,CAAC,OAAO,GAAG,YAAY,CAAC;IAElC,OAAO,UAAU,CAAC;AACpB,CAAC;AAiBD,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAE3C,SAAS,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,QAAQ,CAAC"}

package/dist/editor/client/editHistoryReconciliation.d.ts

@@ -4,7 +4,8 @@ export declare function isRedoStackEntry(operation: EditOperation): boolean;
 /**
  * Persisting any new operation removes all undone operations for that session
  * on the server. Apply the same rule before deciding whether the new operation
- * belongs in the currently visible history scope.
+ * belongs in the currently visible history scope. Arrival order is not commit
+ * order: a delayed response for an edit made before the undo cannot invalidate it.
  */
 export declare function reconcileNewHistoryOperation(history: EditOperation[], newOperation: EditOperation, includeNewOperation: boolean): EditOperation[];
 export declare function isMissingEditOperationResult(result: ExecutionResult<unknown>): boolean;

package/dist/editor/client/editHistoryReconciliation.js

@@ -4,12 +4,15 @@ export function isRedoStackEntry(operation) {
 /**
  * Persisting any new operation removes all undone operations for that session
  * on the server. Apply the same rule before deciding whether the new operation
- * belongs in the currently visible history scope.
+ * belongs in the currently visible history scope. Arrival order is not commit
+ * order: a delayed response for an edit made before the undo cannot invalidate it.
  */
 export function reconcileNewHistoryOperation(history, newOperation, includeNewOperation) {
+    const newOperationTime = Date.parse(newOperation.date);
     const historyWithValidRedoStack = newOperation.sessionId && !isRedoStackEntry(newOperation)
         ? history.filter((operation) => operation.sessionId !== newOperation.sessionId ||
-            !isRedoStackEntry(operation))
+            !isRedoStackEntry(operation) ||
+            newOperationTime < Date.parse(operation.undoDate ?? operation.date))
         : history;
     return includeNewOperation
         ? [newOperation, ...historyWithValidRedoStack]

package/dist/editor/client/editHistoryReconciliation.js.map

@@ -1 +1 @@
-{"version":3,"file":"editHistoryReconciliation.js","sourceRoot":"","sources":["../../../src/editor/client/editHistoryReconciliation.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gBAAgB,CAAC,SAAwB;IACvD,OAAO,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,KAAK,IAAI,CAAC;AACjE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAC1C,OAAwB,EACxB,YAA2B,EAC3B,mBAA4B;IAE5B,MAAM,yBAAyB,GAC7B,YAAY,CAAC,SAAS,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACvD,CAAC,CAAC,OAAO,CAAC,MAAM,CACZ,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,SAAS,KAAK,YAAY,CAAC,SAAS;YAC9C,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAC/B;QACH,CAAC,CAAC,OAAO,CAAC;IAEd,OAAO,mBAAmB;QACxB,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,yBAAyB,CAAC;QAC9C,CAAC,CAAC,yBAAyB,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,MAAgC;IAEhC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;QAAE,OAAO,KAAK,CAAC;IAEjD,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC;SACvD,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC;SAC7D,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"editHistoryReconciliation.js","sourceRoot":"","sources":["../../../src/editor/client/editHistoryReconciliation.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gBAAgB,CAAC,SAAwB;IACvD,OAAO,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,KAAK,IAAI,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAC1C,OAAwB,EACxB,YAA2B,EAC3B,mBAA4B;IAE5B,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,yBAAyB,GAC7B,YAAY,CAAC,SAAS,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACvD,CAAC,CAAC,OAAO,CAAC,MAAM,CACZ,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,SAAS,KAAK,YAAY,CAAC,SAAS;YAC9C,CAAC,gBAAgB,CAAC,SAAS,CAAC;YAC5B,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,CACtE;QACH,CAAC,CAAC,OAAO,CAAC;IAEd,OAAO,mBAAmB;QACxB,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,yBAAyB,CAAC;QAC9C,CAAC,CAAC,yBAAyB,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,MAAgC;IAEhC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;QAAE,OAAO,KAAK,CAAC;IAEjD,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC;SACvD,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC;SAC7D,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7D,CAAC"}

package/dist/editor/client/hooks/useRepositoryItemRefresh.d.ts

@@ -0,0 +1,4 @@
+import { type RefObject } from "react";
+import type { FullItem, ItemDescriptor } from "../../pageModel";
+import type { ItemsRepository } from "../itemsRepository";
+export declare function useRepositoryItemRefresh(repository: Pick<ItemsRepository, "getItem" | "revision"> & Partial<Pick<ItemsRepository, "subscribeItemsChanged">>, descriptor: ItemDescriptor | undefined, currentDescriptor: RefObject<ItemDescriptor | undefined>, setItem: (item: FullItem | undefined) => void): void;

package/dist/editor/client/hooks/useRepositoryItemRefresh.js

@@ -0,0 +1,62 @@
+import { useCallback, useEffect, useRef } from "react";
+/** Same item and language; any version (the current item may be Latest). */
+function sameItemKey(a, b) {
+    const normalize = (value) => (value ?? "").replace(/[{}]/g, "").toLowerCase();
+    return (normalize(a.id) === normalize(b.id) &&
+        normalize(a.language) === normalize(b.language) &&
+        (a.database || "master") === (b.database || "master"));
+}
+export function useRepositoryItemRefresh(repository, descriptor, currentDescriptor, setItem) {
+    const { getItem, subscribeItemsChanged } = repository;
+    const descriptorRef = useRef(descriptor);
+    descriptorRef.current = descriptor;
+    // Only the latest read may apply its result.
+    const latestReadRef = useRef(0);
+    const load = useCallback(() => {
+        const target = descriptorRef.current;
+        if (!target)
+            return;
+        const read = ++latestReadRef.current;
+        void (async () => {
+            const item = await getItem(target);
+            const current = currentDescriptor.current;
+            // A revision read can finish after navigation or after a newer refresh.
+            // In particular, an empty result for a deleted version must not clear
+            // the surviving version loaded by the delete command.
+            if (read !== latestReadRef.current ||
+                current?.id !== target.id ||
+                current.language !== target.language ||
+                current.version !== target.version ||
+                (current.database ?? "master") !== (target.database ?? "master"))
+                return;
+            setItem(item);
+        })();
+    }, [getItem, currentDescriptor, setItem]);
+    useEffect(() => {
+        load();
+    }, [
+        repository.revision,
+        load,
+        descriptor?.id,
+        descriptor?.language,
+        descriptor?.version,
+        descriptor?.database,
+    ]);
+    // A refresh of this item publishes its data just before the revision bump
+    // renders. Reading it right away (from the cache) puts the new item into the
+    // same commit as the new repository: one editor render per save, not two.
+    useEffect(() => {
+        if (!subscribeItemsChanged)
+            return;
+        return subscribeItemsChanged((changes) => {
+            const target = descriptorRef.current;
+            if (target &&
+                changes.some((change) => change.action === "update" &&
+                    change.source !== "local-field-update" &&
+                    sameItemKey(change.item, target))) {
+                load();
+            }
+        });
+    }, [subscribeItemsChanged, load]);
+}
+//# sourceMappingURL=useRepositoryItemRefresh.js.map

package/dist/editor/client/hooks/useRepositoryItemRefresh.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRepositoryItemRefresh.js","sourceRoot":"","sources":["../../../../src/editor/client/hooks/useRepositoryItemRefresh.ts"],"names":[],"mappings":"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"}

package/dist/editor/client/hooks/useSocketMessageHandler.d.ts

@@ -67,4 +67,10 @@ export declare function useSocketMessageHandler(deps: {
      * switch would revert the edit visually.
      */
     canvasHasChromeSuppressedTargets?: () => boolean;
+    /**
+     * Whether a saved item is a dynamic rendering the canvas shows (see
+     * isRenderingOnCanvas). Its code renders into the page, so the canvas has
+     * to render again although no page item changed.
+     */
+    isRenderingOnCanvas?: (itemId: string, fieldIds?: readonly string[] | null) => Promise<boolean>;
 }): (event: any) => Promise<void>;

package/dist/editor/client/hooks/useSocketMessageHandler.js

@@ -11,7 +11,12 @@ import { OperationRefreshDeduplicator } from "./operationRefreshDeduplication";
 import { activeSessionSnapshotsEqual } from "./activeSessionSnapshots";
 import { markCommentRemoved } from "../../reviews/commentState";
 import { markSuggestedEditRemoved } from "../../reviews/suggestedEditState";
+import { DYNAMIC_RENDERING_CHANGED_EVENT, } from "../../page-viewer/renderingChanges";
 export const SOCKET_DIAGNOSTIC_RAW_MESSAGE_MAX_LENGTH = 75_000;
+// A save broadcasts item-changed for the edited item, its page and its
+// containers, spread over up to ~60 ms. Their refreshes publish together (one
+// editor render instead of one per message) when each waits this long.
+const ITEM_CHANGED_SETTLE_MS = 75;
 const feedbackInvalidationMessageTypes = new Set([
     "comment-updated",
     "comment-deleted",
@@ -120,13 +125,20 @@ export function dispatchSocketMessageListeners(listeners, message) {
     }
 }
 export function useSocketMessageHandler(deps) {
-    const { sessionId, mode, setWebSocketMessages, setActiveSessions, sendClientInfo, itemsRepository, currentItemDescriptor, loadItem, loadItemVersions, loadComments, loadSuggestedEdits, setActiveFieldActions, setQuotaInfo, requestRefresh, currentItemRef, addRecentEdit, getActiveFieldModificationStore, getFieldModificationStores, getLastAgentTerminalInteractionAt, getLatestLoadItem, socketMessageListeners, isItemUsedInCurrentPage, updateOperationInHistory, markOperationComplete, addExecutingOperation, updateExecutingOperationProgress, refreshWorkbox, canvasHasChromeSuppressedTargets, } = deps;
+    const { sessionId, mode, setWebSocketMessages, setActiveSessions, sendClientInfo, itemsRepository, currentItemDescriptor, loadItem, loadItemVersions, loadComments, loadSuggestedEdits, setActiveFieldActions, setQuotaInfo, requestRefresh, currentItemRef, addRecentEdit, getActiveFieldModificationStore, getFieldModificationStores, getLastAgentTerminalInteractionAt, getLatestLoadItem, socketMessageListeners, isItemUsedInCurrentPage, updateOperationInHistory, markOperationComplete, addExecutingOperation, updateExecutingOperationProgress, refreshWorkbox, canvasHasChromeSuppressedTargets, isRenderingOnCanvas, } = deps;
     // The deferred toast can outlive many renders; keep the latest navigation
     // callbacks in a ref updated after render, like loadItemRef in EditorShell.
     const navigationDepsRef = useRef({ loadItem, getLatestLoadItem });
     useEffect(() => {
         navigationDepsRef.current = { loadItem, getLatestLoadItem };
     }, [loadItem, getLatestLoadItem]);
+    const resyncSelectionRef = useRef(currentItemDescriptor);
+    useEffect(() => {
+        resyncSelectionRef.current = currentItemDescriptor;
+        return () => {
+            resyncSelectionRef.current = undefined;
+        };
+    }, [currentItemDescriptor]);
     const operationRefreshDeduplicatorRef = useRef(null);
     const operationRefreshDeduplicator = operationRefreshDeduplicatorRef.current ??
         (operationRefreshDeduplicatorRef.current =
@@ -184,7 +196,52 @@ export function useSocketMessageHandler(deps) {
                 const previous = pageResyncAtRef.current.get(pageId) ?? 0;
                 if (now - previous >= 2_000) {
                     pageResyncAtRef.current.set(pageId, now);
-                    requestRefresh("immediate");
+                    // The server sends this when messages passed the session by (cluster recovery,
+                    // or a reconnect after a missed item broadcast). A missed message may have been
+                    // "a version was added": treat the resync like that message, so a "Latest"
+                    // selection re-resolves to the newest version before the next edit lands.
+                    if (currentItemDescriptor?.language) {
+                        itemsRepository.invalidateVersionZeroCache(currentItemDescriptor.id, currentItemDescriptor.language);
+                    }
+                    if (currentItemDescriptor?.version === 0) {
+                        const descriptor = { ...currentItemDescriptor };
+                        const previousVersion = currentItemRef.current?.descriptor?.version;
+                        const isStillSelected = () => resyncSelectionRef.current?.version === descriptor.version &&
+                            isSameLoadTarget(descriptor, resyncSelectionRef.current);
+                        await loadItemVersions({ preserveOnError: true });
+                        if (!isStillSelected())
+                            return;
+                        const refreshedItem = await itemsRepository.getItem(descriptor, {
+                            requireFresh: true,
+                        });
+                        if (!refreshedItem || !isStillSelected())
+                            return;
+                        const latest = navigationDepsRef.current;
+                        await (latest.getLatestLoadItem?.() ?? latest.loadItem)(descriptor, {
+                            skipViewChange: true,
+                        });
+                        if (!isStillSelected())
+                            return;
+                        try {
+                            window.dispatchEvent(new CustomEvent("parhelia:item-version-added", {
+                                detail: {
+                                    itemId: currentItemDescriptor.id,
+                                    language: currentItemDescriptor.language ?? null,
+                                },
+                            }));
+                        }
+                        catch { }
+                        // A version change refreshes through the resolved edit URL. When
+                        // only fields/layout changed, that URL's render signature stays
+                        // the same, so the canvas still needs an explicit refresh.
+                        if (previousVersion == null ||
+                            refreshedItem.descriptor?.version === previousVersion) {
+                            requestRefresh("immediate");
+                        }
+                    }
+                    else {
+                        requestRefresh("immediate");
+                    }
                 }
             }
             return;
@@ -285,7 +342,13 @@ export function useSocketMessageHandler(deps) {
                 }
             }
             else {
-                await itemsRepository.refreshItems([message.payload.item], message.payload.changes);
+                await itemsRepository.refreshItems([message.payload.item], message.payload.changes, { settleMs: ITEM_CHANGED_SETTLE_MS });
+                const changedItemId = message.payload.item?.id;
+                if (changedItemId &&
+                    (await isRenderingOnCanvas?.(changedItemId, message.payload.changes?.fields))) {
+                    window.dispatchEvent(new CustomEvent(DYNAMIC_RENDERING_CHANGED_EVENT, { detail: { renderingId: changedItemId } }));
+                    requestRefresh("delayed");
+                }
                 const changes = message?.payload?.changes;
                 const isVersionChange = changes?.versions === true;
                 const versionAction = changes?.versionAction;
@@ -516,7 +579,9 @@ export function useSocketMessageHandler(deps) {
                 const fieldId = String(editFieldOperation.fieldId ?? "");
                 const isIconField = fieldId === "__Icon" ||
                     fieldId.toLowerCase() === "06d5295c-ed2f-4a54-9bf2-26228d113318";
-                const pageDescriptor = currentItemRef.current?.descriptor;
+                const pageDescriptor = currentItemDescriptor?.version === 0
+                    ? currentItemDescriptor
+                    : currentItemRef.current?.descriptor;
                 const targetItem = {
                     id: editFieldOperation.itemId,
                     language: editFieldOperation.mainItem?.language,