@parhelia/core 0.3.12763 → 0.3.12767

package/dist/editor/client/EditorShell.js

@@ -5,14 +5,15 @@ import { toast } from "sonner";
 import { isPerfTraceActive, perfTracePaintStep, perfTraceStep, } from "../perfTrace";
 import { EditContextProvider, FieldsEditContextProvider, OperationsContextProvider, SelectionContextProvider, useEditContext, } from "./editContext";
 import { aggregateModifiedFieldsFromStores, areModifiedFieldSnapshotsEqual, FieldModificationStore, } from "./fieldModificationStore";
-import { SplashScreenAgentProvider } from "../../splash-screen/SplashScreenAgentContext";
 import { useRouter, useSearchParams, usePathname } from "./navigation";
 import { findComponent, getComponentById } from "../componentTreeHelper";
 import { getOperationsContext } from "./operations";
 import { handleErrorResult } from "./helpers";
 import { showExpandableErrorToast } from "./errorToast";
+import { isRedoStackEntry, reconcileNewHistoryOperation, } from "./editHistoryReconciliation";
 import { isManualShowMeFocusTransfer, isManualShowMeTarget, } from "./manualShowMeFocus";
 import { isAgentTerminalFocusTransfer, nextAgentTerminalInteractionAt, } from "./agentTerminalFocus";
+import { getAvailableSidebarsForWorkspace } from "./sidebarAvailability";
 import { executeFieldAction as executeFieldServerAction, connectSocket, getEditHistory, getRunningOperations, reconnectSession, releaseFieldLocks, validateItems, } from "../services/editService";
 import { emitAgentDocumentsChanged } from "../services/agentService";
 import { onSocketReconnect as onAgentSocketReconnect } from "../services/agentSubscriptionRegistry";
@@ -48,6 +49,7 @@ import { useDebouncedCallback } from "use-debounce";
 import { useKeyboardNavigation } from "../utils/keyboardNavigation";
 import { Toaster } from "../../components/ui/sonner";
 import { Tour } from "../../tour/Tour";
+import { buildBridgeInsertTextCommand } from "../ai/bridgeInlineTextReplace";
 import { GuidanceOverlay } from "../ai/GuidanceOverlay";
 import { AgentDialogHandler } from "../ai/dialogs";
 import { setActiveAgentConversation } from "../ai/useActiveAgentConversation";
@@ -1650,6 +1652,15 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 return;
             if (event.data.type === "componentsSelected" &&
                 Array.isArray(event.data.componentIds)) {
+                // An empty canvas selection is an explicit end to field editing. The
+                // rendering-host focusout event can be lost when its framework replaces
+                // the focused node under load, so selection state must independently
+                // uphold the lock invariant instead of leaving a stale server lock.
+                if (event.data.componentIds.length === 0 && focusedFieldRef.current) {
+                    setFocusedField(undefined);
+                    setLockedField(undefined);
+                    void releaseFieldLocks(sessionId);
+                }
                 setSelection(event.data.componentIds);
             }
         };
@@ -1899,7 +1910,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 if (!currentEditOperation.mainItem ||
                     currentEditOperation.mainItem.id !== currentItem.id ||
                     currentEditOperation.mainItem.language !== currentItem.language) {
-                    return history; // Don't add - doesn't match page-centric filter
+                    return reconcileNewHistoryOperation(history, currentEditOperation, false); // Don't add - doesn't match page-centric filter
                 }
             }
             if (currentHistoryMode === "current-version" && currentItem) {
@@ -1908,13 +1919,13 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                     currentEditOperation.mainItem.id !== currentItem.id ||
                     currentEditOperation.mainItem.language !== currentItem.language ||
                     currentEditOperation.mainItem.version !== currentItem.version) {
-                    return history; // Don't add - doesn't match current-version filter
+                    return reconcileNewHistoryOperation(history, currentEditOperation, false); // Don't add - doesn't match current-version filter
                 }
             }
             if (!matchesHistorySearchQuery(currentEditOperation)) {
-                return history;
+                return reconcileNewHistoryOperation(history, currentEditOperation, false);
             }
-            return [currentEditOperation, ...history];
+            return reconcileNewHistoryOperation(history, currentEditOperation, true);
         });
     }, [matchesHistorySearchQuery]);
     useEffect(() => {
@@ -2136,7 +2147,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             if (!prev.length)
                 return sortEditHistoryByDateDesc(next);
             if (!next.length)
-                return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op)));
+                return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op) && !isRedoStackEntry(op)));
             const prevById = new Map(prev.map((x) => [x.id, x]));
             const nextById = new Set(next.map((x) => x.id));
             const merged = next
