feat(ee): space control to hide comments from viewers role

2026-08-20 02:54:11 +08:00 · 2026-08-13 01:28:02 +01:00
94 changed files with 548 additions and 2463 deletions
@@ -42,7 +42,7 @@ RUN chown -R node:node /app

 USER node

-RUN pnpm install --frozen-lockfile --prod && rm -rf /home/node/.cache/pnpm
+RUN pnpm install --frozen-lockfile --prod

 RUN mkdir -p /app/data/storage

@@ -387,8 +387,6 @@
  "Insert horizontal rule divider": "Insert horizontal rule divider",
  "Page break": "Page break",
  "Insert a page break for printing.": "Insert a page break for printing.",
-  "Footnote": "Footnote",
-  "Insert a footnote reference.": "Insert a footnote reference.",
  "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.",
@@ -510,6 +508,11 @@
  "Allow viewers to comment": "Allow viewers to comment",
  "Allow viewers to add comments on pages in this space.": "Allow viewers to add comments on pages in this space.",
  "Toggle viewer comments": "Toggle viewer comments",
+  "Hide comments from viewers": "Hide comments from viewers",
+  "Viewers cannot see or add comments on pages in this space.": "Viewers cannot see or add comments on pages in this space.",
+  "Toggle hide comments from viewers": "Toggle hide comments from viewers",
+  "Turn off 'Allow viewers to comment' first": "Turn off 'Allow viewers to comment' first",
+  "Turn off 'Hide comments from viewers' first": "Turn off 'Hide comments from viewers' first",
  "Public sharing is disabled at the workspace level": "Public sharing is disabled at the workspace level",
  "Prevent pages in this space from being shared publicly.": "Prevent pages in this space from being shared publicly.",
  "Page permissions": "Page permissions",
@@ -1291,16 +1294,5 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected",
-  "Compare": "Compare",
-  "Compare versions": "Compare versions",
-  "Select version from {{date}}": "Select version from {{date}}",
-  "Version actions for {{date}}": "Version actions for {{date}}",
-  "Comparing {{newer}} and {{older}}": "Comparing {{newer}} and {{older}}",
-  "Exit compare": "Exit compare",
-  "Search attachments...": "Search attachments...",
-  "Error loading attachments.": "Error loading attachments.",
-  "No attachments on this page yet.": "No attachments on this page yet.",
-  "Uploaded by {{name}}": "Uploaded by {{name}}",
-  "Download {{name}}": "Download {{name}}"
+  "{{count}} selected_other": "{{count}} selected"
 }
