fix

apps/client/public/locales/en-US/translation.json

@@ -71,7 +71,6 @@
   "Export": "Export",
   "Failed to create page": "Failed to create page",
   "Failed to delete page": "Failed to delete page",
-  "Failed to restore page": "Failed to restore page",
   "Failed to fetch recent pages": "Failed to fetch recent pages",
   "Failed to import pages": "Failed to import pages",
   "Failed to load page. An error occurred.": "Failed to load page. An error occurred.",
@@ -362,8 +361,6 @@
   "Create block quote.": "Create block quote.",
   "Insert code snippet.": "Insert code snippet.",
   "Insert horizontal rule divider": "Insert horizontal rule divider",
-  "Page break": "Page break",
-  "Insert a page break for printing.": "Insert a page break for printing.",
   "Upload any image from your device.": "Upload any image from your device.",
   "Upload any video from your device.": "Upload any video from your device.",
   "Upload any audio from your device.": "Upload any audio from your device.",
@@ -582,8 +579,6 @@
   "Move to trash": "Move to trash",
   "Move this page to trash?": "Move this page to trash?",
   "Restore page": "Restore page",
-  "Permanently delete": "Permanently delete",
-  "<b>{{name}}</b> moved this page to Trash {{time}}.": "<b>{{name}}</b> moved this page to Trash {{time}}.",
   "Page moved to trash": "Page moved to trash",
   "Page restored successfully": "Page restored successfully",
   "Deleted by": "Deleted by",

apps/client/src/components/layouts/global/aside.tsx

@@ -1,5 +1,4 @@
-import { ActionIcon, Box, Group, ScrollArea, Text, Tooltip } from "@mantine/core";
+import { Box, ScrollArea, Text } from "@mantine/core";
-import { IconX } from "@tabler/icons-react";
 import CommentListWithTabs from "@/features/comment/components/comment-list-with-tabs.tsx";
 import { useAtom } from "jotai";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