@@ -2176,7 +2187,9 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             });
             // Preserve operations that arrived via WebSocket during the fetch window
             for (const [id, priorOp] of prevById) {
-                if (!nextById.has(id) && matchesHistoryScope(priorOp)) {
+                if (!nextById.has(id) &&
+                    matchesHistoryScope(priorOp) &&
+                    !isRedoStackEntry(priorOp)) {
                     merged.push(priorOp);
                 }
             }
@@ -2261,7 +2274,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                     // When searching, respect the empty result — don't fall back to previous items
                     if (historyQuery)
                         return [];
-                    return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op, scope)));
+                    return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op, scope) && !isRedoStackEntry(op)));
                 }
                 const prevById = new Map(prev.map((x) => [x.id, x]));
                 const nextById = new Set(next.map((x) => x.id));
@@ -2301,7 +2314,9 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 // but not when filtering by search query — search results are authoritative
                 if (!historyQuery) {
                     for (const [id, priorOp] of prevById) {
-                        if (!nextById.has(id) && matchesHistoryScope(priorOp, scope)) {
+                        if (!nextById.has(id) &&
+                            matchesHistoryScope(priorOp, scope) &&
+                            !isRedoStackEntry(priorOp)) {
                             merged.push(priorOp);
                         }
                     }
@@ -2367,7 +2382,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 if (!operations.length) {
                     if (historyQuery)
                         return [];
-                    return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op, scope)));
+                    return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op, scope) && !isRedoStackEntry(op)));
                 }
                 const prevById = new Map(prev.map((x) => [x.id, x]));
                 const nextById = new Set(operations.map((x) => x.id));
@@ -2407,7 +2422,9 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 // but not when filtering by search query — search results are authoritative
                 if (!historyQuery) {
                     for (const [id, priorOp] of prevById) {
-                        if (!nextById.has(id) && matchesHistoryScope(priorOp, scope)) {
+                        if (!nextById.has(id) &&
+                            matchesHistoryScope(priorOp, scope) &&
+                            !isRedoStackEntry(priorOp)) {
                             merged.push(priorOp);
                         }
                     }
@@ -3249,15 +3266,17 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             const scopeMatches = matchesHistoryScope(op);
             if (!scopeMatches && !isDeleteOperation) {
                 // Operation doesn't match current scope, don't add to history
-                return prev;
+                return reconcileNewHistoryOperation(prev, op, false);
             }
             // Mirror the backend search filter so live updates don't bypass an
             // active search query.
             if (!matchesHistorySearchQuery(op)) {
-                return prev;
+                return reconcileNewHistoryOperation(prev, op, false);
             }
-            // Add new operation
-            return sortEditHistoryByDateDesc([op, ...prev]);
+            // The backend deletes this session's undone operations whenever a new
+            // operation is persisted. Mirror that redo-stack invalidation locally
+            // so the toolbar never targets an operation that no longer exists.
+            return sortEditHistoryByDateDesc(reconcileNewHistoryOperation(prev, op, true));
         });
     }, [
         matchesHistoryScope,
@@ -3781,27 +3800,18 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
     // Get resolved sidebar (with panels materialized)
     // Note: This is defined as a function that will be called later when editContext is available
     const sidebars = configuration.editor.sidebars ?? [];
-    const getSidebarsForWorkspace = useCallback((targetWorkspaceId) => {
-        const hasBackendWorkspaceSettings = (userInfo.workspaces?.length ?? 0) > 0;
-        const workspaceSettings = userInfo.workspaces?.find((w) => w.id === targetWorkspaceId);
-        const workspaceAllowedSidebarIds = workspaceSettings?.sidebars ?? [];
-        const workspaceDefaultSidebarIds = configuration.editor.workspaces?.find((w) => w.id === targetWorkspaceId)
-            ?.defaultSidebars ?? [];
-        const allowedSidebarIds = workspaceAllowedSidebarIds.length > 0
-            ? workspaceAllowedSidebarIds
-            : workspaceDefaultSidebarIds;
-        return sidebars.filter((s) => {
-            // If the backend does not provide workspace settings, fall back to the
-            // globally registered sidebar list for local/static configurations.
-            if (!hasBackendWorkspaceSettings) {
-                return true;
-            }
-            if (!workspaceSettings) {
-                return false;
-            }
-            return allowedSidebarIds.includes(s.id);
-        });
-    }, [configuration.editor.workspaces, sidebars, userInfo.workspaces]);
+    const getSidebarsForWorkspace = useCallback((targetWorkspaceId) => getAvailableSidebarsForWorkspace({
+        sidebars,
+        workspaces: configuration.editor.workspaces,
+        userWorkspaces: userInfo.workspaces,
+        targetWorkspaceId,
+        isLimitedPreviewUser: userInfo.user?.isLimitedPreviewUser ?? false,
+    }), [
+        configuration.editor.workspaces,
+        sidebars,
+        userInfo.user?.isLimitedPreviewUser,
+        userInfo.workspaces,
+    ]);
     const getResolvedSidebar = useCallback((sidebarId) => {
         const sidebar = getSidebarsForWorkspace(workspaceId).find((s) => s.id === sidebarId);
         if (!sidebar)
@@ -3948,6 +3958,18 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 lastTextSelectionRangeRef.current = undefined;
                 return;
             }
+            // Canvas selections come from the bridge without a replaceText
+            // callback, and their text is the rendered selection — the raw field
+            // value (HTML in rich text fields, untransformed text otherwise)
+            // need not contain it. Let the host replace the restored selection
+            // natively instead of splicing the raw value below.
+            const bridgeInsertCommand = buildBridgeInsertTextCommand(rangeToReplace, newText);
+            if (bridgeInsertCommand &&
+                activePageViewContextRef.current?.requestBridgeRichTextCommand?.(bridgeInsertCommand)) {
+                setSelectedRange(undefined);
+                lastTextSelectionRangeRef.current = undefined;
+                return;
+            }
             const fieldToReplace = focusedField ??
                 (rangeToReplace?.fieldId &&
                     rangeToReplace.itemId &&
@@ -3978,6 +4000,9 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 const actualPosition = currentValue.indexOf(originalSelectedText);
                 if (actualPosition === -1) {
                     console.error("Failed to find selected text in field value");
+                    toast.warning("Could not apply the generated text", {
+                        description: "The selected text could not be located in the field. Re-select the text and try again.",
+                    });
                     return;
                 }
                 newValue =
@@ -5767,13 +5792,13 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                     window.history.replaceState(getCurrentHistoryState(), "", newUrl);
                 }, configuration: configuration, restoredFromUrl: tourRestoredRef.current })), _jsx(FeatureGate, { feature: LicenseFeatures.AI, children: _jsx(GuidanceOverlay, {}) }), _jsx(FeatureGate, { feature: LicenseFeatures.AI, children: _jsx(AgentDialogHandler, {}) })] }));
     const showRefreshSpinner = editContext.isRefreshing && !activePageViewContext.iframeSupportsRefresh;