@@ -11,11 +11,13 @@ import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 import AsideChatPanel from "@/ee/ai-chat/components/aside-chat-panel";
 import { PageDetailsAside } from "@/features/page-details/components/page-details-aside.tsx";
 import { ASIDE_PANEL_ID } from "@/hooks/use-toggle-aside.tsx";
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";

 export default function Aside() {
  const [{ tab, isAsideOpen }, setAsideState] = useAtom(asideStateAtom);
  const { t } = useTranslation();
  const pageEditor = useAtomValue(pageEditorAtom);
+  const canViewComments = useCanViewComments();
  const closeAside = () => setAsideState((s) => ({ ...s, isAsideOpen: false }));

  useEffect(() => {
@@ -23,12 +25,18 @@ export default function Aside() {
    document.getElementById(ASIDE_PANEL_ID)?.focus();
  }, [isAsideOpen, tab]);

+  useEffect(() => {
+    if (isAsideOpen && tab === "comments" && !canViewComments) {
+      setAsideState({ tab: "", isAsideOpen: false });
+    }
+  }, [isAsideOpen, tab, canViewComments, setAsideState]);
+
  let title: string;
  let component: ReactNode;

  switch (tab) {
    case "comments":
-      component = <CommentListWithTabs />;
+      component = canViewComments ? <CommentListWithTabs /> : null;
      title = "Comments";
      break;
    case "toc":
@@ -255,7 +255,6 @@ export default function ChatInput({
    },
    content: "",
    editable: true,
-    textDirection: "auto",
    immediatelyRender: true,
    shouldRerenderOnTransaction: false,
    autofocus: autofocus ? "end" : false,
@@ -15,14 +15,6 @@ export interface IAiSearchResponse {
  }>;
 }

-export async function hintVectorCache(): Promise<void> {
-  try {
-    await api.post("/ai/vector-cache-hint");
-  } catch {
-    // best-effort cache hint
-  }
-}
-
 export async function aiAnswers(
  params: IPageSearchParams,
  onChunk?: (chunk: { content?: string; sources?: any[] }) => void,
@@ -19,6 +19,7 @@ export const Feature = {
  SHARING_CONTROLS: 'sharing:controls',
  TEMPLATES: 'templates',
  VIEWER_COMMENTS: 'comment:viewer',
+  HIDE_COMMENTS: 'comment:hide',
  PERSONAL_SPACES: 'spaces:personal',
  DOCX_EXPORT: 'export:docx',
  BASES: 'bases',
@@ -0,0 +1,62 @@
+import { Group, Text, Switch, Tooltip } from "@mantine/core";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { ISpace } from "@/features/space/types/space.types.ts";
+import { useUpdateSpaceMutation } from "@/features/space/queries/space-query.ts";
+import { useHasFeature } from "@/ee/hooks/use-feature.ts";
+import { Feature } from "@/ee/features.ts";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label.ts";
+
+type SpaceHideCommentsToggleProps = {
+  space: ISpace;
+};
+
+export default function SpaceHideCommentsToggle({
+  space,
+}: SpaceHideCommentsToggleProps) {
+  const { t } = useTranslation();
+  const hasHideComments = useHasFeature(Feature.HIDE_COMMENTS);
+  const upgradeLabel = useUpgradeLabel();
+  const allowViewerCommentsEnabled =
+    space.settings?.comments?.allowViewerComments === true;
+  const isDisabled = !hasHideComments || allowViewerCommentsEnabled;
+  const tooltipLabel = !hasHideComments
+    ? upgradeLabel
+    : t("Turn off 'Allow viewers to comment' first");
+  const [checked, setChecked] = useState(
+    space.settings?.comments?.hideCommentsFromViewers === true,
+  );
+  const updateSpaceMutation = useUpdateSpaceMutation();
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    try {
+      await updateSpaceMutation.mutateAsync({
+        spaceId: space.id,
+        hideCommentsFromViewers: value,
+      });
+      setChecked(value);
+    } catch {
+      // error handled by mutation
+    }
+  };
+
+  return (
+    <Group justify="space-between" wrap="nowrap" gap="xl">
+      <div>
+        <Text size="md">{t("Hide comments from viewers")}</Text>
+        <Text size="sm" c="dimmed">
+          {t("Viewers cannot see or add comments on pages in this space.")}
+        </Text>
+      </div>
+      <Tooltip label={tooltipLabel} disabled={!isDisabled} refProp="rootRef">
+        <Switch
+          checked={checked}
+          onChange={handleChange}
+          disabled={isDisabled}
+          aria-label={t("Toggle hide comments from viewers")}
+        />
+      </Tooltip>
+    </Group>
+  );
+}
@@ -17,7 +17,12 @@ export default function SpaceViewerCommentsToggle({
  const { t } = useTranslation();
  const hasViewerComments = useHasFeature(Feature.VIEWER_COMMENTS);
  const upgradeLabel = useUpgradeLabel();
-  const isDisabled = !hasViewerComments;
+  const hideCommentsEnabled =
+    space.settings?.comments?.hideCommentsFromViewers === true;
+  const isDisabled = !hasViewerComments || hideCommentsEnabled;
+  const tooltipLabel = !hasViewerComments
+    ? upgradeLabel
+    : t("Turn off 'Hide comments from viewers' first");
  const [checked, setChecked] = useState(
    space.settings?.comments?.allowViewerComments === true,
  );
@@ -45,7 +50,7 @@ export default function SpaceViewerCommentsToggle({
        </Text>
      </div>
      <Tooltip
-        label={upgradeLabel}
+        label={tooltipLabel}
        disabled={!isDisabled}
        refProp="rootRef"
      >
@@ -41,7 +41,6 @@ export default function ReadonlyTemplateEditor({
      <EditorProvider
        editable={false}
        immediatelyRender={true}
-        textDirection="auto"
        extensions={extensions}
        content={template.content}
      />
@@ -87,7 +87,6 @@ export default function TemplateEditor() {
  const editor = useEditor({
    extensions: templateExtensions,
    content: "",
-    textDirection: "auto",
    editorProps: {
      scrollThreshold: 80,
      scrollMargin: 80,
@@ -1,59 +0,0 @@
-import { ThemeIcon } from "@mantine/core";
-import {
-  IconFile,
-  IconFileTypeCsv,
-  IconFileTypeDocx,
-  IconFileTypePdf,
-  IconFileTypePpt,
-  IconFileTypeXls,
-  IconFileZip,
-  IconMovie,
-  IconMusic,
-  IconPhoto,
-  type Icon,
-} from "@tabler/icons-react";
-
-const EXT_ICONS: Record<string, { icon: Icon; color: string }> = {
-  ".pdf": { icon: IconFileTypePdf, color: "red" },
-  ".doc": { icon: IconFileTypeDocx, color: "blue" },
-  ".docx": { icon: IconFileTypeDocx, color: "blue" },
-  ".xls": { icon: IconFileTypeXls, color: "teal" },
-  ".xlsx": { icon: IconFileTypeXls, color: "teal" },
-  ".csv": { icon: IconFileTypeCsv, color: "teal" },
-  ".ppt": { icon: IconFileTypePpt, color: "orange" },
-  ".pptx": { icon: IconFileTypePpt, color: "orange" },
-  ".zip": { icon: IconFileZip, color: "gray" },
-  ".rar": { icon: IconFileZip, color: "gray" },
-  ".7z": { icon: IconFileZip, color: "gray" },
-  ".tar": { icon: IconFileZip, color: "gray" },
-  ".gz": { icon: IconFileZip, color: "gray" },
-};
-
-const MIME_ICONS: Array<{ prefix: string; icon: Icon; color: string }> = [
-  { prefix: "image/", icon: IconPhoto, color: "grape" },
-  { prefix: "video/", icon: IconMovie, color: "violet" },
-  { prefix: "audio/", icon: IconMusic, color: "pink" },
-];
-
-interface AttachmentFileIconProps {
-  fileExt?: string;
-  mimeType?: string;
-}
-
-export function AttachmentFileIcon({
-  fileExt,
-  mimeType,
-}: AttachmentFileIconProps) {
-  const byExt = fileExt ? EXT_ICONS[fileExt.toLowerCase()] : undefined;
-  const byMime = mimeType
-    ? MIME_ICONS.find((entry) => mimeType.startsWith(entry.prefix))
-    : undefined;
-  const { icon: FileIcon, color } = byExt ??
-    byMime ?? { icon: IconFile, color: "gray" };
-
-  return (
-    <ThemeIcon variant="light" color={color} size={40} radius="md">
-      <FileIcon size={22} stroke={1.5} />
-    </ThemeIcon>
-  );
-}
@@ -1,191 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import {
-  ActionIcon,
-  Anchor,
-  Center,
-  Group,
-  Loader,
-  Modal,
-  ScrollArea,
-  Text,
-  Tooltip,
-} from "@mantine/core";
-import { IconDownload } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { SearchInput } from "@/components/common/search-input.tsx";
-import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import { usePageAttachmentsQuery } from "@/features/attachments/queries/attachment-query.ts";
-import { IPageAttachment } from "@/features/attachments/types/attachment.types.ts";
-import { AttachmentFileIcon } from "@/features/attachments/components/attachment-file-icon.tsx";
-import { formatBytes } from "@/lib";
-import { getFileUrl } from "@/lib/config.ts";
-import { formattedDate } from "@/lib/time.ts";
-
-interface PageAttachmentsModalProps {
-  pageId: string;
-  open: boolean;
-  onClose: () => void;
-}
-
-export default function PageAttachmentsModal({
-  pageId,
-  open,
-  onClose,
-}: PageAttachmentsModalProps) {
-  const { t } = useTranslation();
-
-  return (
-    <Modal
-      opened={open}
-      onClose={onClose}
-      title={t("Attachments")}
-      size={800}
-      closeButtonProps={{ "aria-label": t("Close") }}
-    >
-      <PageAttachmentsList pageId={pageId} />
-    </Modal>
-  );
-}
-
-function PageAttachmentsList({ pageId }: { pageId: string }) {
-  const { t } = useTranslation();
-  const [search, setSearch] = useState("");
-  const {
-    data,
-    isLoading,
-    isError,
-    isFetching,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
-  } = usePageAttachmentsQuery(pageId, search);
-
-  const attachments = useMemo(
-    () => data?.pages.flatMap((page) => page.items) ?? [],
-    [data],
-  );
-
-  const loadMoreRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const sentinel = loadMoreRef.current;
-    if (!sentinel || !hasNextPage) return;
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0].isIntersecting && !isFetching) {
-          fetchNextPage();
-        }
-      },
-      { threshold: 0.1 },
-    );
-
-    observer.observe(sentinel);
-    return () => observer.disconnect();
-  }, [fetchNextPage, hasNextPage, isFetching]);
-
-  const handleSearch = useCallback((value: string) => setSearch(value), []);
-
-  return (
-    <>
-      <SearchInput
-        onSearch={handleSearch}
-        placeholder={t("Search attachments...")}
-      />
-
-      {isLoading ? (
-        <Center py="xl">
-          <Loader size="sm" />
-        </Center>
-      ) : isError ? (
-        <Center py="xl">
-          <Text size="sm" c="dimmed">
-            {t("Error loading attachments.")}
-          </Text>
-        </Center>
-      ) : attachments.length === 0 ? (
-        <Center py="xl">
-          <Text size="sm" c="dimmed">
-            {search
-              ? t("No results found")
-              : t("No attachments on this page yet.")}
-          </Text>
-        </Center>
-      ) : (
-        <ScrollArea.Autosize mah={480} type="scroll" scrollbarSize={5}>
-          {attachments.map((attachment) => (
-            <AttachmentRow key={attachment.id} attachment={attachment} />
-          ))}
-          {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
-          {isFetchingNextPage && (
-            <Center py="sm">
-              <Loader size="sm" />
-            </Center>
-          )}
-        </ScrollArea.Autosize>
-      )}
-    </>
-  );
-}
-
-function AttachmentRow({ attachment }: { attachment: IPageAttachment }) {
-  const { t } = useTranslation();
-  const fileUrl = getFileUrl(attachment.url);
-
-  return (
-    <Group wrap="nowrap" gap="md" py="sm" pr="xs">
-      <AttachmentFileIcon
-        fileExt={attachment.fileExt}
-        mimeType={attachment.mimeType}
-      />
-
-      <div style={{ flex: 1, minWidth: 0 }}>
-        <Anchor
-          href={fileUrl}
-          target="_blank"
-          rel="noopener noreferrer"
-          size="sm"
-          fw={500}
-          c="inherit"
-          truncate="end"
-          style={{ display: "block" }}
-        >
-          {attachment.fileName}
-        </Anchor>
-        <Text size="xs" c="dimmed" mt={2} truncate="end">
-          {formatBytes(Number(attachment.fileSize))}
-          {" · "}
-          {formattedDate(new Date(attachment.createdAt))}
-        </Text>
-      </div>
-
-      {attachment.creator && (
-        <Tooltip
-          label={t("Uploaded by {{name}}", { name: attachment.creator.name })}
-          withArrow
-        >
-          <CustomAvatar
-            avatarUrl={attachment.creator.avatarUrl}
-            name={attachment.creator.name}
-            size="sm"
-          />
-        </Tooltip>
-      )}
-
-      <Tooltip label={t("Download attachment")} withArrow>
-        <ActionIcon
-          component="a"
-          href={fileUrl}
-          download={attachment.fileName}
-          target="_blank"
-          rel="noopener noreferrer"
-          variant="subtle"
-          color="gray"
-          aria-label={t("Download {{name}}", { name: attachment.fileName })}
-        >
-          <IconDownload size={18} />
-        </ActionIcon>
-      </Tooltip>
-    </Group>
-  );
-}
@@ -1,25 +0,0 @@
-import {
-  InfiniteData,
-  keepPreviousData,
-  useInfiniteQuery,
-  UseInfiniteQueryResult,
-} from "@tanstack/react-query";
-import { getPageAttachments } from "@/features/attachments/services/attachment-service.ts";
-import { IPageAttachment } from "@/features/attachments/types/attachment.types.ts";
-import { IPagination } from "@/lib/types.ts";
-
-export function usePageAttachmentsQuery(
-  pageId: string,
-  search?: string,
-): UseInfiniteQueryResult<InfiniteData<IPagination<IPageAttachment>, unknown>> {
-  return useInfiniteQuery({
-    queryKey: ["page-attachments", pageId, search],
-    queryFn: ({ pageParam }) =>
-      getPageAttachments(pageId, { cursor: pageParam, query: search }),
-    enabled: !!pageId,
-    gcTime: 0,
-    placeholderData: keepPreviousData,
-    initialPageParam: undefined,
-    getNextPageParam: (lastPage) => lastPage.meta?.nextCursor ?? undefined,
-  });
-}
@@ -3,17 +3,7 @@ import loadImage from "blueimp-load-image";
 import {
  AvatarIconType,
  IAttachment,
-  IPageAttachment,
 } from "@/features/attachments/types/attachment.types.ts";
-import { IPagination, QueryParams } from "@/lib/types.ts";
-
-export async function getPageAttachments(
-  pageId: string,
-  params?: QueryParams,
-): Promise<IPagination<IPageAttachment>> {
-  const req = await api.post("/pages/attachments", { pageId, ...params });
-  return req.data;
-}

 async function compressAndResizeIcon(
  file: File,
@@ -1,5 +1,4 @@
 export {
-  getPageAttachments,
  uploadIcon,
  uploadUserAvatar,
  uploadSpaceIcon,
@@ -15,15 +15,6 @@ export interface IAttachment {
  deletedAt: string | null;
 }

-export interface IPageAttachment extends IAttachment {
-  url: string;
-  creator: {
-    id: string;
-    name: string;
-    avatarUrl: string | null;
-  } | null;
-}
-
 export enum AvatarIconType {
  AVATAR = "avatar",
  SPACE_ICON = "space-icon",
@@ -103,7 +103,6 @@ const CommentEditor = forwardRef(
      },
      content: defaultContent,
      editable,
-      textDirection: "auto",
      immediatelyRender: true,
      shouldRerenderOnTransaction: false,
      autofocus: (autofocus && "end") || false,
@@ -0,0 +1,15 @@
+import { useParams } from "react-router-dom";
+import { usePageQuery } from "@/features/page/queries/page-query.ts";
+import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
+import { extractPageSlugId } from "@/lib";
+
+export function useCanViewComments(): boolean {
+  const { pageSlug } = useParams();
+  const { data: page } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
+  const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug);
+
+  const canEdit = !page?.deletedAt && (page?.permissions?.canEdit ?? false);
+  return (
+    canEdit || space?.settings?.comments?.hideCommentsFromViewers !== true
+  );
+}
@@ -12,7 +12,6 @@ import {
  IconMathFunction,
  IconRotate2,
  IconSitemap,
-  IconSuperscript,
  IconTable,
  IconTag,
 } from "@tabler/icons-react";
@@ -271,12 +270,6 @@ export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
        >
          {t("Math block")}
        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconSuperscript size={16} />}
-          onClick={() => editor.chain().focus().addFootnote().run()}
-        >
-          {t("Footnote")}
-        </Menu.Item>
      </Menu.Dropdown>
    </Menu>
  );
@@ -30,7 +30,6 @@ import {
  IconTag,
  IconMoodSmile,
  IconRotate2,
-  IconSuperscript,
 } from "@tabler/icons-react";
 import {
  CommandProps,
@@ -178,16 +177,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
      command: ({ editor, range }: CommandProps) =>
        editor.chain().focus().deleteRange(range).setPageBreak().run(),
    },
-    {
-      title: "Footnote",
-      description: "Insert a footnote reference.",
-      searchTerms: ["footnote", "reference", "citation", "note"],
-      icon: IconSuperscript,
-      command: ({ editor, range }: CommandProps) => {
-        editor.chain().focus().deleteRange(range).run();
-        editor.commands.addFootnote();
-      },
-    },
    {
      title: "Image",
      description: "Upload any image from your device.",
@@ -40,7 +40,6 @@ export default function TransclusionContent({ content }: Props) {
      <EditorProvider
        editable={false}
        immediatelyRender={true}
-        textDirection="auto"
        extensions={extensions}
        content={content as any}
      />
@@ -1,6 +1,5 @@
 import { markInputRule } from "@tiptap/core";
 import { StarterKit } from "@tiptap/starter-kit";
-import { Document } from "@tiptap/extension-document";
 import { Code } from "@tiptap/extension-code";
 import { TextAlign } from "@tiptap/extension-text-align";
 import { TaskList, TaskItem } from "@tiptap/extension-list";
@@ -64,9 +63,6 @@ import {
  TransclusionReference,
  TableView,
  BaseEmbed as BaseEmbedNode,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 } from "@docmost/editor-ext";
 import {
  randomElement,
@@ -136,7 +132,6 @@ lowlight.register("scala", scala);
 // @ts-ignore
 export const mainExtensions = [
  StarterKit.configure({
-    document: false,
    heading: false,
    undoRedo: false,
    link: false,
@@ -148,9 +143,6 @@ export const mainExtensions = [
    codeBlock: false,
    code: false,
  }),
-  Document.extend({
-    content: "block+ footnotes?",
-  }),
  // Override TipTap's Code extension to fix the inline code input rule.
  // The upstream regex /(^|[^`])`([^`]+)`(?!`)$/ captures the character
  // before the opening backtick as part of the match, causing markInputRule
@@ -211,8 +203,7 @@ export const mainExtensions = [
            parentName === "tableCell" ||
            parentName === "tableHeader" ||
            parentName === "callout" ||
-            parentName === "blockquote" ||
-            parentName === "footnote"
+            parentName === "blockquote"
          ) {
            return i18n.t("Write...");
          }
@@ -426,9 +417,6 @@ export const mainExtensions = [
  }).configure(),
  Columns,
  Column,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
  AutoJoiner.configure({
    elementsToJoin: [],
  }),
@@ -82,6 +82,8 @@ import {
  getCollabSocket,
  releaseCollabSocket,
 } from "@/features/editor/collab-socket";
+import clsx from "clsx";
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";

 interface PageEditorProps {
  pageId: string;
@@ -196,6 +198,7 @@ function CollabPageEditor({
  const { pageSlug } = useParams();
  const slugId = extractPageSlugId(pageSlug);
  const currentPageEditMode = useAtomValue(currentPageEditModeAtom);
+  const canViewComments = useCanViewComments();
  const canScroll = useCallback(
    () => Boolean(isComponentMounted.current && editorRef.current),
    [isComponentMounted],
@@ -249,7 +252,6 @@ function CollabPageEditor({
    {
      extensions,
      editable,
-      textDirection: "auto",
      immediatelyRender: true,
      shouldRerenderOnTransaction: false,
      editorProps: {
@@ -373,6 +375,7 @@ function CollabPageEditor({
  };

  useEffect(() => {
+    if (!canViewComments) return;
    document.addEventListener("ACTIVE_COMMENT_EVENT", handleActiveCommentEvent);
    return () => {
      document.removeEventListener(
@@ -380,7 +383,7 @@ function CollabPageEditor({
        handleActiveCommentEvent,
      );
    };
-  }, []);
+  }, [canViewComments]);

  useEffect(() => {
    setActiveCommentId(null);
@@ -431,7 +434,13 @@ function CollabPageEditor({
  }

  return (
-    <div className="editor-container" style={{ position: "relative" }}>
+    <div
+      className={clsx(
+        "editor-container",
+        !canViewComments && "comments-hidden",
+      )}
+      style={{ position: "relative" }}
+    >
      <div ref={menuContainerRef}>
        <EditorContent editor={editor} />

@@ -481,18 +490,21 @@ function StaticPageEditor({
  content: any;
  ariaLabel: string;
 }) {
+  const canViewComments = useCanViewComments();
+
  return (
-    <EditorProvider
-      editable={false}
-      immediatelyRender={true}
-      textDirection="auto"
-      extensions={mainExtensions}
-      content={content}
-      editorProps={{
-        attributes: {
-          "aria-label": ariaLabel,
-        },
-      }}
-    />
+    <div className={clsx(!canViewComments && "comments-hidden")}>
+      <EditorProvider
+        editable={false}
+        immediatelyRender={true}
+        extensions={mainExtensions}
+        content={content}
+        editorProps={{
+          attributes: {
+            "aria-label": ariaLabel,
+          },
+        }}
+      />
+    </div>
  );
 }
@@ -85,7 +85,6 @@ export default function ReadonlyPageEditor({
        <EditorProvider
          editable={false}
          immediatelyRender={true}
-          textDirection="auto"
          extensions={titleExtensions}
          content={title}
        ></EditorProvider>
@@ -94,7 +93,6 @@ export default function ReadonlyPageEditor({
      <EditorProvider
        editable={false}
        immediatelyRender={true}
-        textDirection="auto"
        extensions={extensions}
        content={content}
        onCreate={({ editor }) => {
@@ -315,3 +315,8 @@
    height: 100%;
  }
 }
+
+.comments-hidden .ProseMirror .comment-mark {
+  background: none;
+  border-bottom: none;
+}
@@ -1,26 +0,0 @@
-.ProseMirror sup a.footnote-ref {
-  color: var(--mantine-primary-color-filled);
-  text-decoration: none;
-  cursor: pointer;
-  font-weight: 600;
-}
-
-.ProseMirror sup:has(a.footnote-ref) {
-  padding: 0 1px;
-}
-
-.ProseMirror ol.footnotes {
-  margin-top: 2rem;
-  padding-top: 0.75rem;
-  font-size: 0.875rem;
-  color: var(--mantine-color-dimmed);
-  list-style-type: decimal;
-}
-
-.ProseMirror ol.footnotes:has(li) {
-  border-top: 1px solid var(--mantine-color-default-border);
-}
-
-.ProseMirror ol.footnotes li p {
-  margin: 0.15rem 0;
-}
@@ -18,4 +18,3 @@
@import "./columns.css";
@import "./status.css";
@import "./base-embed.css";
-@import "./footnotes.css";
@@ -54,7 +54,7 @@
        var(--mantine-color-dark-5)
      );
      font-weight: bold;
-      text-align: start;
+      text-align: left;
    }

    .column-resize-handle {
@@ -86,7 +86,6 @@ export function TitleEditor({
    },
    editable: editable,
    content: title,
-    textDirection: "auto",
    immediatelyRender: true,
    shouldRerenderOnTransaction: false,
    editorProps: {
@@ -6,13 +6,4 @@ export const activeHistoryPrevIdAtom = atom<string>("");
 export const highlightChangesAtom = atom<boolean>(true);

 export type DiffCounts = { added: number; deleted: number; total: number };
-export const diffCountsAtom = atom<DiffCounts | null>(
-  null as DiffCounts | null,
-);
-
-export type ComparePair = { newerId: string; olderId: string };
-export const compareModeAtom = atom<boolean>(false);
-export const compareSelectionAtom = atom<string[]>([]);
-export const comparePairAtom = atom<ComparePair | null>(
-  null as ComparePair | null,
-);
+export const diffCountsAtom = atom<DiffCounts | null>(null);
@@ -1,7 +1,7 @@
 .history {
-  display: flex;
-  align-items: center;
+  display: block;
  width: 100%;
+  padding: var(--mantine-spacing-md);
  color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));

  @mixin hover {
@@ -12,28 +12,6 @@
  }
 }

-.historyButton {
-  flex: 1;
-  min-width: 0;
-  color: inherit;
-}
-
-.compareCheckbox {
-  padding-left: var(--mantine-spacing-xs);
-}
-
-.itemMenu {
-  opacity: 0;
-  margin-right: var(--mantine-spacing-xs);
-}
-
-.history:hover .itemMenu,
-.history:focus-within .itemMenu,
-.history.active .itemMenu,
-.itemMenu[aria-expanded="true"] {
-  opacity: 1;
-}
-
 .historyEditor {
  :global(.ProseMirror) {
    padding: 0 !important;
@@ -99,8 +77,3 @@
  flex: 1;
  padding: rem(16px) rem(40px);
 }
-
-.compareBanner {
-  border-bottom: rem(1px) solid
-    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-}
@@ -31,7 +31,6 @@ export function HistoryEditor({
  const editor = useEditor({
    extensions: mainExtensions,
    editable: false,
-    textDirection: "auto",
  });

  useEffect(() => {
@@ -171,6 +170,7 @@ export function HistoryEditor({
    }

    const total = addedCount + deletedCount;
+    // @ts-ignore
    setDiffCounts({ added: addedCount, deleted: deletedCount, total });

    editor.setOptions({
@@ -1,21 +1,10 @@
-import {
-  Text,
-  Group,
-  UnstyledButton,
-  Avatar,
-  Tooltip,
-  ActionIcon,
-  Checkbox,
-  Menu,
-} from "@mantine/core";
-import { IconDots } from "@tabler/icons-react";
+import { Text, Group, UnstyledButton, Avatar, Tooltip } from "@mantine/core";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { formattedDate } from "@/lib/time";
 import classes from "./css/history.module.css";
 import clsx from "clsx";
 import { IPageHistory } from "@/features/page-history/types/page.types";
 import { memo, useCallback } from "react";
-import { useTranslation } from "react-i18next";

 const MAX_VISIBLE_AVATARS = 5;

@@ -26,13 +15,6 @@ interface HistoryItemProps {
  onHover?: (id: string, index: number) => void;
  onHoverEnd?: () => void;
  isActive: boolean;
-  compareMode: boolean;
-  isChecked: boolean;
-  isCheckboxDisabled: boolean;
-  canCompare: boolean;
-  onToggleCompare: (id: string) => void;
-  onStartCompare: (id: string) => void;
-  onRestore?: (id: string, index: number) => void;
 }

 const HistoryItem = memo(function HistoryItem({
@@ -42,24 +24,10 @@ const HistoryItem = memo(function HistoryItem({
  onHover,
  onHoverEnd,
  isActive,
-  compareMode,
-  isChecked,
-  isCheckboxDisabled,
-  canCompare,
-  onToggleCompare,
-  onStartCompare,
-  onRestore,
 }: HistoryItemProps) {
-  const { t } = useTranslation();
-  const date = formattedDate(new Date(historyItem.createdAt));
-
  const handleClick = useCallback(() => {
-    if (compareMode) {
-      onToggleCompare(historyItem.id);
-    } else {
-      onSelect(historyItem.id, index);
-    }
-  }, [compareMode, onToggleCompare, onSelect, historyItem.id, index]);
+    onSelect(historyItem.id, index);
+  }, [onSelect, historyItem.id, index]);

  const handleMouseEnter = useCallback(() => {
    onHover?.(historyItem.id, index);
@@ -69,115 +37,63 @@ const HistoryItem = memo(function HistoryItem({
  const hasContributors = contributors && contributors.length > 0;

  return (
-    <div
-      className={clsx(classes.history, { [classes.active]: isActive })}
+    <UnstyledButton
+      p="xs"
+      onClick={handleClick}
      onMouseEnter={handleMouseEnter}
      onMouseLeave={onHoverEnd}
+      className={clsx(classes.history, { [classes.active]: isActive })}
    >
-      {compareMode && (
-        <Checkbox
-          size="xs"
-          className={classes.compareCheckbox}
-          checked={isChecked}
-          disabled={isCheckboxDisabled}
-          onChange={() => onToggleCompare(historyItem.id)}
-          aria-label={t("Select version from {{date}}", { date })}
-        />
-      )}
+      <Text size="sm">{formattedDate(new Date(historyItem.createdAt))}</Text>

-      <UnstyledButton
-        p="xs"
-        onClick={handleClick}
-        className={classes.historyButton}
-      >
-        <Text size="sm">{date}</Text>
-
-        <Group gap={6} wrap="nowrap" mt={4}>
-          {hasContributors ? (
-            <>
-              <Tooltip.Group openDelay={300} closeDelay={100}>
-                <Avatar.Group spacing={8}>
-                  {contributors
-                    .slice(0, MAX_VISIBLE_AVATARS)
-                    .map((contributor) => (
-                      <Tooltip
-                        key={contributor.id}
-                        label={contributor.name}
-                        withArrow
-                      >
-                        <CustomAvatar
-                          size="sm"
-                          avatarUrl={contributor.avatarUrl}
-                          name={contributor.name}
-                        />
-                      </Tooltip>
+      <Group gap={6} wrap="nowrap" mt={4}>
+        {hasContributors ? (
+          <>
+            <Tooltip.Group openDelay={300} closeDelay={100}>
+              <Avatar.Group spacing={8}>
+                {contributors.slice(0, MAX_VISIBLE_AVATARS).map((contributor) => (
+                  <Tooltip key={contributor.id} label={contributor.name} withArrow>
+                    <CustomAvatar
+                      size="sm"
+                      avatarUrl={contributor.avatarUrl}
+                      name={contributor.name}
+                    />
+                  </Tooltip>
+                ))}
+                {contributors.length > MAX_VISIBLE_AVATARS && (
+                  <Tooltip
+                    withArrow
+                    label={contributors.slice(MAX_VISIBLE_AVATARS).map((c) => (
+                      <div key={c.id}>{c.name}</div>
                    ))}
-                  {contributors.length > MAX_VISIBLE_AVATARS && (
-                    <Tooltip
-                      withArrow
-                      label={contributors
-                        .slice(MAX_VISIBLE_AVATARS)
-                        .map((c) => (
-                          <div key={c.id}>{c.name}</div>
-                        ))}
-                    >
-                      <Avatar size="sm" color="gray">
-                        +{contributors.length - MAX_VISIBLE_AVATARS}
-                      </Avatar>
-                    </Tooltip>
-                  )}
-                </Avatar.Group>
-              </Tooltip.Group>
-              {contributors.length === 1 && (
-                <Text size="sm" c="dimmed" lineClamp={1}>
-                  {contributors[0].name}
-                </Text>
-              )}
-            </>
-          ) : (
-            <>
-              <CustomAvatar
-                size="sm"
-                avatarUrl={historyItem.lastUpdatedBy?.avatarUrl}
-                name={historyItem.lastUpdatedBy?.name}
-              />
+                  >
+                    <Avatar size="sm" color="gray">
+                      +{contributors.length - MAX_VISIBLE_AVATARS}
+                    </Avatar>
+                  </Tooltip>
+                )}
+              </Avatar.Group>
+            </Tooltip.Group>
+            {contributors.length === 1 && (
              <Text size="sm" c="dimmed" lineClamp={1}>
-                {historyItem.lastUpdatedBy?.name}
+                {contributors[0].name}
              </Text>
-            </>
-          )}
-        </Group>
-      </UnstyledButton>
-
-      {!compareMode && (
-        <Menu shadow="md" width={180} position="bottom-end">
-          <Menu.Target>
-            <ActionIcon
-              variant="subtle"
-              color="gray"
-              className={classes.itemMenu}
-              aria-label={t("Version actions for {{date}}", { date })}
-              onClick={(e) => e.stopPropagation()}
-            >
-              <IconDots size={18} />
-            </ActionIcon>
-          </Menu.Target>
-          <Menu.Dropdown>
-            <Menu.Item
-              disabled={!canCompare}
-              onClick={() => onStartCompare(historyItem.id)}
-            >
-              {t("Compare")}
-            </Menu.Item>
-            {onRestore && (
-              <Menu.Item onClick={() => onRestore(historyItem.id, index)}>
-                {t("Restore")}
-              </Menu.Item>
            )}
-          </Menu.Dropdown>
-        </Menu>
-      )}
-    </div>
+          </>
+        ) : (
+          <>
+            <CustomAvatar
+              size="sm"
+              avatarUrl={historyItem.lastUpdatedBy?.avatarUrl}
+              name={historyItem.lastUpdatedBy?.name}
+            />
+            <Text size="sm" c="dimmed" lineClamp={1}>
+              {historyItem.lastUpdatedBy?.name}
+            </Text>
+          </>
+        )}
+      </Group>
+    </UnstyledButton>
  );
 });

@@ -6,12 +6,8 @@ import HistoryItem from "@/features/page-history/components/history-item";
 import {
  activeHistoryIdAtom,
  activeHistoryPrevIdAtom,
-  compareModeAtom,
-  comparePairAtom,
-  compareSelectionAtom,
  historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { resolveComparePair } from "@/features/page-history/utils/resolve-compare-pair";
 import { useAtom, useSetAtom } from "jotai";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import {
@@ -36,9 +32,6 @@ function HistoryList({ pageId }: Props) {
  const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
  const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
  const setHistoryModalOpen = useSetAtom(historyAtoms);
-  const [compareMode, setCompareMode] = useAtom(compareModeAtom);
-  const [compareSelection, setCompareSelection] = useAtom(compareSelectionAtom);
-  const setComparePair = useSetAtom(comparePairAtom);

  const {
    data: pageHistoryData,
@@ -86,58 +79,10 @@ function HistoryList({ pageId }: Props) {

  const handleSelect = useCallback(
    (id: string, index: number) => {
-      setComparePair(null);
      setActiveHistoryId(id);
      setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
    },
-    [historyItems, setActiveHistoryId, setActiveHistoryPrevId, setComparePair],
-  );
-
-  const handleToggleCompare = useCallback(
-    (id: string) => {
-      setCompareSelection((prev) => {
-        if (prev.includes(id)) return prev.filter((item) => item !== id);
-        if (prev.length >= 2) return prev;
-        return [...prev, id];
-      });
-    },
-    [setCompareSelection],
-  );
-
-  const handleStartCompare = useCallback(
-    (id: string) => {
-      setComparePair(null);
-      setCompareMode(true);
-      setCompareSelection([id]);
-    },
-    [setComparePair, setCompareMode, setCompareSelection],
-  );
-
-  const handleCancelCompare = useCallback(() => {
-    setCompareMode(false);
-    setCompareSelection([]);
-  }, [setCompareMode, setCompareSelection]);
-
-  const handleConfirmCompare = useCallback(() => {
-    const pair = resolveComparePair(historyItems, compareSelection);
-    if (!pair) return;
-    setComparePair(pair);
-    setCompareMode(false);
-    setCompareSelection([]);
-  }, [
-    historyItems,
-    compareSelection,
-    setComparePair,
-    setCompareMode,
-    setCompareSelection,
-  ]);
-
-  const handleRestoreItem = useCallback(
-    (id: string, index: number) => {
-      handleSelect(id, index);
-      confirmRestore(id);
-    },
-    [handleSelect, confirmRestore],
+    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
  );

  useEffect(() => {
@@ -193,16 +138,6 @@ function HistoryList({ pageId }: Props) {
            onHover={handleHover}
            onHoverEnd={clearPrefetchTimeout}
            isActive={historyItem.id === activeHistoryId}
-            compareMode={compareMode}
-            isChecked={compareSelection.includes(historyItem.id)}
-            isCheckboxDisabled={
-              !compareSelection.includes(historyItem.id) &&
-              compareSelection.length >= 2
-            }
-            canCompare={historyItems.length >= 2}
-            onToggleCompare={handleToggleCompare}
-            onStartCompare={handleStartCompare}
-            onRestore={canRestore ? handleRestoreItem : undefined}
          />
        ))}
        {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
@@ -213,44 +148,22 @@ function HistoryList({ pageId }: Props) {
        )}
      </ScrollArea>

-      {compareMode ? (
+      {canRestore && (
        <>
          <Divider />
          <Group p="xs" wrap="nowrap">
            <Button
              variant="default"
              size="compact-md"
-              onClick={handleCancelCompare}
+              onClick={() => setHistoryModalOpen(false)}
            >
              {t("Cancel")}
            </Button>
-            <Button
-              size="compact-md"
-              disabled={compareSelection.length !== 2}
-              onClick={handleConfirmCompare}
-            >
-              {t("Compare")}
+            <Button size="compact-md" onClick={confirmRestore}>
+              {t("Restore")}
            </Button>
          </Group>
        </>
-      ) : (
-        canRestore && (
-          <>
-            <Divider />
-            <Group p="xs" wrap="nowrap">
-              <Button
-                variant="default"
-                size="compact-md"
-                onClick={() => setHistoryModalOpen(false)}
-              >
-                {t("Cancel")}
-              </Button>
-              <Button size="compact-md" onClick={() => confirmRestore()}>
-                {t("Restore")}
-              </Button>
-            </Group>
-          </>
-        )
      )}
    </div>
  );
@@ -1,6 +1,5 @@
 import {
  ActionIcon,
-  CloseButton,
  Group,
  Paper,
  ScrollArea,
@@ -13,20 +12,17 @@ import { useAtom, useAtomValue } from "jotai";
 import {
  activeHistoryIdAtom,
  activeHistoryPrevIdAtom,
-  comparePairAtom,
  diffCountsAtom,
  highlightChangesAtom,
 } from "@/features/page-history/atoms/history-atoms";
 import HistoryView from "@/features/page-history/components/history-view";
-import { useMemo, useRef } from "react";
+import { useRef } from "react";
 import { IconChevronUp, IconChevronDown } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import {
  useDiffNavigation,
  useHistoryReset,
 } from "@/features/page-history/hooks";
-import { usePageHistoryListQuery } from "@/features/page-history/queries/page-history-query";
-import { formattedDate } from "@/lib/time";

 interface Props {
  pageId: string;
@@ -40,28 +36,6 @@ export default function HistoryModalBody({ pageId }: Props) {
  const activeHistoryPrevId = useAtomValue(activeHistoryPrevIdAtom);
  const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
  const diffCounts = useAtomValue(diffCountsAtom);
-  const [comparePair, setComparePair] = useAtom(comparePairAtom);
-
-  const { data: pageHistoryData } = usePageHistoryListQuery(pageId);
-  const historyItems = useMemo(
-    () => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
-    [pageHistoryData],
-  );
-
-  const compareLabel = useMemo(() => {
-    if (!comparePair) return null;
-    const newerItem = historyItems.find(
-      (item) => item.id === comparePair.newerId,
-    );
-    const olderItem = historyItems.find(
-      (item) => item.id === comparePair.olderId,
-    );
-    if (!newerItem || !olderItem) return null;
-    return t("Comparing {{newer}} and {{older}}", {
-      newer: formattedDate(new Date(newerItem.createdAt)),
-      older: formattedDate(new Date(olderItem.createdAt)),
-    });
-  }, [comparePair, historyItems, t]);

  useHistoryReset(pageId);
  const { currentChangeIndex, handlePrevChange, handleNextChange } =
@@ -76,25 +50,6 @@ export default function HistoryModalBody({ pageId }: Props) {
      </nav>

      <div style={{ position: "relative", flex: 1 }}>
-        {comparePair && (
-          <Group
-            justify="space-between"
-            wrap="nowrap"
-            px="md"
-            py={4}
-            className={classes.compareBanner}
-          >
-            <Text size="sm" fw={500} lineClamp={1}>
-              {compareLabel ?? t("Compare versions")}
-            </Text>
-            <CloseButton
-              size="sm"
-              aria-label={t("Exit compare")}
-              onClick={() => setComparePair(null)}
-            />
-          </Group>
-        )}
-
        <ScrollArea
          h={650}
          w="100%"
@@ -102,18 +57,11 @@ export default function HistoryModalBody({ pageId }: Props) {
          viewportRef={scrollViewportRef}
        >
          <div className={classes.sidebarRightSection}>
-            {comparePair ? (
-              <HistoryView
-                historyId={comparePair.newerId}
-                prevHistoryId={comparePair.olderId}
-              />
-            ) : (
-              activeHistoryId && <HistoryView />
-            )}
+            {activeHistoryId && <HistoryView />}
          </div>
        </ScrollArea>

-        {(comparePair || (activeHistoryId && activeHistoryPrevId)) && (
+        {activeHistoryId && activeHistoryPrevId && (
          <Paper
            shadow="md"
            radius="xl"
@@ -166,7 +166,7 @@ export default function HistoryModalMobile({ pageId, pageTitle }: Props) {
          <Button variant="default" onClick={() => setHistoryModalOpen(false)}>
            {t("Cancel")}
          </Button>
-          <Button onClick={() => confirmRestore()}>{t("Restore")}</Button>
+          <Button onClick={confirmRestore}>{t("Restore")}</Button>
        </Group>
      )}

@@ -7,29 +7,21 @@ import {
  activeHistoryPrevIdAtom,
 } from "@/features/page-history/atoms/history-atoms";

-interface Props {
-  historyId?: string;
-  prevHistoryId?: string;
-}
-
-function HistoryView({ historyId, prevHistoryId }: Props) {
+function HistoryView() {
  const { t } = useTranslation();
-  const activeId = useAtomValue(activeHistoryIdAtom);
-  const activePrevId = useAtomValue(activeHistoryPrevIdAtom);
-
-  const resolvedId = historyId ?? activeId;
-  const resolvedPrevId = prevHistoryId ?? activePrevId;
+  const historyId = useAtomValue(activeHistoryIdAtom);
+  const prevHistoryId = useAtomValue(activeHistoryPrevIdAtom);

  const {
    data,
    isLoading: isLoadingCurrent,
    isError: isErrorCurrent,
-  } = usePageHistoryQuery(resolvedId);
+  } = usePageHistoryQuery(historyId);
  const {
    data: prevData,
    isLoading: isLoadingPrev,
    isError: isErrorPrev,
-  } = usePageHistoryQuery(resolvedPrevId);
+  } = usePageHistoryQuery(prevHistoryId);

  if (isLoadingCurrent || isLoadingPrev) {
    return <></>;
@@ -3,45 +3,22 @@ import { useEffect } from "react";
 import {
  activeHistoryIdAtom,
  activeHistoryPrevIdAtom,
-  compareModeAtom,
-  comparePairAtom,
-  compareSelectionAtom,
  diffCountsAtom,
 } from "@/features/page-history/atoms/history-atoms";

 /**
 * Resets history state when pageId changes.
- * Clears active selection, diff counts, and compare state.
- * Compare state also resets on unmount so reopening the modal starts clean.
+ * Clears active selection and diff counts.
 */
 export function useHistoryReset(pageId: string) {
  const [, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
  const [, setActiveHistoryPrevId] = useAtom(activeHistoryPrevIdAtom);
  const [, setDiffCounts] = useAtom(diffCountsAtom);
-  const [, setCompareMode] = useAtom(compareModeAtom);
-  const [, setCompareSelection] = useAtom(compareSelectionAtom);
-  const [, setComparePair] = useAtom(comparePairAtom);

  useEffect(() => {
-    const resetCompare = () => {
-      setCompareMode(false);
-      setCompareSelection([]);
-      setComparePair(null);
-    };
-
    setActiveHistoryId("");
    setActiveHistoryPrevId("");
+    // @ts-ignore
    setDiffCounts(null);
-    resetCompare();
-
-    return resetCompare;
-  }, [
-    pageId,
-    setActiveHistoryId,
-    setActiveHistoryPrevId,
-    setDiffCounts,
-    setCompareMode,
-    setCompareSelection,
-    setComparePair,
-  ]);
+  }, [pageId, setActiveHistoryId, setActiveHistoryPrevId, setDiffCounts]);
 }
@@ -1,4 +1,4 @@
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { Text } from "@mantine/core";
@@ -9,8 +9,7 @@ import {
  activeHistoryIdAtom,
  historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { fetchPageHistory } from "@/features/page-history/queries/page-history-query";
-import { IPageHistory } from "@/features/page-history/types/page.types";
+import { usePageHistoryQuery } from "@/features/page-history/queries/page-history-query";
 import {
  pageEditorAtom,
  titleEditorAtom,
@@ -26,6 +25,8 @@ export function useHistoryRestore() {
  const { t } = useTranslation();

  const activeHistoryId = useAtomValue(activeHistoryIdAtom);
+  const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId);
+
  const mainEditor = useAtomValue(pageEditorAtom);
  const mainEditorTitle = useAtomValue(titleEditorAtom);
  const setHistoryModalOpen = useSetAtom(historyAtoms);
@@ -39,66 +40,47 @@ export function useHistoryRestore() {
    SpaceCaslSubject.Page,
  );

-  const handleRestore = useCallback(
-    async (historyId: string) => {
-      let historyData: IPageHistory;
-      try {
-        historyData = await fetchPageHistory(historyId);
-      } catch {
-        notifications.show({
-          message: t("Error fetching page data."),
-          color: "red",
-        });
-        return;
-      }
+  const handleRestore = useCallback(() => {
+    if (!activeHistoryData) return;
+    if (
+      !mainEditor ||
+      mainEditor.isDestroyed ||
+      !mainEditorTitle ||
+      mainEditorTitle.isDestroyed
+    ) {
+      return;
+    }

-      if (
-        !mainEditor ||
-        mainEditor.isDestroyed ||
-        !mainEditorTitle ||
-        mainEditorTitle.isDestroyed
-      ) {
-        return;
-      }
+    mainEditorTitle
+      .chain()
+      .clearContent()
+      .setContent(activeHistoryData.title, { emitUpdate: true })
+      .run();

-      mainEditorTitle
-        .chain()
-        .clearContent()
-        .setContent(historyData.title, { emitUpdate: true })
-        .run();
+    mainEditor
+      .chain()
+      .clearContent()
+      .setContent(activeHistoryData.content)
+      .run();

-      mainEditor
-        .chain()
-        .clearContent()
-        .setContent(historyData.content)
-        .run();
+    setHistoryModalOpen(false);
+    notifications.show({ message: t("Successfully restored") });
+  }, [activeHistoryData, mainEditor, mainEditorTitle, setHistoryModalOpen, t]);

-      setHistoryModalOpen(false);
-      notifications.show({ message: t("Successfully restored") });
-    },
-    [mainEditor, mainEditorTitle, setHistoryModalOpen, t],
-  );
-
-  const confirmRestore = useCallback(
-    (historyId?: string) => {
-      const targetId = historyId ?? activeHistoryId;
-      if (!targetId) return;
-
-      modals.openConfirmModal({
-        title: t("Please confirm your action"),
-        children: (
-          <Text size="sm">
-            {t(
-              "Are you sure you want to restore this version? Any changes not versioned will be lost.",
-            )}
-          </Text>
-        ),
-        labels: { confirm: t("Confirm"), cancel: t("Cancel") },
-        onConfirm: () => handleRestore(targetId),
-      });
-    },
-    [t, handleRestore, activeHistoryId],
-  );
+  const confirmRestore = useCallback(() => {
+    modals.openConfirmModal({
+      title: t("Please confirm your action"),
+      children: (
+        <Text size="sm">
+          {t(
+            "Are you sure you want to restore this version? Any changes not versioned will be lost.",
+          )}
+        </Text>
+      ),
+      labels: { confirm: t("Confirm"), cancel: t("Cancel") },
+      onConfirm: handleRestore,
+    });
+  }, [t, handleRestore]);

  return { canRestore, confirmRestore };
 }
@@ -23,14 +23,6 @@ export function prefetchPageHistory(historyId: string) {
  });
 }

-export function fetchPageHistory(historyId: string): Promise<IPageHistory> {
-  return queryClient.fetchQuery({
-    queryKey: ["page-history", historyId],
-    queryFn: () => getPageHistoryById(historyId),
-    staleTime: HISTORY_STALE_TIME,
-  });
-}
-
 export function usePageHistoryListQuery(
  pageId: string,
 ): UseInfiniteQueryResult<InfiniteData<IPagination<IPageHistory>, unknown>> {
@@ -1,32 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { resolveComparePair } from "./resolve-compare-pair";
-
-// list is newest-first, matching usePageHistoryListQuery order
-const items = [{ id: "v3" }, { id: "v2" }, { id: "v1" }];
-
-describe("resolveComparePair", () => {
-  it("orders newer before older regardless of selection order", () => {
-    expect(resolveComparePair(items, ["v1", "v3"])).toEqual({
-      newerId: "v3",
-      olderId: "v1",
-    });
-    expect(resolveComparePair(items, ["v3", "v1"])).toEqual({
-      newerId: "v3",
-      olderId: "v1",
-    });
-  });
-
-  it("returns null unless exactly two versions are selected", () => {
-    expect(resolveComparePair(items, [])).toBeNull();
-    expect(resolveComparePair(items, ["v1"])).toBeNull();
-    expect(resolveComparePair(items, ["v1", "v2", "v3"])).toBeNull();
-  });
-
-  it("returns null when a selected id is not in the list", () => {
-    expect(resolveComparePair(items, ["v1", "missing"])).toBeNull();
-  });
-
-  it("returns null when the same id is selected twice", () => {
-    expect(resolveComparePair(items, ["v2", "v2"])).toBeNull();
-  });
-});
@@ -1,18 +0,0 @@
-import { ComparePair } from "@/features/page-history/atoms/history-atoms";
-
-/**
- * Resolves which of the two selected versions is newer using their position
- * in the history list (list is newest-first: lower index = newer).
- */
-export function resolveComparePair(
-  historyItems: { id: string }[],
-  selection: string[],
-): ComparePair | null {
-  if (selection.length !== 2) return null;
-  const indexA = historyItems.findIndex((item) => item.id === selection[0]);
-  const indexB = historyItems.findIndex((item) => item.id === selection[1]);
-  if (indexA === -1 || indexB === -1 || indexA === indexB) return null;
-  return indexA < indexB
-    ? { newerId: selection[0], olderId: selection[1] }
-    : { newerId: selection[1], olderId: selection[0] };
-}
@@ -11,7 +11,6 @@ import {
  IconList,
  IconMarkdown,
  IconMessage,
-  IconPaperclip,
  IconPrinter,
  IconStar,
  IconStarFilled,
@@ -43,7 +42,6 @@ import {
 import { formattedDate } from "@/lib/time.ts";
 import { PageEditModeToggle } from "@/features/user/components/page-state-pref.tsx";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
-import PageAttachmentsModal from "@/features/attachments/components/page-attachments-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
 import { PageShareModal } from "@/ee/page-permission";
 import {
@@ -60,6 +58,7 @@ import {
  useWatchPageMutation,
  useUnwatchPageMutation,
 } from "@/features/page/queries/watcher-query";
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";

 interface PageHeaderMenuProps {
  readOnly?: boolean;
@@ -67,6 +66,7 @@ interface PageHeaderMenuProps {
 export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
  const { t } = useTranslation();
  const commentsTriggerProps = useAsideTriggerProps("comments");
+  const canViewComments = useCanViewComments();
  const tocTriggerProps = useAsideTriggerProps("toc");
  const { pageSlug } = useParams();
  const { data: page } = usePageQuery({
@@ -107,16 +107,18 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {

      <PageShareModal readOnly={readOnly} />

-      <Tooltip label={t("Comments")} openDelay={250} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          aria-label={t("Comments")}
-          {...commentsTriggerProps}
-        >
-          <IconMessage size={20} stroke={2} />
-        </ActionIcon>
-      </Tooltip>
+      {canViewComments && (
+        <Tooltip label={t("Comments")} openDelay={250} withArrow>
+          <ActionIcon
+            variant="subtle"
+            color="dark"
+            aria-label={t("Comments")}
+            {...commentsTriggerProps}
+          >
+            <IconMessage size={20} stroke={2} />
+          </ActionIcon>
+        </Tooltip>
+      )}

      {!page?.isBase && (
        <Tooltip label={t("Table of contents")} openDelay={250} withArrow>
@@ -159,10 +161,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
    verificationOpened,
    { open: openVerificationModal, close: closeVerificationModal },
  ] = useDisclosure(false);
-  const [
-    attachmentsOpened,
-    { open: openAttachmentsModal, close: closeAttachmentsModal },
-  ] = useDisclosure(false);
  const [pageEditor] = useAtom(pageEditorAtom);
  const pageUpdatedAt = useTimeAgo(page?.updatedAt);
  const favoriteIds = useFavoriteIds("page", page?.spaceId);
@@ -299,15 +297,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
            </Menu.Item>
          )}

-          {!page?.isBase && (
-            <Menu.Item
-              leftSection={<IconPaperclip size={16} />}
-              onClick={openAttachmentsModal}
-            >
-              {t("Attachments")}
-            </Menu.Item>
-          )}
-
          {!readOnly && !page?.isBase && (
            <PageVerificationMenuItem
              pageId={page?.id}
@@ -410,12 +399,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
        opened={verificationOpened}
        onClose={closeVerificationModal}
      />
-
-      <PageAttachmentsModal
-        pageId={page.id}
-        open={attachmentsOpened}
-        onClose={closeAttachmentsModal}
-      />
    </>
  );
 }
@@ -13,16 +13,11 @@ import { SearchResultItem } from "./search-result-item.tsx";
 import { AiSearchResult } from "../../../ee/ai/components/ai-search-result.tsx";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
-import { useAtomValue } from "jotai";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { hintVectorCache } from "@/ee/ai/services/ai-search-service.ts";
-import { getAiVectorDriver } from "@/lib/config.ts";

 interface SearchSpotlightProps {
  spaceId?: string;
 }
 export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
-  const workspace = useAtomValue(workspaceAtom);
  const { t } = useTranslation();
  const hasAiFeature = useHasFeature(Feature.AI);
  const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
@@ -101,15 +96,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
    />
  ));

-  const handleSpotlightOpen = () => {
-    if (
-      workspace?.settings?.ai?.search === true &&
-      getAiVectorDriver() === "turbopuffer"
-    ) {
-      hintVectorCache();
-    }
-  };
-
  const handleFiltersChange = (newFilters: any) => {
    setFilters(newFilters);
  };
@@ -129,7 +115,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
      <Spotlight.Root
        size="xl"
        maxHeight={600}
-        onSpotlightOpen={handleSpotlightOpen}
        store={searchSpotlightStore}
        query={query}
        onQueryChange={setQuery}
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useDebouncedValue } from "@mantine/hooks";
 import { Group, Select, SelectProps, Text } from "@mantine/core";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
@@ -14,7 +14,6 @@ interface SpaceSelectProps {
  width?: number;
  opened?: boolean;
  clearable?: boolean;
-  withinPortal?: boolean;
 }

 const renderSelectOption: SelectProps["renderOption"] = ({ option }) => (
@@ -42,7 +41,6 @@ export function SpaceSelect({
  width,
  opened,
  clearable,
-  withinPortal = true,
 }: SpaceSelectProps) {
  const { t } = useTranslation();
  const [searchValue, setSearchValue] = useState("");
@@ -52,13 +50,9 @@ export function SpaceSelect({
    limit: 50,
  });
  const [data, setData] = useState([]);
-  const fetchedSpaces = useRef(new Map<string, ISpace>());

  useEffect(() => {
    if (spaces) {
-      spaces.items.forEach((space: ISpace) =>
-        fetchedSpaces.current.set(space.slug, space),
-      );
      const spaceData = spaces?.items
        .filter((space: ISpace) => space.slug !== value)
        .map((space: ISpace) => {
@@ -89,19 +83,14 @@ export function SpaceSelect({
      onSearchChange={setSearchValue}
      clearable={clearable}
      variant="filled"
-      onChange={(slug) => {
-        // options accumulate across fetches; resolve against everything
-        // fetched, not just the latest query result
-        const space = slug && fetchedSpaces.current.get(slug);
-        if (space) {
-          onChange(space);
-        }
-      }}
+      onChange={(slug) =>
+        onChange(spaces.items?.find((item) => item.slug === slug))
+      }
      onClick={(e) => e.stopPropagation()}
      nothingFoundMessage={t("No space found")}
      limit={50}
      checkIconPosition="right"
-      comboboxProps={{ width, withinPortal, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
+      comboboxProps={{ width, withinPortal: true, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
      dropdownOpened={opened}
    />
  );
@@ -70,7 +70,6 @@ export function SwitchSpace({
          onChange={(space) => handleSelect(space.slug)}
          width={300}
          opened={true}
-          withinPortal={false}
        />
      </Popover.Dropdown>
    </Popover>
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { ISpace } from "@/features/space/types/space.types.ts";
 import SpacePublicSharingToggle from "@/ee/security/components/space-public-sharing-toggle.tsx";
 import SpaceViewerCommentsToggle from "@/ee/security/components/space-viewer-comments-toggle.tsx";
+import SpaceHideCommentsToggle from "@/ee/security/components/space-hide-comments-toggle.tsx";

 type SpaceSecuritySettingsProps = {
  space: ISpace;
@@ -29,6 +30,10 @@ export default function SpaceSecuritySettings({
      <Divider my="lg" />

      <SpaceViewerCommentsToggle space={space} />
+
+      <Divider my="lg" />
+
+      <SpaceHideCommentsToggle space={space} />
    </div>
  );
 }
@@ -11,6 +11,7 @@ export interface ISpaceSharingSettings {

 export interface ISpaceCommentsSettings {
  allowViewerComments?: boolean;
+  hideCommentsFromViewers?: boolean;
 }

 export interface ISpaceSettings {
@@ -36,6 +37,7 @@ export interface ISpace {
  // for updates
  disablePublicSharing?: boolean;
  allowViewerComments?: boolean;
+  hideCommentsFromViewers?: boolean;
 }

 interface IMembership {
@@ -43,10 +43,6 @@ export function isCloud(): boolean {
  return castToBoolean(getConfigValue("CLOUD"));
 }

-export function getAiVectorDriver(): string {
-  return getConfigValue("AI_VECTOR_DRIVER");
-}
-
 export function getAvatarUrl(
  avatarUrl: string,
  type: AvatarIconType = AvatarIconType.AVATAR,
@@ -16,7 +16,6 @@ export default defineConfig(({ mode }) => {
    BILLING_TRIAL_DAYS,
    POSTHOG_HOST,
    POSTHOG_KEY,
-    AI_VECTOR_DRIVER,
  } = loadEnv(mode, envPath, "");

  return {
@@ -32,7 +31,6 @@ export default defineConfig(({ mode }) => {
        BILLING_TRIAL_DAYS,
        POSTHOG_HOST,
        POSTHOG_KEY,
-        AI_VECTOR_DRIVER,
      },
      APP_VERSION: JSON.stringify(process.env.npm_package_version),
    },
@@ -66,7 +66,6 @@
    "@nestjs/websockets": "11.1.28",
    "@node-saml/passport-saml": "5.1.0",
    "@socket.io/redis-adapter": "8.3.0",
-    "@turbopuffer/turbopuffer": "^2.8.0",
    "ai": "6.0.134",
    "ai-sdk-ollama": "3.8.1",
    "bcrypt": "6.0.0",
@@ -27,7 +27,6 @@ import { LoggerModule } from './common/logger/logger.module';
 import { ClsModule } from 'nestjs-cls';
 import { NoopAuditModule } from './integrations/audit/audit.module';
 import { ThrottleModule } from './integrations/throttle/throttle.module';
-import { EncryptionModule } from './integrations/encryption/encryption.module';

 const enterpriseModules = [];
 try {
@@ -54,7 +53,6 @@ try {
    CoreModule,
    DatabaseModule,
    EnvironmentModule,
-    EncryptionModule,
    RedisModule.forRootAsync({
      useClass: RedisConfigService,
    }),
@@ -1,5 +1,4 @@
 import { StarterKit } from '@tiptap/starter-kit';
-import { Document } from '@tiptap/extension-document';
 import { TextAlign } from '@tiptap/extension-text-align';
 import { Superscript } from '@tiptap/extension-superscript';
 import SubScript from '@tiptap/extension-subscript';
@@ -46,18 +45,9 @@ import {
  TransclusionSource,
  TransclusionReference,
  BaseEmbed,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 } from '@docmost/editor-ext';
-import {
-  extensions as coreExtensions,
-  generateText,
-  getSchema,
-  JSONContent,
-} from '@tiptap/core';
+import { generateText, getSchema, JSONContent } from '@tiptap/core';
 import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
-import { collapseBlankLines } from '../common/helpers';
 // @tiptap/html library works best for generating prosemirror json state but not HTML
 // see: https://github.com/ueberdosis/tiptap/issues/5352
 // see:https://github.com/ueberdosis/tiptap/issues/4089
@@ -67,17 +57,12 @@ import * as Y from 'yjs';
 import { Logger } from '@nestjs/common';

 export const tiptapExtensions = [
-  coreExtensions.TextDirection.configure({ direction: 'auto' }),
  StarterKit.configure({
-    document: false,
    codeBlock: false,
    link: false,
    trailingNode: false,
    heading: false,
  }),
-  Document.extend({
-    content: 'block+ footnotes?',
-  }),
  Heading,
  UniqueID.configure({
    types: ['heading', 'paragraph', 'transclusionSource'],
@@ -125,10 +110,7 @@ export const tiptapExtensions = [
  Status,
  TransclusionSource,
  TransclusionReference,
-  BaseEmbed,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
+  BaseEmbed
 ] as any;

 export function jsonToHtml(tiptapJson: any) {
@@ -147,7 +129,7 @@ export function htmlToJson(html: string) {
 }

 export function jsonToText(tiptapJson: JSONContent) {
-  return collapseBlankLines(generateText(tiptapJson, tiptapExtensions));
+  return generateText(tiptapJson, tiptapExtensions);
 }

 export function jsonToNode(tiptapJson: JSONContent) {
@@ -18,6 +18,7 @@ export const Feature = {
  RETENTION: 'retention',
  SHARING_CONTROLS: 'sharing:controls',
  VIEWER_COMMENTS: 'comment:viewer',
+  HIDE_COMMENTS: 'comment:hide',
  TEMPLATES: 'templates',
  PDF_EXPORT: 'export:pdf',
  PERSONAL_SPACES: 'spaces:personal',
@@ -1,5 +1,4 @@
 export * from './utils';
-export * from './text.utils';
 export * from './nanoid.utils';
 export * from './file.helper';
 export * from './constants';
@@ -1,14 +0,0 @@
-import { collapseBlankLines } from './text.utils';
-
-describe('collapseBlankLines', () => {
-  it.each([
-    ['a\n\n\n\nb', 'a\n\nb'],
-    ['a\n\nb', 'a\n\nb'],
-    ['a\nb', 'a\nb'],
-    ['\n\n\n\na\n\n\n', '\n\na\n\n'],
-    ['no newlines', 'no newlines'],
-    ['', ''],
-  ])('collapses %j to %j', (input, expected) => {
-    expect(collapseBlankLines(input)).toBe(expected);
-  });
-});
@@ -1,3 +0,0 @@
-export function collapseBlankLines(text: string): string {
-  return text.replace(/\n{2,}/g, '\n\n');
-}
@@ -53,14 +53,8 @@ import { EnvironmentService } from '../../integrations/environment/environment.s
 import { TokenService } from '../auth/services/token.service';
 import { JwtAttachmentPayload, JwtType } from '../auth/dto/jwt-payload';
 import * as path from 'path';
-import {
-  AttachmentInfoDto,
-  PageIdDto,
-  RemoveIconDto,
-} from './dto/attachment.dto';
-import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { AttachmentInfoDto, RemoveIconDto } from './dto/attachment.dto';
 import { PageAccessService } from '../page/page-access/page-access.service';
-import { DomainService } from '../../integrations/environment/domain.service';
 import { AuditEvent, AuditResource } from '../../common/events/audit-events';
 import {
  AUDIT_SERVICE,
@@ -81,7 +75,6 @@ export class AttachmentController {
    private readonly environmentService: EnvironmentService,
    private readonly tokenService: TokenService,
    private readonly pageAccessService: PageAccessService,
-    private readonly domainService: DomainService,
    @Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
  ) {}

@@ -158,10 +151,7 @@ export class AttachmentController {
        },
      });

-      return res.send({
-        ...fileResponse,
-        url: this.buildFileUrl(workspace, fileResponse),
-      });
+      return res.send(fileResponse);
    } catch (err: any) {
      if (err?.statusCode === 413) {
        const errMessage = `File too large. Exceeds the ${this.environmentService.getFileUploadSizeLimit()} limit`;
@@ -421,37 +411,7 @@ export class AttachmentController {

    await this.pageAccessService.validateCanView(page, user);

-    return { ...attachment, url: this.buildFileUrl(workspace, attachment) };
-  }
-
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  @Post('pages/attachments')
-  async getPageAttachments(
-    @Body() dto: PageIdDto,
-    @Body() pagination: PaginationOptions,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    const page = await this.pageRepo.findById(dto.pageId);
-    if (!page || page.workspaceId !== workspace.id) {
-      throw new NotFoundException('Page not found');
-    }
-
-    await this.pageAccessService.validateCanView(page, user);
-
-    const result = await this.attachmentRepo.findPageAttachments(
-      page.id,
-      pagination,
-    );
-
-    return {
-      ...result,
-      items: result.items.map((attachment) => ({
-        ...attachment,
-        url: this.buildFileUrl(workspace, attachment),
-      })),
-    };
+    return attachment;
  }

  @UseGuards(JwtAuthGuard)
@@ -505,10 +465,6 @@ export class AttachmentController {
    }
  }

-  private buildFileUrl(workspace: Workspace, attachment: Attachment): string {
-    return `${this.domainService.getUrl(workspace.hostname)}/api/files/${attachment.id}/${encodeURIComponent(attachment.fileName)}`;
-  }
-
  private async sendFileResponse(
    req: FastifyRequest,
    res: FastifyReply,
@@ -1,11 +1,4 @@
-import {
-  IsEnum,
-  IsIn,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  IsUUID,
-} from 'class-validator';
+import { IsEnum, IsIn, IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
 import { AttachmentType } from '../attachment.constants';

 export class AttachmentInfoDto {
@@ -14,12 +7,6 @@ export class AttachmentInfoDto {
  attachmentId: string;
 }

-export class PageIdDto {
-  @IsString()
-  @IsNotEmpty()
-  pageId: string;
-}
-
 export class RemoveIconDto {
  @IsEnum(AttachmentType)
  @IsIn([
@@ -89,20 +89,29 @@ export class CommentController {
    @Body()
    pagination: PaginationOptions,
    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
  ) {
    const page = await this.pageRepo.findById(input.pageId);
    if (!page) {
      throw new NotFoundException('Page not found');
    }

-    await this.pageAccessService.validateCanView(page, user);
+    await this.pageAccessService.validateCanViewComments(
+      page,
+      user,
+      workspace.id,
+    );

    return this.commentService.findByPageId(page.id, pagination);
  }

  @HttpCode(HttpStatus.OK)
  @Post('info')
-  async findOne(@Body() input: CommentIdDto, @AuthUser() user: User) {
+  async findOne(
+    @Body() input: CommentIdDto,
+    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
    const comment = await this.commentRepo.findById(input.commentId);
    if (!comment) {
      throw new NotFoundException('Comment not found');
@@ -113,7 +122,11 @@ export class CommentController {
      throw new NotFoundException('Page not found');
    }

-    await this.pageAccessService.validateCanView(page, user);
+    await this.pageAccessService.validateCanViewComments(
+      page,
+      user,
+      workspace.id,
+    );

    return comment;
  }
@@ -14,6 +14,7 @@ import { CommentMentionEmail } from '@docmost/transactional/emails/comment-menti
 import { CommentCreateEmail } from '@docmost/transactional/emails/comment-created-email';
 import { CommentResolvedEmail } from '@docmost/transactional/emails/comment-resolved-email';
 import { getPageTitle } from '../../../common/helpers';
+import { PageAccessService } from '../../page/page-access/page-access.service';

@Injectable()
 export class CommentNotificationService {
@@ -25,6 +26,7 @@ export class CommentNotificationService {
    private readonly spaceMemberRepo: SpaceMemberRepo,
    private readonly pagePermissionRepo: PagePermissionRepo,
    private readonly watcherRepo: WatcherRepo,
+    private readonly pageAccessService: PageAccessService,
  ) {}

  async processComment(data: ICommentNotificationJob, appUrl: string) {
@@ -48,7 +50,7 @@ export class CommentNotificationService {
    );
    if (!context) return;

-    const { actor, pageTitle, pageUrl } = context;
+    const { actor, pageTitle, pageUrl, spaceSettings } = context;
    const notifiedUserIds = new Set<string>();
    notifiedUserIds.add(actorId);

@@ -72,7 +74,16 @@ export class CommentNotificationService {
        pageId,
        [...usersWithSpaceAccess],
      );
-    const usersWithAccess = new Set(usersWithPageAccess);
+    let accessibleUserIds = usersWithPageAccess;
+    if (spaceSettings?.comments?.hideCommentsFromViewers === true) {
+      accessibleUserIds =
+        await this.pageAccessService.filterUserIdsWithPageEditAccess(
+          spaceId,
+          pageId,
+          accessibleUserIds,
+        );
+    }
+    const usersWithAccess = new Set(accessibleUserIds);

    for (const userId of mentionedUserIds) {
      if (!usersWithAccess.has(userId)) continue;
@@ -145,7 +156,7 @@ export class CommentNotificationService {
    );
    if (!context) return;

-    const { actor, pageTitle, pageUrl } = context;
+    const { actor, pageTitle, pageUrl, spaceSettings } = context;

    const roles = await this.spaceMemberRepo.getUserSpaceRoles(
      commentCreatorId,
@@ -166,6 +177,16 @@ export class CommentNotificationService {
      );
    if (hasPageAccess.length === 0) return;

+    if (spaceSettings?.comments?.hideCommentsFromViewers === true) {
+      const editCapable =
+        await this.pageAccessService.filterUserIdsWithPageEditAccess(
+          spaceId,
+          pageId,
+          [commentCreatorId],
+        );
+      if (editCapable.length === 0) return;
+    }
+
    const notification = await this.notificationService.create({
      userId: commentCreatorId,
      workspaceId,
@@ -225,7 +246,7 @@ export class CommentNotificationService {
        .executeTakeFirst(),
      this.db
        .selectFrom('spaces')
-        .select(['id', 'slug'])
+        .select(['id', 'slug', 'settings'])
        .where('id', '=', spaceId)
        .executeTakeFirst(),
    ]);
@@ -236,6 +257,11 @@ export class CommentNotificationService {

    const pageUrl = `${appUrl}/s/${space.slug}/p/${page.slugId}`;

-    return { actor, pageTitle: getPageTitle(page.title), pageUrl };
+    return {
+      actor,
+      pageTitle: getPageTitle(page.title),
+      pageUrl,
+      spaceSettings: (space.settings ?? null) as Record<string, any> | null,
+    };
  }
 }
@@ -7,6 +7,7 @@ import {
  SpaceCaslSubject,
 } from '../../casl/interfaces/space-ability.type';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
+import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';

@Injectable()
 export class PageAccessService {
@@ -14,6 +15,7 @@ export class PageAccessService {
    private readonly pagePermissionRepo: PagePermissionRepo,
    private readonly spaceAbility: SpaceAbilityFactory,
    private readonly spaceRepo: SpaceRepo,
+    private readonly spaceMemberRepo: SpaceMemberRepo,
  ) {}

  /**
@@ -118,8 +120,68 @@ export class PageAccessService {

    const space = await this.spaceRepo.findById(page.spaceId, workspaceId);
    const settings = space?.settings as Record<string, any> | null;
-    if (!settings?.comments?.allowViewerComments) {
+    if (
+      !settings?.comments?.allowViewerComments ||
+      settings?.comments?.hideCommentsFromViewers
+    ) {
      throw new ForbiddenException();
    }
  }
+
+  async validateCanViewComments(
+    page: Page,
+    user: User,
+    workspaceId: string,
+  ): Promise<void> {
+    const { canEdit } = await this.validateCanViewWithPermissions(page, user);
+    if (canEdit) {
+      return;
+    }
+
+    const space = await this.spaceRepo.findById(page.spaceId, workspaceId);
+    const settings = space?.settings as Record<string, any> | null;
+    if (settings?.comments?.hideCommentsFromViewers) {
+      throw new ForbiddenException();
+    }
+  }
+
+  /**
+   * Callers must pass userIds that already have space access (WS room members / pre-filtered notification recipients).
+   */
+  async filterUserIdsWithPageEditAccess(
+    spaceId: string,
+    pageId: string,
+    userIds: string[],
+  ): Promise<string[]> {
+    if (userIds.length === 0) {
+      return [];
+    }
+
+    const spaceHasRestrictedPages =
+      await this.pagePermissionRepo.hasRestrictedPagesInSpace(spaceId);
+    const hasRestriction =
+      spaceHasRestrictedPages &&
+      (await this.pagePermissionRepo.hasRestrictedAncestor(pageId));
+
+    if (!hasRestriction) {
+      const editCapableIds =
+        await this.spaceMemberRepo.getUserIdsWithSpaceEditAccess(
+          userIds,
+          spaceId,
+        );
+      return userIds.filter((id) => editCapableIds.has(id));
+    }
+
+    const results = await Promise.all(
+      userIds.map(async (userId) => {
+        const { canEdit } = await this.pagePermissionRepo.canUserEditPage(
+          userId,
+          pageId,
+        );
+        return canEdit ? userId : null;
+      }),
+    );
+
+    return results.filter((id): id is string => id !== null);
+  }
 }
@@ -496,21 +496,10 @@ export class PageService {
          },
        );

-        await this.aiQueue.add(
-          QueueJob.PAGE_MOVED_TO_SPACE,
-          {
-            pageIds: pageIdsToMove,
-            spaceId,
-            workspaceId: rootPage.workspaceId,
-          },
-          {
-            attempts: 2,
-            backoff: {
-              type: 'fixed',
-              delay: 2 * 60 * 1000,
-            },
-          },
-        );
+        await this.aiQueue.add(QueueJob.PAGE_MOVED_TO_SPACE, {
+          pageIds: pageIdsToMove,
+          workspaceId: rootPage.workspaceId,
+        });
      }
    });

@@ -15,4 +15,8 @@ export class UpdateSpaceDto extends PartialType(CreateSpaceDto) {
  @IsOptional()
  @IsBoolean()
  allowViewerComments: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  hideCommentsFromViewers: boolean;
 }
@@ -30,6 +30,35 @@ import {
  IAuditService,
 } from '../../../integrations/audit/audit.service';

+export function validateExclusiveCommentSettings(
+  dto: Partial<
+    Pick<UpdateSpaceDto, 'allowViewerComments' | 'hideCommentsFromViewers'>
+  >,
+  settingsBefore: Record<string, any>,
+): void {
+  if (
+    dto.allowViewerComments === undefined &&
+    dto.hideCommentsFromViewers === undefined
+  ) {
+    return;
+  }
+
+  const allowViewerComments =
+    dto.allowViewerComments ??
+    settingsBefore.comments?.allowViewerComments ??
+    false;
+  const hideCommentsFromViewers =
+    dto.hideCommentsFromViewers ??
+    settingsBefore.comments?.hideCommentsFromViewers ??
+    false;
+
+  if (allowViewerComments && hideCommentsFromViewers) {
+    throw new BadRequestException(
+      "'Allow viewers to comment' and 'Hide comments from viewers' cannot both be enabled",
+    );
+  }
+}
+
@Injectable()
 export class SpaceService {
  constructor(
@@ -141,7 +170,8 @@ export class SpaceService {

    if (
      typeof updateSpaceDto.disablePublicSharing !== 'undefined' ||
-      typeof updateSpaceDto.allowViewerComments !== 'undefined'
+      typeof updateSpaceDto.allowViewerComments !== 'undefined' ||
+      typeof updateSpaceDto.hideCommentsFromViewers !== 'undefined'
    ) {
      const workspace = await this.workspaceRepo.findById(workspaceId, {
        withLicenseKey: true,
@@ -168,6 +198,17 @@ export class SpaceService {
      ) {
        throw new ForbiddenException('This feature requires a valid license');
      }
+
+      if (
+        updateSpaceDto.hideCommentsFromViewers === true &&
+        !this.licenseCheckService.hasFeature(
+          workspace.licenseKey,
+          Feature.HIDE_COMMENTS,
+          workspace.plan,
+        )
+      ) {
+        throw new ForbiddenException('This feature requires a valid license');
+      }
    }

    const spaceBefore = await this.spaceRepo.findById(
@@ -176,6 +217,8 @@ export class SpaceService {
    );
    const settingsBefore = (spaceBefore?.settings ?? {}) as Record<string, any>;

+    validateExclusiveCommentSettings(updateSpaceDto, settingsBefore);
+
    const before: Record<string, any> = {};
    const after: Record<string, any> = {};

@@ -218,6 +261,23 @@ export class SpaceService {
        );
      }

+      if (typeof updateSpaceDto.hideCommentsFromViewers !== 'undefined') {
+        const prev = settingsBefore?.comments?.hideCommentsFromViewers ?? false;
+        if (prev !== updateSpaceDto.hideCommentsFromViewers) {
+          before.hideCommentsFromViewers = prev;
+          after.hideCommentsFromViewers =
+            updateSpaceDto.hideCommentsFromViewers;
+        }
+
+        await this.spaceRepo.updateCommentSettings(
+          updateSpaceDto.spaceId,
+          workspaceId,
+          'hideCommentsFromViewers',
+          updateSpaceDto.hideCommentsFromViewers,
+          trx,
+        );
+      }
+
      updatedSpace = await this.spaceRepo.updateSpace(
        {
          name: updateSpaceDto.name,
@@ -8,7 +8,6 @@ import { EnvironmentService } from '../../integrations/environment/environment.s

 export class SpaceEvent {
  spaceId: string;
-  workspaceId: string;
 }

@Injectable()
@@ -23,12 +22,12 @@ export class SpaceListener {

  @OnEvent(EventName.SPACE_DELETED)
  async handleSpaceDeleted(event: SpaceEvent) {
-    const { spaceId, workspaceId } = event;
+    const { spaceId } = event;
    if (this.isTypesense()) {
      await this.searchQueue.add(QueueJob.SPACE_DELETED, { spaceId });
    }

-    await this.aiQueue.add(QueueJob.SPACE_DELETED, { spaceId, workspaceId });
+    await this.aiQueue.add(QueueJob.SPACE_DELETED, { spaceId });
  }

  isTypesense(): boolean {
@@ -1,8 +1,5 @@
 import { Injectable } from '@nestjs/common';
 import { InjectKysely } from 'nestjs-kysely';
-import { ExpressionBuilder, sql } from 'kysely';
-import { jsonObjectFrom } from 'kysely/helpers/postgres';
-import { DB } from '@docmost/db/types/db';
 import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { dbOrTx } from '@docmost/db/utils';
 import {
@@ -11,8 +8,6 @@ import {
  UpdatableAttachment,
 } from '@docmost/db/types/entity.types';
 import { AttachmentType } from '../../../core/attachment/attachment.constants';
-import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';

@Injectable()
 export class AttachmentRepo {
@@ -94,41 +89,6 @@ export class AttachmentRepo {
      .execute();
  }

-  async findPageAttachments(pageId: string, pagination: PaginationOptions) {
-    let query = this.db
-      .selectFrom('attachments')
-      .select(this.baseFields)
-      .select((eb) => this.withCreator(eb))
-      .where('pageId', '=', pageId)
-      .where('type', '=', AttachmentType.File)
-      .where('deletedAt', 'is', null);
-
-    if (pagination.query) {
-      query = query.where(
-        sql`f_unaccent(file_name)`,
-        'ilike',
-        sql`f_unaccent(${'%' + pagination.query + '%'})`,
-      );
-    }
-
-    return executeWithCursorPagination(query, {
-      perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'id', direction: 'desc' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
-    });
-  }
-
-  withCreator(eb: ExpressionBuilder<DB, 'attachments'>) {
-    return jsonObjectFrom(
-      eb
-        .selectFrom('users')
-        .select(['users.id', 'users.name', 'users.avatarUrl'])
-        .whereRef('users.id', '=', 'attachments.creatorId'),
-    ).as('creator');
-  }
-
  async findByIds(
    ids: string[],
    opts?: {
@@ -20,6 +20,7 @@ import {
  CacheKey,
  PERMISSION_CACHE_TTL_MS,
 } from '../../../common/helpers/cache-keys';
+import { SpaceRole } from '../../../common/helpers/types/permission';

@Injectable()
 export class SpaceMemberRepo {
@@ -278,6 +279,32 @@ export class SpaceMemberRepo {
    return new Set(rows.map((r) => r.userId));
  }

+  async getUserIdsWithSpaceEditAccess(
+    userIds: string[],
+    spaceId: string,
+  ): Promise<Set<string>> {
+    if (userIds.length === 0) return new Set();
+
+    const rows = await this.db
+      .selectFrom('spaceMembers')
+      .select('userId')
+      .where('userId', 'in', userIds)
+      .where('spaceId', '=', spaceId)
+      .where('spaceMembers.role', 'in', [SpaceRole.ADMIN, SpaceRole.WRITER])
+      .unionAll(
+        this.db
+          .selectFrom('spaceMembers')
+          .innerJoin('groupUsers', 'groupUsers.groupId', 'spaceMembers.groupId')
+          .select('groupUsers.userId')
+          .where('groupUsers.userId', 'in', userIds)
+          .where('spaceMembers.spaceId', '=', spaceId)
+          .where('spaceMembers.role', 'in', [SpaceRole.ADMIN, SpaceRole.WRITER]),
+      )
+      .execute();
+
+    return new Set(rows.map((r) => r.userId));
+  }
+
  async getSpaceIdsByGroupId(groupId: string): Promise<string[]> {
    const rows = await this.db
      .selectFrom('spaceMembers')
@@ -149,6 +149,17 @@ export class SpaceRepo {
      .executeTakeFirst();
  }

+  async getSpaceSettings(
+    spaceId: string,
+  ): Promise<Record<string, any> | null> {
+    const row = await this.db
+      .selectFrom('spaces')
+      .select('settings')
+      .where('id', '=', spaceId)
+      .executeTakeFirst();
+    return (row?.settings as Record<string, any> | undefined) ?? null;
+  }
+
  async insertSpace(
    insertableSpace: InsertableSpace,
    trx?: KyselyTransaction,
@@ -230,7 +241,6 @@ export class SpaceRepo {

    this.eventEmitter.emit(EventName.SPACE_DELETED, {
      spaceId,
-      workspaceId,
    });
  }
 }
@@ -211,24 +211,6 @@ export class WorkspaceRepo {
      .executeTakeFirst();
  }

-  async updateAiEmbeddingFingerprint(
-    workspaceId: string,
-    fingerprint: { driver: string; model: string; dimensions: number },
-    trx?: KyselyTransaction,
-  ) {
-    const db = dbOrTx(this.db, trx);
-    return db
-      .updateTable('workspaces')
-      .set({
-        settings: sql`COALESCE(settings, '{}'::jsonb)
-                || jsonb_build_object('ai', COALESCE(settings->'ai', '{}'::jsonb)
-                || jsonb_build_object('embedding', ${JSON.stringify(fingerprint)}::text::jsonb))`,
-        updatedAt: new Date(),
-      })
-      .where('id', '=', workspaceId)
-      .execute();
-  }
-
  async updateSharingSettings(
    workspaceId: string,
    prefKey: string,
@@ -1,13 +0,0 @@
-export class UnableToInitialize extends Error {
-  constructor(message: string) {
-    super(`Unable to initialize the encryption service: ${message}`);
-    this.name = 'UnableToInitialize';
-  }
-}
-
-export class UnableToDecrypt extends Error {
-  constructor(reason: string) {
-    super(`Unable to decrypt the ciphertext: ${reason}`);
-    this.name = 'UnableToDecrypt';
-  }
-}
@@ -1,9 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { EncryptionService } from './encryption.service';
-
-@Global()
-@Module({
-  providers: [EncryptionService],
-  exports: [EncryptionService],
-})
-export class EncryptionModule {}
@@ -1,184 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { EncryptionService } from './encryption.service';
-import { UnableToDecrypt, UnableToInitialize } from './encryption.errors';
-import { EnvironmentService } from '../environment/environment.service';
-
-const APP_SECRET = 'test-app-secret-with-plenty-of-entropy-1234567890';
-
-const buildService = (appSecret: string | undefined) => {
-  const env = { getAppSecret: () => appSecret } as EnvironmentService;
-  return new EncryptionService(env);
-};
-
-const decodeEnvelope = (encrypted: string) =>
-  JSON.parse(Buffer.from(encrypted, 'base64').toString()) as {
-    iv: string;
-    authTag: string;
-    cipherText: string;
-  };
-
-const encodeEnvelope = (envelope: {
-  iv: string;
-  authTag: string;
-  cipherText: string;
-}) => Buffer.from(JSON.stringify(envelope)).toString('base64');
-
-describe('EncryptionService', () => {
-  let service: EncryptionService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        EncryptionService,
-        {
-          provide: EnvironmentService,
-          useValue: { getAppSecret: () => APP_SECRET },
-        },
-      ],
-    }).compile();
-
-    service = module.get<EncryptionService>(EncryptionService);
-  });
-
-  describe('initialization', () => {
-    it('compiles via Nest DI', () => {
-      expect(service).toBeDefined();
-    });
-
-    it('throws UnableToInitialize when APP_SECRET is missing', () => {
-      expect(() => buildService(undefined)).toThrow(UnableToInitialize);
-      expect(() => buildService('')).toThrow(UnableToInitialize);
-    });
-  });
-
-  describe('encrypt + decrypt round-trip', () => {
-    it('decrypts back to the original plaintext', () => {
-      const plaintext = 'hello world';
-      const encrypted = service.encrypt(plaintext);
-      expect(service.decrypt(encrypted)).toBe(plaintext);
-    });
-
-    it('handles empty string', () => {
-      const encrypted = service.encrypt('');
-      expect(service.decrypt(encrypted)).toBe('');
-    });
-
-    it('handles unicode (multi-byte UTF-8)', () => {
-      const plaintext = 'héllo 🔐 世界';
-      const encrypted = service.encrypt(plaintext);
-      expect(service.decrypt(encrypted)).toBe(plaintext);
-    });
-
-    it('handles long plaintext (>1 block)', () => {
-      const plaintext = 'a'.repeat(10_000);
-      const encrypted = service.encrypt(plaintext);
-      expect(service.decrypt(encrypted)).toBe(plaintext);
-    });
-
-    it('produces distinct ciphertexts for the same plaintext (random IV)', () => {
-      const plaintext = 'same input';
-      const a = service.encrypt(plaintext);
-      const b = service.encrypt(plaintext);
-      expect(a).not.toBe(b);
-      expect(service.decrypt(a)).toBe(plaintext);
-      expect(service.decrypt(b)).toBe(plaintext);
-    });
-  });
-
-  describe('cross-key isolation', () => {
-    it('cannot decrypt ciphertext produced under a different APP_SECRET', () => {
-      const other = buildService('totally-different-secret-value-9876543210');
-      const encrypted = service.encrypt('secret');
-      expect(() => other.decrypt(encrypted)).toThrow(UnableToDecrypt);
-    });
-  });
-
-  describe('tamper detection', () => {
-    it('rejects modified ciphertext', () => {
-      const encrypted = service.encrypt('hello');
-      const env = decodeEnvelope(encrypted);
-      const tamperedCipher = Buffer.from(env.cipherText, 'base64');
-      tamperedCipher[0] ^= 0x01;
-      const tampered = encodeEnvelope({
-        ...env,
-        cipherText: tamperedCipher.toString('base64'),
-      });
-      expect(() => service.decrypt(tampered)).toThrow(UnableToDecrypt);
-    });
-
-    it('rejects modified auth tag', () => {
-      const encrypted = service.encrypt('hello');
-      const env = decodeEnvelope(encrypted);
-      const tamperedTag = Buffer.from(env.authTag, 'base64');
-      tamperedTag[0] ^= 0x01;
-      const tampered = encodeEnvelope({
-        ...env,
-        authTag: tamperedTag.toString('base64'),
-      });
-      expect(() => service.decrypt(tampered)).toThrow(UnableToDecrypt);
-    });
-
-    it('rejects modified IV', () => {
-      const encrypted = service.encrypt('hello');
-      const env = decodeEnvelope(encrypted);
-      const tamperedIV = Buffer.from(env.iv, 'base64');
-      tamperedIV[0] ^= 0x01;
-      const tampered = encodeEnvelope({
-        ...env,
-        iv: tamperedIV.toString('base64'),
-      });
-      expect(() => service.decrypt(tampered)).toThrow(UnableToDecrypt);
-    });
-  });
-
-  describe('malformed payloads', () => {
-    it('rejects non-base64 garbage', () => {
-      expect(() => service.decrypt('!!!not-valid-base64!!!')).toThrow(
-        UnableToDecrypt,
-      );
-    });
-
-    it('rejects base64 of non-JSON', () => {
-      const garbage = Buffer.from('not json at all').toString('base64');
-      expect(() => service.decrypt(garbage)).toThrow(UnableToDecrypt);
-    });
-
-    it('rejects JSON missing required fields', () => {
-      const partial = encodeEnvelope({
-        iv: Buffer.alloc(12).toString('base64'),
-        authTag: Buffer.alloc(16).toString('base64'),
-      } as never);
-      expect(() => service.decrypt(partial)).toThrow(UnableToDecrypt);
-    });
-
-    it('rejects wrong-length IV', () => {
-      const encrypted = service.encrypt('hello');
-      const env = decodeEnvelope(encrypted);
-      const bad = encodeEnvelope({
-        ...env,
-        iv: Buffer.alloc(8).toString('base64'),
-      });
-      expect(() => service.decrypt(bad)).toThrow(UnableToDecrypt);
-    });
-
-    it('rejects wrong-length auth tag', () => {
-      const encrypted = service.encrypt('hello');
-      const env = decodeEnvelope(encrypted);
-      const bad = encodeEnvelope({
-        ...env,
-        authTag: Buffer.alloc(8).toString('base64'),
-      });
-      expect(() => service.decrypt(bad)).toThrow(UnableToDecrypt);
-    });
-  });
-
-  describe('envelope format', () => {
-    it('returns base64 of JSON envelope with iv (12B), authTag (16B), cipherText', () => {
-      const encrypted = service.encrypt('hello');
-      const env = decodeEnvelope(encrypted);
-      expect(Buffer.from(env.iv, 'base64')).toHaveLength(12);
-      expect(Buffer.from(env.authTag, 'base64')).toHaveLength(16);
-      expect(Buffer.from(env.cipherText, 'base64').length).toBeGreaterThan(0);
-    });
-  });
-});
@@ -1,108 +0,0 @@
-// https://github.com/nhedger/nestjs-encryption - MIT
-import { Injectable } from '@nestjs/common';
-import {
-  createCipheriv,
-  createDecipheriv,
-  createHash,
-  randomBytes,
-} from 'node:crypto';
-import { UnableToDecrypt, UnableToInitialize } from './encryption.errors';
-import { EnvironmentService } from '../environment/environment.service';
-
-const ALGORITHM = 'aes-256-gcm';
-const KEY_DOMAIN = 'docmost:encryption:v1';
-const IV_LENGTH = 12;
-const AUTH_TAG_LENGTH = 16;
-
-type AEADPayload<TFormat = string | Buffer> = {
-  iv: TFormat;
-  authTag: TFormat;
-  cipherText: TFormat;
-};
-
-@Injectable()
-export class EncryptionService {
-  private readonly key: Buffer;
-
-  constructor(environmentService: EnvironmentService) {
-    const appSecret = environmentService.getAppSecret();
-    if (!appSecret) {
-      throw new UnableToInitialize('APP_SECRET is not set.');
-    }
-    this.key = createHash('sha256')
-      .update(KEY_DOMAIN)
-      .update(appSecret)
-      .digest();
-  }
-
-  public encrypt(plaintext: string): string {
-    const iv = randomBytes(IV_LENGTH);
-    const cipher = createCipheriv(ALGORITHM, this.key, iv);
-    const cipherText = Buffer.concat([
-      cipher.update(plaintext, 'utf8'),
-      cipher.final(),
-    ]);
-    const authTag = cipher.getAuthTag();
-
-    const aead: AEADPayload<string> = {
-      iv: iv.toString('base64'),
-      authTag: authTag.toString('base64'),
-      cipherText: cipherText.toString('base64'),
-    };
-
-    return Buffer.from(JSON.stringify(aead)).toString('base64');
-  }
-
-  public decrypt(encrypted: string): string {
-    try {
-      const { iv, authTag, cipherText } = this.decodeAEADPayload(encrypted);
-      const decipher = createDecipheriv(ALGORITHM, this.key, iv);
-      decipher.setAuthTag(authTag);
-      const decrypted = Buffer.concat([
-        decipher.update(cipherText),
-        decipher.final(),
-      ]);
-      return decrypted.toString('utf8');
-    } catch (e: unknown) {
-      throw new UnableToDecrypt((e as Error).message);
-    }
-  }
-
-  private decodeAEADPayload(encodedPayload: string): AEADPayload<Buffer> {
-    const payload = Buffer.from(encodedPayload, 'base64');
-
-    let deserializedPkg: Record<string, unknown>;
-    try {
-      deserializedPkg = JSON.parse(payload.toString());
-    } catch {
-      throw new Error('The decoded AEAD payload is not a valid JSON string.');
-    }
-
-    for (const field of ['iv', 'authTag', 'cipherText']) {
-      if (!Object.prototype.hasOwnProperty.call(deserializedPkg, field)) {
-        throw new Error(`The AEAD payload is missing the ${field} field.`);
-      }
-    }
-
-    const iv = Buffer.from(deserializedPkg.iv as string, 'base64');
-    if (iv.length !== IV_LENGTH) {
-      throw new Error(
-        `The decoded IV is not the correct length. Expected ${IV_LENGTH} bytes, got ${iv.length} bytes.`,
-      );
-    }
-
-    const authTag = Buffer.from(deserializedPkg.authTag as string, 'base64');
-    if (authTag.length !== AUTH_TAG_LENGTH) {
-      throw new Error(
-        `The decoded auth tag is not the correct length. Expected ${AUTH_TAG_LENGTH} bytes, got ${authTag.length} bytes.`,
-      );
-    }
-
-    const cipherText = Buffer.from(
-      deserializedPkg.cipherText as string,
-      'base64',
-    );
-
-    return { iv, authTag, cipherText };
-  }
-}
@@ -310,31 +310,6 @@ export class EnvironmentService {
    return val === 'true';
  }

-  getAiVectorDriver(): string {
-    return this.configService
-      .get<string>('AI_VECTOR_DRIVER', 'pgvector')
-      .toLowerCase();
-  }
-
-  getTurbopufferApiKey(): string {
-    return this.configService.get<string>('TURBOPUFFER_API_KEY');
-  }
-
-  getTurbopufferRegion(): string {
-    return this.configService.get<string>('TURBOPUFFER_REGION');
-  }
-
-  getTurbopufferBaseUrl(): string {
-    return this.configService.get<string>('TURBOPUFFER_BASE_URL');
-  }
-
-  getTurbopufferNamespacePrefix(): string {
-    return this.configService.get<string>(
-      'TURBOPUFFER_NAMESPACE_PREFIX',
-      'docmost',
-    );
-  }
-
  getOpenAiApiKey(): string {
    return this.configService.get<string>('OPENAI_API_KEY');
  }
@@ -5,7 +5,6 @@ import {
  IsOptional,
  IsString,
  IsUrl,
-  Matches,
  MinLength,
  ValidateIf,
  validateSync,
@@ -109,41 +108,6 @@ export class EnvironmentVariables {
  @IsString()
  AI_DRIVER: string;

-  @IsOptional()
-  @ValidateIf((obj) => obj.AI_VECTOR_DRIVER)
-  @IsIn(['pgvector', 'turbopuffer'])
-  @IsString()
-  AI_VECTOR_DRIVER: string;
-
-  @ValidateIf((obj) => obj.AI_VECTOR_DRIVER === 'turbopuffer')
-  @IsNotEmpty()
-  @IsString()
-  TURBOPUFFER_API_KEY: string;
-
-  @ValidateIf(
-    (obj) =>
-      obj.AI_VECTOR_DRIVER === 'turbopuffer' && !obj.TURBOPUFFER_BASE_URL,
-  )
-  @IsNotEmpty({
-    message:
-      'TURBOPUFFER_REGION is required when AI_VECTOR_DRIVER is turbopuffer, unless TURBOPUFFER_BASE_URL is set',
-  })
-  @IsString()
-  TURBOPUFFER_REGION: string;
-
-  @IsOptional()
-  @ValidateIf((obj) => obj.TURBOPUFFER_BASE_URL != '' && obj.TURBOPUFFER_BASE_URL != null)
-  @IsUrl({ protocols: ['http', 'https'], require_tld: false })
-  TURBOPUFFER_BASE_URL: string;
-
-  @IsOptional()
-  @IsString()
-  @Matches(/^[A-Za-z0-9\-_.]{1,90}$/, {
-    message:
-      'TURBOPUFFER_NAMESPACE_PREFIX may only contain letters, digits, dot, dash, underscore (max 90 chars)',
-  })
-  TURBOPUFFER_NAMESPACE_PREFIX: string;
-
  @IsOptional()
  @IsString()
  AI_EMBEDDING_MODEL: string;
@@ -61,7 +61,6 @@ export enum QueueJob {
  WORKSPACE_DELETED = 'workspace-deleted',
  WORKSPACE_CREATE_EMBEDDINGS = 'workspace-create-embeddings',
  WORKSPACE_DELETE_EMBEDDINGS = 'workspace-delete-embeddings',
-  WORKSPACE_RESET_EMBEDDINGS = 'workspace-reset-embeddings',

  GENERATE_PAGE_EMBEDDINGS = 'generate-page-embeddings',
  DELETE_PAGE_EMBEDDINGS = 'delete-page-embeddings',
@@ -49,10 +49,6 @@ export class StaticModule implements OnModuleInit {
          : undefined,
        POSTHOG_HOST: this.environmentService.getPostHogHost(),
        POSTHOG_KEY: this.environmentService.getPostHogKey(),
-        AI_VECTOR_DRIVER:
-          this.environmentService.getAiVectorDriver() === 'turbopuffer'
-            ? 'turbopuffer'
-            : undefined,
      };

      const windowScriptContent = `<script>window.CONFIG=${JSON.stringify(configString)};</script>`;
@@ -3,6 +3,8 @@ import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { Cache } from 'cache-manager';
 import { Server, Socket } from 'socket.io';
 import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
+import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
+import { PageAccessService } from '../core/page/page-access/page-access.service';
 import {
  TREE_EVENTS,
  WS_SPACE_RESTRICTION_CACHE_PREFIX,
@@ -17,6 +19,8 @@ export class WsService {

  constructor(
    private readonly pagePermissionRepo: PagePermissionRepo,
+    private readonly spaceRepo: SpaceRepo,
+    private readonly pageAccessService: PageAccessService,
    @Inject(CACHE_MANAGER) private readonly cacheManager: Cache,
  ) {}

@@ -67,9 +71,24 @@ export class WsService {
    spaceId: string,
    pageId: string,
    data: any,
+    opts?: { bypassVisibilityCheck?: boolean },
  ): Promise<void> {
    const room = getSpaceRoomName(spaceId);

+    if (
+      !opts?.bypassVisibilityCheck &&
+      (await this.spaceHidesCommentsFromViewers(spaceId))
+    ) {
+      await this.broadcastToUsersMatching(room, null, data, (candidateIds) =>
+        this.pageAccessService.filterUserIdsWithPageEditAccess(
+          spaceId,
+          pageId,
+          candidateIds,
+        ),
+      );
+      return;
+    }
+
    const hasRestrictions = await this.spaceHasRestrictions(spaceId);
    if (!hasRestrictions) {
      this.server.to(room).emit('message', data);
@@ -118,6 +137,17 @@ export class WsService {
    excludeSocketId: string | null,
    pageId: string,
    data: any,
+  ): Promise<void> {
+    await this.broadcastToUsersMatching(room, excludeSocketId, data, (ids) =>
+      this.pagePermissionRepo.getUserIdsWithPageAccess(pageId, ids),
+    );
+  }
+
+  private async broadcastToUsersMatching(
+    room: string,
+    excludeSocketId: string | null,
+    data: any,
+    filterUserIds: (candidateUserIds: string[]) => Promise<string[]>,
  ): Promise<void> {
    const sockets = await this.server.in(room).fetchSockets();

@@ -144,15 +174,9 @@ export class WsService {
    const candidateUserIds = Array.from(userSocketMap.keys());
    if (candidateUserIds.length === 0) return;

-    const authorizedUserIds =
-      await this.pagePermissionRepo.getUserIdsWithPageAccess(
-        pageId,
-        candidateUserIds,
-      );
-
-    const authorizedSet = new Set(authorizedUserIds);
+    const allowedSet = new Set(await filterUserIds(candidateUserIds));
    for (const [userId, userSockets] of userSocketMap) {
-      if (authorizedSet.has(userId)) {
+      if (allowedSet.has(userId)) {
        for (const socket of userSockets) {
          socket.emit('message', data);
        }
@@ -176,6 +200,13 @@ export class WsService {
    return hasRestrictions;
  }

+  private async spaceHidesCommentsFromViewers(
+    spaceId: string,
+  ): Promise<boolean> {
+    const settings = await this.spaceRepo.getSpaceSettings(spaceId);
+    return settings?.comments?.hideCommentsFromViewers === true;
+  }
+
  private extractPageId(data: any): string | null {
    switch (data.operation) {
      case 'addTreeNode':
@@ -32,7 +32,6 @@ export * from "./lib/columns";
 export * from "./lib/status";
 export * from "./lib/pdf";
 export * from "./lib/page-break";
-export * from "./lib/footnotes";
 export * from "./lib/resizable-nodeview";
 export {
  pageNodeToDocxBuffer,
@@ -1,189 +0,0 @@
-//Source MIT - https://github.com/buttondown/tiptap-footnotes
-import { mergeAttributes } from "@tiptap/core";
-import ListItem, { ListItemOptions } from "@tiptap/extension-list-item";
-
-declare module "@tiptap/core" {
-  interface Commands<ReturnType> {
-    footnote: {
-      /**
-       * scrolls to & sets the text selection at the end of the footnote with the given id
-       * @param id the id of the footote (i.e. the `data-id` attribute value of the footnote)
-       * @example editor.commands.focusFootnote("a43956c1-1ab8-462f-96e4-be3a4b27fd50")
-       */
-      focusFootnote: (id: string) => ReturnType;
-    };
-  }
-}
-
-export interface FootnoteOptions extends ListItemOptions {
-  /**
-   * Content expression for this node
-   * @default "paragraph+"
-   */
-  content: string;
-}
-
-const Footnote = ListItem.extend<FootnoteOptions>({
-  name: "footnote",
-  content() {
-    return this.options.content;
-  },
-  isolating: true,
-  defining: true,
-  draggable: false,
-
-  addOptions() {
-    return {
-      HTMLAttributes: {},
-      bulletListTypeName: 'bulletList',
-      orderedListTypeName: 'orderedList',
-      ...this.parent?.(),
-      content: "paragraph+",
-    };
-  },
-
-  addAttributes() {
-    return {
-      id: {
-        isRequired: true,
-      },
-      // the data-id field should match the data-id field of a footnote reference.
-      // it's used to link footnotes and references together.
-      "data-id": {
-        isRequired: true,
-      },
-    };
-  },
-  parseHTML() {
-    return [
-      {
-        tag: "li",
-        getAttrs(node) {
-          const id = node.getAttribute("data-id");
-          if (id) {
-            return {
-              "data-id": node.getAttribute("data-id"),
-            };
-          }
-          return false;
-        },
-        priority: 1000,
-      },
-    ];
-  },
-  renderHTML({ HTMLAttributes }) {
-    return [
-      "li",
-      mergeAttributes(this.options.HTMLAttributes, HTMLAttributes),
-      0,
-    ];
-  },
-
-  addCommands() {
-    return {
-      focusFootnote:
-        (id: string) =>
-        ({ editor, chain }) => {
-          const matchedFootnote = editor.$node("footnote", {
-            "data-id": id,
-          });
-          if (matchedFootnote) {
-            // sets the text selection to the end of the footnote definition and scroll to it.
-            chain()
-              .focus()
-              .setTextSelection(
-                matchedFootnote.from + matchedFootnote.content.size
-              )
-              .run();
-
-            matchedFootnote.element.scrollIntoView();
-            return true;
-          }
-          return false;
-        },
-    };
-  },
-  addKeyboardShortcuts() {
-    return {
-      // when inside a footnote, Mod-a should select only the footnote content
-      "Mod-a": ({ editor }) => {
-        try {
-          const { selection } = editor.state;
-          const { $from } = selection;
-
-          for (let depth = $from.depth; depth >= 0; depth--) {
-            const node = $from.node(depth);
-            if (node.type.name === "footnote") {
-              const start = $from.start(depth);
-              const end = $from.end(depth);
-
-              editor.commands.setTextSelection({
-                from: start + 1,
-                to: end - 1,
-              });
-              return true;
-            }
-          }
-
-          return false;
-        } catch (e) {
-          return false;
-        }
-      },
-      // when the user presses tab, adjust the text selection to be at the end of the next footnote
-      Tab: ({ editor }) => {
-        try {
-          const { selection } = editor.state;
-          const pos = editor.$pos(selection.anchor);
-          if (!pos.after) return false;
-          // if the next node  is "footnotes", place the text selection at the end of the first footnote
-          if (pos.after.node.type.name == "footnotes") {
-            const firstChild = pos.after.node.child(0);
-            editor
-              .chain()
-              .setTextSelection(pos.after.from + firstChild.content.size)
-              .scrollIntoView()
-              .run();
-            return true;
-          } else {
-            const startPos = selection.$from.start(2);
-            if (Number.isNaN(startPos)) return false;
-            const parent = editor.$pos(startPos);
-            if (parent.node.type.name != "footnote" || !parent.after) {
-              return false;
-            }
-            // if the next node is a footnote, place the text selection at the end of it
-            editor
-              .chain()
-              .setTextSelection(parent.after.to - 1)
-              .scrollIntoView()
-              .run();
-            return true;
-          }
-        } catch {
-          return false;
-        }
-      },
-      // inverse of the tab command - place the text selection at the end of the previous footnote
-      "Shift-Tab": ({ editor }) => {
-        const { selection } = editor.state;
-        const startPos = selection.$from.start(2);
-        if (Number.isNaN(startPos)) return false;
-        const parent = editor.$pos(startPos);
-        if (parent.node.type.name != "footnote" || !parent.before) {
-          return false;
-        }
-
-        editor
-          .chain()
-          .setTextSelection(parent.before.to - 1)
-          .scrollIntoView()
-          .run();
-        return true;
-      },
-    };
-  },
-
-});
-
-export default Footnote;
@@ -1,46 +0,0 @@
-//Source MIT - https://github.com/buttondown/tiptap-footnotes
-import OrderedList from "@tiptap/extension-ordered-list";
-import FootnoteRules from "./rules";
-
-const Footnotes = OrderedList.extend({
-  name: "footnotes",
-  group: "", // removed the default group of the ordered list extension
-  isolating: true,
-  defining: true,
-  draggable: false,
-
-  content() {
-    return "footnote*";
-  },
-  addAttributes() {
-    return {
-      class: {
-        default: "footnotes",
-      },
-    };
-  },
-  parseHTML() {
-    return [
-      {
-        tag: "ol.footnotes",
-        priority: 1000,
-      },
-    ];
-  },
-
-  addKeyboardShortcuts() {
-    return {};
-  },
-  addCommands() {
-    return {};
-  },
-  addInputRules() {
-    return [];
-  },
-
-  addExtensions() {
-    return [FootnoteRules];
-  },
-});
-
-export default Footnotes;
@@ -1,4 +0,0 @@
-export { default as Footnotes } from "./footnotes";
-export { default as Footnote } from "./footnote";
-export type { FootnoteOptions } from "./footnote";
-export { default as FootnoteReference } from "./reference";
@@ -1,221 +0,0 @@
-//Source MIT - https://github.com/buttondown/tiptap-footnotes
-import { mergeAttributes, Node } from "@tiptap/core";
-import {
-  Fragment as PMFragment,
-  Node as PMNode,
-  Slice,
-} from "@tiptap/pm/model";
-import { NodeSelection, Plugin, PluginKey } from "@tiptap/pm/state";
-import { generateNodeId } from "../utils";
-
-
-const REFNUM_ATTR = "data-reference-number";
-const REF_CLASS = "footnote-ref";
-
-declare module "@tiptap/core" {
-  interface Commands<ReturnType> {
-    footnoteReference: {
-      /**
-       * add a new footnote reference
-       * @example editor.commands.addFootnote()
-       */
-      addFootnote: () => ReturnType;
-    };
-  }
-}
-
-const FootnoteReference = Node.create({
-  name: "footnoteReference",
-  inline: true,
-  content: "text*",
-  group: "inline",
-  atom: true,
-  draggable: true,
-
-  parseHTML() {
-    return [
-      {
-        tag: `sup`,
-        priority: 1000,
-        getAttrs(node) {
-          const anchor = node.querySelector<HTMLAnchorElement>(
-            `a.${REF_CLASS}:first-child`
-          );
-
-          if (!anchor) {
-            return false;
-          }
-
-          const id = anchor.getAttribute("data-id");
-          const ref = anchor.getAttribute(REFNUM_ATTR);
-
-          return {
-            "data-id": id ?? generateNodeId(),
-            referenceNumber: ref ?? anchor.innerText,
-          };
-        },
-        contentElement(node) {
-          return node.firstChild as HTMLElement;
-        },
-      },
-    ];
-  },
-
-  addAttributes() {
-    return {
-      class: {
-        default: REF_CLASS,
-      },
-      "data-id": {
-        renderHTML(attributes) {
-          return {
-            "data-id": attributes["data-id"] || generateNodeId(),
-          };
-        },
-      },
-      referenceNumber: {},
-
-      href: {
-        renderHTML(attributes) {
-          return {
-            href: `#fn:${attributes["referenceNumber"]}`,
-          };
-        },
-      },
-    };
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    const { referenceNumber, ...attributes } = HTMLAttributes;
-    const attrs = mergeAttributes(this.options.HTMLAttributes, attributes);
-    attrs[REFNUM_ATTR] = referenceNumber;
-
-    return [
-      "sup",
-      { id: `fnref:${referenceNumber}` },
-      ["a", attrs, HTMLAttributes.referenceNumber],
-    ];
-  },
-
-  addProseMirrorPlugins() {
-    const { editor } = this;
-
-    // Ensures pasted footnote references get unique IDs.
-    const mapNode = (node: PMNode): PMNode => {
-      if (node.type.name === this.name) {
-        const newAttrs = { ...node.attrs, "data-id": generateNodeId() };
-        return node.type.create(newAttrs, node.content, node.marks);
-      }
-
-      if (node.content && node.content.size > 0) {
-        const newChildren: PMNode[] = [];
-        let changed = false;
-
-        node.content.forEach((child) => {
-          const mapped = mapNode(child);
-          if (mapped !== child) {
-            changed = true;
-          }
-
-          newChildren.push(mapped);
-        });
-
-        if (changed) {
-          return node.copy(PMFragment.from(newChildren));
-        }
-      }
-
-      return node;
-    };
-
-    return [
-      new Plugin({
-        key: new PluginKey("footnotePasteHandler"),
-        props: {
-          transformPasted(slice) {
-            const mappedNodes: PMNode[] = [];
-            let changed = false;
-
-            slice.content.forEach((node) => {
-              const mapped = mapNode(node);
-              if (mapped !== node) {
-                changed = true;
-              }
-              mappedNodes.push(mapped);
-            });
-
-            if (!changed) {
-              return slice;
-            }
-
-            return new Slice(
-              PMFragment.from(mappedNodes),
-              slice.openStart,
-              slice.openEnd
-            );
-          },
-        },
-      }),
-      new Plugin({
-        key: new PluginKey("footnoteRefClick"),
-
-        props: {
-          // on double-click, focus on the footnote
-          handleDoubleClickOn(view, pos, node, nodePos, event) {
-            if (node.type.name != "footnoteReference") return false;
-            event.preventDefault();
-            const id = node.attrs["data-id"];
-            return editor.commands.focusFootnote(id);
-          },
-          // click the footnote reference once to get focus, click twice to scroll to the footnote
-          handleClickOn(view, pos, node, nodePos, event) {
-            if (node.type.name != "footnoteReference") return false;
-            event.preventDefault();
-            const { selection } = editor.state.tr;
-            if (selection instanceof NodeSelection && selection.node.eq(node)) {
-              const id = node.attrs["data-id"];
-              return editor.commands.focusFootnote(id);
-            } else {
-              editor.chain().setNodeSelection(nodePos).run();
-              return true;
-            }
-          },
-        },
-      }),
-    ];
-  },
-
-  addCommands() {
-    return {
-      addFootnote:
-        () =>
-        ({ state, tr }) => {
-          const node = this.type.create({
-            "data-id": generateNodeId(),
-          });
-          tr.insert(state.selection.anchor, node);
-          return true;
-        },
-    };
-  },
-
-  addInputRules() {
-    // when a user types [^text], add a new footnote
-    return [
-      {
-        find: /\[\^(.*?)\]/,
-        type: this.type,
-        undoable: true,
-        handler({ range, match, chain }) {
-          const start = range.from;
-          let end = range.to;
-          if (match[1]) {
-            chain().deleteRange({ from: start, to: end }).addFootnote().run();
-          }
-        },
-      },
-    ];
-  },
-});
-
-export default FootnoteReference;
@@ -1,90 +0,0 @@
-//Source MIT - https://github.com/buttondown/tiptap-footnotes
-import { Plugin, PluginKey } from "@tiptap/pm/state";
-import { ReplaceStep } from "@tiptap/pm/transform";
-import { Extension } from "@tiptap/core";
-import { updateFootnotesList } from "./utils";
-
-const FootnoteRules = Extension.create({
-  name: "footnoteRules",
-  priority: 1000,
-  addProseMirrorPlugins() {
-    return [
-      new Plugin({
-        key: new PluginKey("footnoteRules"),
-        filterTransaction(tr) {
-          const { from, to } = tr.selection;
-
-          // Allow full document selections (Mod-a/Ctrl-a)
-          if (from === 0 && to === tr.doc.content.size) return true;
-
-          let selectedFootnotes = false;
-          let selectedContent = false;
-          let footnoteCount = 0;
-          tr.doc.nodesBetween(from, to, (node, _, parent) => {
-            if (parent?.type.name == "doc" && node.type.name != "footnotes") {
-              selectedContent = true;
-            } else if (node.type.name == "footnote") {
-              footnoteCount += 1;
-            } else if (node.type.name == "footnotes") {
-              selectedFootnotes = true;
-            }
-          });
-          const overSelected = selectedContent && selectedFootnotes;
-          /*
-           * Here, we don't allow any transaction that spans between the "content" nodes and the "footnotes" node. This also rejects any transaction that spans between more than 1 footnote.
-           */
-          return !overSelected && footnoteCount <= 1;
-        },
-
-        // if there are some to the footnote references (added/deleted/dragged), append a transaction that updates the footnotes list accordingly
-        appendTransaction(transactions, oldState, newState) {
-          let newTr = newState.tr;
-          let refsChanged = false; // true if the footnote references have been changed, false otherwise
-          for (let tr of transactions) {
-            if (!tr.docChanged) continue;
-            if (refsChanged) break;
-
-            for (let step of tr.steps) {
-              if (!(step instanceof ReplaceStep)) continue;
-              if (refsChanged) break;
-
-              const isDelete = step.from != step.to; // the user deleted items from the document (from != to & the step is a replace step)
-              const isInsert = step.slice.size > 0;
-
-              // check if any footnote references have been inserted
-              if (isInsert) {
-                step.slice.content.descendants((node) => {
-                  if (node?.type.name == "footnoteReference") {
-                    refsChanged = true;
-                    return false;
-                  }
-                });
-              }
-              if (isDelete && !refsChanged) {
-                // check if any footnote references have been deleted
-                tr.before.nodesBetween(
-                  step.from,
-                  Math.min(tr.before.content.size, step.to), // make sure to not go over the old document's limit
-                  (node) => {
-                    if (node.type.name == "footnoteReference") {
-                      refsChanged = true;
-                      return false;
-                    }
-                  },
-                );
-              }
-            }
-          }
-
-          if (refsChanged) {
-            updateFootnotesList(newTr, newState);
-            return newTr;
-          }
-
-          return null;
-        },
-      }),
-    ];
-  },
-});
-export default FootnoteRules;
@@ -1,123 +0,0 @@
-//Source MIT - https://github.com/buttondown/tiptap-footnotes
-import { EditorState, Transaction } from "@tiptap/pm/state";
-import { Fragment, Node } from "@tiptap/pm/model";
-
-// update the reference number of all the footnote references in the document
-export function updateFootnoteReferences(tr: Transaction) {
-  let count = 1;
-
-  const nodes: any[] = [];
-
-  tr.doc.descendants((node, pos) => {
-    if (node.type.name == "footnoteReference") {
-      tr.setNodeAttribute(pos, "referenceNumber", `${count}`);
-
-      nodes.push(node);
-      count += 1;
-    }
-  });
-  // return the updated footnote references (in the order that they appear in the document)
-  return nodes;
-}
-
-function getFootnotes(tr: Transaction) {
-  let footnotesRange: { from: number; to: number } | undefined;
-  const footnotes: Node[] = [];
-  tr.doc.descendants((node, pos) => {
-    if (node.type.name == "footnote") {
-      footnotes.push(node);
-    } else if (node.type.name == "footnotes") {
-      footnotesRange = { from: pos, to: pos + node.nodeSize };
-    } else {
-      return false;
-    }
-  });
-  return { footnotesRange, footnotes };
-}
-
-// update the "footnotes" ordered list based on the footnote references in the document
-export function updateFootnotesList(tr: Transaction, state: EditorState) {
-  const footnoteReferences = updateFootnoteReferences(tr);
-
-  const footnoteType = state.schema.nodes.footnote;
-  const footnotesType = state.schema.nodes.footnotes;
-
-  const emptyParagraph = state.schema.nodeFromJSON({
-    type: "paragraph",
-    content: [],
-  });
-
-  const { footnotesRange, footnotes } = getFootnotes(tr);
-
-  // a mapping of footnote id -> footnote node
-  const footnoteIds: { [key: string]: Node } = footnotes.reduce(
-    (obj, footnote) => {
-      obj[footnote.attrs["data-id"]] = footnote;
-      return obj;
-    },
-    {} as any,
-  );
-
-  const newFootnotes: Node[] = [];
-
-  let footnoteRefIds = new Set(
-    footnoteReferences.map((ref) => ref.attrs["data-id"]),
-  );
-  const deleteFootnoteIds: Set<string> = new Set();
-  for (let footnote of footnotes) {
-    const id = footnote.attrs["data-id"];
-    if (!footnoteRefIds.has(id) || deleteFootnoteIds.has(id)) {
-      deleteFootnoteIds.add(id);
-      // we traverse through this footnote's content because it may contain footnote references.
-      // we want to delete the footnotes associated with these references, so we add them to the delete set.
-      footnote.content.descendants((node) => {
-        if (node.type.name == "footnoteReference")
-          deleteFootnoteIds.add(node.attrs["data-id"]);
-      });
-    }
-  }
-
-  for (let i = 0; i < footnoteReferences.length; i++) {
-    let refId = footnoteReferences[i].attrs["data-id"];
-
-    if (deleteFootnoteIds.has(refId)) continue;
-    // if there is a footnote w/ the same id as this `ref`, we preserve its content and update its id attribute
-    if (refId in footnoteIds) {
-      let footnote = footnoteIds[refId];
-      newFootnotes.push(
-        footnoteType.create(
-          { ...footnote.attrs, id: `fn:${i + 1}` },
-          footnote.content,
-        ),
-      );
-    } else {
-      let newNode = footnoteType.create(
-        {
-          "data-id": refId,
-          id: `fn:${i + 1}`,
-        },
-        [emptyParagraph],
-      );
-      newFootnotes.push(newNode);
-    }
-  }
-
-  if (newFootnotes.length == 0) {
-    // no footnotes in the doc, delete the "footnotes" node
-    if (footnotesRange) {
-      tr.delete(footnotesRange.from, footnotesRange.to);
-    }
-  } else if (!footnotesRange) {
-    // there is no footnotes node present in the doc, add it
-    tr.insert(
-      tr.doc.content.size,
-      footnotesType.create(undefined, Fragment.from(newFootnotes)),
-    );
-  } else {
-    tr.replaceWith(
-      footnotesRange!.from + 1, // add 1 to point at the position after the opening ol tag
-      footnotesRange!.to - 1, // substract 1 to point to the position before the closing ol tag
-      Fragment.from(newFootnotes),
-    );
-  }
-}
@@ -1,110 +0,0 @@
-import { Token, marked } from 'marked';
-import { generateNodeId } from '../../utils';
-
-interface FootnoteRefToken {
-  type: 'footnoteRef';
-  label: string;
-  raw: string;
-}
-
-interface FootnoteDefToken {
-  type: 'footnoteDef';
-  label: string;
-  text: string;
-  raw: string;
-}
-
-// Parse-scoped state: markdownToHtml resets before the top-level parse and
-// appends the collected list after it. Nested marked.parse calls (callout,
-// footnote definitions) share this state, so hooks cannot be used here.
-let footnoteRefs: { label: string; id: string; number: number }[] = [];
-let footnoteDefs = new Map<string, string>();
-
-export function resetFootnotes() {
-  footnoteRefs = [];
-  footnoteDefs = new Map();
-}
-
-export function renderFootnotesList(): string {
-  if (!footnoteRefs.length) return '';
-  const items = footnoteRefs.map(({ label, id, number }) => {
-    const body = footnoteDefs.get(label) || '<p></p>';
-    return `<li id="fn:${number}" data-id="${id}">${body}</li>`;
-  });
-  return `<ol class="footnotes">\n${items.join('\n')}\n</ol>\n`;
-}
-
-export const footnoteRefExtension = {
-  name: 'footnoteRef',
-  level: 'inline',
-  start(src: string) {
-    return src.indexOf('[^');
-  },
-  tokenizer(src: string): FootnoteRefToken | undefined {
-    const match = /^\[\^([^\]\s]+)\]/.exec(src);
-    if (match) {
-      return {
-        type: 'footnoteRef',
-        raw: match[0],
-        label: match[1].toLowerCase(),
-      };
-    }
-  },
-  renderer(token: Token) {
-    const refToken = token as FootnoteRefToken;
-    const number = footnoteRefs.length + 1;
-    const id = generateNodeId();
-    footnoteRefs.push({ label: refToken.label, id, number });
-    return `<sup id="fnref:${number}"><a class="footnote-ref" data-id="${id}" data-reference-number="${number}" href="#fn:${number}">${number}</a></sup>`;
-  },
-};
-
-export const footnoteDefExtension = {
-  name: 'footnoteDef',
-  level: 'block',
-  start(src: string) {
-    return src.match(/^\[\^[^\]\s]+\]:/m)?.index ?? -1;
-  },
-  tokenizer(src: string): FootnoteDefToken | undefined {
-    const firstLine = /^\[\^([^\]\s]+)\]:[ \t]*/.exec(src);
-    if (!firstLine) return undefined;
-
-    const lines = src.split('\n');
-    const contentLines = [lines[0].slice(firstLine[0].length)];
-    let consumed = 1;
-    while (consumed < lines.length) {
-      const line = lines[consumed];
-      if (/^[ \t]{2,}\S/.test(line)) {
-        contentLines.push(line.replace(/^[ \t]{1,4}/, ''));
-        consumed += 1;
-      } else if (
-        /^[ \t]*$/.test(line) &&
-        consumed + 1 < lines.length &&
-        /^[ \t]{2,}\S/.test(lines[consumed + 1])
-      ) {
-        contentLines.push('');
-        consumed += 1;
-      } else {
-        break;
-      }
-    }
-
-    const raw =
-      lines.slice(0, consumed).join('\n') +
-      (consumed < lines.length ? '\n' : '');
-    return {
-      type: 'footnoteDef',
-      raw,
-      label: firstLine[1].toLowerCase(),
-      text: contentLines.join('\n').trim(),
-    };
-  },
-  renderer(token: Token) {
-    const defToken = token as FootnoteDefToken;
-    const body = defToken.text
-      ? marked.parse(defToken.text).toString()
-      : '<p></p>';
-    footnoteDefs.set(defToken.label, body);
-    return '';
-  },
-};
@@ -2,12 +2,6 @@ import { marked } from "marked";
 import { calloutExtension } from "./callout.marked";
 import { mathBlockExtension } from "./math-block.marked";
 import { mathInlineExtension } from "./math-inline.marked";
-import {
-  footnoteDefExtension,
-  footnoteRefExtension,
-  renderFootnotesList,
-  resetFootnotes,
-} from "./footnotes.marked";

 marked.use({
  renderer: {
@@ -40,13 +34,7 @@ marked.use({
 });

 marked.use({
-  extensions: [
-    calloutExtension,
-    mathBlockExtension,
-    mathInlineExtension,
-    footnoteDefExtension,
-    footnoteRefExtension,
-  ],
+  extensions: [calloutExtension, mathBlockExtension, mathInlineExtension],
 });

 marked.setOptions({ breaks: true });
@@ -60,7 +48,5 @@ export function markdownToHtml(
    .replace(YAML_FONT_MATTER_REGEX, "")
    .trimStart();

-  resetFootnotes();
-  const html = marked.parse(markdown).toString();
-  return html + renderFootnotesList();
+  return marked.parse(markdown).toString();
 }
@@ -34,8 +34,6 @@ export function htmlToMarkdown(html: string): string {
    iframeEmbed,
    image,
    video,
-    footnoteRef,
-    footnotesList,
  ]);
  return turndownService.turndown(html).replaceAll('<br>', ' ');
 }
@@ -205,56 +203,6 @@ function image(turndownService: _TurndownService) {
  });
 }

-function getFootnoteAnchor(node: HTMLElement): HTMLElement | null {
-  const child = node.firstElementChild as HTMLElement | null;
-  return child?.nodeName === 'A' && child.classList.contains('footnote-ref')
-    ? child
-    : null;
-}
-
-function footnoteRef(turndownService: _TurndownService) {
-  turndownService.addRule('footnoteRef', {
-    filter: function (node: HTMLInputElement) {
-      return node.nodeName === 'SUP' && !!getFootnoteAnchor(node);
-    },
-    replacement: function (_content: string, node: HTMLInputElement) {
-      const anchor = getFootnoteAnchor(node);
-      const number =
-        anchor.getAttribute('data-reference-number') || anchor.textContent;
-      return `[^${number}]`;
-    },
-  });
-}
-
-function footnotesList(turndownService: _TurndownService) {
-  turndownService.addRule('footnotesList', {
-    filter: function (node: HTMLInputElement) {
-      return node.nodeName === 'OL' && node.classList.contains('footnotes');
-    },
-    replacement: function (_content: string, node: HTMLInputElement) {
-      const items = Array.from(node.children).filter(
-        (child) => child.nodeName === 'LI',
-      );
-      const definitions = items.map((li, index) => {
-        const number =
-          (li.getAttribute('id') || '').replace('fn:', '') ||
-          String(index + 1);
-        const markdown = turndownService
-          .turndown((li as HTMLElement).innerHTML)
-          .trim();
-        // continuation lines need a 4-space indent to stay in the footnote
-        const [first, ...rest] = markdown.split('\n');
-        const body = [
-          first,
-          ...rest.map((line: string) => (line.trim() ? `    ${line}` : line)),
-        ].join('\n');
-        return `[^${number}]: ${body}`;
-      });
-      return `\n\n${definitions.join('\n')}\n\n`;
-    },
-  });
-}
-
 function video(turndownService: _TurndownService) {
  turndownService.addRule('video', {
    filter: function (node: HTMLInputElement) {
@@ -1,4 +1,4 @@
-import { FootnoteReferenceRun, HeadingLevel, Paragraph, ShadingType } from 'docx';
+import { HeadingLevel, ShadingType } from 'docx';
 import { Node } from 'prosemirror-model';
 import {
  DocxSerializerAsync,
@@ -168,31 +168,9 @@ export const defaultAsyncNodes: NodeSerializerAsync = {
  pageBreak(state, node) {
    state.closeBlock(node, { pageBreakBefore: true });
  },
-  footnoteReference(state, node) {
-    const number =
-      Number(node.attrs?.referenceNumber) || state.$footnoteCounter + 1;
-    state.$footnoteCounter = Math.max(state.$footnoteCounter, number);
-    // seed an empty body so the reference stays valid even if the trailing
-    // footnotes list is missing; the footnotes node overwrites it with content
-    if (!state.footnotes[number]) {
-      state.footnotes[number] = { children: [new Paragraph('')] };
-    }
-    state.current.push(new FootnoteReferenceRun(number));
-  },
-  async footnotes(state, node) {
-    for (let i = 0; i < node.childCount; i += 1) {
-      const item = node.child(i);
-      const number =
-        Number(String(item.attrs?.id ?? '').replace('fn:', '')) || i + 1;
-      await state.footnoteDefinition(item, number);
-    }
-  },
-  // items are consumed by the footnotes handler above
-  footnote() {},
  // No usable static export representation: skip without failing.
  subpages() {},
  transclusionReference() {},
-  base() {},
 };

 export const defaultMarks: MarkSerializer = {
@@ -824,29 +824,6 @@ export class DocxSerializerStateAsync {
    this.current.push(new FootnoteReferenceRun(this.$footnoteCounter));
  }

-  // Fills the footnote body for an already-referenced footnote number from a
-  // node holding block content (Docmost keeps footnote text in a trailing
-  // list, separate from the inline reference).
-  async footnoteDefinition(node: Node, number: number) {
-    const { current, children, nextRunOpts, nextParentParagraphOpts } = this;
-    this.current = [];
-    this.children = [];
-    delete this.nextRunOpts;
-    delete this.nextParentParagraphOpts;
-
-    await this.renderContent(node);
-    this.footnotes[number] = {
-      children: this.children.filter(
-        (child): child is Paragraph => child instanceof Paragraph,
-      ),
-    };
-
-    this.current = current;
-    this.children = children;
-    this.nextRunOpts = nextRunOpts;
-    this.nextParentParagraphOpts = nextParentParagraphOpts;
-  }
-
  closeBlock(node: Node, props?: IParagraphOptions) {
    const paragraph = new Paragraph({
      children: this.current,
@@ -7,19 +7,9 @@ export interface TrailingNodeExtensionOptions {
 }

 function nodeEqualsType({ types, node }: { types: any, node: any }) {
-  if (!node) return false
  return (Array.isArray(types) && types.includes(node.type)) || node.type === types
 }

-// footnotes must stay the last doc child, so the trailing node goes before it
-function lastNodeBeforeFootnotes(doc: any) {
-  const lastChild = doc.lastChild
-  if (lastChild?.type.name === 'footnotes') {
-    return doc.childCount > 1 ? doc.child(doc.childCount - 2) : null
-  }
-  return lastChild
-}
-
 // @ts-ignore
 /**
 * Extension based on:
@@ -50,23 +40,19 @@ export const TrailingNode = Extension.create<TrailingNodeExtensionOptions>({
        appendTransaction: (_, __, state) => {
          const { doc, tr, schema } = state;
          const shouldInsertNodeAtEnd = plugin.getState(state);
+          const endPosition = doc.content.size;
          const type = schema.nodes[this.options.node]

          if (!shouldInsertNodeAtEnd) {
            return;
          }

-          const lastChild = doc.lastChild
-          const endPosition = lastChild?.type.name === 'footnotes'
-            ? doc.content.size - lastChild.nodeSize
-            : doc.content.size
-
          return tr.insert(endPosition, type.create());
        },
        state: {
          init: (_, state) => {
            try {
-              const lastNode = lastNodeBeforeFootnotes(state.tr.doc)
+              const lastNode = state.tr.doc.lastChild
              return !nodeEqualsType({ node: lastNode, types: disabledNodes })
            } catch (err){
              console.log(err)
@@ -84,7 +70,7 @@ export const TrailingNode = Extension.create<TrailingNodeExtensionOptions>({
              return value
            }

-            const lastNode = lastNodeBeforeFootnotes(tr.doc)
+            const lastNode = tr.doc.lastChild
            return !nodeEqualsType({ node: lastNode, types: disabledNodes })
          },
        },
@@ -593,9 +593,6 @@ importers:
      '@socket.io/redis-adapter':
        specifier: 8.3.0
        version: 8.3.0(socket.io-adapter@2.5.4(supports-color@10.2.2))(supports-color@10.2.2)
-      '@turbopuffer/turbopuffer':
-        specifier: ^2.8.0
-        version: 2.8.0
      ai:
        specifier: 6.0.134
        version: 6.0.134(zod@4.3.6)
@@ -4385,9 +4382,6 @@ packages:
  '@tsconfig/node16@1.0.4':
    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}

-  '@turbopuffer/turbopuffer@2.8.0':
-    resolution: {integrity: sha512-lurmVByLynuWtPtVl7SBEJ0bNakb8bs4KsafKzeLWnXA6BsQiGS9obT/7ExQVb9/yecyRn/grj8VgwUzi2xMyg==}
-
  '@tybys/wasm-util@0.10.2':
    resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==}

@@ -5704,7 +5698,6 @@ packages:
  cron-parser@4.9.0:
    resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
    engines: {node: '>=12.0.0'}
-    deprecated: v4 is no longer maintained, upgrade to v5

  cron@4.4.0:
    resolution: {integrity: sha512-fkdfq+b+AHI4cKdhZlppHveI/mgz2qpiYxcm+t5E5TsxX7QrLS1VE0+7GENEk9z0EeGPcpSciGv6ez24duWhwQ==}
@@ -8175,9 +8168,6 @@ packages:
  pako@2.0.3:
    resolution: {integrity: sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw==}

-  pako@2.2.0:
-    resolution: {integrity: sha512-zJq6RP/5q+TO2OpFV3FHzlPnFjmkb7Nc99a5SNjJE+uu/PkpChs+NIZSSzbBoD+6kjiISXjfYdwj1ZRQ81dz/w==}
-
  parent-module@1.0.1:
    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
    engines: {node: '>=6'}
@@ -14351,11 +14341,6 @@ snapshots:

  '@tsconfig/node16@1.0.4': {}

-  '@turbopuffer/turbopuffer@2.8.0':
-    dependencies:
-      pako: 2.2.0
-      undici: 7.29.0
-
  '@tybys/wasm-util@0.10.2':
    dependencies:
      tslib: 2.8.1
@@ -18764,8 +18749,6 @@ snapshots:

  pako@2.0.3: {}

-  pako@2.2.0: {}
-
  parent-module@1.0.1:
    dependencies:
      callsites: 3.1.0