@@ -12,10 +11,9 @@ import AsideChatPanel from "@/ee/ai-chat/components/aside-chat-panel";
 import { PageDetailsAside } from "@/features/page-details/components/page-details-aside.tsx";
 
 export default function Aside() {
-  const [{ tab }, setAsideState] = useAtom(asideStateAtom);
+  const [{ tab }] = useAtom(asideStateAtom);
   const { t } = useTranslation();
   const pageEditor = useAtomValue(pageEditorAtom);
-  const closeAside = () => setAsideState((s) => ({ ...s, isAsideOpen: false }));
 
   let title: string;
   let component: ReactNode;
@@ -47,19 +45,9 @@ export default function Aside() {
       {component && (
         <>
           {tab !== "chat" && (
-            <Group justify="space-between" wrap="nowrap" mb="md">
+            <Text mb="md" fw={500}>
-              <Text fw={500}>{t(title)}</Text>
+              {t(title)}
-              <Tooltip label={t("Close")} withArrow>
+            </Text>
-                <ActionIcon
-                  variant="subtle"
-                  color="gray"
-                  onClick={closeAside}
-                  aria-label={t("Close")}
-                >
-                  <IconX size={18} />
-                </ActionIcon>
-              </Tooltip>
-            </Group>
           )}
 
           {tab === "comments" || tab === "chat" ? (

apps/client/src/ee/components/sso-login.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useState } from "react";
 import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
 import { Button, Divider, Stack } from "@mantine/core";
 import { IconLock, IconServer } from "@tabler/icons-react";
@@ -7,37 +7,15 @@ import { buildSsoLoginUrl } from "@/ee/security/sso.utils.ts";
 import { SSO_PROVIDER } from "@/ee/security/contants.ts";
 import { GoogleIcon } from "@/components/icons/google-icon.tsx";
 import { LdapLoginModal } from "@/ee/components/ldap-login-modal.tsx";
-import { getRedirectParam } from "@/lib/app-route.ts";
-import useCurrentUser from "@/features/user/hooks/use-current-user.ts";
-
-const SSO_AUTO_ATTEMPT_KEY = "docmost:ssoAutoAttempt";
-const SSO_AUTO_ATTEMPT_TTL_MS = 5 * 60_000;
-
-function recentAutoAttempt(): boolean {
-  try {
-    const raw = window.sessionStorage.getItem(SSO_AUTO_ATTEMPT_KEY);
-    if (!raw) return false;
-    const ts = Number(raw);
-    return Number.isFinite(ts) && Date.now() - ts < SSO_AUTO_ATTEMPT_TTL_MS;
-  } catch {
-    return false;
-  }
-}
-
-function markAutoAttempt(): void {
-  try {
-    window.sessionStorage.setItem(SSO_AUTO_ATTEMPT_KEY, String(Date.now()));
-  } catch {
-    /* sessionStorage unavailable (private mode, etc.) — best effort */
-  }
-}
 
 export default function SsoLogin() {
   const { data, isLoading } = useWorkspacePublicDataQuery();
-  const { data: currentUser } = useCurrentUser();
   const [ldapModalOpened, setLdapModalOpened] = useState(false);
   const [selectedLdapProvider, setSelectedLdapProvider] = useState<IAuthProvider | null>(null);
-  const autoRedirectedRef = useRef(false);
+
+  if (!data?.authProviders || data?.authProviders?.length === 0) {
+    return null;
+  }
 
   const handleSsoLogin = (provider: IAuthProvider) => {
     if (provider.type === SSO_PROVIDER.LDAP) {
@@ -50,47 +28,10 @@ export default function SsoLogin() {
         providerId: provider.id,
         type: provider.type,
         workspaceId: data.id,
-        redirect: getRedirectParam() ?? undefined,
       });
     }
   };
 
-  // Auto-redirect when SSO is enforced and there is exactly one non-LDAP
-  // provider. The user has no other option, so skip the extra click.
-  useEffect(() => {
-    if (autoRedirectedRef.current) return;
-    if (!data?.enforceSso) return;
-    if (!data.authProviders || data.authProviders.length !== 1) return;
-    const onlyProvider = data.authProviders[0];
-    if (onlyProvider.type === SSO_PROVIDER.LDAP) return;
-
-    // Already signed in: let useRedirectIfAuthenticated handle navigation
-    // instead of racing it through the IdP.
-    if (currentUser?.user) return;
-
-    // Explicit logout: don't immediately bounce them back to the IdP.
-    const params = new URLSearchParams(window.location.search);
-    if (params.has("logout")) return;
-
-    // Circuit-breaker: if we already auto-redirected within the TTL, the
-    // user came back (likely from an IdP failure). Show the page so they
-    // can read errors or pick a different account.
-    if (recentAutoAttempt()) return;
-
-    autoRedirectedRef.current = true;
-    markAutoAttempt();
-    window.location.href = buildSsoLoginUrl({
-      providerId: onlyProvider.id,
-      type: onlyProvider.type,
-      workspaceId: data.id,
-      redirect: getRedirectParam() ?? undefined,
-    });
-  }, [data, currentUser]);
-
-  if (!data?.authProviders || data?.authProviders?.length === 0) {
-    return null;
-  }
-
   const getProviderIcon = (provider: IAuthProvider) => {
     if (provider.type === SSO_PROVIDER.GOOGLE) {
       return <GoogleIcon size={16} />;

apps/client/src/ee/security/sso.utils.ts

@@ -18,21 +18,14 @@ export function buildSsoLoginUrl(opts: {
   providerId: string;
   type: SSO_PROVIDER;
   workspaceId?: string;
-  redirect?: string;
 }): string {
-  const { providerId, type, workspaceId, redirect } = opts;
+  const { providerId, type, workspaceId } = opts;
   const domain = getAppUrl();
 
-  const params = new URLSearchParams();
-  if (redirect) params.set("redirect", redirect);
-
   if (type === SSO_PROVIDER.GOOGLE) {
-    if (workspaceId) params.set("workspaceId", workspaceId);
+    return `${getServerAppUrl()}/api/sso/${type}/login?workspaceId=${workspaceId}`;
-    return `${getServerAppUrl()}/api/sso/${type}/login?${params.toString()}`;
   }
-  const query = params.toString();
+  return `${domain}/api/sso/${type}/${providerId}/login`;
-  const base = `${domain}/api/sso/${type}/${providerId}/login`;
-  return query ? `${base}?${query}` : base;
 }
 
 export function getGoogleSignupUrl(): string {

apps/client/src/features/auth/hooks/use-auth.ts

@@ -166,7 +166,7 @@ export default function useAuth() {
   const handleLogout = async () => {
     setCurrentUser(RESET);
     await logout();
-    window.location.replace(`${APP_ROUTE.AUTH.LOGIN}?logout=1`);
+    window.location.replace(APP_ROUTE.AUTH.LOGIN);
   };
 
   const handleForgotPassword = async (data: IForgotPassword) => {

apps/client/src/features/editor/atoms/editor-atoms.ts

@@ -1,6 +1,5 @@
 import { atom } from "jotai";
 import { Editor } from "@tiptap/core";
-import { PageEditMode } from "@/features/user/types/user.types.ts";
 
 export const pageEditorAtom = atom<Editor | null>(null);
 
@@ -13,7 +12,3 @@ export const yjsConnectionStatusAtom = atom<string>("");
 export const showAiMenuAtom = atom(false);
 
 export const showLinkMenuAtom = atom(false);
-
-// Current page's edit mode — initialized from the user's saved preference on
-// first load, can be toggled locally without persisting to the server.
-export const currentPageEditModeAtom = atom<PageEditMode>(PageEditMode.Edit);

apps/client/src/features/editor/components/audio/audio-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -47,7 +46,7 @@ export function AudioMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "audio";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/callout/callout-menu.tsx

@@ -16,7 +16,7 @@ import {
   IconMoodSmile,
   IconNotes,
 } from "@tabler/icons-react";
-import { CalloutType, isEditorReady, isTextSelected } from "@docmost/editor-ext";
+import { CalloutType, isTextSelected } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
 import EmojiPicker from "@/components/ui/emoji-picker.tsx";
 import classes from "../common/toolbar-menu.module.css";
@@ -55,7 +55,7 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
   });
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "callout";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/columns/columns-menu.tsx

@@ -19,7 +19,7 @@ import {
   IconCopy,
   IconTrash,
 } from "@tabler/icons-react";
-import { isEditorReady, isTextSelected } from "@docmost/editor-ext";
+import { isTextSelected } from "@docmost/editor-ext";
 import type { WidthMode, ColumnsLayout } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
 import classes from "../common/toolbar-menu.module.css";
@@ -82,7 +82,7 @@ export function ColumnsMenu({ editor }: EditorMenuProps) {
 
   const shouldShow = useCallback(
     ({ state }: ShouldShowProps) => {
-      if (!state || !isEditorReady(editor)) return false;
+      if (!state) return false;
       if (!editor.isActive("columns")) return false;
       if (isTextSelected(editor)) return false;
       if (nodesWithMenus.some((name) => editor.isActive(name))) return false;
@@ -121,7 +121,7 @@ export function ColumnsMenu({ editor }: EditorMenuProps) {
   });
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "columns";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/drawio/drawio-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -82,7 +81,7 @@ export function DrawioMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "drawio";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/excalidraw/excalidraw-menu-lazy.tsx

@@ -1,14 +0,0 @@
-import { lazy, Suspense } from "react";
-import { EditorMenuProps } from "@/features/editor/components/table/types/types.ts";
-
-const ExcalidrawMenu = lazy(
-  () => import("@/features/editor/components/excalidraw/excalidraw-menu.tsx"),
-);
-
-export default function ExcalidrawMenuLazy(props: EditorMenuProps) {
-  return (
-    <Suspense fallback={null}>
-      <ExcalidrawMenu {...props} />
-    </Suspense>
-  );
-}

apps/client/src/features/editor/components/excalidraw/excalidraw-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { lazy, Suspense, useCallback, useEffect, useRef, useState } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -95,7 +94,7 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "excalidraw";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/excalidraw/excalidraw-view-lazy.tsx

@@ -1,14 +0,0 @@
-import { lazy, Suspense } from "react";
-import { NodeViewProps } from "@tiptap/react";
-
-const ExcalidrawView = lazy(
-  () => import("@/features/editor/components/excalidraw/excalidraw-view.tsx"),
-);
-
-export default function ExcalidrawViewLazy(props: NodeViewProps) {
-  return (
-    <Suspense fallback={null}>
-      <ExcalidrawView {...props} />
-    </Suspense>
-  );
-}

apps/client/src/features/editor/components/fixed-toolbar/groups/block-type-group.tsx

@@ -10,7 +10,6 @@ import {
   IconH2,
   IconH3,
   IconMenu4,
-  IconPageBreak,
   IconTypography,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
@@ -103,12 +102,6 @@ export const BlockTypeGroup: FC<Props> = ({ editor }) => {
         >
           {t("Divider")}
         </Menu.Item>
-        <Menu.Item
-          leftSection={<IconPageBreak size={16} />}
-          onClick={() => editor.chain().focus().setPageBreak().run()}
-        >
-          {t("Page break")}
-        </Menu.Item>
       </Menu.Dropdown>
     </Menu>
   );

apps/client/src/features/editor/components/image/image-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import React, { useCallback, useRef } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -57,7 +56,7 @@ export function ImageMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "image";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/pdf/pdf-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -38,8 +37,9 @@ export function PdfMenu({ editor }: EditorMenuProps) {
 
   const shouldShow = useCallback(
     ({ state }: ShouldShowProps) => {
-      if (!state || !isEditorReady(editor)) return false;
+      if (!state || !editor.isActive("pdf")) {
-      if (!editor.isActive("pdf")) return false;
+        return false;
+      }
 
       const { selection } = state;
       const dom = editor.view.nodeDOM(selection.from) as HTMLElement | null;
@@ -51,7 +51,7 @@ export function PdfMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "pdf";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/slash-menu/menu-items.ts

@@ -19,7 +19,6 @@ import {
   IconTable,
   IconTypography,
   IconMenu4,
-  IconPageBreak,
   IconCalendar,
   IconAppWindow,
   IconSitemap,
@@ -165,14 +164,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       command: ({ editor, range }: CommandProps) =>
         editor.chain().focus().deleteRange(range).setHorizontalRule().run(),
     },
-    {
-      title: "Page break",
-      description: "Insert a page break for printing.",
-      searchTerms: ["page", "break", "pagebreak", "print"],
-      icon: IconPageBreak,
-      command: ({ editor, range }: CommandProps) =>
-        editor.chain().focus().deleteRange(range).setPageBreak().run(),
-    },
     {
       title: "Image",
       description: "Upload any image from your device.",

apps/client/src/features/editor/components/subpages/subpages-menu.tsx

@@ -6,7 +6,6 @@ import { ActionIcon, Tooltip } from "@mantine/core";
 import { IconTrash } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { Editor } from "@tiptap/core";
-import { isEditorReady } from "@docmost/editor-ext";
 
 interface SubpagesMenuProps {
   editor: Editor;
@@ -34,7 +33,6 @@ export const SubpagesMenu = React.memo(
     );
 
     const getReferenceClientRect = useCallback(() => {
-      if (!isEditorReady(editor)) return new DOMRect();
       const { selection } = editor.state;
       const predicate = (node: PMNode) => node.type.name === "subpages";
       const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/table/handle/column-handle.tsx

@@ -31,12 +31,7 @@ export const ColumnHandle = React.memo(function ColumnHandle({
   // (the plugin re-emits `hoveringCell` with the mapped pos a tick later);
   // unmounting the source element here would make pragmatic-dnd silently
   // abort the active drag.
-  // `nodeDOM` is typed as `Node | null` — when `anchorPos` goes stale (e.g.
+  const lookupCellDom = editor.view.nodeDOM(anchorPos) as HTMLElement | null;
-  // an external drop reflows the doc before the plugin re-emits
-  // hoveringCell), it can resolve to a Text node, on which `.closest` is
-  // undefined. Filter to HTMLElement so downstream consumers stay safe.
-  const lookupDom = editor.view.nodeDOM(anchorPos);
-  const lookupCellDom = lookupDom instanceof HTMLElement ? lookupDom : null;
   const [cellDom, setCellDom] = useState<HTMLElement | null>(lookupCellDom);
   const lastCellDomRef = useRef<HTMLElement | null>(lookupCellDom);
   useEffect(() => {

apps/client/src/features/editor/components/table/handle/row-handle.tsx

@@ -29,12 +29,7 @@ export const RowHandle = React.memo(function RowHandle({
   // See ColumnHandle for the rationale: keep the last valid cell DOM cached
   // so the handle div stays mounted across stale-anchor renders, otherwise
   // pragmatic-dnd silently aborts an in-flight drag.
-  // `nodeDOM` is typed as `Node | null` — when `anchorPos` goes stale (e.g.
+  const lookupCellDom = editor.view.nodeDOM(anchorPos) as HTMLElement | null;
-  // an external drop reflows the doc before the plugin re-emits
-  // hoveringCell), it can resolve to a Text node, on which `.closest` is
-  // undefined. Filter to HTMLElement so downstream consumers stay safe.
-  const lookupDom = editor.view.nodeDOM(anchorPos);
-  const lookupCellDom = lookupDom instanceof HTMLElement ? lookupDom : null;
   const [cellDom, setCellDom] = useState<HTMLElement | null>(lookupCellDom);
   const lastCellDomRef = useRef<HTMLElement | null>(lookupCellDom);
   useEffect(() => {

apps/client/src/features/editor/components/table/table-menu.tsx

@@ -18,7 +18,7 @@ import {
   IconTrashX,
 } from "@tabler/icons-react";
 import { BubbleMenu } from "@tiptap/react/menus";
-import { isCellSelection, isEditorReady, isTextSelected } from "@docmost/editor-ext";
+import { isCellSelection, isTextSelected } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
 import classes from "../common/toolbar-menu.module.css";
 
@@ -38,7 +38,6 @@ export const TableMenu = React.memo(
     );
 
     const getReferencedVirtualElement = useCallback(() => {
-      if (!isEditorReady(editor)) return;
       const { selection } = editor.state;
       const predicate = (node: PMNode) => node.type.name === "table";
       const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/transclusion/transclusion-reference-view.tsx

@@ -35,7 +35,6 @@ export default function TransclusionReferenceView(props: NodeViewProps) {
   return (
     <NodeViewWrapper
       className={classes.includeWrap}
-      data-editable={isEditable ? "true" : "false"}
       data-focused={isEditable && props.selected ? "true" : "false"}
       data-menu-open={openMenus > 0 ? "true" : "false"}
       contentEditable={false}

apps/client/src/features/editor/components/transclusion/transclusion-view.tsx

@@ -62,7 +62,6 @@ export default function TransclusionView(props: NodeViewProps) {
   return (
     <NodeViewWrapper
       className={classes.transclusionWrap}
-      data-editable={isEditable ? "true" : "false"}
       data-menu-open={openMenus > 0 ? "true" : "false"}
       data-id={transclusionId ?? undefined}
     >

apps/client/src/features/editor/components/transclusion/transclusion.module.css

@@ -44,29 +44,8 @@
   transition: border 0.3s;
 }
 
-.transclusionWrap[data-editable="false"],
+.transclusionWrap:hover,
-.includeWrap[data-editable="false"] {
+.transclusionWrap:focus-within {
-  margin-left: 0;
-  margin-right: 0;
-  width: 100%;
-  padding: 0;
-}
-
-/* Cancel the wrapping .react-renderer's vertical spacing in read-only mode
-   so the synced block sits flush with surrounding paragraphs (whose own
-   margins already provide the right rhythm). */
-:global(.react-renderer.node-transclusionSource):has(
-    .transclusionWrap[data-editable="false"]
-  ),
-:global(.react-renderer.node-transclusionReference):has(
-    .includeWrap[data-editable="false"]
-  ) {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.transclusionWrap[data-editable="true"]:hover,
-.transclusionWrap[data-editable="true"]:focus-within {
   border: 2px solid
     light-dark(
       var(--mantine-color-orange-2),
@@ -135,9 +114,9 @@
   transition: border 0.3s;
 }
 
-.includeWrap[data-editable="true"]:hover,
+.includeWrap:hover,
-.includeWrap[data-editable="true"][data-focused="true"],
+.includeWrap[data-focused="true"],
-.includeWrap[data-editable="true"][data-menu-open="true"] {
+.includeWrap[data-menu-open="true"] {
   border: 2px solid
     light-dark(
       var(--mantine-color-orange-2),

apps/client/src/features/editor/components/video/video-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -54,7 +53,7 @@ export function VideoMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "video";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/extensions/extensions.ts

@@ -42,7 +42,6 @@ import {
   Excalidraw,
   Embed,
   TiptapPdf,
-  PageBreak,
   SearchAndReplace,
   Mention,
   TableDndExtension,
@@ -85,7 +84,7 @@ import AudioView from "@/features/editor/components/audio/audio-view.tsx";
 import AttachmentView from "@/features/editor/components/attachment/attachment-view.tsx";
 import CodeBlockView from "@/features/editor/components/code-block/code-block-view.tsx";
 import DrawioView from "../components/drawio/drawio-view";
-import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-view-lazy.tsx";
+import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-view.tsx";
 import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
 import PdfView from "@/features/editor/components/pdf/pdf-view.tsx";
 import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx";
@@ -367,7 +366,6 @@ export const mainExtensions = [
   TiptapPdf.configure({
     view: PdfView,
   }),
-  PageBreak,
   Subpages.configure({
     view: SubpagesView,
   }),

apps/client/src/features/editor/full-editor.tsx

@@ -1,5 +1,5 @@
 import classes from "@/features/editor/styles/editor.module.css";
-import React, { useEffect } from "react";
+import React from "react";
 import { TitleEditor } from "@/features/editor/title-editor";
 import PageEditor from "@/features/editor/page-editor";
 import {
@@ -23,25 +23,17 @@ import { IContributor } from "@/features/page/types/page.types.ts";
 import { FixedToolbar } from "@/features/editor/components/fixed-toolbar/fixed-toolbar";
 import { PageEditMode } from "@/features/user/types/user.types.ts";
 import useToggleAside from "@/hooks/use-toggle-aside.tsx";
-import { DeletedPageBanner } from "@/features/page/trash/components/deleted-page-banner.tsx";
 import clsx from "clsx";
-import { currentPageEditModeAtom } from "@/features/editor/atoms/editor-atoms.ts";
 
 const MemoizedTitleEditor = React.memo(TitleEditor);
 const MemoizedPageEditor = React.memo(PageEditor);
-const MemoizedFixedToolbar = React.memo(FixedToolbar);
-const MemoizedDeletedPageBanner = React.memo(DeletedPageBanner);
 
-type PageUser = {
+type PageCreator = {
   id: string;
   name: string;
   avatarUrl: string;
 };
 
-// Module-level flag: survives component unmount/remount on page navigation,
-// reset only on full page reload (i.e. a new app session).
-let defaultEditModeApplied = false;
-
 export interface FullEditorProps {
   pageId: string;
   slugId: string;
@@ -49,7 +41,7 @@ export interface FullEditorProps {
   content: string;
   spaceSlug: string;
   editable: boolean;
-  creator?: PageUser;
+  creator?: PageCreator;
   contributors?: IContributor[];
   canComment?: boolean;
 }
@@ -69,21 +61,9 @@ export function FullEditor({
   const fullPageWidth = user.settings?.preferences?.fullPageWidth;
   const editorToolbarEnabled =
     user.settings?.preferences?.editorToolbar ?? false;
-  const [currentPageEditMode, setCurrentPageEditMode] = useAtom(
-    currentPageEditModeAtom,
-  );
   const userPageEditMode =
     user.settings?.preferences?.pageEditMode ?? PageEditMode.Edit;
-  const isEditMode = currentPageEditMode === PageEditMode.Edit;
+  const isEditMode = userPageEditMode === PageEditMode.Edit;
-
-  // Apply the user's saved preference only once on initial load, not on every
-  // page navigation — so the mode sticks across navigations within a session.
-  useEffect(() => {
-    if (!defaultEditModeApplied) {
-      setCurrentPageEditMode(userPageEditMode as PageEditMode);
-      defaultEditModeApplied = true;
-    }
-  }, [userPageEditMode, setCurrentPageEditMode]);
 
   return (
     <Container
@@ -91,10 +71,7 @@ export function FullEditor({
       size={!fullPageWidth && 900}
       className={classes.editor}
     >
-      {editorToolbarEnabled && editable && isEditMode && (
+      {editorToolbarEnabled && editable && isEditMode && <FixedToolbar />}
-        <MemoizedFixedToolbar />
-      )}
-      <MemoizedDeletedPageBanner slugId={slugId} />
       <MemoizedTitleEditor
         pageId={pageId}
         slugId={slugId}
@@ -118,12 +95,16 @@ export function FullEditor({
 }
 
 type PageBylineProps = {
-  creator?: PageUser;
+  creator?: PageCreator;
   contributors?: IContributor[];
   readOnly?: boolean;
 };
 
-function PageByline({ creator, contributors, readOnly }: PageBylineProps) {
+function PageByline({
+  creator,
+  contributors,
+  readOnly,
+}: PageBylineProps) {
   const { t } = useTranslation();
   const toggleAside = useToggleAside();
 

apps/client/src/features/editor/page-editor.tsx

@@ -26,11 +26,10 @@ import {
   collabExtensions,
   mainExtensions,
 } from "@/features/editor/extensions/extensions";
-import { useAtom, useAtomValue } from "jotai";
+import { useAtom } from "jotai";
 import useCollaborationUrl from "@/features/editor/hooks/use-collaboration-url";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import {
-  currentPageEditModeAtom,
   pageEditorAtom,
   yjsConnectionStatusAtom,
 } from "@/features/editor/atoms/editor-atoms";
@@ -55,7 +54,7 @@ import {
   handleFileDrop,
   handlePaste,
 } from "@/features/editor/components/common/editor-paste-handler.tsx";
-import ExcalidrawMenu from "./components/excalidraw/excalidraw-menu-lazy";
+import ExcalidrawMenu from "./components/excalidraw/excalidraw-menu";
 import DrawioMenu from "./components/drawio/drawio-menu";
 import { useCollabToken } from "@/features/auth/queries/auth-query.tsx";
 import SearchAndReplaceDialog from "@/features/editor/components/search-and-replace/search-and-replace-dialog.tsx";
@@ -113,7 +112,8 @@ export default function PageEditor({
   const documentState = useDocumentVisibility();
   const { pageSlug } = useParams();
   const slugId = extractPageSlugId(pageSlug);
-  const currentPageEditMode = useAtomValue(currentPageEditModeAtom);
+  const userPageEditMode =
+    currentUser?.user?.settings?.preferences?.pageEditMode ?? PageEditMode.Edit;
   const canScroll = useCallback(
     () => Boolean(isComponentMounted.current && editorRef.current),
     [isComponentMounted],
@@ -373,9 +373,19 @@ export default function PageEditor({
     return () => clearTimeout(timeout);
   }, [yjsConnectionStatus, isSynced]);
   useEffect(() => {
-    if (!editor) return;
+    // Only honor user default page edit mode preference and permissions
-    editor.setEditable(editable && currentPageEditMode === PageEditMode.Edit);
+    if (editor) {
-  }, [currentPageEditMode, editor, editable]);
+      if (userPageEditMode && editable) {
+        if (userPageEditMode === PageEditMode.Edit) {
+          editor.setEditable(true);
+        } else if (userPageEditMode === PageEditMode.Read) {
+          editor.setEditable(false);
+        }
+      } else {
+        editor.setEditable(false);
+      }
+    }
+  }, [userPageEditMode, editor, editable]);
 
   const hasConnectedOnceRef = useRef(false);
   const [showStatic, setShowStatic] = useState(true);

apps/client/src/features/editor/styles/index.css

@@ -9,7 +9,6 @@
 @import "./media.css";
 @import "./code.css";
 @import "./print.css";
-@import "./page-break.css";
 @import "./find.css";
 @import "./mention.css";
 @import "./ordered-list.css";

apps/client/src/features/editor/styles/page-break.css

@@ -1,50 +0,0 @@
-.ProseMirror .page-break {
-  position: relative;
-  margin: 1.5rem 0;
-  border-top: 1px dashed var(--mantine-color-default-border);
-  height: 0;
-  user-select: none;
-}
-
-.ProseMirror[contenteditable="false"] .page-break {
-  margin: 0;
-  border: none;
-  height: 0;
-}
-
-.ProseMirror[contenteditable="false"] .page-break::after {
-  content: none;
-}
-
-.ProseMirror .page-break::after {
-  content: "Page break";
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  padding: 0 0.5rem;
-  background: var(--mantine-color-body);
-  color: var(--mantine-color-dimmed);
-  font-size: 0.75rem;
-  line-height: 1;
-  letter-spacing: 0.02em;
-  text-transform: uppercase;
-}
-
-.ProseMirror .page-break.ProseMirror-selectednode {
-  border-top-color: var(--mantine-primary-color-filled);
-}
-
-@media print {
-  .ProseMirror .page-break {
-    break-before: always;
-    page-break-before: always;
-    visibility: hidden;
-    border: none;
-    margin: 0;
-  }
-
-  .ProseMirror .page-break::after {
-    content: none;
-  }
-}

apps/client/src/features/editor/title-editor.tsx

@@ -7,7 +7,6 @@ import { Text } from "@tiptap/extension-text";
 import { Placeholder } from "@tiptap/extension-placeholder";
 import { useAtomValue } from "jotai";
 import {
-  currentPageEditModeAtom,
   pageEditorAtom,
   titleEditorAtom,
 } from "@/features/editor/atoms/editor-atoms";
@@ -25,6 +24,7 @@ import { useTranslation } from "react-i18next";
 import EmojiCommand from "@/features/editor/extensions/emoji-command.ts";
 import { UpdateEvent } from "@/features/websocket/types";
 import localEmitter from "@/lib/local-emitter.ts";
+import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { PageEditMode } from "@/features/user/types/user.types.ts";
 import { searchSpotlight } from "@/features/search/constants.ts";
 import { platformModifierKey } from "@/lib";
@@ -52,7 +52,9 @@ export function TitleEditor({
   const emit = useQueryEmit();
   const navigate = useNavigate();
   const [activePageId, setActivePageId] = useState(pageId);
-  const currentPageEditMode = useAtomValue(currentPageEditModeAtom);
+  const [currentUser] = useAtom(currentUserAtom);
+  const userPageEditMode =
+    currentUser?.user?.settings?.preferences?.pageEditMode ?? PageEditMode.Edit;
 
   const titleEditor = useEditor({
     extensions: [
@@ -170,9 +172,18 @@ export function TitleEditor({
   }, [pageId]);
 
   useEffect(() => {
-    if (!titleEditor) return;
+    if (titleEditor) {
-    titleEditor.setEditable(editable && currentPageEditMode === PageEditMode.Edit);
+      if (userPageEditMode && editable) {
-  }, [currentPageEditMode, titleEditor, editable]);
+        if (userPageEditMode === PageEditMode.Edit) {
+          titleEditor.setEditable(true);
+        } else if (userPageEditMode === PageEditMode.Read) {
+          titleEditor.setEditable(false);
+        }
+      } else {
+        titleEditor.setEditable(false);
+      }
+    }
+  }, [userPageEditMode, titleEditor, editable]);
 
   const openSearchDialog = () => {
     const event = new CustomEvent("openFindDialogFromEditor", {});

apps/client/src/features/page/components/header/page-header-menu.tsx

@@ -40,7 +40,7 @@ import {
   yjsConnectionStatusAtom,
 } from "@/features/editor/atoms/editor-atoms.ts";
 import { formattedDate } from "@/lib/time.ts";
-import { PageEditModeToggle } from "@/features/user/components/page-state-pref.tsx";
+import { PageStateSegmentedControl } from "@/features/user/components/page-state-pref.tsx";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
 import { PageShareModal } from "@/ee/page-permission";
@@ -65,11 +65,6 @@ interface PageHeaderMenuProps {
 export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
   const { t } = useTranslation();
   const toggleAside = useToggleAside();
-  const { pageSlug } = useParams();
-  const { data: page } = usePageQuery({
-    pageId: extractPageSlugId(pageSlug),
-  });
-  const isDeleted = !!page?.deletedAt;
 
   useHotkeys(
     [
@@ -92,15 +87,11 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
     [],
   );
 
-  if (isDeleted) {
-    return null;
-  }
-
   return (
     <>
       <ConnectionWarning />
 
-      {!readOnly && <PageEditModeToggle size="xs" />}
+      {!readOnly && <PageStateSegmentedControl size="xs" />}
 
       <PageShareModal readOnly={readOnly} />
 

apps/client/src/features/page/hooks/use-restore-page-modal.tsx

@@ -1,30 +0,0 @@
-import { modals } from "@mantine/modals";
-import { Text } from "@mantine/core";
-import { useTranslation } from "react-i18next";
-
-type UseRestoreModalProps = {
-  title?: string | null;
-  onConfirm: () => void;
-};
-
-export function useRestorePageModal() {
-  const { t } = useTranslation();
-  const openRestoreModal = ({ title, onConfirm }: UseRestoreModalProps) => {
-    modals.openConfirmModal({
-      title: t("Restore page"),
-      children: (
-        <Text size="sm">
-          {t("Restore '{{title}}' and its sub-pages?", {
-            title: title || t("Untitled"),
-          })}
-        </Text>
-      ),
-      centered: true,
-      labels: { confirm: t("Restore"), cancel: t("Cancel") },
-      confirmProps: { color: "blue" },
-      onConfirm,
-    });
-  };
-
-  return { openRestoreModal } as const;
-}

apps/client/src/features/page/queries/page-query.ts

@@ -117,20 +117,10 @@ export function useUpdatePageMutation() {
 }
 
 export function useRemovePageMutation() {
-  const { t } = useTranslation();
   return useMutation({
     mutationFn: (pageId: string) => deletePage(pageId, false),
     onSuccess: (_, pageId) => {
-      notifications.show({ message: t("Page moved to trash") });
+      notifications.show({ message: "Page moved to trash" });
-
-      // Stamp deletedAt so a re-visit shows the trash banner, not stale state.
-      const cached = queryClient.getQueryData<IPage>(["pages", pageId]);
-      if (cached) {
-        const stamped = { ...cached, deletedAt: new Date() };
-        queryClient.setQueryData(["pages", cached.id], stamped);
-        queryClient.setQueryData(["pages", cached.slugId], stamped);
-      }
-
       invalidateOnDeletePage(pageId);
       queryClient.invalidateQueries({
         predicate: (item) =>
@@ -138,7 +128,7 @@ export function useRemovePageMutation() {
       });
     },
     onError: (error) => {
-      notifications.show({ message: t("Failed to delete page"), color: "red" });
+      notifications.show({ message: "Failed to delete page", color: "red" });
     },
   });
 }
@@ -172,14 +162,13 @@ export function useMovePageMutation() {
 }
 
 export function useRestorePageMutation() {
-  const { t } = useTranslation();
   const [treeData, setTreeData] = useAtom(treeDataAtom);
   const emit = useQueryEmit();
 
   return useMutation({
     mutationFn: (pageId: string) => restorePage(pageId),
     onSuccess: async (restoredPage) => {
-      notifications.show({ message: t("Page restored successfully") });
+      notifications.show({ message: "Page restored successfully" });
 
       // Check if the page already exists in the tree (it shouldn't)
       if (!treeModel.find(treeData, restoredPage.id)) {
@@ -233,16 +222,9 @@ export function useRestorePageMutation() {
       await queryClient.invalidateQueries({
         queryKey: ["trash-list", restoredPage.spaceId],
       });
-
-      // Merge — restore endpoint returns a skinny page;
-      // Replace would strip space/permissions/content and break the editor.
-      const merge = (cached: IPage | undefined) =>
-        cached ? { ...cached, ...restoredPage } : cached;
-      queryClient.setQueryData<IPage>(["pages", restoredPage.id], merge);
-      queryClient.setQueryData<IPage>(["pages", restoredPage.slugId], merge);
     },
     onError: (error) => {
-      notifications.show({ message: t("Failed to restore page"), color: "red" });
+      notifications.show({ message: "Failed to restore page", color: "red" });
     },
   });
 }

apps/client/src/features/page/trash/components/deleted-page-banner.tsx

@@ -1,140 +0,0 @@
-import { ActionIcon, Button, Group, Paper, Text, Tooltip } from "@mantine/core";
-import { IconRestore, IconTrash } from "@tabler/icons-react";
-import { useNavigate } from "react-router-dom";
-import { Trans, useTranslation } from "react-i18next";
-import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
-import { useRestorePageModal } from "@/features/page/hooks/use-restore-page-modal.tsx";
-import { useDeletePageModal } from "@/features/page/hooks/use-delete-page-modal.tsx";
-import {
-  useDeletePageMutation,
-  usePageQuery,
-  useRestorePageMutation,
-} from "@/features/page/queries/page-query.ts";
-import { getSpaceUrl } from "@/lib/config.ts";
-import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
-import { useSpaceAbility } from "@/features/space/permissions/use-space-ability.ts";
-import {
-  SpaceCaslAction,
-  SpaceCaslSubject,
-} from "@/features/space/permissions/permissions.type.ts";
-
-type DeletedPageBannerProps = {
-  slugId: string;
-};
-
-export function DeletedPageBanner({ slugId }: DeletedPageBannerProps) {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-  const { data: page } = usePageQuery({ pageId: slugId });
-  const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug);
-  const spaceAbility = useSpaceAbility(space?.membership?.permissions);
-  const deletedTimeAgo = useTimeAgo(page?.deletedAt);
-  const restorePageMutation = useRestorePageMutation();
-  const deletePageMutation = useDeletePageMutation();
-  const { openRestoreModal } = useRestorePageModal();
-  const { openDeleteModal } = useDeletePageModal();
-
-  if (!page?.deletedAt) return null;
-
-  const canRestore = spaceAbility.can(
-    SpaceCaslAction.Edit,
-    SpaceCaslSubject.Page,
-  );
-  const canPermanentlyDelete = spaceAbility.can(
-    SpaceCaslAction.Manage,
-    SpaceCaslSubject.Settings,
-  );
-  const actorName = page.deletedBy?.name ?? t("Someone");
-
-  const handleRestore = () => {
-    openRestoreModal({
-      title: page.title,
-      onConfirm: () => restorePageMutation.mutate(page.id),
-    });
-  };
-
-  const handlePermanentDelete = () => {
-    openDeleteModal({
-      isPermanent: true,
-      onConfirm: async () => {
-        await deletePageMutation.mutateAsync(page.id);
-        navigate(getSpaceUrl(page.space?.slug));
-      },
-    });
-  };
-
-  const hasAnyAction = canRestore || canPermanentlyDelete;
-
-  return (
-    <Paper radius="sm" mb="md" px="md" py="xs" bg="red.0">
-      <Group justify="space-between" wrap="wrap" gap="sm">
-        <Text size="sm" style={{ flex: 1, minWidth: 0 }}>
-          <Trans
-            i18nKey="<b>{{name}}</b> moved this page to Trash {{time}}."
-            values={{ name: actorName, time: deletedTimeAgo }}
-            components={{ b: <Text span fw={600} inherit /> }}
-          />
-        </Text>
-        {hasAnyAction && (
-          <>
-            <Group gap="xs" wrap="nowrap" visibleFrom="sm">
-              {canRestore && (
-                <Button
-                  size="xs"
-                  variant="light"
-                  color="red"
-                  leftSection={<IconRestore size={16} />}
-                  onClick={handleRestore}
-                  loading={restorePageMutation.isPending}
-                >
-                  {t("Restore page")}
-                </Button>
-              )}
-              {canPermanentlyDelete && (
-                <Button
-                  size="xs"
-                  variant="light"
-                  color="red"
-                  leftSection={<IconTrash size={16} />}
-                  onClick={handlePermanentDelete}
-                  loading={deletePageMutation.isPending}
-                >
-                  {t("Permanently delete")}
-                </Button>
-              )}
-            </Group>
-            <Group gap="xs" wrap="nowrap" hiddenFrom="sm">
-              {canRestore && (
-                <Tooltip label={t("Restore page")} withArrow>
-                  <ActionIcon
-                    size="lg"
-                    variant="default"
-                    onClick={handleRestore}
-                    loading={restorePageMutation.isPending}
-                    aria-label={t("Restore page")}
-                  >
-                    <IconRestore size={18} />
-                  </ActionIcon>
-                </Tooltip>
-              )}
-              {canPermanentlyDelete && (
-                <Tooltip label={t("Permanently delete")} withArrow>
-                  <ActionIcon
-                    size="lg"
-                    variant="light"
-                    color="red"
-                    onClick={handlePermanentDelete}
-                    loading={deletePageMutation.isPending}
-                    aria-label={t("Permanently delete")}
-                  >
-                    <IconTrash size={18} />
-                  </ActionIcon>
-                </Tooltip>
-              )}
-            </Group>
-          </>
-        )}
-      </Group>
-    </Paper>
-  );
-}

apps/client/src/features/page/trash/components/trash-banner.tsx

@@ -1,21 +0,0 @@
-import { Alert, Text } from "@mantine/core";
-import { IconInfoCircle } from "@tabler/icons-react";
-import { useAtomValue } from "jotai";
-import { useTranslation } from "react-i18next";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-
-export function TrashBanner() {
-  const { t } = useTranslation();
-  const workspace = useAtomValue(workspaceAtom);
-  const retentionDays = workspace?.trashRetentionDays ?? 30;
-
-  return (
-    <Alert icon={<IconInfoCircle size={16} />} variant="light" color="red">
-      <Text size="sm" lh={1.35}>
-        {t("Pages in trash will be permanently deleted after {{count}} days.", {
-          count: retentionDays,
-        })}
-      </Text>
-    </Alert>
-  );
-}

apps/client/src/features/page/trash/components/trash.tsx

@@ -7,16 +7,17 @@ import {
   Group,
   ActionIcon,
   Text,
+  Alert,
   Stack,
   Menu,
 } from "@mantine/core";
 import {
+  IconInfoCircle,
   IconDots,
   IconRestore,
   IconTrash,
   IconFileDescription,
 } from "@tabler/icons-react";
-import { TrashBanner } from "@/features/page/trash/components/trash-banner.tsx";
 import {
   useDeletedPagesQuery,
   useRestorePageMutation,
@@ -30,10 +31,12 @@ import TrashPageContentModal from "@/features/page/trash/components/trash-page-c
 import { UserInfo } from "@/components/common/user-info.tsx";
 import Paginate from "@/components/common/paginate.tsx";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
-import { useRestorePageModal } from "@/features/page/hooks/use-restore-page-modal.tsx";
+import { useAtom } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 
 export default function Trash() {
   const { t } = useTranslation();
+  const [workspace] = useAtom(workspaceAtom);
   const { spaceSlug } = useParams();
   const { cursor, goNext, goPrev } = useCursorPaginate();
   const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
@@ -42,7 +45,6 @@ export default function Trash() {
   });
   const restorePageMutation = useRestorePageMutation();
   const deletePageMutation = useDeletePageMutation();
-  const { openRestoreModal } = useRestorePageModal();
 
   const [selectedPage, setSelectedPage] = useState<{
     title: string;
@@ -76,6 +78,23 @@ export default function Trash() {
     });
   };
 
+  const openRestoreModal = (pageId: string, pageTitle: string) => {
+    modals.openConfirmModal({
+      title: t("Restore page"),
+      children: (
+        <Text size="sm">
+          {t("Restore '{{title}}' and its sub-pages?", {
+            title: pageTitle || "Untitled",
+          })}
+        </Text>
+      ),
+      centered: true,
+      labels: { confirm: t("Restore"), cancel: t("Cancel") },
+      confirmProps: { color: "blue" },
+      onConfirm: () => handleRestorePage(pageId),
+    });
+  };
+
   const hasPages = deletedPages && deletedPages.items.length > 0;
 
   const handlePageClick = (page: any) => {
@@ -90,7 +109,11 @@ export default function Trash() {
           <Title order={2}>{t("Trash")}</Title>
         </Group>
 
-        <TrashBanner />
+        <Alert icon={<IconInfoCircle size={16} />} variant="light" color="red">
+          <Text size="sm">
+            {t("Pages in trash will be permanently deleted after {{count}} days.", { count: workspace?.trashRetentionDays ?? 30 })}
+          </Text>
+        </Alert>
 
         {isLoading || !deletedPages ? (
           <></>
@@ -158,10 +181,7 @@ export default function Trash() {
                           <Menu.Item
                             leftSection={<IconRestore size={16} />}
                             onClick={() =>
-                              openRestoreModal({
+                              openRestoreModal(page.id, page.title)
-                                title: page.title,
-                                onConfirm: () => handleRestorePage(page.id),
-                              })
                             }
                           >
                             {t("Restore")}

apps/client/src/features/share/atoms/shared-page-atom.ts

@@ -1,11 +1,6 @@
 import { atom } from "jotai";
-import { atomWithStorage } from "jotai/utils";
 import { ISharedPageTree } from "@/features/share/types/share.types";
 import { SharedPageTreeNode } from "@/features/share/utils";
 
 export const sharedPageTreeAtom = atom<ISharedPageTree | null>(null);
 export const sharedTreeDataAtom = atom<SharedPageTreeNode[] | null>(null);
-export const sharedPageFullWidthAtom = atomWithStorage<boolean>(
-  "sharedPageFullWidth",
-  false,
-);

apps/client/src/features/share/components/share-shell.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, { useEffect, useMemo } from "react";
 import {
   ActionIcon,
   AppShell,
@@ -14,16 +14,11 @@ import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 import { ThemeToggle } from "@/components/theme-toggle.tsx";
 import { useAtomValue, useSetAtom } from "jotai";
 import { useAtom } from "jotai";
-import {
+import { sharedPageTreeAtom, sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom";
-  sharedPageFullWidthAtom,
-  sharedPageTreeAtom,
-  sharedTreeDataAtom,
-} from "@/features/share/atoms/shared-page-atom";
 import { buildSharedPageTree } from "@/features/share/utils";
 import {
   desktopSidebarAtom,
   mobileSidebarAtom,
-  sidebarWidthAtom,
 } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import SidebarToggle from "@/components/ui/sidebar-toggle-button.tsx";
 import { useTranslation } from "react-i18next";
@@ -32,7 +27,7 @@ import {
   mobileTableOfContentAsideAtom,
   tableOfContentAsideAtom,
 } from "@/features/share/atoms/sidebar-atom.ts";
-import { IconArrowsHorizontal, IconList } from "@tabler/icons-react";
+import { IconList } from "@tabler/icons-react";
 import { useToggleToc } from "@/features/share/hooks/use-toggle-toc.ts";
 import classes from "./share.module.css";
 import {
@@ -60,46 +55,6 @@ export default function ShareShell({
   const [mobileTocOpened] = useAtom(mobileTableOfContentAsideAtom);
   const toggleTocMobile = useToggleToc(mobileTableOfContentAsideAtom);
   const toggleToc = useToggleToc(tableOfContentAsideAtom);
-  const [fullWidth, setFullWidth] = useAtom(sharedPageFullWidthAtom);
-  const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
-  const [isResizing, setIsResizing] = useState(false);
-  const sidebarRef = useRef<HTMLElement | null>(null);
-
-  const startResizing = useCallback((e: React.MouseEvent) => {
-    e.preventDefault();
-    setIsResizing(true);
-  }, []);
-
-  const stopResizing = useCallback(() => {
-    setIsResizing(false);
-  }, []);
-
-  const resize = useCallback(
-    (e: MouseEvent) => {
-      if (!isResizing || !sidebarRef.current) return;
-      const newWidth =
-        e.clientX - sidebarRef.current.getBoundingClientRect().left;
-      if (newWidth < 220) {
-        setSidebarWidth(220);
-        return;
-      }
-      if (newWidth > 600) {
-        setSidebarWidth(600);
-        return;
-      }
-      setSidebarWidth(newWidth);
-    },
-    [isResizing, setSidebarWidth],
-  );
-
-  useEffect(() => {
-    window.addEventListener("mousemove", resize);
-    window.addEventListener("mouseup", stopResizing);
-    return () => {
-      window.removeEventListener("mousemove", resize);
-      window.removeEventListener("mouseup", stopResizing);
-    };
-  }, [resize, stopResizing]);
 
   const { shareId } = useParams();
   const { data } = useGetSharedPageTreeQuery(shareId);
@@ -126,7 +81,7 @@ export default function ShareShell({
       header={{ height: 50 }}
       {...(data?.pageTree?.length > 1 && {
         navbar: {
-          width: sidebarWidth,
+          width: 300,
           breakpoint: "sm",
           collapsed: {
             mobile: !mobileOpened,
@@ -211,20 +166,6 @@ export default function ShareShell({
                   <IconList size={20} stroke={2} />
                 </ActionIcon>
               </Tooltip>
-
-              <Tooltip label={t("Full width")} withArrow>
-                <ActionIcon
-                  variant={fullWidth ? "light" : "default"}
-                  style={fullWidth ? undefined : { border: "none" }}
-                  aria-label={t("Full width")}
-                  aria-pressed={fullWidth}
-                  onClick={() => setFullWidth((v) => !v)}
-                  visibleFrom="sm"
-                  size="sm"
-                >
-                  <IconArrowsHorizontal size={20} stroke={2} />
-                </ActionIcon>
-              </Tooltip>
             </>
 
             <ThemeToggle />
@@ -233,11 +174,7 @@ export default function ShareShell({
       </AppShell.Header>
 
       {data?.pageTree?.length > 1 && (
-        <AppShell.Navbar p="md" className={classes.navbar} ref={sidebarRef}>
+        <AppShell.Navbar p="md" className={classes.navbar}>
-          <div
-            className={classes.resizeHandle}
-            onMouseDown={startResizing}
-          />
           <MemoizedSharedTree sharedPageTree={data} />
         </AppShell.Navbar>
       )}

apps/client/src/features/share/components/share.module.css

@@ -10,7 +10,6 @@
 .treeNode {
   text-decoration: none;
   user-select: none;
-  padding-bottom: 0;
 }
 
 .navbar,
@@ -19,26 +18,3 @@
     width: 350px;
   }
 }
-
-.resizeHandle {
-  width: 3px;
-  cursor: col-resize;
-  position: absolute;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  z-index: 1;
-
-  &:hover,
-  &:active {
-    width: 5px;
-    background: light-dark(
-      var(--mantine-color-gray-4),
-      var(--mantine-color-dark-5)
-    );
-  }
-
-  @media (max-width: $mantine-breakpoint-sm) {
-    display: none;
-  }
-}

apps/client/src/features/user/components/page-state-pref.tsx

@@ -6,7 +6,6 @@ import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { PageEditMode } from "@/features/user/types/user.types.ts";
 import { ResponsiveSettingsRow, ResponsiveSettingsContent, ResponsiveSettingsControl } from "@/components/ui/responsive-settings-row";
-import { currentPageEditModeAtom } from "@/features/editor/atoms/editor-atoms.ts";
 
 export default function PageStatePref() {
   const { t } = useTranslation();
@@ -72,24 +71,3 @@ export function PageStateSegmentedControl({
     />
   );
 }
-
-// Header variant: updates the current page's mode locally without persisting
-// the preference to the server.
-export function PageEditModeToggle({ size }: { size?: MantineSize }) {
-  const { t } = useTranslation();
-  const [currentPageEditMode, setCurrentPageEditMode] = useAtom(
-    currentPageEditModeAtom,
-  );
-
-  return (
-    <SegmentedControl
-      size={size}
-      value={currentPageEditMode}
-      onChange={(v) => setCurrentPageEditMode(v as PageEditMode)}
-      data={[
-        { label: t("Edit"), value: PageEditMode.Edit },
-        { label: t("Read"), value: PageEditMode.Read },
-      ]}
-    />
-  );
-}

apps/client/src/lib/app-route.ts

@@ -31,38 +31,20 @@ const APP_ROUTE = {
   },
 };
 
-export function safeRedirectPath(input: unknown): string | null {
-  if (typeof input !== "string") return null;
-  if (input.length === 0 || input.length > 2048) return null;
-  // Reject whitespace, backslash, and any Unicode "Other" category char
-  // (ASCII controls, zero-width space, BOM, bidi marks, etc).
-  if (/[\s\\]|\p{C}/u.test(input)) return null;
-  if (!input.startsWith("/") || input.startsWith("//")) return null;
-  if (input.toLowerCase().includes("://")) return null;
-  if (/^\/[a-z][a-z0-9+\-.]*:/i.test(input)) return null;
-  try {
-    const resolved = new URL(input, window.location.origin);
-    if (resolved.origin !== window.location.origin) return null;
-    return resolved.pathname + resolved.search + resolved.hash;
-  } catch {
-    return null;
-  }
-}
-
 export function getPostLoginRedirect(): string {
   const params = new URLSearchParams(window.location.search);
-  return safeRedirectPath(params.get("redirect")) ?? APP_ROUTE.HOME;
+  const redirect = params.get("redirect");
+  if (redirect) {
+    try {
+      const resolved = new URL(redirect, window.location.origin);
+      if (resolved.origin === window.location.origin) {
+        return resolved.pathname + resolved.search + resolved.hash;
       }
-
+    } catch {
-/**
+      // malformed URL, fall through to default
- * Returns the `?redirect=` value from the current URL only when it is a safe
+    }
- * same-origin path. Unlike {@link getPostLoginRedirect} this returns `null`
+  }
- * (not `/home`) when no redirect is present, so callers can distinguish
+  return APP_ROUTE.HOME;
- * "user came here directly" from "user was bounced from a deep link".
- */
-export function getRedirectParam(): string | null {
-  const params = new URLSearchParams(window.location.search);
-  return safeRedirectPath(params.get("redirect"));
 }
 
 export default APP_ROUTE;

apps/client/src/pages/page/page.tsx

@@ -52,7 +52,7 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
   } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
   const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug);
 
-  const canEdit = !page?.deletedAt && (page?.permissions?.canEdit ?? false);
+  const canEdit = page?.permissions?.canEdit ?? false;
   const canComment =
     canEdit ||
     (space?.settings?.comments?.allowViewerComments === true);

apps/client/src/pages/share/shared-page.tsx

@@ -9,10 +9,7 @@ import { extractPageSlugId } from "@/lib";
 import { Error404 } from "@/components/ui/error-404.tsx";
 import ShareBranding from "@/features/share/components/share-branding.tsx";
 import { useAtomValue } from "jotai";
-import {
+import { sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom.ts";
-  sharedPageFullWidthAtom,
-  sharedTreeDataAtom,
-} from "@/features/share/atoms/shared-page-atom.ts";
 import { isPageInTree } from "@/features/share/utils.ts";
 
 export default function SharedPage() {
@@ -26,7 +23,6 @@ export default function SharedPage() {
   });
 
   const sharedTreeData = useAtomValue(sharedTreeDataAtom);
-  const fullWidth = useAtomValue(sharedPageFullWidthAtom);
 
   useEffect(() => {
     if (shareId && data) {
@@ -63,7 +59,7 @@ export default function SharedPage() {
         )}
       </Helmet>
 
-      <Container fluid={fullWidth} size={fullWidth ? undefined : 900} p={0}>
+      <Container size={900} p={0}>
         <ReadonlyPageEditor
           key={data.page.id}
           title={data.page.title}

apps/client/vite.config.ts

@@ -38,12 +38,12 @@ export default defineConfig(({ mode }) => {
     build: {
       rolldownOptions: {
         output: {
-          advancedChunks: {
+          codeSplitting: {
             groups: [
-              {
+              { name: "vendor-mantine", test: /@mantine/ },
-                name: "vendor-mantine",
+              { name: "vendor-mermaid", test: /mermaid|cytoscape|elkjs/ },
-                test: /[\\/]node_modules[\\/]@mantine[\\/]/,
+              { name: "vendor-excalidraw", test: /excalidraw/ },
-              },
+              { name: "vendor-katex", test: /katex/ },
             ],
           },
         },

apps/server/package.json

@@ -42,7 +42,7 @@
     "@fastify/multipart": "^10.0.0",
     "@fastify/static": "^9.1.3",
     "@keyv/redis": "^5.1.6",
-    "@langchain/core": "1.1.46",
+    "@langchain/core": "1.1.39",
     "@langchain/textsplitters": "1.0.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@nest-lab/throttler-storage-redis": "^1.2.0",
@@ -81,7 +81,7 @@
     "ioredis": "^5.10.1",
     "js-tiktoken": "^1.0.21",
     "jsonwebtoken": "^9.0.3",
-    "kysely": "^0.28.17",
+    "kysely": "^0.28.14",
     "kysely-migration-cli": "^0.4.2",
     "kysely-postgres-js": "^3.0.0",
     "ldapts": "^8.1.7",

apps/server/src/collaboration/collaboration.util.ts

@@ -26,7 +26,6 @@ import {
   TiptapVideo,
   TiptapAudio,
   TiptapPdf,
-  PageBreak,
   TrailingNode,
   Attachment,
   Drawio,
@@ -95,7 +94,6 @@ export const tiptapExtensions = [
   TiptapVideo,
   TiptapAudio,
   TiptapPdf,
-  PageBreak,
   Callout,
   Attachment,
   CustomCodeBlock,

apps/server/src/collaboration/server/collab-app.module.ts

@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
 import { AppController } from '../../app.controller';
 import { AppService } from '../../app.service';
 import { EnvironmentModule } from '../../integrations/environment/environment.module';
-import { EnvironmentService } from '../../integrations/environment/environment.service';
 import { CollaborationModule } from '../collaboration.module';
 import { DatabaseModule } from '@docmost/db/database.module';
 import { QueueModule } from '../../integrations/queue/queue.module';
@@ -13,8 +12,6 @@ import { LoggerModule } from '../../common/logger/logger.module';
 import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
 import { RedisConfigService } from '../../integrations/redis/redis-config.service';
 import { CaslModule } from '../../core/casl/casl.module';
-import { CacheModule } from '@nestjs/cache-manager';
-import KeyvRedis from '@keyv/redis';
 
 @Module({
   imports: [
@@ -29,18 +26,6 @@ import KeyvRedis from '@keyv/redis';
     RedisModule.forRootAsync({
       useClass: RedisConfigService,
     }),
-    CacheModule.registerAsync({
-      isGlobal: true,
-      useFactory: async (environmentService: EnvironmentService) => {
-        const redisUrl = environmentService.getRedisUrl();
-
-        return {
-          ttl: 5 * 1000,
-          stores: [new KeyvRedis(redisUrl)],
-        };
-      },
-      inject: [EnvironmentService],
-    }),
   ],
   controllers: [
     AppController,

apps/server/src/common/helpers/cache-keys.ts

@@ -1,11 +1,3 @@
 export const CacheKey = {
   LICENSE_VALID: (workspaceId: string) => `license:valid:${workspaceId}`,
-  SPACE_ROLES: (userId: string, spaceId: string) =>
-    `perm:space-roles:${userId}:${spaceId}`,
-  PAGE_CAN_EDIT: (userId: string, pageId: string) =>
-    `perm:can-edit:${userId}:${pageId}`,
 };
-
-// Permission caches dedupe repeated checks within and across short request bursts.
-// 5s keeps staleness on revocations bounded.
-export const PERMISSION_CACHE_TTL_MS = 5_000;

apps/server/src/common/helpers/with-cache.ts

@@ -1,27 +0,0 @@
-import { Cache } from 'cache-manager';
-
-export async function withCache<T>(
-  cacheManager: Cache,
-  key: string,
-  ttlMs: number,
-  fn: () => Promise<T>,
-): Promise<T> {
-  try {
-    const cached = await cacheManager.get<{ v: T }>(key);
-    if (cached !== undefined && cached !== null) {
-      return cached.v;
-    }
-  } catch (err) {
-    console.warn(`[withCache] get failed for "${key}", falling back to source`, err);
-  }
-
-  const value = await fn();
-
-  try {
-    await cacheManager.set(key, { v: value }, ttlMs);
-  } catch (err) {
-    console.warn(`[withCache] set failed for "${key}"`, err);
-  }
-
-  return value;
-}

apps/server/src/core/page/page.controller.ts

@@ -76,7 +76,6 @@ export class PageController {
       includeCreator: true,
       includeLastUpdatedBy: true,
       includeContributors: true,
-      includeDeletedBy: true,
     });
 
     if (!page) {

apps/server/src/database/repos/page/page-permission.repo.ts

@@ -1,6 +1,4 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
-import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { Cache } from 'cache-manager';
 import { InjectKysely } from 'nestjs-kysely';
 import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { dbOrTx } from '@docmost/db/utils';
@@ -19,11 +17,6 @@ import {
   executeWithCursorPagination,
 } from '@docmost/db/pagination/cursor-pagination';
 import { PagePermissionMember } from './types/page-permission.types';
-import { withCache } from '../../../common/helpers/with-cache';
-import {
-  CacheKey,
-  PERMISSION_CACHE_TTL_MS,
-} from '../../../common/helpers/cache-keys';
 
 export { PagePermissionMember } from './types/page-permission.types';
 
@@ -32,7 +25,6 @@ export class PagePermissionRepo {
   constructor(
     @InjectKysely() private readonly db: KyselyDB,
     private readonly groupRepo: GroupRepo,
-    @Inject(CACHE_MANAGER) private readonly cacheManager: Cache,
   ) {}
 
   async findPageAccessByPageId(
@@ -369,8 +361,40 @@ export class PagePermissionRepo {
    * Check if user can access a page by verifying they have permission on ALL restricted ancestors.
    */
   async canUserAccessPage(userId: string, pageId: string): Promise<boolean> {
-    const { canAccess } = await this.canUserEditPage(userId, pageId);
+    const deniedAncestor = await this.db
-    return canAccess;
+      .withRecursive('ancestors', (qb) =>
+        qb
+          .selectFrom('pages')
+          .select(['pages.id as ancestorId', 'pages.parentPageId'])
+          .where('pages.id', '=', pageId)
+          .unionAll((eb) =>
+            eb
+              .selectFrom('pages')
+              .innerJoin('ancestors', 'ancestors.parentPageId', 'pages.id')
+              .select(['pages.id as ancestorId', 'pages.parentPageId']),
+          ),
+      )
+      .selectFrom('ancestors')
+      .innerJoin('pageAccess', 'pageAccess.pageId', 'ancestors.ancestorId')
+      .leftJoin('pagePermissions', (join) =>
+        join
+          .onRef('pagePermissions.pageAccessId', '=', 'pageAccess.id')
+          .on((eb) =>
+            eb.or([
+              eb('pagePermissions.userId', '=', userId),
+              eb(
+                'pagePermissions.groupId',
+                'in',
+                this.userGroupIdsSubquery(eb, userId),
+              ),
+            ]),
+          ),
+      )
+      .select('pageAccess.pageId')
+      .where('pagePermissions.id', 'is', null)
+      .executeTakeFirst();
+
+    return !deniedAncestor;
   }
 
   /**
@@ -388,11 +412,6 @@ export class PagePermissionRepo {
     canAccess: boolean;
     canEdit: boolean;
   }> {
-    return withCache(
-      this.cacheManager,
-      CacheKey.PAGE_CAN_EDIT(userId, pageId),
-      PERMISSION_CACHE_TTL_MS,
-      async () => {
     const result = await sql<{
       canAccess: boolean | null;
       canEdit: boolean | null;
@@ -430,8 +449,6 @@ export class PagePermissionRepo {
       canAccess: row.canAccess,
       canEdit: row.canAccess && (row.canEdit ?? false),
     };
-      },
-    );
   }
 
   /**

apps/server/src/database/repos/page/page.repo.ts

@@ -54,7 +54,6 @@ export class PageRepo {
       includeCreator?: boolean;
       includeLastUpdatedBy?: boolean;
       includeContributors?: boolean;
-      includeDeletedBy?: boolean;
       includeHasChildren?: boolean;
       withLock?: boolean;
       trx?: KyselyTransaction;
@@ -84,10 +83,6 @@ export class PageRepo {
       query = query.select((eb) => this.withContributors(eb));
     }
 
-    if (opts?.includeDeletedBy) {
-      query = query.select((eb) => this.withDeletedBy(eb));
-    }
-
     if (opts?.includeSpace) {
       query = query.select((eb) => this.withSpace(eb));
     }

apps/server/src/database/repos/space/space-member.repo.ts

@@ -1,6 +1,4 @@
-import { BadRequestException, Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
-import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { Cache } from 'cache-manager';
 import { InjectKysely } from 'nestjs-kysely';
 import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { dbOrTx } from '@docmost/db/utils';
@@ -15,11 +13,6 @@ import { MemberInfo, UserSpaceRole } from './types';
 import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
-import { withCache } from '../../../common/helpers/with-cache';
-import {
-  CacheKey,
-  PERMISSION_CACHE_TTL_MS,
-} from '../../../common/helpers/cache-keys';
 
 @Injectable()
 export class SpaceMemberRepo {
@@ -27,7 +20,6 @@ export class SpaceMemberRepo {
     @InjectKysely() private readonly db: KyselyDB,
     private readonly groupRepo: GroupRepo,
     private readonly spaceRepo: SpaceRepo,
-    @Inject(CACHE_MANAGER) private readonly cacheManager: Cache,
   ) {}
 
   async insertSpaceMember(
@@ -222,11 +214,6 @@ export class SpaceMemberRepo {
     userId: string,
     spaceId: string,
   ): Promise<UserSpaceRole[]> {
-    return withCache(
-      this.cacheManager,
-      CacheKey.SPACE_ROLES(userId, spaceId),
-      PERMISSION_CACHE_TTL_MS,
-      async () => {
     const roles = await this.db
       .selectFrom('spaceMembers')
       .select(['userId', 'role'])
@@ -235,11 +222,7 @@ export class SpaceMemberRepo {
       .unionAll(
         this.db
           .selectFrom('spaceMembers')
-              .innerJoin(
+          .innerJoin('groupUsers', 'groupUsers.groupId', 'spaceMembers.groupId')
-                'groupUsers',
-                'groupUsers.groupId',
-                'spaceMembers.groupId',
-              )
           .select(['groupUsers.userId', 'spaceMembers.role'])
           .where('groupUsers.userId', '=', userId)
           .where('spaceMembers.spaceId', '=', spaceId),
@@ -250,8 +233,6 @@ export class SpaceMemberRepo {
       return undefined;
     }
     return roles;
-      },
-    );
   }
 
   async getUserIdsWithSpaceAccess(

package.json

@@ -104,8 +104,8 @@
       "ws": "8.20.0",
       "dompurify": "3.4.1",
       "tmp": "0.2.5",
-      "hono": "4.12.18",
+      "hono": "4.12.14",
-      "mermaid": "11.15.0",
+      "mermaid": "11.13.0",
       "nanoid@^3": "3.3.8",
       "socket.io-parser": "4.2.6",
       "serialize-javascript": "7.0.3",
@@ -131,10 +131,9 @@
       "@xmldom/xmldom": "0.8.13",
       "handlebars": "4.7.9",
       "axios": "1.16.0",
-      "langsmith": "0.7.0",
+      "langsmith": "0.5.19",
       "follow-redirects": "1.16.0",
-      "protobufjs":  "7.5.6",
+      "protobufjs":  "7.5.5"
-      "ip-address":  "10.1.1"
     },
     "neverBuiltDependencies": []
   }

packages/editor-ext/src/index.ts

@@ -31,6 +31,5 @@ export * from "./lib/recreate-transform";
 export * from "./lib/columns";
 export * from "./lib/status";
 export * from "./lib/pdf";
-export * from "./lib/page-break";
 export * from "./lib/resizable-nodeview";
 

packages/editor-ext/src/lib/callout/callout.ts

@@ -162,28 +162,6 @@ export const Callout = Node.create<CalloutOptions>({
           return false;
         }
 
-        // Empty callout: delete the whole node so Backspace inside it isn't
-        // a no-op (isolating: true blocks the default join with the block
-        // above).
-        const calloutDepth = $from.depth - 1;
-        if (calloutDepth >= 0) {
-          const calloutNode = $from.node(calloutDepth);
-          if (
-            calloutNode.type === this.type &&
-            calloutNode.childCount === 1 &&
-            calloutNode.firstChild?.content.size === 0
-          ) {
-            const calloutPos = $from.before(calloutDepth);
-            const { tr } = state;
-            tr.delete(calloutPos, calloutPos + calloutNode.nodeSize);
-            tr.setSelection(
-              TextSelection.near(tr.doc.resolve(calloutPos), -1),
-            );
-            view.dispatch(tr);
-            return true;
-          }
-        }
-
         const previousPosition = $from.before($from.depth) - 1;
 
         // If nothing above to join with
@@ -229,56 +207,6 @@ export const Callout = Node.create<CalloutOptions>({
         }
         return false;
       },
-
-      // Exit the callout into a fresh paragraph below when the cursor sits
-      // in an empty trailing child. An empty callout (single empty
-      // paragraph) exits on the first Enter and keeps the empty callout
-      // intact; a callout with content needs the double-Enter pattern
-      // (first Enter splits, second Enter on the new trailing empty exits
-      // and removes that trailing paragraph).
-      Enter: ({ editor }) => {
-        const { state, view } = editor;
-        const { selection } = state;
-        if (!selection.empty) return false;
-
-        const { $from } = selection;
-        const calloutDepth = $from.depth - 1;
-        if (calloutDepth < 0) return false;
-
-        const calloutNode = $from.node(calloutDepth);
-        if (calloutNode.type !== this.type) return false;
-        if ($from.parent.content.size !== 0) return false;
-        if ($from.index(calloutDepth) !== calloutNode.childCount - 1) {
-          return false;
-        }
-
-        const paragraphType = state.schema.nodes.paragraph;
-        const containerDepth = calloutDepth - 1;
-        const container = $from.node(containerDepth);
-        const indexAfter = $from.indexAfter(containerDepth);
-        if (
-          !container.canReplaceWith(indexAfter, indexAfter, paragraphType)
-        ) {
-          return false;
-        }
-
-        const calloutEnd = $from.after(calloutDepth);
-        const paragraph = paragraphType.create();
-        const { tr } = state;
-
-        if (calloutNode.childCount === 1) {
-          tr.insert(calloutEnd, paragraph);
-          tr.setSelection(TextSelection.create(tr.doc, calloutEnd + 1));
-        } else {
-          tr.delete($from.before(), $from.after());
-          const insertPos = tr.mapping.map(calloutEnd);
-          tr.insert(insertPos, paragraph);
-          tr.setSelection(TextSelection.create(tr.doc, insertPos + 1));
-        }
-
-        view.dispatch(tr);
-        return true;
-      },
     };
   },
 

packages/editor-ext/src/lib/custom-code-block/custom-code-block.ts

@@ -1,7 +1,5 @@
 import type { CodeBlockOptions } from '@tiptap/extension-code-block';
 import CodeBlock from '@tiptap/extension-code-block';
-import { Plugin, Selection, TextSelection } from '@tiptap/pm/state';
-import { GapCursor } from '@tiptap/pm/gapcursor';
 
 import { LowlightPlugin } from './lowlight-plugin.js';
 import { ReactNodeViewRenderer } from '@tiptap/react';
@@ -21,11 +19,7 @@ const TAB_CHAR = '\u00A0\u00A0';
  * @see https://tiptap.dev/api/nodes/code-block-lowlight
  */
 export const CustomCodeBlock = CodeBlock.extend<CodeBlockLowlightOptions>({
-  // Run ahead of Gapcursor (100) so the mermaid arrow-into-source plugin
-  // can intercept before gapcursor takes over.
-  priority: 101,
   selectable: true,
-  isolating: true,
 
   addOptions() {
     return {
@@ -41,86 +35,8 @@ export const CustomCodeBlock = CodeBlock.extend<CodeBlockLowlightOptions>({
   },
 
   addKeyboardShortcuts() {
-    const isMermaid = (node: any) =>
-      node?.type === this.type && node.attrs.language === 'mermaid';
-
     return {
       ...this.parent?.(),
-      // Stop at the gap (or enter mermaid source) instead of jumping
-      // straight into the next block, so the user can place a cursor
-      // between two adjacent isolating blocks.
-      ArrowDown: ({ editor }) => {
-        const { state } = editor;
-        const { selection, doc } = state;
-        const { $from, empty } = selection;
-
-        if (!empty || $from.parent.type !== this.type) return false;
-        if ($from.parentOffset !== $from.parent.nodeSize - 2) return false;
-
-        const after = $from.after();
-        if (after >= doc.content.size) {
-          return editor.commands.exitCode();
-        }
-
-        const $after = doc.resolve(after);
-        const nodeAfter = $after.nodeAfter;
-
-        if (isMermaid(nodeAfter)) {
-          return editor.commands.command(({ tr }) => {
-            tr.setSelection(TextSelection.create(tr.doc, after + 1));
-            return true;
-          });
-        }
-
-        if (
-          nodeAfter?.type.spec.isolating &&
-          !nodeAfter.type.spec.atom
-        ) {
-          return editor.commands.command(({ tr }) => {
-            tr.setSelection(new GapCursor(tr.doc.resolve(after)));
-            return true;
-          });
-        }
-
-        return editor.commands.command(({ tr }) => {
-          tr.setSelection(Selection.near(tr.doc.resolve(after)));
-          return true;
-        });
-      },
-      // Mirror of ArrowDown; upstream has no ArrowUp handler.
-      ArrowUp: ({ editor }) => {
-        const { state } = editor;
-        const { selection, doc } = state;
-        const { $from, empty } = selection;
-
-        if (!empty || $from.parent.type !== this.type) return false;
-        if ($from.parentOffset !== 0) return false;
-
-        const before = $from.before();
-        if (before <= 0) return false;
-
-        const $before = doc.resolve(before);
-        const nodeBefore = $before.nodeBefore;
-
-        if (isMermaid(nodeBefore)) {
-          return editor.commands.command(({ tr }) => {
-            tr.setSelection(TextSelection.create(tr.doc, before - 1));
-            return true;
-          });
-        }
-
-        if (
-          nodeBefore?.type.spec.isolating &&
-          !nodeBefore.type.spec.atom
-        ) {
-          return editor.commands.command(({ tr }) => {
-            tr.setSelection(new GapCursor(tr.doc.resolve(before)));
-            return true;
-          });
-        }
-
-        return false;
-      },
       'Mod-a': () => {
         if (this.editor.isActive('codeBlock')) {
           const { state } = this.editor;
@@ -168,7 +84,6 @@ export const CustomCodeBlock = CodeBlock.extend<CodeBlockLowlightOptions>({
   },
 
   addProseMirrorPlugins() {
-    const codeBlockType = this.type;
     return [
       ...(this.parent?.() || []),
       LowlightPlugin({
@@ -176,60 +91,6 @@ export const CustomCodeBlock = CodeBlock.extend<CodeBlockLowlightOptions>({
         lowlight: this.options.lowlight,
         defaultLanguage: this.options.defaultLanguage,
       }),
-      // Mermaid hides its <pre> when unselected, so the browser's native
-      // vertical caret movement skips past it. Land the cursor inside the
-      // source explicitly.
-      new Plugin({
-        props: {
-          handleKeyDown: (view, event) => {
-            if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown') {
-              return false;
-            }
-            const { state } = view;
-            const { selection } = state;
-            if (
-              !selection.empty ||
-              !(selection instanceof TextSelection)
-            ) {
-              return false;
-            }
-            const { $from } = selection;
-            if ($from.depth === 0 || $from.parent.type === codeBlockType) {
-              return false;
-            }
-            const dir = event.key === 'ArrowUp' ? 'up' : 'down';
-            if (!view.endOfTextblock(dir)) return false;
-
-            const isMermaid = (node: any) =>
-              node?.type === codeBlockType && node.attrs.language === 'mermaid';
-
-            if (event.key === 'ArrowUp') {
-              if ($from.parentOffset !== 0) return false;
-              const beforePos = $from.before();
-              const prev = state.doc.resolve(beforePos).nodeBefore;
-              if (!isMermaid(prev)) return false;
-              const endPos = beforePos - 1;
-              view.dispatch(
-                state.tr.setSelection(
-                  TextSelection.create(state.doc, endPos),
-                ),
-              );
-              return true;
-            }
-            if ($from.parentOffset !== $from.parent.nodeSize - 2) return false;
-            const afterPos = $from.after();
-            const next = state.doc.resolve(afterPos).nodeAfter;
-            if (!isMermaid(next)) return false;
-            const startPos = afterPos + 1;
-            view.dispatch(
-              state.tr.setSelection(
-                TextSelection.create(state.doc, startPos),
-              ),
-            );
-            return true;
-          },
-        },
-      }),
     ];
   },
 });

packages/editor-ext/src/lib/page-break/index.ts

@@ -1 +0,0 @@
-export * from "./page-break";

packages/editor-ext/src/lib/page-break/page-break.ts

@@ -1,60 +0,0 @@
-import { mergeAttributes, Node } from "@tiptap/core";
-
-export interface PageBreakOptions {
-  HTMLAttributes: Record<string, any>;
-}
-
-declare module "@tiptap/core" {
-  interface Commands<ReturnType> {
-    pageBreak: {
-      setPageBreak: () => ReturnType;
-    };
-  }
-}
-
-export const PageBreak = Node.create<PageBreakOptions>({
-  name: "pageBreak",
-
-  group: "block",
-
-  atom: true,
-
-  selectable: true,
-
-  addOptions() {
-    return {
-      HTMLAttributes: {},
-    };
-  },
-
-  parseHTML() {
-    return [
-      {
-        tag: `div[data-type="${this.name}"]`,
-      },
-    ];
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    return [
-      "div",
-      mergeAttributes(
-        { "data-type": this.name, class: "page-break" },
-        this.options.HTMLAttributes,
-        HTMLAttributes,
-      ),
-    ];
-  },
-
-  addCommands() {
-    return {
-      setPageBreak:
-        () =>
-        ({ chain }) =>
-          chain()
-            .insertContent({ type: this.name })
-            .focus()
-            .run(),
-    };
-  },
-});

packages/editor-ext/src/lib/utils.ts

@@ -338,15 +338,6 @@ export const isRowGripSelected = ({
   return !!gripRow;
 };
 
-// TipTap's `editor.view` proxy throws if accessed before mount or after destroy.
-// Guard floating-menu callbacks (getReferencedVirtualElement, shouldShow) with
-// this before touching `editor.view.nodeDOM(...)`.
-export function isEditorReady(
-  editor: Editor | null | undefined,
-): editor is Editor {
-  return !!editor && editor.isInitialized;
-}
-
 export function isTextSelected(editor: Editor) {
   const {
     state: {