cleanup

dev package overides
prod package overrides
2026-08-20 02:54:11 +08:00 · 2026-07-17 14:01:39 +01:00 · 2026-07-15 17:11:21 +01:00 · 2026-07-15 17:10:50 +01:00 · 2026-07-15 16:56:27 +01:00 · 2026-07-15 16:55:10 +01:00
76 changed files with 3283 additions and 4102 deletions
@@ -1,7 +1,7 @@
 FROM node:26-slim AS base
 LABEL org.opencontainers.image.source="https://github.com/docmost/docmost"

-RUN npm install -g pnpm@11.15.1
+RUN npm install -g pnpm@11.13.0

 FROM base AS builder

@@ -36,7 +36,7 @@
    "@tanstack/react-table": "8.21.3",
    "@tanstack/react-virtual": "3.14.3",
    "alfaaz": "1.1.0",
-    "axios": "1.18.1",
+    "axios": "1.16.0",
    "blueimp-load-image": "5.16.0",
    "clsx": "2.1.1",
    "file-saver": "2.0.5",
@@ -50,9 +50,9 @@
    "katex": "0.16.40",
    "lowlight": "3.3.0",
    "mantine-form-zod-resolver": "1.3.0",
-    "mermaid": "11.16.1",
+    "mermaid": "11.15.0",
    "mitt": "3.0.1",
-    "nanoid": "3.3.17",
+    "nanoid": "3.3.8",
    "posthog-js": "1.391.2",
    "react": "19.2.7",
    "react-clear-modal": "^2.0.18",
@@ -61,7 +61,7 @@
    "react-error-boundary": "6.1.1",
    "react-helmet-async": "3.0.0",
    "react-i18next": "16.5.8",
-    "react-router-dom": "7.18.2",
+    "react-router-dom": "7.18.0",
    "semver": "7.7.4",
    "socket.io-client": "4.8.3",
    "zod": "4.3.6"
@@ -86,7 +86,7 @@
    "globals": "15.13.0",
    "jsdom": "25.0.0",
    "optics-ts": "2.4.1",
-    "postcss": "8.5.25",
+    "postcss": "8.5.14",
    "postcss-preset-mantine": "1.18.0",
    "postcss-simple-vars": "7.0.1",
    "prettier": "3.8.1",
@@ -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.",
@@ -1,45 +0,0 @@
-import { describe, expect, it, beforeEach } from "vitest";
-import { render } from "@testing-library/react";
-import { HelmetProvider } from "react-helmet-async";
-import { DocumentTitle } from "./document-title.tsx";
-
-const renderTitle = (ui: React.ReactNode) =>
-  render(<HelmetProvider>{ui}</HelmetProvider>);
-
-describe("DocumentTitle", () => {
-  beforeEach(() => {
-    document.head.innerHTML = "<title>Docmost</title>";
-  });
-
-  it("appends the app name", () => {
-    renderTitle(<DocumentTitle title="Home" />);
-    expect(document.title).toBe("Home - Docmost");
-  });
-
-  it("omits the app name when asked", () => {
-    renderTitle(<DocumentTitle title="My page" withAppName={false} />);
-    expect(document.title).toBe("My page");
-  });
-
-  it("falls back to the app name without a title", () => {
-    renderTitle(<DocumentTitle />);
-    expect(document.title).toBe("Docmost");
-  });
-
-  it("never renders an empty title", () => {
-    renderTitle(<DocumentTitle title="Spaces" />);
-    const titles = Array.from(document.querySelectorAll("head > title"));
-    expect(titles.every((node) => node.textContent !== "")).toBe(true);
-  });
-
-  it("renders extra head children", () => {
-    renderTitle(
-      <DocumentTitle title="Shared">
-        <meta name="robots" content="noindex" />
-      </DocumentTitle>,
-    );
-    expect(
-      document.querySelector('head > meta[name="robots"]')?.getAttribute("content"),
-    ).toBe("noindex");
-  });
-});
@@ -1,29 +0,0 @@
-import React from "react";
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
-
-type DocumentTitleProps = {
-  title?: string;
-  withAppName?: boolean;
-  children?: React.ReactNode;
-};
-
-export function DocumentTitle({
-  title,
-  withAppName = true,
-  children,
-}: DocumentTitleProps) {
-  const appName = getAppName();
-
-  let documentTitle = appName;
-  if (title) {
-    documentTitle = withAppName ? `${title} - ${appName}` : title;
-  }
-
-  return (
-    <Helmet>
-      <title>{documentTitle}</title>
-      {children}
-    </Helmet>
-  );
-}
@@ -1,15 +1,17 @@
 import { Title, Text, Button, Container, Group } from "@mantine/core";
 import classes from "./error-404.module.css";
 import { Link } from "react-router-dom";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export function Error404() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("404 page not found")} />
+      <Helmet>
+        <title>{t("404 page not found")} - Docmost</title>
+      </Helmet>
      <Container className={classes.root}>
        <Title className={classes.title}>{t("404 page not found")}</Title>
        <Text c="dimmed" size="lg" ta="center" className={classes.description}>
@@ -1,3 +1,5 @@
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import React from "react";
 import useUserRole from "@/hooks/use-user-role.tsx";