-    return (_jsx(LicenseProvider, { initialLicenseStatus: initialLicenseStatus, initialStatusLoaded: initialLicenseStatusLoaded, children: _jsx("div", { className: `editor h-full w-full`, children: _jsx(OperationsContextProvider, { value: operationsContext.context, children: _jsx(FieldsEditContextProvider, { value: fieldsEditContext, children: _jsx(EditContextProvider, { value: editContext, children: _jsx(SelectionContextProvider, { value: selectionContextValue, children: _jsxs(SplashScreenAgentProvider, { children: [_jsx(DevModeIndicator, {}), startupChecks.state === "loading" && (_jsx(EditorLoadingOverlay, {})), showRefreshSpinner && (_jsx("div", { className: "text-neutral-grey-50 pointer-events-none fixed right-0 bottom-0 flex h-24 w-24 items-center justify-center opacity-50 select-none", children: _jsx(Spinner, {}) })), (currentWorkspace.id === "agents" ||
-                                        currentWorkspace.id === "taskboard" ||
-                                        currentWorkspace.id === "translation-management") &&
-                                        showAgentsWorkspaceEditor && (_jsx(AgentsSlotContextBridgeHost, { slots: editorSlots })), startupChecks.state !== "loading" && (children || editorUi), startupChecks.state !== "loading" && dialog, _jsx(Toaster, { position: "top-center" }), " ", _jsx(ConfirmationDialog, { ref: confirmationDialogRef }), _jsx(ConcurrentUserLimitDialog, { open: concurrentUserLimitError !== null, onOpenChange: (open) => {
-                                            if (!open) {
-                                                setConcurrentUserLimitError(null);
-                                            }
-                                        }, sessionId: sessionId, currentUsers: concurrentUserLimitError?.currentUsers ?? 0, maxUsers: concurrentUserLimitError?.maxUsers ?? 0, message: concurrentUserLimitError?.message ?? "", onRetry: handleRetryConnection, isAdministrator: userInfo.user.isAdministrator === true }), _jsx(QuickItemSwitcher, { visible: quickSwitcherVisible, entries: quickSwitcherEntries.slice(0, 5), selectedIndex: quickSwitcherSelectedIndex, onSelect: handleQuickSwitcherSelect, onClose: () => setQuickSwitcherVisible(false) }), _jsx(EditContextMenu, { ref: contextMenuRef, onOpenChange: handleContextMenuOpenChange }), _jsx(EditorFormHintPopover, {}), _jsx(FeatureGate, { feature: LicenseFeatures.AI, children: _jsx(InlineAiTrigger, {}) }), media.mediaSelectorVisible && (_jsx(MediaSelector, { language: editContext.currentItemDescriptor.language, visible: media.mediaSelectorVisible, onHide: media.handleHide, onMediaSelected: media.onMediaSelect, selectedIdPath: media.selectedMediaIdPath, mode: media.mediaSelectorMode, initialSearchTerm: media.initialSearchTerm })), _jsx(FieldEditorPopup, { ref: fieldEditorPopupRef }), _jsx(LicenseOverlay, {}), _jsx(SessionExpiredOverlay, {})] }) }) }) }) }) }) }));
+    return (_jsx(LicenseProvider, { initialLicenseStatus: initialLicenseStatus, initialStatusLoaded: initialLicenseStatusLoaded, children: _jsx("div", { className: `editor h-full w-full`, children: _jsx(OperationsContextProvider, { value: operationsContext.context, children: _jsx(FieldsEditContextProvider, { value: fieldsEditContext, children: _jsx(EditContextProvider, { value: editContext, children: _jsxs(SelectionContextProvider, { value: selectionContextValue, children: [_jsx(DevModeIndicator, {}), startupChecks.state === "loading" && _jsx(EditorLoadingOverlay, {}), showRefreshSpinner && (_jsx("div", { className: "text-neutral-grey-50 pointer-events-none fixed right-0 bottom-0 flex h-24 w-24 items-center justify-center opacity-50 select-none", children: _jsx(Spinner, {}) })), (currentWorkspace.id === "agents" ||
+                                    currentWorkspace.id === "taskboard" ||
+                                    currentWorkspace.id === "translation-management") &&
+                                    showAgentsWorkspaceEditor && (_jsx(AgentsSlotContextBridgeHost, { slots: editorSlots })), startupChecks.state !== "loading" && (children || editorUi), startupChecks.state !== "loading" && dialog, _jsx(Toaster, { position: "top-center" }), " ", _jsx(ConfirmationDialog, { ref: confirmationDialogRef }), _jsx(ConcurrentUserLimitDialog, { open: concurrentUserLimitError !== null, onOpenChange: (open) => {
+                                        if (!open) {
+                                            setConcurrentUserLimitError(null);
+                                        }
+                                    }, sessionId: sessionId, backendReachable: concurrentUserLimitError?.backendReachable ?? true, currentUsers: concurrentUserLimitError?.currentUsers ?? 0, maxUsers: concurrentUserLimitError?.maxUsers ?? 0, message: concurrentUserLimitError?.message ?? "", onRetry: handleRetryConnection, isAdministrator: userInfo.user.isAdministrator === true }), _jsx(QuickItemSwitcher, { visible: quickSwitcherVisible, entries: quickSwitcherEntries.slice(0, 5), selectedIndex: quickSwitcherSelectedIndex, onSelect: handleQuickSwitcherSelect, onClose: () => setQuickSwitcherVisible(false) }), _jsx(EditContextMenu, { ref: contextMenuRef, onOpenChange: handleContextMenuOpenChange }), _jsx(EditorFormHintPopover, {}), _jsx(FeatureGate, { feature: LicenseFeatures.AI, children: _jsx(InlineAiTrigger, {}) }), media.mediaSelectorVisible && (_jsx(MediaSelector, { language: editContext.currentItemDescriptor.language, visible: media.mediaSelectorVisible, onHide: media.handleHide, onMediaSelected: media.onMediaSelect, selectedIdPath: media.selectedMediaIdPath, mode: media.mediaSelectorMode, initialSearchTerm: media.initialSearchTerm })), _jsx(FieldEditorPopup, { ref: fieldEditorPopupRef }), _jsx(LicenseOverlay, {}), _jsx(SessionExpiredOverlay, {})] }) }) }) }) }) }));
 }
 //# sourceMappingURL=EditorShell.js.map