@@ -13,7 +15,6 @@ import { Feature } from "@/ee/features";
 import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 import { isCloud } from "@/lib/config.ts";
 import { useLocation, useNavigate } from "react-router-dom";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function AiSettings() {
  const { t } = useTranslation();
@@ -39,7 +40,9 @@ export default function AiSettings() {

  return (
    <>
-      <DocumentTitle title="AI settings" />
+      <Helmet>
+        <title>AI settings - {getAppName()}</title>
+      </Helmet>
      <SettingsTitle title={t("AI settings")} />

      <Tabs color="dark" value={activeTab} onChange={handleTabChange}>
@@ -1,9 +1,10 @@
 import React, { useState } from "react";
 import { Anchor, Alert, Button, Group, Space, Text } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
+import { Helmet } from "react-helmet-async";
 import { Trans, useTranslation } from "react-i18next";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppUrl } from "@/lib/config";
+import { getAppName, getAppUrl } from "@/lib/config";
 import { ApiKeyTable } from "@/ee/api-key/components/api-key-table";
 import { CreateApiKeyModal } from "@/ee/api-key/components/create-api-key-modal";
 import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-modal";
@@ -16,7 +17,6 @@ import { IApiKey } from "@/ee/api-key";
 import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function UserApiKeys() {
  const { t } = useTranslation();
@@ -49,7 +49,11 @@ export default function UserApiKeys() {

  return (
    <>
-      <DocumentTitle title={t("API keys")} />
+      <Helmet>
+        <title>
+          {t("API keys")} - {getAppName()}
+        </title>
+      </Helmet>

      <SettingsTitle title={t("API keys")} />

@@ -1,7 +1,9 @@
 import React, { useState } from "react";
 import { Anchor, Button, Divider, Group, Space, Text } from "@mantine/core";
+import { Helmet } from "react-helmet-async";
 import { Trans, useTranslation } from "react-i18next";
 import SettingsTitle from "@/components/settings/settings-title";
+import { getAppName } from "@/lib/config";
 import { ApiKeyTable } from "@/ee/api-key/components/api-key-table";
 import { CreateApiKeyModal } from "@/ee/api-key/components/create-api-key-modal";
 import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-modal";
@@ -13,7 +15,6 @@ import { useGetApiKeysQuery } from "@/ee/api-key/queries/api-key-query.ts";
 import { IApiKey } from "@/ee/api-key";
 import useUserRole from '@/hooks/use-user-role.tsx';
 import RestrictApiToAdmins from "@/ee/api-key/components/restrict-api-to-admins";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function WorkspaceApiKeys() {
  const { t } = useTranslation();
@@ -46,7 +47,11 @@ export default function WorkspaceApiKeys() {

  return (
    <>
-      <DocumentTitle title={t("API management")} />
+      <Helmet>
+        <title>
+          {t("API management")} - {getAppName()}
+        </title>
+      </Helmet>

      <SettingsTitle title={t("API management")} />

@@ -10,9 +10,11 @@ import {
  Text,
  Tooltip,
 } from "@mantine/core";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { IconSettings } from "@tabler/icons-react";
 import SettingsTitle from "@/components/settings/settings-title";
+import { getAppName } from "@/lib/config";
 import Paginate from "@/components/common/paginate";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import {
@@ -24,7 +26,6 @@ import { IAuditLogParams } from "@/ee/audit/types/audit.types";
 import { eventFilterOptions } from "@/ee/audit/lib/audit-event-labels";
 import AuditLogsTable from "@/ee/audit/components/audit-logs-table";
 import useUserRole from "@/hooks/use-user-role";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 type RetentionUnit = "days" | "months" | "years";

@@ -96,7 +97,11 @@ export default function AuditLogs() {

  return (
    <>
-      <DocumentTitle title={t("Audit log")} />
+      <Helmet>
+        <title>
+          {t("Audit log")} - {getAppName()}
+        </title>
+      </Helmet>

      <SettingsTitle title={t("Audit log")} />

@@ -1,3 +1,5 @@
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import BillingPlans from "@/ee/billing/components/billing-plans.tsx";
 import BillingTrial from "@/ee/billing/components/billing-trial.tsx";
@@ -7,7 +9,6 @@ import React from "react";
 import BillingDetails from "@/ee/billing/components/billing-details.tsx";
 import { useBillingQuery } from "@/ee/billing/queries/billing-query.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function Billing() {
  const { data: billing, isError: isBillingError } = useBillingQuery();
@@ -19,7 +20,9 @@ export default function Billing() {

  return (
    <>
-      <DocumentTitle title="Billing" />
+      <Helmet>
+        <title>Billing - {getAppName()}</title>
+      </Helmet>
      <SettingsTitle title="Billing" />

      <BillingTrial />
@@ -1,3 +1,5 @@
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import React from "react";
 import useUserRole from "@/hooks/use-user-role.tsx";
@@ -7,7 +9,6 @@ import InstallationDetails from "@/ee/licence/components/installation-details.ts
 import OssDetails from "@/ee/licence/components/oss-details.tsx";
 import { useAtom } from "jotai/index";
 import { entitlementAtom } from "@/ee/entitlement/entitlement-atom";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function License() {
  const [entitlements] = useAtom(entitlementAtom);
@@ -20,7 +21,9 @@ export default function License() {

  return (
    <>
-      <DocumentTitle title="License" />
+      <Helmet>
+        <title>License - {getAppName()}</title>
+      </Helmet>
      <SettingsTitle title="License" />

      <ActivateLicenseForm />
@@ -1,16 +1,17 @@
 import { useState, useMemo } from "react";
 import { Group, MultiSelect, Select, Space, TextInput } from "@mantine/core";
 import { useDebouncedValue } from "@mantine/hooks";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { IconSearch } from "@tabler/icons-react";
 import SettingsTitle from "@/components/settings/settings-title";
+import { getAppName } from "@/lib/config";
 import Paginate from "@/components/common/paginate";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { useVerificationListQuery } from "@/ee/page-verification/queries/page-verification-query";
 import { IVerificationListParams } from "@/ee/page-verification/types/page-verification.types";
 import VerificationListTable from "@/ee/page-verification/components/verification-list-table";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function VerifiedPages() {
  const { t } = useTranslation();
@@ -67,7 +68,11 @@ export default function VerifiedPages() {

  return (
    <>
-      <DocumentTitle title={t("Verified pages")} />
+      <Helmet>
+        <title>
+          {t("Verified pages")} - {getAppName()}
+        </title>
+      </Helmet>

      <SettingsTitle title={t("Verified pages")} />

@@ -1,13 +1,18 @@
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
 import { CloudLoginForm } from "@/ee/components/cloud-login-form.tsx";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function CloudLogin() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("Login")} />
+      <Helmet>
+        <title>
+          {t("Login")} - {getAppName()}
+        </title>
+      </Helmet>

      <CloudLoginForm />
    </>
@@ -1,11 +1,14 @@
 import { SetupWorkspaceForm } from "@/features/auth/components/setup-workspace-form.tsx";
+import { Helmet } from "react-helmet-async";
 import React from "react";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";
+import { getAppName } from "@/lib/config.ts";

 export default function CreateWorkspace() {
  return (
    <>
-      <DocumentTitle title="Create Workspace" />
+      <Helmet>
+        <title>Create Workspace - {getAppName()}</title>
+      </Helmet>
      <SetupWorkspaceForm />
    </>
  );
@@ -1,4 +1,5 @@
-import { isCloud } from "@/lib/config.ts";
+import { Helmet } from "react-helmet-async";
+import { getAppName, isCloud } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import {
  Alert,
@@ -36,7 +37,6 @@ import EnableScim from "@/ee/scim/components/enable-scim";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import Paginate from "@/components/common/paginate";
 import { IScimToken } from "@/ee/scim/types/scim-token.types";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 const SCIM_TOKEN_LIMIT = 5;

@@ -64,7 +64,9 @@ export default function Security() {

  return (
    <>
-      <DocumentTitle title="Security" />
+      <Helmet>
+        <title>Security - {getAppName()}</title>
+      </Helmet>
      <SettingsTitle title={t("Security")} />

      <EnforceMfa />
@@ -22,6 +22,8 @@ import { useTranslation } from "react-i18next";
 import { useDisclosure, useWindowEvent } from "@mantine/hooks";
 import { notifications } from "@mantine/notifications";
 import { Link, useParams } from "react-router-dom";
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config";
 import { useEditor, EditorContent } from "@tiptap/react";
 import { templateExtensions } from "@/features/editor/extensions/extensions";
 import {
@@ -42,7 +44,6 @@ import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
 import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";

 import classes from "./template-editor.module.css";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function TemplateEditor() {
  const { t } = useTranslation();
@@ -246,7 +247,11 @@ export default function TemplateEditor() {

  return (
    <>
-      <DocumentTitle title={t("Edit template")} />
+      <Helmet>
+        <title>
+          {t("Edit template")} - {getAppName()}
+        </title>
+      </Helmet>

      {editorToolbarEnabled && editor && (
        <FixedToolbar editor={editor} templateMode />
@@ -13,9 +13,11 @@ import {
 } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import { IconPlus } from "@tabler/icons-react";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { useDisclosure } from "@mantine/hooks";
+import { getAppName } from "@/lib/config";
 import {
  useGetTemplatesQuery,
  useDeleteTemplateMutation,
@@ -29,7 +31,6 @@ import useUserRole from "@/hooks/use-user-role";
 import CreateTemplateModal from "@/ee/template/components/create-template-modal";
 import { useAtomValue } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function TemplateList() {
  const { t } = useTranslation();
@@ -101,7 +102,11 @@ export default function TemplateList() {

  return (
    <>
-      <DocumentTitle title={t("Templates")} />
+      <Helmet>
+        <title>
+          {t("Templates")} - {getAppName()}
+        </title>
+      </Helmet>

      <Container size="900" pt="xl">
        <Group justify="space-between" mb="xl">
@@ -1,46 +0,0 @@
-import {
-  HocuspocusProviderWebsocket,
-  WebSocketStatus,
-} from "@hocuspocus/provider";
-import { getCollaborationUrl } from "@/lib/config.ts";
-
-const RELEASE_GRACE_MS = 5000;
-
-let socket: HocuspocusProviderWebsocket | null = null;
-let editorCount = 0;
-let releaseTimer: ReturnType<typeof setTimeout> | null = null;
-
-export function getCollabSocket(): HocuspocusProviderWebsocket {
-  if (!socket) {
-    socket = new HocuspocusProviderWebsocket({
-      url: getCollaborationUrl(),
-      autoConnect: false,
-    });
-  }
-  return socket;
-}
-
-export function acquireCollabSocket(): void {
-  editorCount++;
-  if (releaseTimer) {
-    clearTimeout(releaseTimer);
-    releaseTimer = null;
-  }
-  const collabSocket = getCollabSocket();
-  collabSocket.shouldConnect = true;
-  if (collabSocket.status === WebSocketStatus.Disconnected) {
-    collabSocket.connect();
-  }
-}
-
-export function releaseCollabSocket(): void {
-  editorCount--;
-  if (editorCount > 0) return;
-  if (releaseTimer) clearTimeout(releaseTimer);
-  releaseTimer = setTimeout(() => {
-    releaseTimer = null;
-    if (editorCount === 0) {
-      socket?.disconnect();
-    }
-  }, RELEASE_GRACE_MS);
-}
@@ -6,7 +6,6 @@
  z-index: 99;
  display: flex;
  align-items: center;
-  min-height: 45px;
  background: var(--mantine-color-body);
  border-bottom: 1px solid
    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
@@ -31,6 +31,8 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
  const workspace = useAtomValue(workspaceAtom);
  const isGenerativeAiEnabled = workspace?.settings?.ai?.generative === true;

+  if (!editor || !state) return null;
+
  return (
    <>
      <div
@@ -47,26 +49,22 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
              <div className={classes.divider} />
            </>
          )} */}
-          {editor && state && (
-            <>
-              <BlockTypeGroup editor={editor} />
-              <div className={classes.divider} />
-              <InlineMarksGroup editor={editor} state={state} />
-              <div className={classes.divider} />
-              <ColorGroup editor={editor} />
-              <div className={classes.divider} />
-              <ListsGroup editor={editor} state={state} />
-              <div className={classes.divider} />
-              <AlignmentGroup editor={editor} />
-              <div className={classes.divider} />
-              <MediaGroup editor={editor} templateMode={templateMode} />
-              <div className={classes.divider} />
-              <QuickInsertsGroup editor={editor} />
-              <MoreInsertsGroup editor={editor} templateMode={templateMode} />
-              <div className={classes.divider} />
-              <HistoryGroup editor={editor} state={state} />
-            </>
-          )}
+          <BlockTypeGroup editor={editor} />
+          <div className={classes.divider} />
+          <InlineMarksGroup editor={editor} state={state} />
+          <div className={classes.divider} />
+          <ColorGroup editor={editor} />
+          <div className={classes.divider} />
+          <ListsGroup editor={editor} state={state} />
+          <div className={classes.divider} />
+          <AlignmentGroup editor={editor} />
+          <div className={classes.divider} />
+          <MediaGroup editor={editor} templateMode={templateMode} />
+          <div className={classes.divider} />
+          <QuickInsertsGroup editor={editor} />
+          <MoreInsertsGroup editor={editor} templateMode={templateMode} />
+          <div className={classes.divider} />
+          <HistoryGroup editor={editor} state={state} />
        </div>
      </div>
      <div className={classes.spacer} aria-hidden />
@@ -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.",
@@ -1,11 +1,9 @@
 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";
-import { CharacterCount, UndoRedo } from "@tiptap/extensions";
-import { Placeholder } from "@/features/editor/extensions/placeholder";
+import { Placeholder, CharacterCount, UndoRedo } from "@tiptap/extensions";
 import { Superscript } from "@tiptap/extension-superscript";
 import SubScript from "@tiptap/extension-subscript";
 import { Typography } from "@tiptap/extension-typography";
@@ -64,9 +62,6 @@ import {
  TransclusionReference,
  TableView,
  BaseEmbed as BaseEmbedNode,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 } from "@docmost/editor-ext";
 import {
  randomElement,
@@ -136,7 +131,6 @@ lowlight.register("scala", scala);
 // @ts-ignore
 export const mainExtensions = [
  StarterKit.configure({
-    document: false,
    heading: false,
    undoRedo: false,
    link: false,
@@ -148,9 +142,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
@@ -203,19 +194,16 @@ export const mainExtensions = [
        return i18n.t("Toggle title");
      }
      if (node.type.name === "paragraph") {
-        const doc = editor.state.doc;
-        if (pos >= 0 && pos <= doc.content.size) {
-          const parentName = doc.resolve(pos).parent.type.name;
-          if (
-            parentName === "column" ||
-            parentName === "tableCell" ||
-            parentName === "tableHeader" ||
-            parentName === "callout" ||
-            parentName === "blockquote" ||
-            parentName === "footnote"
-          ) {
-            return i18n.t("Write...");
-          }
+        const $pos = editor.state.doc.resolve(pos);
+        const parentName = $pos.parent.type.name;
+        if (
+          parentName === "column" ||
+          parentName === "tableCell" ||
+          parentName === "tableHeader" ||
+          parentName === "callout" ||
+          parentName === "blockquote"
+        ) {
+          return i18n.t("Write...");
        }
        return i18n.t('Write anything. Enter "/" for commands');
      }
@@ -426,9 +414,6 @@ export const mainExtensions = [
  }).configure(),
  Columns,
  Column,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
  AutoJoiner.configure({
    elementsToJoin: [],
  }),
@@ -1,64 +0,0 @@
-import { isNodeEmpty } from "@tiptap/core";
-import { Plugin, PluginKey } from "@tiptap/pm/state";
-import { Decoration, DecorationSet } from "@tiptap/pm/view";
-import { Placeholder as TiptapPlaceholder } from "@tiptap/extensions";
-
-export const Placeholder = TiptapPlaceholder.extend({
-  addProseMirrorPlugins() {
-    const editor = this.editor;
-    const options = this.options;
-    const dataAttribute = `data-${options.dataAttribute || "placeholder"}`;
-
-    return [
-      new Plugin({
-        key: new PluginKey("docmostPlaceholder"),
-        props: {
-          decorations: (state) => {
-            if (options.showOnlyWhenEditable && !editor.isEditable) {
-              return null;
-            }
-
-            const { doc, selection } = state;
-            const { anchor } = selection;
-            const decorations: Decoration[] = [];
-            const isEmptyDoc = editor.isEmpty;
-
-            doc.descendants((node, pos) => {
-              if (!node.type.isTextblock) {
-                return options.includeChildren;
-              }
-
-              const hasAnchor = anchor >= pos && anchor <= pos + node.nodeSize;
-              const isEmpty = !node.isLeaf && isNodeEmpty(node);
-
-              if ((hasAnchor || !options.showOnlyCurrent) && isEmpty) {
-                const emptyNodeClass =
-                  typeof options.emptyNodeClass === "function"
-                    ? options.emptyNodeClass({ editor, node, pos, hasAnchor })
-                    : options.emptyNodeClass;
-                const classes = [emptyNodeClass];
-                if (isEmptyDoc) {
-                  classes.push(options.emptyEditorClass);
-                }
-
-                decorations.push(
-                  Decoration.node(pos, pos + node.nodeSize, {
-                    class: classes.join(" "),
-                    [dataAttribute]:
-                      typeof options.placeholder === "function"
-                        ? options.placeholder({ editor, node, pos, hasAnchor })
-                        : options.placeholder,
-                  }),
-                );
-              }
-
-              return options.includeChildren;
-            });
-
-            return DecorationSet.create(doc, decorations);
-          },
-        },
-      }),
-    ];
-  },
-});
@@ -0,0 +1,7 @@
+import { getCollaborationUrl } from "@/lib/config.ts";
+
+const useCollaborationURL = (): string => {
+  return getCollaborationUrl();
+};
+
+export default useCollaborationURL;
@@ -2,22 +2,20 @@ import "@/features/editor/styles/index.css";
 import React, {
  useCallback,
  useEffect,
-  useLayoutEffect,
  useMemo,
  useRef,
  useState,
 } from "react";
 import { IndexeddbPersistence } from "y-indexeddb";
+import * as Y from "yjs";
 import {
+  HocuspocusProvider,
+  onStatusParameters,
  WebSocketStatus,
+  HocuspocusProviderWebsocket,
+  onSyncedParameters,
  onStatelessParameters,
 } from "@hocuspocus/provider";
-import {
-  HocuspocusProviderWebsocketComponent,
-  HocuspocusRoom,
-  useHocuspocusEvent,
-  useHocuspocusProvider,
-} from "@hocuspocus/provider-react";
 import {
  Editor,
  EditorContent,
@@ -30,6 +28,7 @@ import {
  mainExtensions,
 } from "@/features/editor/extensions/extensions";
 import { useAtom, useAtomValue } from "jotai";
+import useCollaborationUrl from "@/features/editor/hooks/use-collaboration-url";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import {
  currentPageEditModeAtom,
@@ -77,11 +76,6 @@ import { EditorLinkMenu } from "@/features/editor/components/link/link-menu";
 import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
 import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
 import { useTranslation } from "react-i18next";
-import {
-  acquireCollabSocket,
-  getCollabSocket,
-  releaseCollabSocket,
-} from "@/features/editor/collab-socket";

 interface PageEditorProps {
  pageId: string;
@@ -97,80 +91,7 @@ export default function PageEditor({
  canComment,
 }: PageEditorProps) {
  const { t } = useTranslation();
-  const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
-  const { pageSlug } = useParams();
-  const slugId = extractPageSlugId(pageSlug);
-  const [socket] = useState(getCollabSocket);
-  const hasCollabToken = !!collabQuery?.token;
-
-  useEffect(() => {
-    if (!hasCollabToken) return;
-    acquireCollabSocket();
-    return () => releaseCollabSocket();
-  }, [hasCollabToken]);
-
-  const handleStateless = ({ payload }: onStatelessParameters) => {
-    try {
-      const message = JSON.parse(payload);
-      if (message?.type !== "page.updated" || !message.updatedAt) return;
-      const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
-      if (pageData) {
-        queryClient.setQueryData(["pages", slugId], {
-          ...pageData,
-          updatedAt: message.updatedAt,
-          ...(message.lastUpdatedBy && {
-            lastUpdatedBy: message.lastUpdatedBy,
-          }),
-        });
-      }
-    } catch {
-      // ignore unrelated stateless messages
-    }
-  };
-
-  const handleAuthenticationFailed = () => {
-    const payload = jwtDecode(collabQuery?.token);
-    const now = Date.now().valueOf() / 1000;
-    const isTokenExpired = now >= payload.exp;
-    if (isTokenExpired) {
-      refetchCollabToken();
-    }
-  };
-
-  return (
-    <TransclusionLookupProvider>
-      {collabQuery?.token ? (
-        <HocuspocusProviderWebsocketComponent websocketProvider={socket}>
-          <HocuspocusRoom
-            name={`page.${pageId}`}
-            token={collabQuery.token}
-            flushDelay={500}
-            onStateless={handleStateless}
-            onAuthenticationFailed={handleAuthenticationFailed}
-          >
-            <CollabPageEditor
-              pageId={pageId}
-              editable={editable}
-              content={content}
-              canComment={canComment}
-            />
-          </HocuspocusRoom>
-        </HocuspocusProviderWebsocketComponent>
-      ) : (
-        <StaticPageEditor content={content} ariaLabel={t("Page content")} />
-      )}
-    </TransclusionLookupProvider>
-  );
-}
-
-function CollabPageEditor({
-  pageId,
-  editable,
-  content,
-  canComment,
-}: PageEditorProps) {
-  const { t } = useTranslation();
-  const provider = useHocuspocusProvider();
+  const collaborationURL = useCollaborationUrl();
  const isComponentMounted = useRef(false);
  const editorRef = useRef<Editor | null>(null);

@@ -191,6 +112,7 @@ function CollabPageEditor({
  );
  const [, setYjsSynced] = useAtom(yjsSyncedAtom);
  const menuContainerRef = useRef(null);
+  const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
  const { isIdle, resetIdle } = useIdle(FIVE_MINUTES, { initialState: false });
  const documentState = useDocumentVisibility();
  const { pageSlug } = useParams();
@@ -201,24 +123,95 @@ function CollabPageEditor({
    [isComponentMounted],
  );
  const { handleScrollTo } = useEditorScroll({ canScroll });
+  // Providers only created once per pageId
+  const providersRef = useRef<{
+    local: IndexeddbPersistence;
+    remote: HocuspocusProvider;
+    socket: HocuspocusProviderWebsocket;
+  } | null>(null);
+  const [providersReady, setProvidersReady] = useState(false);

  useEffect(() => {
-    const local = new IndexeddbPersistence(
-      provider.configuration.name,
-      provider.document,
-    );
-    local.on("synced", () => setIsLocalSynced(true));
-    return () => {
-      local.destroy();
-    };
-  }, [provider]);
+    if (!providersRef.current) {
+      const documentName = `page.${pageId}`;
+      const ydoc = new Y.Doc();
+      const local = new IndexeddbPersistence(documentName, ydoc);
+      const socket = new HocuspocusProviderWebsocket({
+        url: collaborationURL,
+      });
+      const onLocalSyncedHandler = () => {
+        setIsLocalSynced(true);
+      };
+      const onStatusHandler = (event: onStatusParameters) => {
+        setYjsConnectionStatus(event.status);
+      };
+      const onSyncedHandler = (event: onSyncedParameters) => {
+        setIsRemoteSynced(event.state);
+      };
+      const onStatelessHandler = ({ payload }: onStatelessParameters) => {
+        try {
+          const message = JSON.parse(payload);
+          if (message?.type !== "page.updated" || !message.updatedAt) return;
+          const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
+          if (pageData) {
+            queryClient.setQueryData(["pages", slugId], {
+              ...pageData,
+              updatedAt: message.updatedAt,
+              ...(message.lastUpdatedBy && {
+                lastUpdatedBy: message.lastUpdatedBy,
+              }),
+            });
+          }
+        } catch {
+          // ignore unrelated stateless messages
+        }
+      };
+      const onAuthenticationFailedHandler = () => {
+        const payload = jwtDecode(collabQuery?.token);
+        const now = Date.now().valueOf() / 1000;
+        const isTokenExpired = now >= payload.exp;
+        if (isTokenExpired) {
+          refetchCollabToken().then((result) => {
+            if (result.data?.token) {
+              socket.disconnect();
+              setTimeout(() => {
+                remote.configuration.token = result.data.token;
+                socket.connect();
+              }, 100);
+            }
+          });
+        }
+      };
+      const remote = new HocuspocusProvider({
+        websocketProvider: socket,
+        name: documentName,
+        document: ydoc,
+        token: collabQuery?.token,
+        onAuthenticationFailed: onAuthenticationFailedHandler,
+        onStatus: onStatusHandler,
+        onSynced: onSyncedHandler,
+        onStateless: onStatelessHandler,
+      });

-  useHocuspocusEvent("synced", ({ state }) => setIsRemoteSynced(state));
-  useHocuspocusEvent("status", ({ status }) => setYjsConnectionStatus(status));
+      local.on("synced", onLocalSyncedHandler);
+      providersRef.current = { socket, local, remote };
+      setProvidersReady(true);
+    } else {
+      setProvidersReady(true);
+    }
+    // Only destroy on final unmount
+    return () => {
+      providersRef.current?.socket.destroy();
+      providersRef.current?.remote.destroy();
+      providersRef.current?.local.destroy();
+      providersRef.current = null;
+    };
+  }, [pageId]);

  // Only connect/disconnect on tab/idle, not destroy
  useEffect(() => {
-    const socket = provider.configuration.websocketProvider;
+    if (!providersReady || !providersRef.current) return;
+    const socket = providersRef.current.socket;

    if (
      isIdle &&
@@ -235,15 +228,23 @@ function CollabPageEditor({
      resetIdle();
      socket.connect();
    }
-  }, [isIdle, documentState, provider, resetIdle]);
+  }, [isIdle, documentState, providersReady, resetIdle]);
+
+  // Attach here, to make sure the connection gets properly established
+  providersRef.current?.remote.attach();

  const extensions = useMemo(() => {
-    if (!currentUser?.user) {
+    if (!providersReady || !providersRef.current || !currentUser?.user) {
      return mainExtensions;
    }

-    return [...mainExtensions, ...collabExtensions(provider, currentUser.user)];
-  }, [provider, currentUser?.user]);
+    const remoteProvider = providersRef.current.remote;
+
+    return [
+      ...mainExtensions,
+      ...collabExtensions(remoteProvider, currentUser?.user),
+    ];
+  }, [providersReady, currentUser?.user]);

  const editor = useEditor(
    {
@@ -325,16 +326,6 @@ function CollabPageEditor({
    [pageId, editable, extensions],
  );

-  useLayoutEffect(() => {
-    if (editor && !editor.isDestroyed) {
-      // @ts-ignore
-      setEditor(editor);
-      // @ts-ignore
-      editor.storage.pageId = pageId;
-      editorRef.current = editor;
-    }
-  }, [editor, pageId, setEditor]);
-
  const editorIsEditable = useEditorState({
    editor,
    selector: (ctx) => {
@@ -425,72 +416,65 @@ function CollabPageEditor({
    }
  }, [yjsConnectionStatus, isSynced]);

-  if (showStatic) {
-    return <StaticPageEditor content={content} ariaLabel={t("Page content")} />;
-  }
-
  return (
-    <div className="editor-container" style={{ position: "relative" }}>
-      <div ref={menuContainerRef}>
-        <EditorContent editor={editor} />
+    <TransclusionLookupProvider>
+      {showStatic ? (
+        <EditorProvider
+          editable={false}
+          immediatelyRender={true}
+          extensions={mainExtensions}
+          content={content}
+          editorProps={{
+            attributes: {
+              "aria-label": t("Page content"),
+            },
+          }}
+        />
+      ) : (
+        <div className="editor-container" style={{ position: "relative" }}>
+          <div ref={menuContainerRef}>
+            <EditorContent editor={editor} />

-        {editor && (
-          <SearchAndReplaceDialog editor={editor} editable={editable} />
-        )}
+            {editor && (
+              <SearchAndReplaceDialog editor={editor} editable={editable} />
+            )}

-        {editor && editorIsEditable && (
-          <div>
-            <EditorAiMenu editor={editor} />
-            <EditorLinkMenu editor={editor} />
-            <EditorBubbleMenu editor={editor} />
-            <TableMenu editor={editor} />
-            <TableHandlesLayer editor={editor} />
-            <ImageMenu editor={editor} />
-            <VideoMenu editor={editor} />
-            <PdfMenu editor={editor} />
-            <CalloutMenu editor={editor} />
-            <SubpagesMenu editor={editor} />
-            <ExcalidrawMenu editor={editor} />
-            <DrawioMenu editor={editor} />
-            <ColumnsMenu editor={editor} />
+            {editor && editorIsEditable && (
+              <div>
+                <EditorAiMenu editor={editor} />
+                <EditorLinkMenu editor={editor} />
+                <EditorBubbleMenu editor={editor} />
+                <TableMenu editor={editor} />
+                <TableHandlesLayer editor={editor} />
+                <ImageMenu editor={editor} />
+                <VideoMenu editor={editor} />
+                <PdfMenu editor={editor} />
+                <CalloutMenu editor={editor} />
+                <SubpagesMenu editor={editor} />
+                <ExcalidrawMenu editor={editor} />
+                <DrawioMenu editor={editor} />
+                <ColumnsMenu editor={editor} />
+              </div>
+            )}
+            {editor &&
+              !editorIsEditable &&
+              (editable || canComment) &&
+              providersRef.current && <ReadonlyBubbleMenu editor={editor} />}
+            {showCommentPopup && (
+              <CommentDialog editor={editor} pageId={pageId} />
+            )}
+            {showReadOnlyCommentPopup && (
+              <CommentDialog editor={editor} pageId={pageId} readOnly />
+            )}
          </div>
-        )}
-        {editor && !editorIsEditable && (editable || canComment) && (
-          <ReadonlyBubbleMenu editor={editor} />
-        )}
-        {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
-        {showReadOnlyCommentPopup && (
-          <CommentDialog editor={editor} pageId={pageId} readOnly />
-        )}
-      </div>
-      <div
-        onClick={() => {
-          if (editor && !editor.isDestroyed) editor.commands.focus("end");
-        }}
-        style={{ paddingBottom: "20vh" }}
-      ></div>
-    </div>
-  );
-}
-
-function StaticPageEditor({
-  content,
-  ariaLabel,
-}: {
-  content: any;
-  ariaLabel: string;
-}) {
-  return (
-    <EditorProvider
-      editable={false}
-      immediatelyRender={true}
-      extensions={mainExtensions}
-      content={content}
-      editorProps={{
-        attributes: {
-          "aria-label": ariaLabel,
-        },
-      }}
-    />
+          <div
+            onClick={() => {
+              if (editor && !editor.isDestroyed) editor.commands.focus("end");
+            }}
+            style={{ paddingBottom: "20vh" }}
+          ></div>
+        </div>
+      )}
+    </TransclusionLookupProvider>
  );
 }
@@ -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";
@@ -1,10 +1,13 @@
 import { ForgotPasswordForm } from "@/features/auth/components/forgot-password-form";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";
+import { getAppName } from "@/lib/config";
+import { Helmet } from "react-helmet-async";

 export default function ForgotPassword() {
    return (
        <>
-            <DocumentTitle title="Forgot Password" />
+            <Helmet>
+                <title>Forgot Password - {getAppName()}</title>
+            </Helmet>
            <ForgotPasswordForm />
        </>
    );
@@ -1,13 +1,16 @@
+import { Helmet } from "react-helmet-async";
 import { InviteSignUpForm } from "@/features/auth/components/invite-sign-up-form.tsx";
+import {getAppName} from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function InviteSignup() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("Invitation Signup")} />
+      <Helmet>
+        <title>{t("Invitation Signup")} - {getAppName()}</title>
+      </Helmet>
      <InviteSignUpForm />
    </>
  );
@@ -1,13 +1,18 @@
 import { LoginForm } from "@/features/auth/components/login-form";
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function LoginPage() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("Login")} />
+      <Helmet>
+        <title>
+          {t("Login")} - {getAppName()}
+        </title>
+      </Helmet>
      <LoginForm />
    </>
  );
@@ -1,10 +1,11 @@
+import { Helmet } from "react-helmet-async";
 import { PasswordResetForm } from "@/features/auth/components/password-reset-form";
 import { Link, useSearchParams } from "react-router-dom";
 import { useVerifyUserTokenQuery } from "@/features/auth/queries/auth-query";
 import { Button, Container, Group, Text } from "@mantine/core";
 import APP_ROUTE from "@/lib/app-route";
+import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function PasswordReset() {
  const { t } = useTranslation();
@@ -22,7 +23,11 @@ export default function PasswordReset() {
  if (isError || !resetToken) {
    return (
      <>
-        <DocumentTitle title={t("Password Reset")} />
+        <Helmet>
+          <title>
+            {t("Password Reset")} - {getAppName()}
+          </title>
+        </Helmet>
        <Container my={40}>
          <Text size="lg" ta="center">
            {t("Invalid or expired password reset link")}
@@ -44,7 +49,11 @@ export default function PasswordReset() {

  return (
    <>
-      <DocumentTitle title={t("Password Reset")} />
+      <Helmet>
+        <title>
+          {t("Password Reset")} - {getAppName()}
+        </title>
+      </Helmet>
      <PasswordResetForm resetToken={resetToken} />
    </>
  );
@@ -1,10 +1,11 @@
 import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
 import { SetupWorkspaceForm } from "@/features/auth/components/setup-workspace-form.tsx";
+import { Helmet } from "react-helmet-async";
 import React, { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import APP_ROUTE from "@/lib/app-route.ts";
+import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function SetupWorkspace() {
  const { t } = useTranslation();
@@ -34,7 +35,11 @@ export default function SetupWorkspace() {
  ) {
    return (
      <>
-        <DocumentTitle title={t("Setup Workspace")} />
+        <Helmet>
+          <title>
+            {t("Setup Workspace")} - {getAppName()}
+          </title>
+        </Helmet>
        <SetupWorkspaceForm />
      </>
    );
@@ -2,15 +2,20 @@ import { Container, Space } from "@mantine/core";
 import HomeTabs from "@/features/home/components/home-tabs";
 import HomeAiPrompt from "@/features/home/components/home-ai-prompt";
 import SpaceCarousel from "@/features/space/components/space-carousel.tsx";
+import { getAppName } from "@/lib/config.ts";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function Home() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("Home")} />
+      <Helmet>
+        <title>
+          {t("Home")} - {getAppName()}
+        </title>
+      </Helmet>
      <Container size={"900"} pt="xl">
        <HomeAiPrompt />

@@ -17,7 +17,9 @@ import {
 } from "@tabler/icons-react";
 import { Link, useParams } from "react-router-dom";
 import { useTranslation } from "react-i18next";
+import { Helmet } from "react-helmet-async";
 import { useDebouncedValue } from "@mantine/hooks";
+import { getAppName } from "@/lib/config";
 import { useLabelPagesQuery } from "@/features/label/queries/label-query.ts";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
 import { getLabelColor } from "@/features/label/utils/label-colors.ts";
@@ -27,7 +29,6 @@ import { normalizeLabelName } from "@/features/label/utils/normalize-label.ts";
 import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu.tsx";
 import { EmptyState } from "@/components/ui/empty-state";
 import classes from "@/features/label/label.module.css";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function LabelPage() {
  const { t } = useTranslation();
@@ -81,7 +82,11 @@ export default function LabelPage() {

  return (
    <>
-      <DocumentTitle title={labelName} />
+      <Helmet>
+        <title>
+          {labelName} - {getAppName()}
+        </title>
+      </Helmet>

      <Container size={820} py="xl">
        <Stack gap="lg">
@@ -3,6 +3,7 @@ import { usePageQuery } from "@/features/page/queries/page-query";
 import { FullEditor } from "@/features/editor/full-editor";
 import { TitleEditor } from "@/features/editor/title-editor";
 import HistoryModal from "@/features/page-history/components/history-modal";
+import { Helmet } from "react-helmet-async";
 import PageHeader from "@/features/page/components/header/page-header.tsx";
 import { extractPageSlugId } from "@/lib";
 import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
@@ -17,7 +18,6 @@ import { BaseView } from "@/ee/base/components/base-view";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
 import { getPageTitle } from "@/features/page/page.utils";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";
 const MemoizedFullEditor = React.memo(FullEditor);
 const MemoizedTitleEditor = React.memo(TitleEditor);
 const MemoizedPageHeader = React.memo(PageHeader);
@@ -110,10 +110,9 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
          paddingTop: "calc(var(--page-header-height) + 6px)",
        }}
      >
-        <DocumentTitle
-          title={`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}
-          withAppName={false}
-        />
+        <Helmet>
+          <title>{`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
+        </Helmet>
        <MemoizedPageHeader readOnly={!canEdit} />
        <div
          style={{
@@ -160,10 +159,9 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
  return (
    page && (
      <div>
-        <DocumentTitle
-          title={`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}
-          withAppName={false}
-        />
+        <Helmet>
+          <title>{`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
+        </Helmet>

        <MemoizedPageHeader readOnly={!canEdit} />

@@ -5,16 +5,21 @@ import PageWidthPref from "@/features/user/components/page-width-pref.tsx";
 import PageEditPref from "@/features/user/components/page-state-pref";
 import FixedToolbarPref from "@/features/user/components/fixed-toolbar-pref";
 import NotificationPref from "@/features/user/components/notification-pref";
+import { getAppName } from "@/lib/config.ts";
 import { Divider } from "@mantine/core";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function AccountPreferences() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("Preferences")} />
+      <Helmet>
+        <title>
+          {t("Preferences")} - {getAppName()}
+        </title>
+      </Helmet>
      <SettingsTitle title={t("Preferences")} />

      <AccountTheme />
@@ -4,17 +4,22 @@ import ChangePassword from "@/features/user/components/change-password";
 import { Divider } from "@mantine/core";
 import AccountAvatar from "@/features/user/components/account-avatar";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
+import { getAppName } from "@/lib/config.ts";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { AccountMfaSection } from "@/features/user/components/account-mfa-section";
 import SessionList from "@/features/session/components/session-list";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function AccountSettings() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("My Profile")} />
+      <Helmet>
+        <title>
+          {t("My Profile")} - {getAppName()}
+        </title>
+      </Helmet>
      <SettingsTitle title={t("My Profile")} />

      <AccountAvatar />
@@ -1,15 +1,20 @@
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import GroupMembersList from "@/features/group/components/group-members";
 import GroupDetails from "@/features/group/components/group-details";
+import { getAppName } from "@/lib/config.ts";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function GroupInfo() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("Manage Group")} />
+      <Helmet>
+        <title>
+          {t("Manage Group")} - {getAppName()}
+        </title>
+      </Helmet>
      <SettingsTitle title={t("Manage Group")} />
      <GroupDetails />
      <GroupMembersList />
@@ -3,8 +3,9 @@ import SettingsTitle from "@/components/settings/settings-title.tsx";
 import { Group } from "@mantine/core";
 import CreateGroupModal from "@/features/group/components/create-group-modal";
 import useUserRole from "@/hooks/use-user-role.tsx";
+import {getAppName} from "@/lib/config.ts";
+import {Helmet} from "react-helmet-async";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function Groups() {
  const { t } = useTranslation();
@@ -12,7 +13,9 @@ export default function Groups() {

  return (
    <>
-      <DocumentTitle title={t("Groups")} />
+        <Helmet>
+            <title>{t("Groups")} - {getAppName()}</title>
+        </Helmet>
      <SettingsTitle title={t("Groups")} />

      <Group my="md" justify="flex-end">
@@ -1,17 +1,22 @@
 import SettingsTitle from "@/components/settings/settings-title.tsx";
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
 import ShareList from "@/features/share/components/share-list.tsx";
 import { Alert, Text } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
 import React from "react";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function Shares() {
  const { t } = useTranslation();

  return (
    <>
-      <DocumentTitle title={t("Public sharing")} />
+      <Helmet>
+        <title>
+          {t("Public sharing")} - {getAppName()}
+        </title>
+      </Helmet>
      <SettingsTitle title={t("Public sharing")} />

      <Alert variant="light" color="blue" icon={<IconInfoCircle />}>
@@ -3,8 +3,9 @@ import SpaceList from "@/features/space/components/space-list.tsx";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { Group } from "@mantine/core";
 import CreateSpaceModal from "@/features/space/components/create-space-modal.tsx";
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function Spaces() {
  const { t } = useTranslation();
@@ -12,7 +13,11 @@ export default function Spaces() {

  return (
    <>
-      <DocumentTitle title={t("Spaces")} />
+      <Helmet>
+        <title>
+          {t("Spaces")} - {getAppName()}
+        </title>
+      </Helmet>
      <SettingsTitle title={t("Spaces")} />

      <Group my="md" justify="flex-end">
@@ -6,10 +6,11 @@ import { useEffect, useState } from "react";
 import { useNavigate, useSearchParams } from "react-router-dom";
 import WorkspaceInvitesTable from "@/features/workspace/components/members/components/workspace-invites-table.tsx";
 import useUserRole from "@/hooks/use-user-role.tsx";
+import { getAppName } from "@/lib/config.ts";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function WorkspaceMembers() {
  const { t } = useTranslation();
@@ -37,7 +38,11 @@ export default function WorkspaceMembers() {

  return (
    <>
-      <DocumentTitle title={t("Members")} />
+      <Helmet>
+        <title>
+          {t("Members")} - {getAppName()}
+        </title>
+      </Helmet>
      <SettingsTitle title={t("Members")} />

      {/* <WorkspaceInviteSection /> */}
@@ -2,19 +2,21 @@ import SettingsTitle from "@/components/settings/settings-title.tsx";
 import WorkspaceNameForm from "@/features/workspace/components/settings/components/workspace-name-form";
 import WorkspaceIcon from "@/features/workspace/components/settings/components/workspace-icon.tsx";
 import { useTranslation } from "react-i18next";
-import { isCloud } from "@/lib/config.ts";
+import { getAppName, isCloud } from "@/lib/config.ts";
+import { Helmet } from "react-helmet-async";
 import ManageHostname from "@/ee/components/manage-hostname.tsx";
 import { Divider } from "@mantine/core";
 import AllowMemberTemplates from "@/ee/security/components/allow-member-templates.tsx";
 import WorkspaceDefaultPageEditMode from "@/features/workspace/components/settings/components/workspace-default-page-edit-mode.tsx";
 import PersonalSpacesSetting from "@/ee/personal-space/components/personal-spaces-setting.tsx";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function WorkspaceSettings() {
  const { t } = useTranslation();
  return (
    <>
-      <DocumentTitle title="Workspace Settings" />
+      <Helmet>
+        <title>Workspace Settings - {getAppName()}</title>
+      </Helmet>
      <SettingsTitle title={t("General")} />
      <WorkspaceIcon />
      <WorkspaceNameForm />
@@ -1,4 +1,5 @@
 import { useNavigate, useParams } from "react-router-dom";
+import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { useSharePageQuery } from "@/features/share/queries/share-query.ts";
 import { Container } from "@mantine/core";
@@ -13,7 +14,6 @@ import {
  sharedTreeDataAtom,
 } from "@/features/share/atoms/shared-page-atom.ts";
 import { isPageInTree } from "@/features/share/utils.ts";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function SharedPage() {
  const { t } = useTranslation();
@@ -56,14 +56,12 @@ export default function SharedPage() {

  return (
    <div>
-      <DocumentTitle
-        title={data?.page?.title || t("untitled")}
-        withAppName={false}
-      >
+      <Helmet>
+        <title>{`${data?.page?.title || t("untitled")}`}</title>
        {!data?.share.searchIndexing && (
          <meta name="robots" content="noindex" />
        )}
-      </DocumentTitle>
+      </Helmet>

      <Container fluid={fullWidth} size={fullWidth ? undefined : 900} p={0}>
        <ReadonlyPageEditor
@@ -2,7 +2,8 @@ import {Container} from "@mantine/core";
 import SpaceHomeTabs from "@/features/space/components/space-home-tabs.tsx";
 import {useParams} from "react-router-dom";
 import {useGetSpaceBySlugQuery} from "@/features/space/queries/space-query.ts";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";
+import {getAppName} from "@/lib/config.ts";
+import {Helmet} from "react-helmet-async";

 export default function SpaceHome() {
    const {spaceSlug} = useParams();
@@ -10,7 +11,9 @@ export default function SpaceHome() {

    return (
        <>
-            <DocumentTitle title={space?.name || 'Overview'} />
+            <Helmet>
+                <title>{space?.name || 'Overview'} - {getAppName()}</title>
+            </Helmet>
            <Container size={"900"} pt="xl">
                {space && <SpaceHomeTabs/>}
            </Container>
@@ -1,12 +1,13 @@
 import { Container, Title, Text, Group, Box } from "@mantine/core";
 import { useTranslation } from "react-i18next";
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import CreateSpaceModal from "@/features/space/components/create-space-modal";
 import { AllSpacesList } from "@/features/space/components/spaces-page";
 import FavoriteSpacesGrid from "@/features/space/components/spaces-page/favorite-spaces-grid";
 import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 import useUserRole from "@/hooks/use-user-role";
-import { DocumentTitle } from "@/components/ui/document-title.tsx";

 export default function Spaces() {
  const { t } = useTranslation();
@@ -21,7 +22,11 @@ export default function Spaces() {

  return (
    <>
-      <DocumentTitle title={t("Spaces")} />
+      <Helmet>
+        <title>
+          {t("Spaces")} - {getAppName()}
+        </title>
+      </Helmet>

      <Container size={"800"} pt="xl">
        <Group justify="space-between" mb="xl">
@@ -40,30 +40,30 @@
    "@clickhouse/client": "1.18.2",
    "@docmost/base-formula": "workspace:*",
    "@docmost/pdf-inspector": "1.9.6",
-    "@fastify/cookie": "11.0.2",
-    "@fastify/multipart": "10.0.0",
-    "@fastify/static": "10.1.2",
-    "@keyv/redis": "5.1.6",
+    "@fastify/cookie": "^11.0.2",
+    "@fastify/multipart": "^10.0.0",
+    "@fastify/static": "^9.1.3",
+    "@keyv/redis": "^5.1.6",
    "@langchain/core": "1.1.46",
    "@langchain/textsplitters": "1.0.1",
-    "@modelcontextprotocol/sdk": "1.30.0",
-    "@nest-lab/throttler-storage-redis": "1.2.0",
+    "@modelcontextprotocol/sdk": "1.29.0",
+    "@nest-lab/throttler-storage-redis": "^1.2.0",
    "@nestjs-labs/nestjs-ioredis": "11.0.4",
    "@nestjs/bullmq": "11.0.4",
    "@nestjs/cache-manager": "3.1.3",
-    "@nestjs/common": "11.1.28",
+    "@nestjs/common": "11.1.27",
    "@nestjs/config": "4.0.4",
    "@nestjs/core": "11.1.27",
    "@nestjs/event-emitter": "3.1.0",
    "@nestjs/jwt": "11.0.2",
    "@nestjs/mapped-types": "2.1.1",
    "@nestjs/passport": "11.0.5",
-    "@nestjs/platform-fastify": "11.1.28",
-    "@nestjs/platform-socket.io": "11.1.28",
+    "@nestjs/platform-fastify": "11.1.27",
+    "@nestjs/platform-socket.io": "11.1.27",
    "@nestjs/schedule": "6.1.3",
    "@nestjs/terminus": "11.1.1",
    "@nestjs/throttler": "6.5.0",
-    "@nestjs/websockets": "11.1.28",
+    "@nestjs/websockets": "11.1.27",
    "@node-saml/passport-saml": "5.1.0",
    "@socket.io/redis-adapter": "8.3.0",
    "ai": "6.0.134",
@@ -88,10 +88,11 @@
    "kysely-migration-cli": "0.4.2",
    "kysely-postgres-js": "3.0.0",
    "ldapts": "8.1.7",
+    "lib0": "0.2.117",
    "mammoth": "1.12.0",
    "mime-types": "3.0.2",
-    "msgpackr": "1.11.9",
-    "nanoid": "5.1.16",
+    "msgpackr": "^1.11.9",
+    "nanoid": "5.1.7",
    "nestjs-cls": "6.2.0",
    "nestjs-kysely": "3.1.2",
    "nestjs-pino": "4.6.1",
@@ -102,7 +103,7 @@
    "passport-google-oauth20": "2.0.0",
    "passport-jwt": "4.0.1",
    "pg-tsquery": "8.4.2",
-    "pgvector": "0.2.1",
+    "pgvector": "^0.2.1",
    "pino-http": "11.0.0",
    "pino-pretty": "13.1.3",
    "postgres": "3.4.8",
@@ -117,8 +118,9 @@
    "stripe": "^17.7.0",
    "tlds": "1.261.0",
    "tmp-promise": "3.0.3",
+    "tseep": "1.3.1",
    "typesense": "3.0.5",
-    "undici": "7.29.0",
+    "undici": "7.28.0",
    "ws": "8.21.0",
    "yauzl": "3.4.0",
    "zod": "4.3.6"
@@ -15,7 +15,6 @@ import {
  RedisSyncExtension,
  SerializedHTTPRequest,
 } from './extensions/redis-sync';
-import { toWebRequest } from './extensions/redis-sync/redis-sync.types';
 import { WsSocketWrapper } from './extensions/redis-sync/ws-socket-wrapper';
 import RedisClient from 'ioredis';
 import { pack, unpack } from 'msgpackr';
@@ -99,36 +98,34 @@ export class CollaborationGateway {
      const serializedHTTPRequest = this.serializeRequest(request);
      const socketId = serializedHTTPRequest.headers['sec-websocket-key'];

+      // Create wrapper socket that only receives events via emit()
+      // This prevents double-handling since Hocuspocus won't listen to raw WebSocket events
      const wrappedSocket = new WsSocketWrapper(client);

      // Route through RedisSync extension (this calls handleConnection internally)
-      this.redisSync.onSocketOpen(wrappedSocket, serializedHTTPRequest);
+      this.redisSync.onSocketOpen(wrappedSocket as any, serializedHTTPRequest);

+      // Forward raw WebSocket messages to the extension
      client.on('message', (data: ArrayBuffer) => {
-        this.redisSync!.onSocketMessage(serializedHTTPRequest, data);
+        this.redisSync!.onSocketMessage(
+          wrappedSocket as any,
+          serializedHTTPRequest,
+          data,
+        );
      });

+      // Forward close events
      client.on('close', (code: number, reason: Buffer) => {
-        this.redisSync!.onSocketClose(
-          socketId,
-          code,
-          new Uint8Array(reason).buffer,
-        );
+        this.redisSync!.onSocketClose(socketId, code, reason.buffer as ArrayBuffer);
+      });
+
+      // Forward pong events for keepalive
+      client.on('pong', (data: Buffer) => {
+        wrappedSocket.emit('pong', data);
      });
    } else {
      // Fallback to direct Hocuspocus connection
-      const clientConnection = this.hocuspocus.handleConnection(
-        client,
-        toWebRequest(this.serializeRequest(request)),
-      );
-
-      client.on('message', (data: Buffer) => {
-        clientConnection.handleMessage(new Uint8Array(data));
-      });
-
-      client.on('close', (code: number, reason: Buffer) => {
-        clientConnection.handleClose({ code, reason: reason.toString() });
-      });
+      this.hocuspocus.handleConnection(client, request);
    }
  }

@@ -181,7 +178,6 @@ export class CollaborationGateway {

        if (this.hocuspocus.getDocumentsCount() === 0) resolve('');
        this.hocuspocus.closeConnections();
-        this.hocuspocus.flushPendingStores();
      } catch (error) {
        console.error(error);
      }
@@ -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,9 +45,6 @@ import {
  TransclusionSource,
  TransclusionReference,
  BaseEmbed,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 } from '@docmost/editor-ext';
 import { generateText, getSchema, JSONContent } from '@tiptap/core';
 import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
@@ -62,15 +58,11 @@ import { Logger } from '@nestjs/common';

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

 export function jsonToHtml(tiptapJson: any) {
@@ -96,7 +96,7 @@ export class PersistenceExtension implements Extension {
  }

  async onStoreDocument(data: onStoreDocumentPayload) {
-    const { documentName, document, lastContext } = data;
+    const { documentName, document, context } = data;

    const pageId = getPageId(documentName);

@@ -151,7 +151,7 @@ export class PersistenceExtension implements Extension {
            content: tiptapJson,
            textContent: textContent,
            ydoc: ydocState,
-            lastUpdatedById: lastContext.user.id,
+            lastUpdatedById: context.user.id,
            contributorIds: contributorIds,
          },
          pageId,
@@ -169,12 +169,12 @@ export class PersistenceExtension implements Extension {
        JSON.stringify({
          type: 'page.updated',
          updatedAt: new Date().toISOString(),
-          lastUpdatedById: lastContext?.user?.id,
-          lastUpdatedBy: lastContext?.user
+          lastUpdatedById: context?.user?.id,
+          lastUpdatedBy: context?.user
            ? {
-                id: lastContext.user?.id,
-                name: lastContext.user?.name,
-                avatarUrl: lastContext.user?.avatarUrl,
+                id: context.user?.id,
+                name: context.user?.name,
+                avatarUrl: context.user?.avatarUrl,
              }
            : undefined,
        }),
@@ -1,37 +1,61 @@
 import type RedisClient from 'ioredis';
-import type { WebSocketLike } from '@hocuspocus/server';
-import type { Pack, RSAMessageClose, RSAMessageSend } from './redis-sync.types';
+import { EventEmitter } from 'tseep';
+import type {
+  Pack,
+  RSAMessageClose,
+  RSAMessagePing,
+  RSAMessageSend,
+} from './redis-sync.types';

-// Stands in for the client WebSocket on the server that owns the document.
-// Outgoing traffic is relayed over redis to the origin server, which holds the real socket.
-export class CollabProxySocket implements WebSocketLike {
+export class CollabProxySocket extends EventEmitter {
  private readonly replyTo: string;
+  private readonly serverChannel: string;
  private readonly socketId: string;
  private pub: RedisClient;
  private readonly pack: Pack;
  readyState = 1;
-  onClose?: (code?: number, reason?: string) => void;

-  constructor(pub: RedisClient, pack: Pack, replyTo: string, socketId: string) {
+  constructor(
+    pub: RedisClient,
+    pack: Pack,
+    replyTo: string,
+    serverChannel: string,
+    socketId: string,
+  ) {
+    super();
    this.replyTo = replyTo;
    this.socketId = socketId;
+    this.serverChannel = serverChannel;
    this.pub = pub;
    this.pack = pack;
+    this.once('close', () => {
+      this.readyState = 3;
+    });
  }

-  private publish(msg: RSAMessageClose | RSAMessageSend) {
+  private publish(msg: RSAMessageClose | RSAMessagePing | RSAMessageSend) {
    this.pub.publish(this.replyTo, this.pack(msg));
  }

-  // The origin server already closed the real socket; stop relaying without echoing a close back
-  markClosed() {
-    this.readyState = 3;
-  }
-
  close(code?: number, reason?: string) {
    if (this.readyState !== 1) return;
-    this.readyState = 3;
-    this.onClose?.(code, reason);
+    const msg: RSAMessageClose = {
+      type: 'close',
+      code,
+      reason,
+      socketId: this.socketId,
+    };
+    this.publish(msg);
+  }
+
+  ping() {
+    if (this.readyState !== 1) return;
+    const msg: RSAMessagePing = {
+      type: 'ping',
+      socketId: this.socketId,
+      replyTo: this.serverChannel,
+    };
+    this.publish(msg);
  }

  send(message: Uint8Array) {
@@ -3,30 +3,27 @@ import {
  Extension,
  Hocuspocus,
  IncomingMessage,
+  afterUnloadDocumentPayload,
  onConfigurePayload,
  onLoadDocumentPayload,
-  afterUnloadDocumentPayload,
-  WebSocketLike,
 } from '@hocuspocus/server';
-import { ConnectionTimeout, Unauthorized } from '@hocuspocus/common';
 import RedisClient from 'ioredis';
+import { readVarString } from 'lib0/decoding.js';
 import { CollabProxySocket } from './collab-proxy-socket';
 import {
+  BaseWebSocket,
  Configuration,
  CustomEvents,
  Pack,
  RSAMessage,
-  RSAMessageClose,
  RSAMessageCloseProxy,
  RSAMessageCustomEventComplete,
  RSAMessageCustomEventStart,
+  RSAMessagePong,
  RSAMessageProxy,
  RSAMessageUnload,
  SerializedHTTPRequest,
  Unpack,
-  OriginConnection,
-  ProxyConnection,
-  toWebRequest,
 } from './redis-sync.types';

 export type { Pack, SerializedHTTPRequest } from './redis-sync.types';
@@ -41,10 +38,10 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
  private sub: RedisClient;
  private readonly pack: Pack;
  private readonly unpack: Unpack;
-  private originConnections: Record<SocketId, OriginConnection> = {};
+  private originSockets: Record<SocketId, BaseWebSocket> = {};
  private locks: Record<DocumentName, NodeJS.Timeout> = {};
  private lockPromises: Record<DocumentName, Promise<ServerId | null>> = {};
-  private proxyConnections: Record<SocketId, ProxyConnection> = {};
+  private proxySockets: Record<SocketId, CollabProxySocket> = {};
  private readonly prefix: string;
  private readonly lockPrefix: string;
  private readonly msgChannel: string;
@@ -57,9 +54,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
  // @ts-ignore
  private pendingReplies: Record<number, PromiseWithResolvers<any>['resolve']> =
    {};
-  private deriveContext: (
-    serializedHTTPRequest: SerializedHTTPRequest,
-  ) => Record<string, any>;

  constructor(configuration: Configuration<TCE>) {
    const {
@@ -71,7 +65,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      prefix,
      customEvents,
      customEventTTL,
-      deriveContext,
    } = configuration;
    this.pub = redis.duplicate();
    this.sub = redis.duplicate();
@@ -84,7 +77,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
    this.lockPrefix = `${this.prefix}Lock`;
    this.msgChannel = `${this.prefix}Msg`;
    this.customEvents = (customEvents as any) ?? ({} as any as CustomEvents);
-    this.deriveContext = deriveContext ?? (() => ({}));
    this.sub.subscribe(this.msgChannel, `${this.msgChannel}:${this.serverId}`);
    this.sub.on('messageBuffer', this.handleRedisMessage);
    this.pub.on('error', () => {});
@@ -95,63 +87,44 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
  }

  private closeProxy(socketId: string) {
-    const entry = this.proxyConnections[socketId];
-    if (entry) {
-      delete this.proxyConnections[socketId];
-      const { socket, clientConnection } = entry;
-      // The origin socket is already gone; don't echo a close message back
-      socket.markClosed();
-      clientConnection.handleClose({
-        code: 1000,
-        reason: 'provider_initiated',
-      });
+    const proxySocket = this.proxySockets[socketId];
+    if (proxySocket) {
+      proxySocket.emit(
+        'close',
+        1000,
+        Buffer.from('provider_initiated', 'utf-8'),
+      );
+      delete this.proxySockets[socketId];
    }
  }

+  private pongProxy(socketId: string) {
+    this.proxySockets[socketId]?.emit('pong');
+  }
+
  private handleProxyMessage(
    msg: Pick<RSAMessageProxy, 'replyTo' | 'message' | 'serializedHTTPRequest'>,
  ) {
    const { replyTo, message, serializedHTTPRequest } = msg;
    const { headers } = serializedHTTPRequest;
-    const socketId = headers['sec-websocket-key'];
-    let entry = this.proxyConnections[socketId];
-    if (!entry) {
-      const socket = new CollabProxySocket(
+    const socketId = headers['sec-websocket-key']!;
+    let socket = this.proxySockets[socketId];
+    if (!socket) {
+      socket = new CollabProxySocket(
        this.pub,
        this.pack,
        replyTo,
+        `${this.msgChannel}:${this.serverId}`,
        socketId,
      );
-      // A proxy connection with no live documents (client left the page, auth
-      // failed, or the origin server crashed) is reaped by hocuspocus' message
-      // timeout. Dispose it silently in that case: relaying the timeout close
-      // to the origin would kill the client's real socket, which may be busy
-      // serving other documents. Genuine protocol closes are still relayed.
-      socket.onClose = (code, reason) => {
-        delete this.proxyConnections[socketId];
-        if (code !== ConnectionTimeout.code) {
-          const msg: RSAMessageClose = {
-            type: 'close',
-            code,
-            reason,
-            socketId,
-          };
-          this.pub.publish(replyTo, this.pack(msg));
-        }
-      };
-      const clientConnection = this.instance.handleConnection(
-        socket,
-        toWebRequest(serializedHTTPRequest),
-        this.deriveContext(serializedHTTPRequest),
+      this.proxySockets[socketId] = socket;
+      this.instance.handleConnection(
+        socket as any,
+        serializedHTTPRequest as any,
+        {},
      );
-      entry = { clientConnection, socket };
-      this.proxyConnections[socketId] = entry;
    }
-    entry.clientConnection.handleMessage(message);
-  }
-
-  private getLock(documentName: string) {
-    return this.pub.get(this.getKey(documentName));
+    socket.emit('message', message);
  }

  private getOrClaimLock(documentName: string) {
@@ -193,6 +166,10 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      this.closeProxy(msg.socketId);
      return;
    }
+    if (type === 'pong') {
+      this.pongProxy(msg.socketId);
+      return;
+    }
    if (type === 'unload') {
      delete this.lockPromises[msg.documentName];
      return;
@@ -221,14 +198,22 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      return;
    }
    const { socketId } = msg;
-    const entry = this.originConnections[socketId];
-    if (!entry) {
+    const socket = this.originSockets[socketId];
+    if (!socket) {
      // origin socket already cleaned up
      return;
    }
-    const { socket } = entry;
    if (type === 'close') {
      socket.close(msg.code, msg.reason);
+    } else if (type === 'ping') {
+      // Reply instantly to the proxy socket, without forwarding to client
+      // The origin socket handles heartbeat for itself
+      const { replyTo, socketId } = msg;
+      const reply: RSAMessagePong = {
+        type: 'pong',
+        socketId,
+      };
+      this.pub.publish(`${replyTo}`, this.pack(reply));
    } else if (type === 'send') {
      socket.send(msg.message);
    }
@@ -266,8 +251,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
    eventName: TName,
    documentName: string,
    payload: any,
-    // if true, don't claim the lock. Useful for targeting pages that are currently open
-    onlyIfOpen = false,
  ) {
    const isDocLoadedOnInstance = this.instance.documents.has(documentName);

@@ -275,14 +258,7 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      return this.handleEventLocally(eventName, documentName, payload);
    }

-    const proxyTo = await (onlyIfOpen
-      ? this.getLock(documentName)
-      : this.getOrClaimLockThrottled(documentName));
-
-    if (!proxyTo && onlyIfOpen) {
-      return;
-    }
-
+    const proxyTo = await this.getOrClaimLockThrottled(documentName);
    if (proxyTo && proxyTo !== this.serverId) {
      ++this.replyIdCounter; // bug in biome thinks this.replyIdCounter is not used if written on the line below
      const replyId = this.replyIdCounter;
@@ -301,8 +277,7 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      const { promise, resolve, reject } = Promise.withResolvers();
      this.pendingReplies[replyId] = resolve;
      setTimeout(() => {
-        delete this.pendingReplies[replyId];
-        reject(new Error('TIMEOUT'));
+        reject('TIMEOUT');
      }, this.customEventTTL);
      return promise as Promise<ReturnType<TCE[TName]>>;
    }
@@ -321,59 +296,36 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {

  /* WebSocket Server Hooks */
  onSocketOpen(
-    ws: WebSocketLike,
+    ws: BaseWebSocket,
    serializedHTTPRequest: SerializedHTTPRequest,
+    context = {},
  ) {
-    const socketId = serializedHTTPRequest.headers['sec-websocket-key'];
-    const clientConnection = this.instance.handleConnection(
-      ws,
-      toWebRequest(serializedHTTPRequest),
-      this.deriveContext(serializedHTTPRequest),
+    const socketId = serializedHTTPRequest.headers['sec-websocket-key']!;
+    this.originSockets[socketId] = ws;
+    this.instance.handleConnection(
+      ws as any,
+      serializedHTTPRequest as any,
+      context,
    );
-    this.originConnections[socketId] = { clientConnection, socket: ws };
  }

  async onSocketMessage(
+    ws: BaseWebSocket,
    serializedHTTPRequest: SerializedHTTPRequest,
    detachableMsg: ArrayBuffer,
  ) {
-    const socketId = serializedHTTPRequest.headers['sec-websocket-key'];
-    const entry = this.originConnections[socketId];
-    if (!entry) return;
-    const { clientConnection } = entry;
-
-    let message: Uint8Array;
-    let documentName: string;
-    try {
-      message = new Uint8Array(detachableMsg.slice());
-      const tmpMsg = new IncomingMessage(detachableMsg);
-      const documentNameAndSessionId = tmpMsg.readVarString();
-      // session-aware providers suffix the documentName with \0sessionId
-      const sepIdx = documentNameAndSessionId.indexOf('\0');
-      documentName =
-        sepIdx === -1
-          ? documentNameAndSessionId
-          : documentNameAndSessionId.slice(0, sepIdx);
-    } catch (error) {
-      entry.socket.close(Unauthorized.code, Unauthorized.reason);
-      return;
-    }
+    const message = new Uint8Array(detachableMsg.slice());
+    const tmpMsg = new IncomingMessage(detachableMsg);
+    const documentName = readVarString(tmpMsg.decoder);
    const isDocLoadedOnInstance = this.instance.documents.has(documentName);

    if (isDocLoadedOnInstance) {
-      clientConnection.handleMessage(message);
+      ws.emit('message', message);
      return;
    }

    const proxyTo = await this.getOrClaimLockThrottled(documentName);
    if (proxyTo && proxyTo !== this.serverId) {
-      // Proxied messages bypass handleMessage, so refresh the connection's
-      // liveness fields manually or hocuspocus' message timeout would reap the
-      // real socket every `timeout` ms. connectionEstablishedAt is the
-      // reference while unauthenticated (auth for remote docs is proxied too)
-      // and is private upstream.
-      clientConnection.lastMessageReceivedAt = Date.now();
-      (clientConnection as any).connectionEstablishedAt = Date.now();
      // another server owns the doc
      const proxyMessage: RSAMessageProxy = {
        serializedHTTPRequest: serializedHTTPRequest,
@@ -386,17 +338,16 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      return;
    }
    // This server owns the document, but hocuspocus hasn't loaded it yet
-    clientConnection.handleMessage(message);
+    ws.emit('message', message);
  }

  onSocketClose(socketId: string, code?: number, reason?: ArrayBuffer) {
-    const entry = this.originConnections[socketId];
-    if (!entry) return;
-    delete this.originConnections[socketId];
-    entry.clientConnection.handleClose({
-      code: code ?? 1000,
-      reason: reason ? Buffer.from(reason).toString() : '',
-    });
+    const socket = this.originSockets[socketId];
+    if (!socket) return;
+    // at this point the socket is considered GC'd and we cannot call close
+    // The origin socket did not set up any connections for the proxy, so none of the hooks will work if we just emit
+    socket?.emit('close', code, reason);
+    delete this.originSockets[socketId];
    const msg: RSAMessageCloseProxy = { type: 'closeProxy', socketId };
    this.pub.publish(this.msgChannel, this.pack(msg)).catch(() => {});
  }
@@ -421,7 +372,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
  }

  async onDestroy() {
-    this.pendingReplies = {};
    this.pub.disconnect(false);
    this.sub.disconnect(false);
  }
@@ -1,13 +1,12 @@
+import EventEmitter from 'node:events';
 import { IncomingHttpHeaders } from 'node:http2';
 import RedisClient from 'ioredis';
-import { CollabProxySocket } from './collab-proxy-socket';
-import { type Hocuspocus, type WebSocketLike } from '@hocuspocus/server';

 export type SecondParam<T> = T extends (
-  arg1: any,
+  arg1: unknown,
  arg2: infer A,
-  ...args: any[]
-) => any
+  ...args: unknown[]
+) => unknown
  ? A
  : never;

@@ -42,6 +41,17 @@ export type RSAMessageClose = {
  socketId: string;
 };

+export type RSAMessagePing = {
+  type: 'ping';
+  socketId: string;
+  replyTo: string;
+};
+
+export type RSAMessagePong = {
+  type: 'pong';
+  socketId: string;
+};
+
 export type RSAMessageSend = {
  type: 'send';
  // @ts-ignore
@@ -49,7 +59,7 @@ export type RSAMessageSend = {
  socketId: string;
 };

-export type RSAMessageCustomEventStart<TName = string, TPayload = any> = {
+export type RSAMessageCustomEventStart<TName = string, TPayload = unknown> = {
  type: 'customEventStart';
  documentName: string;
  eventName: TName;
@@ -61,7 +71,7 @@ export type RSAMessageCustomEventStart<TName = string, TPayload = any> = {
 export type RSAMessageCustomEventComplete = {
  type: 'customEventComplete';
  replyId: number;
-  payload: any;
+  payload: unknown;
 };

 export type RSAMessage =
@@ -69,6 +79,8 @@ export type RSAMessage =
  | RSAMessageCloseProxy
  | RSAMessageUnload
  | RSAMessageClose
+  | RSAMessagePing
+  | RSAMessagePong
  | RSAMessageSend
  | RSAMessageCustomEventStart
  | RSAMessageCustomEventComplete;
@@ -87,20 +99,9 @@ type CustomEventName = string;

 export type CustomEvents = Record<
  CustomEventName,
-  (documentName: string, payload: any) => Promise<any>
+  (documentName: string, payload: unknown) => Promise<unknown>
 >;

-// Not exported by @hocuspocus/server
-export type ClientConnection = ReturnType<Hocuspocus['handleConnection']>;
-export type OriginConnection = {
-  clientConnection: ClientConnection;
-  socket: WebSocketLike;
-};
-export type ProxyConnection = {
-  clientConnection: ClientConnection;
-  socket: CollabProxySocket;
-};
-
 export interface Configuration<TCE> {
  redis: RedisClient;
  pack: Pack;
@@ -110,29 +111,11 @@ export interface Configuration<TCE> {
  customEventTTL?: number;
  prefix?: string;
  customEvents?: TCE;
-  // Derive the hocuspocus context once per socket instead of re-deriving it in a
-  // per-document hook like onConnect/onAuthenticate. Runs on the origin server when
-  // the socket opens and on the doc owner when the first proxied message arrives.
-  deriveContext?: (
-    serializedHTTPRequest: SerializedHTTPRequest,
-  ) => Record<string, any>;
 }

-// Hocuspocus expects a web-standard Request, so rehydrate one from what crossed the wire
-export const toWebRequest = (serializedHTTPRequest: SerializedHTTPRequest) => {
-  const { method, url, headers } = serializedHTTPRequest;
-  const webHeaders = new Headers();
-  Object.entries(headers).forEach(([name, value]) => {
-    if (Array.isArray(value)) {
-      value.forEach((v) => {
-        webHeaders.append(name, v);
-      });
-    } else if (value !== undefined) {
-      webHeaders.set(name, value);
-    }
-  });
-  return new Request(new URL(url, 'http://localhost'), {
-    method,
-    headers: webHeaders,
-  });
+export type BaseWebSocket = EventEmitter & {
+  readyState: number;
+  close(code?: number, reason?: string): void;
+  ping(): void;
+  send(message: Uint8Array): void;
 };
@@ -1,17 +1,20 @@
+import { EventEmitter } from 'events';
 import type WebSocket from 'ws';
-import type { WebSocketLike } from '@hocuspocus/server';

 /**
- * Wrapper around ws WebSocket that Hocuspocus only writes to.
- * Incoming socket events are forwarded separately by the gateway,
- * which prevents double-handling with RedisSyncExtension.
+ * Wrapper around ws WebSocket that only receives events via emit().
+ * This prevents double-handling when used with RedisSyncExtension.
 */
-export class WsSocketWrapper implements WebSocketLike {
+export class WsSocketWrapper extends EventEmitter {
  private ws: WebSocket;
  readyState = 1;

  constructor(ws: WebSocket) {
+    super();
    this.ws = ws;
+    this.once('close', () => {
+      this.readyState = 3;
+    });
  }

  close(code?: number, reason?: string) {
@@ -24,6 +27,15 @@ export class WsSocketWrapper implements WebSocketLike {
    }
  }

+  ping() {
+    if (this.readyState !== 1) return;
+    try {
+      this.ws.ping();
+    } catch (e) {
+      // Socket already closed
+    }
+  }
+
  send(message: Uint8Array) {
    if (this.readyState !== 1) return;
    try {
@@ -810,10 +810,6 @@ export class PageService {
      throw new BadRequestException('Invalid move position');
    }

-    if (dto.parentPageId && dto.parentPageId === dto.pageId) {
-      throw new BadRequestException('A page cannot be its own parent');
-    }
-
    let parentPageId = null;
    if (movedPage.parentPageId === dto.parentPageId) {
      parentPageId = undefined;
@@ -15,21 +15,13 @@ import { getMimeType } from '../../../common/helpers';
 import { Upload } from '@aws-sdk/lib-storage';
 import { Logger } from '@nestjs/common';

-const S3_MAX_SOCKETS = parseInt(process.env.AWS_S3_MAX_SOCKETS) || 200;
-
 export class S3Driver implements StorageDriver {
  private readonly s3Client: S3Client;
  private readonly config: S3StorageConfig;

  constructor(config: S3StorageConfig) {
-    this.config = {
-      ...config,
-      requestHandler: {
-        httpAgent: { maxSockets: S3_MAX_SOCKETS },
-        httpsAgent: { maxSockets: S3_MAX_SOCKETS },
-      },
-    };
-    this.s3Client = new S3Client(this.config as any);
+    this.config = config;
+    this.s3Client = new S3Client(config as any);
  }

  async upload(filePath: string, file: Buffer | Readable): Promise<void> {
@@ -23,49 +23,47 @@
    "@casl/ability": "6.8.0",
    "@docmost/editor-ext": "workspace:*",
    "@floating-ui/dom": "1.7.3",
-    "@hocuspocus/common": "4.5.0",
-    "@hocuspocus/provider": "4.5.0",
-    "@hocuspocus/provider-react": "4.5.0",
-    "@hocuspocus/server": "4.5.0",
-    "@hocuspocus/transformer": "4.5.0",
+    "@hocuspocus/provider": "3.4.4",
+    "@hocuspocus/server": "3.4.4",
+    "@hocuspocus/transformer": "3.4.4",
    "@joplin/turndown": "4.0.82",
    "@joplin/turndown-plugin-gfm": "1.0.64",
    "@sindresorhus/slugify": "3.0.0",
-    "@tiptap/core": "3.29.2",
-    "@tiptap/extension-audio": "3.29.2",
-    "@tiptap/extension-code-block": "3.29.2",
-    "@tiptap/extension-collaboration": "3.29.2",
-    "@tiptap/extension-collaboration-caret": "3.29.2",
-    "@tiptap/extension-color": "3.29.2",
-    "@tiptap/extension-document": "3.29.2",
-    "@tiptap/extension-heading": "3.29.2",
-    "@tiptap/extension-highlight": "3.29.2",
-    "@tiptap/extension-history": "3.29.2",
-    "@tiptap/extension-image": "3.29.2",
-    "@tiptap/extension-link": "3.29.2",
-    "@tiptap/extension-list": "3.29.2",
-    "@tiptap/extension-placeholder": "3.29.2",
-    "@tiptap/extension-subscript": "3.29.2",
-    "@tiptap/extension-superscript": "3.29.2",
-    "@tiptap/extension-table": "3.29.2",
-    "@tiptap/extension-text": "3.29.2",
-    "@tiptap/extension-text-align": "3.29.2",
-    "@tiptap/extension-text-style": "3.29.2",
-    "@tiptap/extension-typography": "3.29.2",
-    "@tiptap/extension-unique-id": "3.29.2",
-    "@tiptap/extension-youtube": "3.29.2",
-    "@tiptap/html": "3.29.2",
-    "@tiptap/pm": "3.29.2",
-    "@tiptap/react": "3.29.2",
-    "@tiptap/starter-kit": "3.29.2",
-    "@tiptap/suggestion": "3.29.2",
-    "@tiptap/y-tiptap": "3.0.7",
+    "@tiptap/core": "3.27.1",
+    "@tiptap/extension-audio": "3.27.1",
+    "@tiptap/extension-code-block": "3.27.1",
+    "@tiptap/extension-collaboration": "3.27.1",
+    "@tiptap/extension-collaboration-caret": "3.27.1",
+    "@tiptap/extension-color": "3.27.1",
+    "@tiptap/extension-document": "3.27.1",
+    "@tiptap/extension-heading": "3.27.1",
+    "@tiptap/extension-highlight": "3.27.1",
+    "@tiptap/extension-history": "3.27.1",
+    "@tiptap/extension-image": "3.27.1",
+    "@tiptap/extension-link": "3.27.1",
+    "@tiptap/extension-list": "3.27.1",
+    "@tiptap/extension-placeholder": "3.27.1",
+    "@tiptap/extension-subscript": "3.27.1",
+    "@tiptap/extension-superscript": "3.27.1",
+    "@tiptap/extension-table": "3.27.1",
+    "@tiptap/extension-text": "3.27.1",
+    "@tiptap/extension-text-align": "3.27.1",
+    "@tiptap/extension-text-style": "3.27.1",
+    "@tiptap/extension-typography": "3.27.1",
+    "@tiptap/extension-unique-id": "3.27.1",
+    "@tiptap/extension-youtube": "3.27.1",
+    "@tiptap/html": "3.27.1",
+    "@tiptap/pm": "3.27.1",
+    "@tiptap/react": "3.27.1",
+    "@tiptap/starter-kit": "3.27.1",
+    "@tiptap/suggestion": "3.27.1",
+    "@tiptap/y-tiptap": "3.0.5",
    "bytes": "3.1.2",
    "cross-env": "10.1.0",
    "date-fns": "4.1.0",
    "diff": "8.0.3",
    "docx": "9.7.1",
-    "dompurify": "3.4.13",
+    "dompurify": "3.4.11",
    "fractional-indexing-jittered": "1.0.0",
    "highlight.js": "11.11.1",
    "image-dimensions": "2.5.0",
@@ -81,12 +79,12 @@
    "yjs": "^13.6.30"
  },
  "devDependencies": {
-    "@nx/js": "23.1.1",
+    "@nx/js": "22.6.1",
    "@types/bytes": "3.1.5",
    "@types/qrcode": "1.5.6",
    "@types/turndown": "5.0.6",
-    "concurrently": "10.0.4",
-    "nx": "23.1.1",
+    "concurrently": "9.2.3",
+    "nx": "22.6.1",
    "tsx": "^4.21.0"
  },
  "workspaces": {
@@ -95,5 +93,5 @@
      "packages/*"
    ]
  },
-  "packageManager": "pnpm@11.15.1"
+  "packageManager": "pnpm@11.13.0"
 }
@@ -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,27 +168,6 @@ 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() {},
@@ -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,
@@ -422,8 +422,6 @@ export const SearchAndReplace = Extension.create<
        state: {
          init: () => DecorationSet.empty,
          apply({ doc, docChanged }, oldState) {
-            const storage = editor.storage.searchAndReplace;
-            if (!storage) return oldState;
            const {
              searchTerm,
              lastSearchTerm,
@@ -431,7 +429,7 @@ export const SearchAndReplace = Extension.create<
              lastCaseSensitive,
              resultIndex,
              lastResultIndex,
-            } = storage;
+            } = editor.storage.searchAndReplace;

            if (
              !docChanged &&
@@ -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 })
          },
        },
@@ -5,30 +5,56 @@ patchedDependencies:
  scimmy@1.3.5: patches/scimmy@1.3.5.patch
 overrides:
  prosemirror-changeset: 2.4.0
+  y-prosemirror: 1.3.7
  glob: 13.0.6
  ws: 8.21.0
-  dompurify: 3.4.13
-  mermaid: 11.16.1
-  undici: 7.29.0
+  dompurify: 3.4.11
  tmp: 0.2.7
-  nanoid@^3: 3.3.17
+  hono: 4.12.25
+  mermaid: 11.15.0
+  nanoid@^3: 3.3.8
+  socket.io-parser: 4.2.6
+  serialize-javascript: 7.0.3
  lodash-es: 4.18.1
+  lodash: 4.18.1
+  '@hono/node-server': 1.19.13
+  undici: 7.28.0
+  ajv@^6: 6.14.0
+  ajv@^8: 8.18.0
+  underscore: 1.13.8
+  immutable: 4.3.8
  express-rate-limit: 8.2.2
+  minimatch@^3: 3.1.5
+  minimatch@^5: 5.1.8
  flatted: 3.4.2
-  find-my-way: 9.7.0
+  picomatch@<2.3.2: 2.3.2
+  picomatch@>=4.0.0 <4.0.4: 4.0.4
+  fastify: 5.8.5
+  yaml@>=1.0.0 <1.10.3: 1.10.3
  yaml@>=2.0.0 <2.8.3: 2.8.3
-  brace-expansion@^5: 5.0.9
-  axios: 1.18.1
-  ip-address: 10.3.1
-  fast-uri: 3.1.5
+  path-to-regexp@^8: 8.4.0
+  brace-expansion@^5: 5.0.6
+  '@xmldom/xmldom': 0.8.13
+  handlebars: 4.7.9
+  axios: 1.16.0
+  langsmith: 0.7.0
+  follow-redirects: 1.16.0
+  protobufjs: 7.5.8
+  ip-address: 10.1.1
+  fast-uri: 3.1.3
  form-data@>=4.0.0 <4.0.6: 4.0.6
-  nanoid@>=4.0.0 <5.1.16: 5.1.16
+  nanoid@>=4.0.0 <5.0.9: 5.1.16
+  qs: 6.15.3
  esbuild@>=0.27.3 <0.28.1: 0.28.1
+  '@babel/core@<=7.29.0': 7.29.7
  '@opentelemetry/core@>=2.0.0 <2.8.0': 2.9.0
-  js-yaml@>=3.0.0 <3.15.1: 3.15.1
-  js-yaml@>=4.0.0 <4.3.1: 4.3.1
+  '@babel/plugin-transform-modules-systemjs@<=7.29.3': 7.29.7
+  brace-expansion@<1.1.13: 1.1.15
+  brace-expansion@>=2.0.0 <2.0.3: 2.0.3
+  js-yaml@>=3.0.0 <3.15.0: 3.15.0
+  js-yaml@>=4.0.0 <=4.1.1: 4.3.0
 shamefullyHoist: true
-minimumReleaseAge: 4320
+minimumReleaseAge: 5760
 allowBuilds:
  '@swc/core': true
  bcrypt: true
Author	SHA1	Message	Date
Philipinho	68871510d8	cleanup	2026-07-17 14:01:39 +01:00
Philipinho	92b895bcbb	dev package overides	2026-07-15 17:11:21 +01:00
Philipinho	7a9eb16d77	prod package overrides	2026-07-15 17:10:50 +01:00
Philipinho	698f02e4b8	Node 26; pnpm 11	2026-07-15 16:56:27 +01:00
Philipinho	c216a366c5	chore: set minimum age and allowedBuilds	2026-07-15 16:55:10 +01:00
Philipinho	a29b3c8615	chore: pnpm 11	2026-07-15 14:24:50 +01:00