cleanup

Dockerfile

@@ -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
 
@@ -42,7 +42,7 @@ RUN chown -R node:node /app
 
 USER node
 
-RUN pnpm install --frozen-lockfile --prod && rm -rf /home/node/.cache/pnpm
+RUN pnpm install --frozen-lockfile --prod
 
 RUN mkdir -p /app/data/storage
 

apps/client/package.json

@@ -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.18",
+    "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",

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

@@ -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.",
@@ -1291,16 +1289,5 @@
   "{{count}} rows deleted_one": "1 row deleted",
   "{{count}} rows deleted_other": "{{count}} rows deleted",
   "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected",
+  "{{count}} selected_other": "{{count}} selected"
-  "Compare": "Compare",
-  "Compare versions": "Compare versions",
-  "Select version from {{date}}": "Select version from {{date}}",
-  "Version actions for {{date}}": "Version actions for {{date}}",
-  "Comparing {{newer}} and {{older}}": "Comparing {{newer}} and {{older}}",
-  "Exit compare": "Exit compare",
-  "Search attachments...": "Search attachments...",
-  "Error loading attachments.": "Error loading attachments.",
-  "No attachments on this page yet.": "No attachments on this page yet.",
-  "Uploaded by {{name}}": "Uploaded by {{name}}",
-  "Download {{name}}": "Download {{name}}"
 }

apps/client/src/components/ui/document-title.test.tsx

@@ -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");
-  });
-});

apps/client/src/components/ui/document-title.tsx

@@ -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>
-  );
-}

apps/client/src/components/ui/error-404.tsx

@@ -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}>

apps/client/src/ee/ai-chat/components/chat-input.tsx

@@ -255,7 +255,6 @@ export default function ChatInput({
     },
     content: "",
     editable: true,
-    textDirection: "auto",
     immediatelyRender: true,
     shouldRerenderOnTransaction: false,
     autofocus: autofocus ? "end" : false,

apps/client/src/ee/ai/pages/ai-settings.tsx

@@ -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}>

apps/client/src/ee/ai/services/ai-search-service.ts

@@ -15,14 +15,6 @@ export interface IAiSearchResponse {
   }>;
 }
 
-export async function hintVectorCache(): Promise<void> {
-  try {
-    await api.post("/ai/vector-cache-hint");
-  } catch {
-    // best-effort cache hint
-  }
-}
-
 export async function aiAnswers(
   params: IPageSearchParams,
   onChunk?: (chunk: { content?: string; sources?: any[] }) => void,

apps/client/src/ee/api-key/pages/user-api-keys.tsx

@@ -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")} />
 

apps/client/src/ee/api-key/pages/workspace-api-keys.tsx

@@ -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")} />
 

apps/client/src/ee/audit/pages/audit-logs.tsx

@@ -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")} />
 

apps/client/src/ee/billing/pages/billing.tsx

@@ -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 />

apps/client/src/ee/licence/pages/license.tsx

@@ -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 />

apps/client/src/ee/page-verification/pages/verified-pages.tsx

@@ -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")} />
 

apps/client/src/ee/pages/cloud-login.tsx

@@ -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 />
     </>

apps/client/src/ee/pages/create-workspace.tsx

@@ -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 />
     </>
   );

apps/client/src/ee/security/pages/security.tsx

@@ -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 />

apps/client/src/ee/template/components/readonly-template-editor.tsx

@@ -41,7 +41,6 @@ export default function ReadonlyTemplateEditor({
       <EditorProvider
         editable={false}
         immediatelyRender={true}
-        textDirection="auto"
         extensions={extensions}
         content={template.content}
       />

apps/client/src/ee/template/pages/template-editor.tsx

@@ -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();
@@ -87,7 +88,6 @@ export default function TemplateEditor() {
   const editor = useEditor({
     extensions: templateExtensions,
     content: "",
-    textDirection: "auto",
     editorProps: {
       scrollThreshold: 80,
       scrollMargin: 80,
@@ -247,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 />

apps/client/src/ee/template/pages/template-list.tsx

@@ -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">

apps/client/src/features/attachments/components/attachment-file-icon.tsx

@@ -1,59 +0,0 @@
-import { ThemeIcon } from "@mantine/core";
-import {
-  IconFile,
-  IconFileTypeCsv,
-  IconFileTypeDocx,
-  IconFileTypePdf,
-  IconFileTypePpt,
-  IconFileTypeXls,
-  IconFileZip,
-  IconMovie,
-  IconMusic,
-  IconPhoto,
-  type Icon,
-} from "@tabler/icons-react";
-
-const EXT_ICONS: Record<string, { icon: Icon; color: string }> = {
-  ".pdf": { icon: IconFileTypePdf, color: "red" },
-  ".doc": { icon: IconFileTypeDocx, color: "blue" },
-  ".docx": { icon: IconFileTypeDocx, color: "blue" },
-  ".xls": { icon: IconFileTypeXls, color: "teal" },
-  ".xlsx": { icon: IconFileTypeXls, color: "teal" },
-  ".csv": { icon: IconFileTypeCsv, color: "teal" },
-  ".ppt": { icon: IconFileTypePpt, color: "orange" },
-  ".pptx": { icon: IconFileTypePpt, color: "orange" },
-  ".zip": { icon: IconFileZip, color: "gray" },
-  ".rar": { icon: IconFileZip, color: "gray" },
-  ".7z": { icon: IconFileZip, color: "gray" },
-  ".tar": { icon: IconFileZip, color: "gray" },
-  ".gz": { icon: IconFileZip, color: "gray" },
-};
-
-const MIME_ICONS: Array<{ prefix: string; icon: Icon; color: string }> = [
-  { prefix: "image/", icon: IconPhoto, color: "grape" },
-  { prefix: "video/", icon: IconMovie, color: "violet" },
-  { prefix: "audio/", icon: IconMusic, color: "pink" },
-];
-
-interface AttachmentFileIconProps {
-  fileExt?: string;
-  mimeType?: string;
-}
-
-export function AttachmentFileIcon({
-  fileExt,
-  mimeType,
-}: AttachmentFileIconProps) {
-  const byExt = fileExt ? EXT_ICONS[fileExt.toLowerCase()] : undefined;
-  const byMime = mimeType
-    ? MIME_ICONS.find((entry) => mimeType.startsWith(entry.prefix))
-    : undefined;
-  const { icon: FileIcon, color } = byExt ??
-    byMime ?? { icon: IconFile, color: "gray" };
-
-  return (
-    <ThemeIcon variant="light" color={color} size={40} radius="md">
-      <FileIcon size={22} stroke={1.5} />
-    </ThemeIcon>
-  );
-}

apps/client/src/features/attachments/components/page-attachments-modal.tsx

@@ -1,191 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import {
-  ActionIcon,
-  Anchor,
-  Center,
-  Group,
-  Loader,
-  Modal,
-  ScrollArea,
-  Text,
-  Tooltip,
-} from "@mantine/core";
-import { IconDownload } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { SearchInput } from "@/components/common/search-input.tsx";
-import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import { usePageAttachmentsQuery } from "@/features/attachments/queries/attachment-query.ts";
-import { IPageAttachment } from "@/features/attachments/types/attachment.types.ts";
-import { AttachmentFileIcon } from "@/features/attachments/components/attachment-file-icon.tsx";
-import { formatBytes } from "@/lib";
-import { getFileUrl } from "@/lib/config.ts";
-import { formattedDate } from "@/lib/time.ts";
-
-interface PageAttachmentsModalProps {
-  pageId: string;
-  open: boolean;
-  onClose: () => void;
-}
-
-export default function PageAttachmentsModal({
-  pageId,
-  open,
-  onClose,
-}: PageAttachmentsModalProps) {
-  const { t } = useTranslation();
-
-  return (
-    <Modal
-      opened={open}
-      onClose={onClose}
-      title={t("Attachments")}
-      size={800}
-      closeButtonProps={{ "aria-label": t("Close") }}
-    >
-      <PageAttachmentsList pageId={pageId} />
-    </Modal>
-  );
-}
-
-function PageAttachmentsList({ pageId }: { pageId: string }) {
-  const { t } = useTranslation();
-  const [search, setSearch] = useState("");
-  const {
-    data,
-    isLoading,
-    isError,
-    isFetching,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
-  } = usePageAttachmentsQuery(pageId, search);
-
-  const attachments = useMemo(
-    () => data?.pages.flatMap((page) => page.items) ?? [],
-    [data],
-  );
-
-  const loadMoreRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const sentinel = loadMoreRef.current;
-    if (!sentinel || !hasNextPage) return;
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0].isIntersecting && !isFetching) {
-          fetchNextPage();
-        }
-      },
-      { threshold: 0.1 },
-    );
-
-    observer.observe(sentinel);
-    return () => observer.disconnect();
-  }, [fetchNextPage, hasNextPage, isFetching]);
-
-  const handleSearch = useCallback((value: string) => setSearch(value), []);
-
-  return (
-    <>
-      <SearchInput
-        onSearch={handleSearch}
-        placeholder={t("Search attachments...")}
-      />
-
-      {isLoading ? (
-        <Center py="xl">
-          <Loader size="sm" />
-        </Center>
-      ) : isError ? (
-        <Center py="xl">
-          <Text size="sm" c="dimmed">
-            {t("Error loading attachments.")}
-          </Text>
-        </Center>
-      ) : attachments.length === 0 ? (
-        <Center py="xl">
-          <Text size="sm" c="dimmed">
-            {search
-              ? t("No results found")
-              : t("No attachments on this page yet.")}
-          </Text>
-        </Center>
-      ) : (
-        <ScrollArea.Autosize mah={480} type="scroll" scrollbarSize={5}>
-          {attachments.map((attachment) => (
-            <AttachmentRow key={attachment.id} attachment={attachment} />
-          ))}
-          {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
-          {isFetchingNextPage && (
-            <Center py="sm">
-              <Loader size="sm" />
-            </Center>
-          )}
-        </ScrollArea.Autosize>
-      )}
-    </>
-  );
-}
-
-function AttachmentRow({ attachment }: { attachment: IPageAttachment }) {
-  const { t } = useTranslation();
-  const fileUrl = getFileUrl(attachment.url);
-
-  return (
-    <Group wrap="nowrap" gap="md" py="sm" pr="xs">
-      <AttachmentFileIcon
-        fileExt={attachment.fileExt}
-        mimeType={attachment.mimeType}
-      />
-
-      <div style={{ flex: 1, minWidth: 0 }}>
-        <Anchor
-          href={fileUrl}
-          target="_blank"
-          rel="noopener noreferrer"
-          size="sm"
-          fw={500}
-          c="inherit"
-          truncate="end"
-          style={{ display: "block" }}
-        >
-          {attachment.fileName}
-        </Anchor>
-        <Text size="xs" c="dimmed" mt={2} truncate="end">
-          {formatBytes(Number(attachment.fileSize))}
-          {" · "}
-          {formattedDate(new Date(attachment.createdAt))}
-        </Text>
-      </div>
-
-      {attachment.creator && (
-        <Tooltip
-          label={t("Uploaded by {{name}}", { name: attachment.creator.name })}
-          withArrow
-        >
-          <CustomAvatar
-            avatarUrl={attachment.creator.avatarUrl}
-            name={attachment.creator.name}
-            size="sm"
-          />
-        </Tooltip>
-      )}
-
-      <Tooltip label={t("Download attachment")} withArrow>
-        <ActionIcon
-          component="a"
-          href={fileUrl}
-          download={attachment.fileName}
-          target="_blank"
-          rel="noopener noreferrer"
-          variant="subtle"
-          color="gray"
-          aria-label={t("Download {{name}}", { name: attachment.fileName })}
-        >
-          <IconDownload size={18} />
-        </ActionIcon>
-      </Tooltip>
-    </Group>
-  );
-}

apps/client/src/features/attachments/queries/attachment-query.ts

@@ -1,25 +0,0 @@
-import {
-  InfiniteData,
-  keepPreviousData,
-  useInfiniteQuery,
-  UseInfiniteQueryResult,
-} from "@tanstack/react-query";
-import { getPageAttachments } from "@/features/attachments/services/attachment-service.ts";
-import { IPageAttachment } from "@/features/attachments/types/attachment.types.ts";
-import { IPagination } from "@/lib/types.ts";
-
-export function usePageAttachmentsQuery(
-  pageId: string,
-  search?: string,
-): UseInfiniteQueryResult<InfiniteData<IPagination<IPageAttachment>, unknown>> {
-  return useInfiniteQuery({
-    queryKey: ["page-attachments", pageId, search],
-    queryFn: ({ pageParam }) =>
-      getPageAttachments(pageId, { cursor: pageParam, query: search }),
-    enabled: !!pageId,
-    gcTime: 0,
-    placeholderData: keepPreviousData,
-    initialPageParam: undefined,
-    getNextPageParam: (lastPage) => lastPage.meta?.nextCursor ?? undefined,
-  });
-}

apps/client/src/features/attachments/services/attachment-service.ts

@@ -3,17 +3,7 @@ import loadImage from "blueimp-load-image";
 import {
   AvatarIconType,
   IAttachment,
-  IPageAttachment,
 } from "@/features/attachments/types/attachment.types.ts";
-import { IPagination, QueryParams } from "@/lib/types.ts";
-
-export async function getPageAttachments(
-  pageId: string,
-  params?: QueryParams,
-): Promise<IPagination<IPageAttachment>> {
-  const req = await api.post("/pages/attachments", { pageId, ...params });
-  return req.data;
-}
 
 async function compressAndResizeIcon(
   file: File,

apps/client/src/features/attachments/services/index.ts

@@ -1,5 +1,4 @@
 export {
-  getPageAttachments,
   uploadIcon,
   uploadUserAvatar,
   uploadSpaceIcon,

apps/client/src/features/attachments/types/attachment.types.ts

@@ -15,15 +15,6 @@ export interface IAttachment {
   deletedAt: string | null;
 }
 
-export interface IPageAttachment extends IAttachment {
-  url: string;
-  creator: {
-    id: string;
-    name: string;
-    avatarUrl: string | null;
-  } | null;
-}
-
 export enum AvatarIconType {
   AVATAR = "avatar",
   SPACE_ICON = "space-icon",

apps/client/src/features/comment/components/comment-editor.tsx

@@ -103,7 +103,6 @@ const CommentEditor = forwardRef(
       },
       content: defaultContent,
       editable,
-      textDirection: "auto",
       immediatelyRender: true,
       shouldRerenderOnTransaction: false,
       autofocus: (autofocus && "end") || false,

apps/client/src/features/editor/collab-socket.ts

@@ -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);
-}

apps/client/src/features/editor/components/fixed-toolbar/fixed-toolbar.module.css

@@ -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));

apps/client/src/features/editor/components/fixed-toolbar/fixed-toolbar.tsx

@@ -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,8 +49,6 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
               <div className={classes.divider} />
             </>
           )} */}
-          {editor && state && (
-            <>
           <BlockTypeGroup editor={editor} />
           <div className={classes.divider} />
           <InlineMarksGroup editor={editor} state={state} />
@@ -65,8 +65,6 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
           <MoreInsertsGroup editor={editor} templateMode={templateMode} />
           <div className={classes.divider} />
           <HistoryGroup editor={editor} state={state} />
-            </>
-          )}
         </div>
       </div>
       <div className={classes.spacer} aria-hidden />

apps/client/src/features/editor/components/fixed-toolbar/groups/more-inserts-group.tsx

@@ -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>
   );

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

@@ -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.",

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

@@ -40,7 +40,6 @@ export default function TransclusionContent({ content }: Props) {
       <EditorProvider
         editable={false}
         immediatelyRender={true}
-        textDirection="auto"
         extensions={extensions}
         content={content as any}
       />

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

@@ -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, CharacterCount, UndoRedo } from "@tiptap/extensions";
-import { Placeholder } from "@/features/editor/extensions/placeholder";
 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,20 +194,17 @@ export const mainExtensions = [
         return i18n.t("Toggle title");
       }
       if (node.type.name === "paragraph") {
-        const doc = editor.state.doc;
+        const $pos = editor.state.doc.resolve(pos);
-        if (pos >= 0 && pos <= doc.content.size) {
+        const parentName = $pos.parent.type.name;
-          const parentName = doc.resolve(pos).parent.type.name;
         if (
           parentName === "column" ||
           parentName === "tableCell" ||
           parentName === "tableHeader" ||
           parentName === "callout" ||
-            parentName === "blockquote" ||
+          parentName === "blockquote"
-            parentName === "footnote"
         ) {
           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: [],
   }),

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

@@ -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);
-          },
-        },
-      }),
-    ];
-  },
-});

apps/client/src/features/editor/hooks/use-collaboration-url.ts

@@ -0,0 +1,7 @@
+import { getCollaborationUrl } from "@/lib/config.ts";
+
+const useCollaborationURL = (): string => {
+  return getCollaborationUrl();
+};
+
+export default useCollaborationURL;

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

@@ -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 collaborationURL = useCollaborationUrl();
-  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 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(
+    if (!providersRef.current) {
-      provider.configuration.name,
+      const documentName = `page.${pageId}`;
-      provider.document,
+      const ydoc = new Y.Doc();
-    );
+      const local = new IndexeddbPersistence(documentName, ydoc);
-    local.on("synced", () => setIsLocalSynced(true));
+      const socket = new HocuspocusProviderWebsocket({
-    return () => {
+        url: collaborationURL,
-      local.destroy();
+      });
+      const onLocalSyncedHandler = () => {
+        setIsLocalSynced(true);
       };
-  }, [provider]);
+      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));
+      local.on("synced", onLocalSyncedHandler);
-  useHocuspocusEvent("status", ({ status }) => setYjsConnectionStatus(status));
+      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,21 +228,28 @@ 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)];
+    const remoteProvider = providersRef.current.remote;
-  }, [provider, currentUser?.user]);
+
+    return [
+      ...mainExtensions,
+      ...collabExtensions(remoteProvider, currentUser?.user),
+    ];
+  }, [providersReady, currentUser?.user]);
 
   const editor = useEditor(
     {
       extensions,
       editable,
-      textDirection: "auto",
       immediatelyRender: true,
       shouldRerenderOnTransaction: false,
       editorProps: {
@@ -326,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) => {
@@ -426,11 +416,21 @@ function CollabPageEditor({
     }
   }, [yjsConnectionStatus, isSynced]);
 
-  if (showStatic) {
-    return <StaticPageEditor content={content} ariaLabel={t("Page content")} />;
-  }
-
   return (
+    <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} />
@@ -456,10 +456,13 @@ function CollabPageEditor({
                 <ColumnsMenu editor={editor} />
               </div>
             )}
-        {editor && !editorIsEditable && (editable || canComment) && (
+            {editor &&
-          <ReadonlyBubbleMenu editor={editor} />
+              !editorIsEditable &&
+              (editable || canComment) &&
+              providersRef.current && <ReadonlyBubbleMenu editor={editor} />}
+            {showCommentPopup && (
+              <CommentDialog editor={editor} pageId={pageId} />
             )}
-        {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
             {showReadOnlyCommentPopup && (
               <CommentDialog editor={editor} pageId={pageId} readOnly />
             )}
@@ -471,28 +474,7 @@ function CollabPageEditor({
             style={{ paddingBottom: "20vh" }}
           ></div>
         </div>
-  );
+      )}
-}
+    </TransclusionLookupProvider>
-
-function StaticPageEditor({
-  content,
-  ariaLabel,
-}: {
-  content: any;
-  ariaLabel: string;
-}) {
-  return (
-    <EditorProvider
-      editable={false}
-      immediatelyRender={true}
-      textDirection="auto"
-      extensions={mainExtensions}
-      content={content}
-      editorProps={{
-        attributes: {
-          "aria-label": ariaLabel,
-        },
-      }}
-    />
   );
 }

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

@@ -85,7 +85,6 @@ export default function ReadonlyPageEditor({
         <EditorProvider
           editable={false}
           immediatelyRender={true}
-          textDirection="auto"
           extensions={titleExtensions}
           content={title}
         ></EditorProvider>
@@ -94,7 +93,6 @@ export default function ReadonlyPageEditor({
       <EditorProvider
         editable={false}
         immediatelyRender={true}
-        textDirection="auto"
         extensions={extensions}
         content={content}
         onCreate={({ editor }) => {

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

@@ -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;
-}

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

@@ -18,4 +18,3 @@
 @import "./columns.css";
 @import "./status.css";
 @import "./base-embed.css";
-@import "./footnotes.css";

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

@@ -54,7 +54,7 @@
         var(--mantine-color-dark-5)
       );
       font-weight: bold;
-      text-align: start;
+      text-align: left;
     }
 
     .column-resize-handle {

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

@@ -86,7 +86,6 @@ export function TitleEditor({
     },
     editable: editable,
     content: title,
-    textDirection: "auto",
     immediatelyRender: true,
     shouldRerenderOnTransaction: false,
     editorProps: {

apps/client/src/features/page-history/atoms/history-atoms.ts

@@ -6,13 +6,4 @@ export const activeHistoryPrevIdAtom = atom<string>("");
 export const highlightChangesAtom = atom<boolean>(true);
 
 export type DiffCounts = { added: number; deleted: number; total: number };
-export const diffCountsAtom = atom<DiffCounts | null>(
+export const diffCountsAtom = atom<DiffCounts | null>(null);
-  null as DiffCounts | null,
-);
-
-export type ComparePair = { newerId: string; olderId: string };
-export const compareModeAtom = atom<boolean>(false);
-export const compareSelectionAtom = atom<string[]>([]);
-export const comparePairAtom = atom<ComparePair | null>(
-  null as ComparePair | null,
-);

apps/client/src/features/page-history/components/css/history.module.css

@@ -1,7 +1,7 @@
 .history {
-  display: flex;
+  display: block;
-  align-items: center;
   width: 100%;
+  padding: var(--mantine-spacing-md);
   color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));
 
   @mixin hover {
@@ -12,28 +12,6 @@
   }
 }
 
-.historyButton {
-  flex: 1;
-  min-width: 0;
-  color: inherit;
-}
-
-.compareCheckbox {
-  padding-left: var(--mantine-spacing-xs);
-}
-
-.itemMenu {
-  opacity: 0;
-  margin-right: var(--mantine-spacing-xs);
-}
-
-.history:hover .itemMenu,
-.history:focus-within .itemMenu,
-.history.active .itemMenu,
-.itemMenu[aria-expanded="true"] {
-  opacity: 1;
-}
-
 .historyEditor {
   :global(.ProseMirror) {
     padding: 0 !important;
@@ -99,8 +77,3 @@
   flex: 1;
   padding: rem(16px) rem(40px);
 }
-
-.compareBanner {
-  border-bottom: rem(1px) solid
-    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-}

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

@@ -31,7 +31,6 @@ export function HistoryEditor({
   const editor = useEditor({
     extensions: mainExtensions,
     editable: false,
-    textDirection: "auto",
   });
 
   useEffect(() => {
@@ -171,6 +170,7 @@ export function HistoryEditor({
     }
 
     const total = addedCount + deletedCount;
+    // @ts-ignore
     setDiffCounts({ added: addedCount, deleted: deletedCount, total });
 
     editor.setOptions({

apps/client/src/features/page-history/components/history-item.tsx

@@ -1,21 +1,10 @@
-import {
+import { Text, Group, UnstyledButton, Avatar, Tooltip } from "@mantine/core";
-  Text,
-  Group,
-  UnstyledButton,
-  Avatar,
-  Tooltip,
-  ActionIcon,
-  Checkbox,
-  Menu,
-} from "@mantine/core";
-import { IconDots } from "@tabler/icons-react";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { formattedDate } from "@/lib/time";
 import classes from "./css/history.module.css";
 import clsx from "clsx";
 import { IPageHistory } from "@/features/page-history/types/page.types";
 import { memo, useCallback } from "react";
-import { useTranslation } from "react-i18next";
 
 const MAX_VISIBLE_AVATARS = 5;
 
@@ -26,13 +15,6 @@ interface HistoryItemProps {
   onHover?: (id: string, index: number) => void;
   onHoverEnd?: () => void;
   isActive: boolean;
-  compareMode: boolean;
-  isChecked: boolean;
-  isCheckboxDisabled: boolean;
-  canCompare: boolean;
-  onToggleCompare: (id: string) => void;
-  onStartCompare: (id: string) => void;
-  onRestore?: (id: string, index: number) => void;
 }
 
 const HistoryItem = memo(function HistoryItem({
@@ -42,24 +24,10 @@ const HistoryItem = memo(function HistoryItem({
   onHover,
   onHoverEnd,
   isActive,
-  compareMode,
-  isChecked,
-  isCheckboxDisabled,
-  canCompare,
-  onToggleCompare,
-  onStartCompare,
-  onRestore,
 }: HistoryItemProps) {
-  const { t } = useTranslation();
-  const date = formattedDate(new Date(historyItem.createdAt));
-
   const handleClick = useCallback(() => {
-    if (compareMode) {
-      onToggleCompare(historyItem.id);
-    } else {
     onSelect(historyItem.id, index);
-    }
+  }, [onSelect, historyItem.id, index]);
-  }, [compareMode, onToggleCompare, onSelect, historyItem.id, index]);
 
   const handleMouseEnter = useCallback(() => {
     onHover?.(historyItem.id, index);
@@ -69,42 +37,22 @@ const HistoryItem = memo(function HistoryItem({
   const hasContributors = contributors && contributors.length > 0;
 
   return (
-    <div
-      className={clsx(classes.history, { [classes.active]: isActive })}
-      onMouseEnter={handleMouseEnter}
-      onMouseLeave={onHoverEnd}
-    >
-      {compareMode && (
-        <Checkbox
-          size="xs"
-          className={classes.compareCheckbox}
-          checked={isChecked}
-          disabled={isCheckboxDisabled}
-          onChange={() => onToggleCompare(historyItem.id)}
-          aria-label={t("Select version from {{date}}", { date })}
-        />
-      )}
-
     <UnstyledButton
       p="xs"
       onClick={handleClick}
-        className={classes.historyButton}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={onHoverEnd}
+      className={clsx(classes.history, { [classes.active]: isActive })}
     >
-        <Text size="sm">{date}</Text>
+      <Text size="sm">{formattedDate(new Date(historyItem.createdAt))}</Text>
 
       <Group gap={6} wrap="nowrap" mt={4}>
         {hasContributors ? (
           <>
             <Tooltip.Group openDelay={300} closeDelay={100}>
               <Avatar.Group spacing={8}>
-                  {contributors
+                {contributors.slice(0, MAX_VISIBLE_AVATARS).map((contributor) => (
-                    .slice(0, MAX_VISIBLE_AVATARS)
+                  <Tooltip key={contributor.id} label={contributor.name} withArrow>
-                    .map((contributor) => (
-                      <Tooltip
-                        key={contributor.id}
-                        label={contributor.name}
-                        withArrow
-                      >
                     <CustomAvatar
                       size="sm"
                       avatarUrl={contributor.avatarUrl}
@@ -115,9 +63,7 @@ const HistoryItem = memo(function HistoryItem({
                 {contributors.length > MAX_VISIBLE_AVATARS && (
                   <Tooltip
                     withArrow
-                      label={contributors
+                    label={contributors.slice(MAX_VISIBLE_AVATARS).map((c) => (
-                        .slice(MAX_VISIBLE_AVATARS)
-                        .map((c) => (
                       <div key={c.id}>{c.name}</div>
                     ))}
                   >
@@ -148,36 +94,6 @@ const HistoryItem = memo(function HistoryItem({
         )}
       </Group>
     </UnstyledButton>
-
-      {!compareMode && (
-        <Menu shadow="md" width={180} position="bottom-end">
-          <Menu.Target>
-            <ActionIcon
-              variant="subtle"
-              color="gray"
-              className={classes.itemMenu}
-              aria-label={t("Version actions for {{date}}", { date })}
-              onClick={(e) => e.stopPropagation()}
-            >
-              <IconDots size={18} />
-            </ActionIcon>
-          </Menu.Target>
-          <Menu.Dropdown>
-            <Menu.Item
-              disabled={!canCompare}
-              onClick={() => onStartCompare(historyItem.id)}
-            >
-              {t("Compare")}
-            </Menu.Item>
-            {onRestore && (
-              <Menu.Item onClick={() => onRestore(historyItem.id, index)}>
-                {t("Restore")}
-              </Menu.Item>
-            )}
-          </Menu.Dropdown>
-        </Menu>
-      )}
-    </div>
   );
 });
 

apps/client/src/features/page-history/components/history-list.tsx

@@ -6,12 +6,8 @@ import HistoryItem from "@/features/page-history/components/history-item";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
-  compareModeAtom,
-  comparePairAtom,
-  compareSelectionAtom,
   historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { resolveComparePair } from "@/features/page-history/utils/resolve-compare-pair";
 import { useAtom, useSetAtom } from "jotai";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import {
@@ -36,9 +32,6 @@ function HistoryList({ pageId }: Props) {
   const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
   const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
   const setHistoryModalOpen = useSetAtom(historyAtoms);
-  const [compareMode, setCompareMode] = useAtom(compareModeAtom);
-  const [compareSelection, setCompareSelection] = useAtom(compareSelectionAtom);
-  const setComparePair = useSetAtom(comparePairAtom);
 
   const {
     data: pageHistoryData,
@@ -86,58 +79,10 @@ function HistoryList({ pageId }: Props) {
 
   const handleSelect = useCallback(
     (id: string, index: number) => {
-      setComparePair(null);
       setActiveHistoryId(id);
       setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
     },
-    [historyItems, setActiveHistoryId, setActiveHistoryPrevId, setComparePair],
+    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
-  );
-
-  const handleToggleCompare = useCallback(
-    (id: string) => {
-      setCompareSelection((prev) => {
-        if (prev.includes(id)) return prev.filter((item) => item !== id);
-        if (prev.length >= 2) return prev;
-        return [...prev, id];
-      });
-    },
-    [setCompareSelection],
-  );
-
-  const handleStartCompare = useCallback(
-    (id: string) => {
-      setComparePair(null);
-      setCompareMode(true);
-      setCompareSelection([id]);
-    },
-    [setComparePair, setCompareMode, setCompareSelection],
-  );
-
-  const handleCancelCompare = useCallback(() => {
-    setCompareMode(false);
-    setCompareSelection([]);
-  }, [setCompareMode, setCompareSelection]);
-
-  const handleConfirmCompare = useCallback(() => {
-    const pair = resolveComparePair(historyItems, compareSelection);
-    if (!pair) return;
-    setComparePair(pair);
-    setCompareMode(false);
-    setCompareSelection([]);
-  }, [
-    historyItems,
-    compareSelection,
-    setComparePair,
-    setCompareMode,
-    setCompareSelection,
-  ]);
-
-  const handleRestoreItem = useCallback(
-    (id: string, index: number) => {
-      handleSelect(id, index);
-      confirmRestore(id);
-    },
-    [handleSelect, confirmRestore],
   );
 
   useEffect(() => {
@@ -193,16 +138,6 @@ function HistoryList({ pageId }: Props) {
             onHover={handleHover}
             onHoverEnd={clearPrefetchTimeout}
             isActive={historyItem.id === activeHistoryId}
-            compareMode={compareMode}
-            isChecked={compareSelection.includes(historyItem.id)}
-            isCheckboxDisabled={
-              !compareSelection.includes(historyItem.id) &&
-              compareSelection.length >= 2
-            }
-            canCompare={historyItems.length >= 2}
-            onToggleCompare={handleToggleCompare}
-            onStartCompare={handleStartCompare}
-            onRestore={canRestore ? handleRestoreItem : undefined}
           />
         ))}
         {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
@@ -213,28 +148,7 @@ function HistoryList({ pageId }: Props) {
         )}
       </ScrollArea>
 
-      {compareMode ? (
+      {canRestore && (
-        <>
-          <Divider />
-          <Group p="xs" wrap="nowrap">
-            <Button
-              variant="default"
-              size="compact-md"
-              onClick={handleCancelCompare}
-            >
-              {t("Cancel")}
-            </Button>
-            <Button
-              size="compact-md"
-              disabled={compareSelection.length !== 2}
-              onClick={handleConfirmCompare}
-            >
-              {t("Compare")}
-            </Button>
-          </Group>
-        </>
-      ) : (
-        canRestore && (
         <>
           <Divider />
           <Group p="xs" wrap="nowrap">
@@ -245,12 +159,11 @@ function HistoryList({ pageId }: Props) {
             >
               {t("Cancel")}
             </Button>
-              <Button size="compact-md" onClick={() => confirmRestore()}>
+            <Button size="compact-md" onClick={confirmRestore}>
               {t("Restore")}
             </Button>
           </Group>
         </>
-        )
       )}
     </div>
   );

apps/client/src/features/page-history/components/history-modal-body.tsx

@@ -1,6 +1,5 @@
 import {
   ActionIcon,
-  CloseButton,
   Group,
   Paper,
   ScrollArea,
@@ -13,20 +12,17 @@ import { useAtom, useAtomValue } from "jotai";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
-  comparePairAtom,
   diffCountsAtom,
   highlightChangesAtom,
 } from "@/features/page-history/atoms/history-atoms";
 import HistoryView from "@/features/page-history/components/history-view";
-import { useMemo, useRef } from "react";
+import { useRef } from "react";
 import { IconChevronUp, IconChevronDown } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import {
   useDiffNavigation,
   useHistoryReset,
 } from "@/features/page-history/hooks";
-import { usePageHistoryListQuery } from "@/features/page-history/queries/page-history-query";
-import { formattedDate } from "@/lib/time";
 
 interface Props {
   pageId: string;
@@ -40,28 +36,6 @@ export default function HistoryModalBody({ pageId }: Props) {
   const activeHistoryPrevId = useAtomValue(activeHistoryPrevIdAtom);
   const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
   const diffCounts = useAtomValue(diffCountsAtom);
-  const [comparePair, setComparePair] = useAtom(comparePairAtom);
-
-  const { data: pageHistoryData } = usePageHistoryListQuery(pageId);
-  const historyItems = useMemo(
-    () => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
-    [pageHistoryData],
-  );
-
-  const compareLabel = useMemo(() => {
-    if (!comparePair) return null;
-    const newerItem = historyItems.find(
-      (item) => item.id === comparePair.newerId,
-    );
-    const olderItem = historyItems.find(
-      (item) => item.id === comparePair.olderId,
-    );
-    if (!newerItem || !olderItem) return null;
-    return t("Comparing {{newer}} and {{older}}", {
-      newer: formattedDate(new Date(newerItem.createdAt)),
-      older: formattedDate(new Date(olderItem.createdAt)),
-    });
-  }, [comparePair, historyItems, t]);
 
   useHistoryReset(pageId);
   const { currentChangeIndex, handlePrevChange, handleNextChange } =
@@ -76,25 +50,6 @@ export default function HistoryModalBody({ pageId }: Props) {
       </nav>
 
       <div style={{ position: "relative", flex: 1 }}>
-        {comparePair && (
-          <Group
-            justify="space-between"
-            wrap="nowrap"
-            px="md"
-            py={4}
-            className={classes.compareBanner}
-          >
-            <Text size="sm" fw={500} lineClamp={1}>
-              {compareLabel ?? t("Compare versions")}
-            </Text>
-            <CloseButton
-              size="sm"
-              aria-label={t("Exit compare")}
-              onClick={() => setComparePair(null)}
-            />
-          </Group>
-        )}
-
         <ScrollArea
           h={650}
           w="100%"
@@ -102,18 +57,11 @@ export default function HistoryModalBody({ pageId }: Props) {
           viewportRef={scrollViewportRef}
         >
           <div className={classes.sidebarRightSection}>
-            {comparePair ? (
+            {activeHistoryId && <HistoryView />}
-              <HistoryView
-                historyId={comparePair.newerId}
-                prevHistoryId={comparePair.olderId}
-              />
-            ) : (
-              activeHistoryId && <HistoryView />
-            )}
           </div>
         </ScrollArea>
 
-        {(comparePair || (activeHistoryId && activeHistoryPrevId)) && (
+        {activeHistoryId && activeHistoryPrevId && (
           <Paper
             shadow="md"
             radius="xl"

apps/client/src/features/page-history/components/history-modal-mobile.tsx

@@ -166,7 +166,7 @@ export default function HistoryModalMobile({ pageId, pageTitle }: Props) {
           <Button variant="default" onClick={() => setHistoryModalOpen(false)}>
             {t("Cancel")}
           </Button>
-          <Button onClick={() => confirmRestore()}>{t("Restore")}</Button>
+          <Button onClick={confirmRestore}>{t("Restore")}</Button>
         </Group>
       )}
 

apps/client/src/features/page-history/components/history-view.tsx

@@ -7,29 +7,21 @@ import {
   activeHistoryPrevIdAtom,
 } from "@/features/page-history/atoms/history-atoms";
 
-interface Props {
+function HistoryView() {
-  historyId?: string;
-  prevHistoryId?: string;
-}
-
-function HistoryView({ historyId, prevHistoryId }: Props) {
   const { t } = useTranslation();
-  const activeId = useAtomValue(activeHistoryIdAtom);
+  const historyId = useAtomValue(activeHistoryIdAtom);
-  const activePrevId = useAtomValue(activeHistoryPrevIdAtom);
+  const prevHistoryId = useAtomValue(activeHistoryPrevIdAtom);
-
-  const resolvedId = historyId ?? activeId;
-  const resolvedPrevId = prevHistoryId ?? activePrevId;
 
   const {
     data,
     isLoading: isLoadingCurrent,
     isError: isErrorCurrent,
-  } = usePageHistoryQuery(resolvedId);
+  } = usePageHistoryQuery(historyId);
   const {
     data: prevData,
     isLoading: isLoadingPrev,
     isError: isErrorPrev,
-  } = usePageHistoryQuery(resolvedPrevId);
+  } = usePageHistoryQuery(prevHistoryId);
 
   if (isLoadingCurrent || isLoadingPrev) {
     return <></>;

apps/client/src/features/page-history/hooks/use-history-reset.ts

@@ -3,45 +3,22 @@ import { useEffect } from "react";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
-  compareModeAtom,
-  comparePairAtom,
-  compareSelectionAtom,
   diffCountsAtom,
 } from "@/features/page-history/atoms/history-atoms";
 
 /**
  * Resets history state when pageId changes.
- * Clears active selection, diff counts, and compare state.
+ * Clears active selection and diff counts.
- * Compare state also resets on unmount so reopening the modal starts clean.
  */
 export function useHistoryReset(pageId: string) {
   const [, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
   const [, setActiveHistoryPrevId] = useAtom(activeHistoryPrevIdAtom);
   const [, setDiffCounts] = useAtom(diffCountsAtom);
-  const [, setCompareMode] = useAtom(compareModeAtom);
-  const [, setCompareSelection] = useAtom(compareSelectionAtom);
-  const [, setComparePair] = useAtom(comparePairAtom);
 
   useEffect(() => {
-    const resetCompare = () => {
-      setCompareMode(false);
-      setCompareSelection([]);
-      setComparePair(null);
-    };
-
     setActiveHistoryId("");
     setActiveHistoryPrevId("");
+    // @ts-ignore
     setDiffCounts(null);
-    resetCompare();
+  }, [pageId, setActiveHistoryId, setActiveHistoryPrevId, setDiffCounts]);
-
-    return resetCompare;
-  }, [
-    pageId,
-    setActiveHistoryId,
-    setActiveHistoryPrevId,
-    setDiffCounts,
-    setCompareMode,
-    setCompareSelection,
-    setComparePair,
-  ]);
 }

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

@@ -1,4 +1,4 @@
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { Text } from "@mantine/core";
@@ -9,8 +9,7 @@ import {
   activeHistoryIdAtom,
   historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { fetchPageHistory } from "@/features/page-history/queries/page-history-query";
+import { usePageHistoryQuery } from "@/features/page-history/queries/page-history-query";
-import { IPageHistory } from "@/features/page-history/types/page.types";
 import {
   pageEditorAtom,
   titleEditorAtom,
@@ -26,6 +25,8 @@ export function useHistoryRestore() {
   const { t } = useTranslation();
 
   const activeHistoryId = useAtomValue(activeHistoryIdAtom);
+  const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId);
+
   const mainEditor = useAtomValue(pageEditorAtom);
   const mainEditorTitle = useAtomValue(titleEditorAtom);
   const setHistoryModalOpen = useSetAtom(historyAtoms);
@@ -39,19 +40,8 @@ export function useHistoryRestore() {
     SpaceCaslSubject.Page,
   );
 
-  const handleRestore = useCallback(
+  const handleRestore = useCallback(() => {
-    async (historyId: string) => {
+    if (!activeHistoryData) return;
-      let historyData: IPageHistory;
-      try {
-        historyData = await fetchPageHistory(historyId);
-      } catch {
-        notifications.show({
-          message: t("Error fetching page data."),
-          color: "red",
-        });
-        return;
-      }
-
     if (
       !mainEditor ||
       mainEditor.isDestroyed ||
@@ -64,26 +54,20 @@ export function useHistoryRestore() {
     mainEditorTitle
       .chain()
       .clearContent()
-        .setContent(historyData.title, { emitUpdate: true })
+      .setContent(activeHistoryData.title, { emitUpdate: true })
       .run();
 
     mainEditor
       .chain()
       .clearContent()
-        .setContent(historyData.content)
+      .setContent(activeHistoryData.content)
       .run();
 
     setHistoryModalOpen(false);
     notifications.show({ message: t("Successfully restored") });
-    },
+  }, [activeHistoryData, mainEditor, mainEditorTitle, setHistoryModalOpen, t]);
-    [mainEditor, mainEditorTitle, setHistoryModalOpen, t],
-  );
-
-  const confirmRestore = useCallback(
-    (historyId?: string) => {
-      const targetId = historyId ?? activeHistoryId;
-      if (!targetId) return;
 
+  const confirmRestore = useCallback(() => {
     modals.openConfirmModal({
       title: t("Please confirm your action"),
       children: (
@@ -94,11 +78,9 @@ export function useHistoryRestore() {
         </Text>
       ),
       labels: { confirm: t("Confirm"), cancel: t("Cancel") },
-        onConfirm: () => handleRestore(targetId),
+      onConfirm: handleRestore,
     });
-    },
+  }, [t, handleRestore]);
-    [t, handleRestore, activeHistoryId],
-  );
 
   return { canRestore, confirmRestore };
 }

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

@@ -23,14 +23,6 @@ export function prefetchPageHistory(historyId: string) {
   });
 }
 
-export function fetchPageHistory(historyId: string): Promise<IPageHistory> {
-  return queryClient.fetchQuery({
-    queryKey: ["page-history", historyId],
-    queryFn: () => getPageHistoryById(historyId),
-    staleTime: HISTORY_STALE_TIME,
-  });
-}
-
 export function usePageHistoryListQuery(
   pageId: string,
 ): UseInfiniteQueryResult<InfiniteData<IPagination<IPageHistory>, unknown>> {

apps/client/src/features/page-history/utils/resolve-compare-pair.test.ts

@@ -1,32 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { resolveComparePair } from "./resolve-compare-pair";
-
-// list is newest-first, matching usePageHistoryListQuery order
-const items = [{ id: "v3" }, { id: "v2" }, { id: "v1" }];
-
-describe("resolveComparePair", () => {
-  it("orders newer before older regardless of selection order", () => {
-    expect(resolveComparePair(items, ["v1", "v3"])).toEqual({
-      newerId: "v3",
-      olderId: "v1",
-    });
-    expect(resolveComparePair(items, ["v3", "v1"])).toEqual({
-      newerId: "v3",
-      olderId: "v1",
-    });
-  });
-
-  it("returns null unless exactly two versions are selected", () => {
-    expect(resolveComparePair(items, [])).toBeNull();
-    expect(resolveComparePair(items, ["v1"])).toBeNull();
-    expect(resolveComparePair(items, ["v1", "v2", "v3"])).toBeNull();
-  });
-
-  it("returns null when a selected id is not in the list", () => {
-    expect(resolveComparePair(items, ["v1", "missing"])).toBeNull();
-  });
-
-  it("returns null when the same id is selected twice", () => {
-    expect(resolveComparePair(items, ["v2", "v2"])).toBeNull();
-  });
-});

apps/client/src/features/page-history/utils/resolve-compare-pair.ts

@@ -1,18 +0,0 @@
-import { ComparePair } from "@/features/page-history/atoms/history-atoms";
-
-/**
- * Resolves which of the two selected versions is newer using their position
- * in the history list (list is newest-first: lower index = newer).
- */
-export function resolveComparePair(
-  historyItems: { id: string }[],
-  selection: string[],
-): ComparePair | null {
-  if (selection.length !== 2) return null;
-  const indexA = historyItems.findIndex((item) => item.id === selection[0]);
-  const indexB = historyItems.findIndex((item) => item.id === selection[1]);
-  if (indexA === -1 || indexB === -1 || indexA === indexB) return null;
-  return indexA < indexB
-    ? { newerId: selection[0], olderId: selection[1] }
-    : { newerId: selection[1], olderId: selection[0] };
-}

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

@@ -11,7 +11,6 @@ import {
   IconList,
   IconMarkdown,
   IconMessage,
-  IconPaperclip,
   IconPrinter,
   IconStar,
   IconStarFilled,
@@ -43,7 +42,6 @@ import {
 import { formattedDate } from "@/lib/time.ts";
 import { PageEditModeToggle } from "@/features/user/components/page-state-pref.tsx";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
-import PageAttachmentsModal from "@/features/attachments/components/page-attachments-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
 import { PageShareModal } from "@/ee/page-permission";
 import {
@@ -159,10 +157,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
     verificationOpened,
     { open: openVerificationModal, close: closeVerificationModal },
   ] = useDisclosure(false);
-  const [
-    attachmentsOpened,
-    { open: openAttachmentsModal, close: closeAttachmentsModal },
-  ] = useDisclosure(false);
   const [pageEditor] = useAtom(pageEditorAtom);
   const pageUpdatedAt = useTimeAgo(page?.updatedAt);
   const favoriteIds = useFavoriteIds("page", page?.spaceId);
@@ -299,15 +293,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
             </Menu.Item>
           )}
 
-          {!page?.isBase && (
-            <Menu.Item
-              leftSection={<IconPaperclip size={16} />}
-              onClick={openAttachmentsModal}
-            >
-              {t("Attachments")}
-            </Menu.Item>
-          )}
-
           {!readOnly && !page?.isBase && (
             <PageVerificationMenuItem
               pageId={page?.id}
@@ -410,12 +395,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
         opened={verificationOpened}
         onClose={closeVerificationModal}
       />
-
-      <PageAttachmentsModal
-        pageId={page.id}
-        open={attachmentsOpened}
-        onClose={closeAttachmentsModal}
-      />
     </>
   );
 }

apps/client/src/features/search/components/search-spotlight.tsx

@@ -13,16 +13,11 @@ import { SearchResultItem } from "./search-result-item.tsx";
 import { AiSearchResult } from "../../../ee/ai/components/ai-search-result.tsx";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
-import { useAtomValue } from "jotai";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { hintVectorCache } from "@/ee/ai/services/ai-search-service.ts";
-import { getAiVectorDriver } from "@/lib/config.ts";
 
 interface SearchSpotlightProps {
   spaceId?: string;
 }
 export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
-  const workspace = useAtomValue(workspaceAtom);
   const { t } = useTranslation();
   const hasAiFeature = useHasFeature(Feature.AI);
   const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
@@ -101,15 +96,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
     />
   ));
 
-  const handleSpotlightOpen = () => {
-    if (
-      workspace?.settings?.ai?.search === true &&
-      getAiVectorDriver() === "turbopuffer"
-    ) {
-      hintVectorCache();
-    }
-  };
-
   const handleFiltersChange = (newFilters: any) => {
     setFilters(newFilters);
   };
@@ -129,7 +115,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
       <Spotlight.Root
         size="xl"
         maxHeight={600}
-        onSpotlightOpen={handleSpotlightOpen}
         store={searchSpotlightStore}
         query={query}
         onQueryChange={setQuery}

apps/client/src/features/space/components/sidebar/space-select.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useDebouncedValue } from "@mantine/hooks";
 import { Group, Select, SelectProps, Text } from "@mantine/core";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
@@ -14,7 +14,6 @@ interface SpaceSelectProps {
   width?: number;
   opened?: boolean;
   clearable?: boolean;
-  withinPortal?: boolean;
 }
 
 const renderSelectOption: SelectProps["renderOption"] = ({ option }) => (
@@ -42,7 +41,6 @@ export function SpaceSelect({
   width,
   opened,
   clearable,
-  withinPortal = true,
 }: SpaceSelectProps) {
   const { t } = useTranslation();
   const [searchValue, setSearchValue] = useState("");
@@ -52,13 +50,9 @@ export function SpaceSelect({
     limit: 50,
   });
   const [data, setData] = useState([]);
-  const fetchedSpaces = useRef(new Map<string, ISpace>());
 
   useEffect(() => {
     if (spaces) {
-      spaces.items.forEach((space: ISpace) =>
-        fetchedSpaces.current.set(space.slug, space),
-      );
       const spaceData = spaces?.items
         .filter((space: ISpace) => space.slug !== value)
         .map((space: ISpace) => {
@@ -89,19 +83,14 @@ export function SpaceSelect({
       onSearchChange={setSearchValue}
       clearable={clearable}
       variant="filled"
-      onChange={(slug) => {
+      onChange={(slug) =>
-        // options accumulate across fetches; resolve against everything
+        onChange(spaces.items?.find((item) => item.slug === slug))
-        // fetched, not just the latest query result
-        const space = slug && fetchedSpaces.current.get(slug);
-        if (space) {
-          onChange(space);
       }
-      }}
       onClick={(e) => e.stopPropagation()}
       nothingFoundMessage={t("No space found")}
       limit={50}
       checkIconPosition="right"
-      comboboxProps={{ width, withinPortal, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
+      comboboxProps={{ width, withinPortal: true, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
       dropdownOpened={opened}
     />
   );

apps/client/src/features/space/components/sidebar/switch-space.tsx

@@ -70,7 +70,6 @@ export function SwitchSpace({
           onChange={(space) => handleSelect(space.slug)}
           width={300}
           opened={true}
-          withinPortal={false}
         />
       </Popover.Dropdown>
     </Popover>

apps/client/src/lib/config.ts

@@ -43,10 +43,6 @@ export function isCloud(): boolean {
   return castToBoolean(getConfigValue("CLOUD"));
 }
 
-export function getAiVectorDriver(): string {
-  return getConfigValue("AI_VECTOR_DRIVER");
-}
-
 export function getAvatarUrl(
   avatarUrl: string,
   type: AvatarIconType = AvatarIconType.AVATAR,

apps/client/src/pages/auth/forgot-password.tsx

@@ -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 />
         </>
     );

apps/client/src/pages/auth/invite-signup.tsx

@@ -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 />
     </>
   );

apps/client/src/pages/auth/login.tsx

@@ -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 />
     </>
   );

apps/client/src/pages/auth/password-reset.tsx

@@ -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} />
     </>
   );

apps/client/src/pages/auth/setup-workspace.tsx

@@ -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 />
       </>
     );

apps/client/src/pages/dashboard/home.tsx

@@ -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 />
 

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

@@ -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">

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

@@ -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
+        <Helmet>
-          title={`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}
+          <title>{`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
-          withAppName={false}
+        </Helmet>
-        />
         <MemoizedPageHeader readOnly={!canEdit} />
         <div
           style={{
@@ -160,10 +159,9 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
   return (
     page && (
       <div>
-        <DocumentTitle
+        <Helmet>
-          title={`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}
+          <title>{`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
-          withAppName={false}
+        </Helmet>
-        />
 
         <MemoizedPageHeader readOnly={!canEdit} />
 

apps/client/src/pages/settings/account/account-preferences.tsx

@@ -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 />

apps/client/src/pages/settings/account/account-settings.tsx

@@ -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 />

apps/client/src/pages/settings/group/group-info.tsx

@@ -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 />

apps/client/src/pages/settings/group/groups.tsx

@@ -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">

apps/client/src/pages/settings/shares/shares.tsx

@@ -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 />}>

apps/client/src/pages/settings/space/spaces.tsx

@@ -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">

apps/client/src/pages/settings/workspace/workspace-members.tsx

@@ -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 /> */}

apps/client/src/pages/settings/workspace/workspace-settings.tsx

@@ -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 />

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

@@ -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
+      <Helmet>
-        title={data?.page?.title || t("untitled")}
+        <title>{`${data?.page?.title || t("untitled")}`}</title>
-        withAppName={false}
-      >
         {!data?.share.searchIndexing && (
           <meta name="robots" content="noindex" />
         )}
-      </DocumentTitle>
+      </Helmet>
 
       <Container fluid={fullWidth} size={fullWidth ? undefined : 900} p={0}>
         <ReadonlyPageEditor

apps/client/src/pages/space/space-home.tsx

@@ -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>

apps/client/src/pages/spaces/spaces.tsx

@@ -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">

apps/client/vite.config.ts

@@ -16,7 +16,6 @@ export default defineConfig(({ mode }) => {
     BILLING_TRIAL_DAYS,
     POSTHOG_HOST,
     POSTHOG_KEY,
-    AI_VECTOR_DRIVER,
   } = loadEnv(mode, envPath, "");
 
   return {
@@ -32,7 +31,6 @@ export default defineConfig(({ mode }) => {
         BILLING_TRIAL_DAYS,
         POSTHOG_HOST,
         POSTHOG_KEY,
-        AI_VECTOR_DRIVER,
       },
       APP_VERSION: JSON.stringify(process.env.npm_package_version),
     },

apps/server/package.json

@@ -40,33 +40,32 @@
     "@clickhouse/client": "1.18.2",
     "@docmost/base-formula": "workspace:*",
     "@docmost/pdf-inspector": "1.9.6",
-    "@fastify/cookie": "11.1.2",
+    "@fastify/cookie": "^11.0.2",
-    "@fastify/multipart": "10.1.1",
+    "@fastify/multipart": "^10.0.0",
-    "@fastify/static": "10.1.3",
+    "@fastify/static": "^9.1.3",
-    "@keyv/redis": "5.1.6",
+    "@keyv/redis": "^5.1.6",
     "@langchain/core": "1.1.46",
     "@langchain/textsplitters": "1.0.1",
-    "@modelcontextprotocol/sdk": "1.30.0",
+    "@modelcontextprotocol/sdk": "1.29.0",
-    "@nest-lab/throttler-storage-redis": "1.2.0",
+    "@nest-lab/throttler-storage-redis": "^1.2.0",
     "@nestjs-labs/nestjs-ioredis": "11.0.4",
-    "@nestjs/bullmq": "11.0.5",
+    "@nestjs/bullmq": "11.0.4",
     "@nestjs/cache-manager": "3.1.3",
-    "@nestjs/common": "11.2.1",
+    "@nestjs/common": "11.1.27",
     "@nestjs/config": "4.0.4",
-    "@nestjs/core": "11.2.1",
+    "@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.2.1",
+    "@nestjs/platform-fastify": "11.1.27",
-    "@nestjs/platform-socket.io": "11.2.1",
+    "@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.2.1",
+    "@nestjs/websockets": "11.1.27",
     "@node-saml/passport-saml": "5.1.0",
     "@socket.io/redis-adapter": "8.3.0",
-    "@turbopuffer/turbopuffer": "^2.8.0",
     "ai": "6.0.134",
     "ai-sdk-ollama": "3.8.1",
     "bcrypt": "6.0.0",
@@ -89,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",
+    "msgpackr": "^1.11.9",
-    "nanoid": "5.1.16",
+    "nanoid": "5.1.7",
     "nestjs-cls": "6.2.0",
     "nestjs-kysely": "3.1.2",
     "nestjs-pino": "4.6.1",
@@ -103,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",
@@ -118,9 +118,10 @@
     "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.3",
+    "ws": "8.21.0",
     "yauzl": "3.4.0",
     "zod": "4.3.6"
   },

apps/server/src/app.module.ts

@@ -22,13 +22,11 @@ import { TelemetryModule } from './integrations/telemetry/telemetry.module';
 import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
 import { RedisConfigService } from './integrations/redis/redis-config.service';
 import { CacheModule } from '@nestjs/cache-manager';
-import KeyvRedis, { defaultReconnectStrategy } from '@keyv/redis';
+import KeyvRedis from '@keyv/redis';
-import { parseRedisUrl } from './common/helpers';
 import { LoggerModule } from './common/logger/logger.module';
 import { ClsModule } from 'nestjs-cls';
 import { NoopAuditModule } from './integrations/audit/audit.module';
 import { ThrottleModule } from './integrations/throttle/throttle.module';
-import { EncryptionModule } from './integrations/encryption/encryption.module';
 
 const enterpriseModules = [];
 try {
@@ -55,7 +53,6 @@ try {
     CoreModule,
     DatabaseModule,
     EnvironmentModule,
-    EncryptionModule,
     RedisModule.forRootAsync({
       useClass: RedisConfigService,
     }),
@@ -63,20 +60,10 @@ try {
       isGlobal: true,
       useFactory: async (environmentService: EnvironmentService) => {
         const redisUrl = environmentService.getRedisUrl();
-        const { family, tls } = parseRedisUrl(redisUrl);
 
         return {
           ttl: 5 * 1000,
-          stores: [
+          stores: [new KeyvRedis(redisUrl)],
-            new KeyvRedis({
-              url: redisUrl,
-              socket: {
-                family,
-                reconnectStrategy: defaultReconnectStrategy,
-                ...tls,
-              },
-            }),
-          ],
         };
       },
       inject: [EnvironmentService],

apps/server/src/collaboration/collaboration.gateway.ts

@@ -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';
@@ -66,7 +65,6 @@ export class CollaborationGateway {
           password: this.redisConfig.password,
           db: this.redisConfig.db,
           family: this.redisConfig.family,
-          tls: this.redisConfig.tls,
           retryStrategy: createRetryStrategy(),
         }),
         serverId: `collab-${os?.hostname()}-${nanoid(10)}`,
@@ -100,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(
+        this.redisSync!.onSocketClose(socketId, code, reason.buffer as ArrayBuffer);
-          socketId,
+      });
-          code,
+
-          new Uint8Array(reason).buffer,
+      // 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(
+      this.hocuspocus.handleConnection(client, request);
-        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() });
-      });
     }
   }
 
@@ -182,7 +178,6 @@ export class CollaborationGateway {
 
         if (this.hocuspocus.getDocumentsCount() === 0) resolve('');
         this.hocuspocus.closeConnections();
-        this.hocuspocus.flushPendingStores();
       } catch (error) {
         console.error(error);
       }

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

@@ -1,5 +1,4 @@
 import { StarterKit } from '@tiptap/starter-kit';
-import { Document } from '@tiptap/extension-document';
 import { TextAlign } from '@tiptap/extension-text-align';
 import { Superscript } from '@tiptap/extension-superscript';
 import SubScript from '@tiptap/extension-subscript';
@@ -46,18 +45,9 @@ import {
   TransclusionSource,
   TransclusionReference,
   BaseEmbed,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 } from '@docmost/editor-ext';
-import {
+import { generateText, getSchema, JSONContent } from '@tiptap/core';
-  extensions as coreExtensions,
-  generateText,
-  getSchema,
-  JSONContent,
-} from '@tiptap/core';
 import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
-import { collapseBlankLines } from '../common/helpers';
 // @tiptap/html library works best for generating prosemirror json state but not HTML
 // see: https://github.com/ueberdosis/tiptap/issues/5352
 // see:https://github.com/ueberdosis/tiptap/issues/4089
@@ -67,17 +57,12 @@ import * as Y from 'yjs';
 import { Logger } from '@nestjs/common';
 
 export const tiptapExtensions = [
-  coreExtensions.TextDirection.configure({ direction: 'auto' }),
   StarterKit.configure({
-    document: false,
     codeBlock: false,
     link: false,
     trailingNode: false,
     heading: false,
   }),
-  Document.extend({
-    content: 'block+ footnotes?',
-  }),
   Heading,
   UniqueID.configure({
     types: ['heading', 'paragraph', 'transclusionSource'],
@@ -125,10 +110,7 @@ export const tiptapExtensions = [
   Status,
   TransclusionSource,
   TransclusionReference,
-  BaseEmbed,
+  BaseEmbed
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 ] as any;
 
 export function jsonToHtml(tiptapJson: any) {
@@ -147,7 +129,7 @@ export function htmlToJson(html: string) {
 }
 
 export function jsonToText(tiptapJson: JSONContent) {
-  return collapseBlankLines(generateText(tiptapJson, tiptapExtensions));
+  return generateText(tiptapJson, tiptapExtensions);
 }
 
 export function jsonToNode(tiptapJson: JSONContent) {

apps/server/src/collaboration/extensions/persistence.extension.ts

@@ -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,
+          lastUpdatedById: context?.user?.id,
-          lastUpdatedBy: lastContext?.user
+          lastUpdatedBy: context?.user
             ? {
-                id: lastContext.user?.id,
+                id: context.user?.id,
-                name: lastContext.user?.name,
+                name: context.user?.name,
-                avatarUrl: lastContext.user?.avatarUrl,
+                avatarUrl: context.user?.avatarUrl,
               }
             : undefined,
         }),

apps/server/src/collaboration/extensions/redis-sync/collab-proxy-socket.ts

@@ -1,37 +1,61 @@
 import type RedisClient from 'ioredis';
-import type { WebSocketLike } from '@hocuspocus/server';
+import { EventEmitter } from 'tseep';
-import type { Pack, RSAMessageClose, RSAMessageSend } from './redis-sync.types';
+import type {
+  Pack,
+  RSAMessageClose,
+  RSAMessagePing,
+  RSAMessageSend,
+} from './redis-sync.types';
 
-// Stands in for the client WebSocket on the server that owns the document.
+export class CollabProxySocket extends EventEmitter {
-// Outgoing traffic is relayed over redis to the origin server, which holds the real socket.
-export class CollabProxySocket implements WebSocketLike {
   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', () => {
-
-  private publish(msg: RSAMessageClose | 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;
+    });
+  }
+
+  private publish(msg: RSAMessageClose | RSAMessagePing | RSAMessageSend) {
+    this.pub.publish(this.replyTo, this.pack(msg));
   }
 
   close(code?: number, reason?: string) {
     if (this.readyState !== 1) return;
-    this.readyState = 3;
+    const msg: RSAMessageClose = {
-    this.onClose?.(code, reason);
+      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) {

apps/server/src/collaboration/extensions/redis-sync/redis-sync.extension.ts

@@ -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];
+    const proxySocket = this.proxySockets[socketId];
-    if (entry) {
+    if (proxySocket) {
-      delete this.proxyConnections[socketId];
+      proxySocket.emit(
-      const { socket, clientConnection } = entry;
+        'close',
-      // The origin socket is already gone; don't echo a close message back
+        1000,
-      socket.markClosed();
+        Buffer.from('provider_initiated', 'utf-8'),
-      clientConnection.handleClose({
+      );
-        code: 1000,
+      delete this.proxySockets[socketId];
-        reason: 'provider_initiated',
-      });
     }
   }
 
+  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'];
+    const socketId = headers['sec-websocket-key']!;
-    let entry = this.proxyConnections[socketId];
+    let socket = this.proxySockets[socketId];
-    if (!entry) {
+    if (!socket) {
-      const socket = new CollabProxySocket(
+      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
+      this.proxySockets[socketId] = socket;
-      // failed, or the origin server crashed) is reaped by hocuspocus' message
+      this.instance.handleConnection(
-      // timeout. Dispose it silently in that case: relaying the timeout close
+        socket as any,
-      // to the origin would kill the client's real socket, which may be busy
+        serializedHTTPRequest as any,
-      // 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),
       );
-      entry = { clientConnection, socket };
-      this.proxyConnections[socketId] = entry;
     }
-    entry.clientConnection.handleMessage(message);
+    socket.emit('message', message);
-  }
-
-  private getLock(documentName: string) {
-    return this.pub.get(this.getKey(documentName));
   }
 
   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];
+    const socket = this.originSockets[socketId];
-    if (!entry) {
+    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
+    const proxyTo = await this.getOrClaimLockThrottled(documentName);
-      ? this.getLock(documentName)
-      : this.getOrClaimLockThrottled(documentName));
-
-    if (!proxyTo && onlyIfOpen) {
-      return;
-    }
-
     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('TIMEOUT');
-        reject(new Error('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 socketId = serializedHTTPRequest.headers['sec-websocket-key']!;
-    const clientConnection = this.instance.handleConnection(
+    this.originSockets[socketId] = ws;
-      ws,
+    this.instance.handleConnection(
-      toWebRequest(serializedHTTPRequest),
+      ws as any,
-      this.deriveContext(serializedHTTPRequest),
+      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 message = new Uint8Array(detachableMsg.slice());
-    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();
+    const documentName = readVarString(tmpMsg.decoder);
-      // 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 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];
+    const socket = this.originSockets[socketId];
-    if (!entry) return;
+    if (!socket) return;
-    delete this.originConnections[socketId];
+    // at this point the socket is considered GC'd and we cannot call close
-    entry.clientConnection.handleClose({
+    // The origin socket did not set up any connections for the proxy, so none of the hooks will work if we just emit
-      code: code ?? 1000,
+    socket?.emit('close', code, reason);
-      reason: reason ? Buffer.from(reason).toString() : '',
+    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);
   }

apps/server/src/collaboration/extensions/redis-sync/redis-sync.types.ts

@@ -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[]
+  ...args: unknown[]
-) => any
+) => 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 type BaseWebSocket = EventEmitter & {
-export const toWebRequest = (serializedHTTPRequest: SerializedHTTPRequest) => {
+  readyState: number;
-  const { method, url, headers } = serializedHTTPRequest;
+  close(code?: number, reason?: string): void;
-  const webHeaders = new Headers();
+  ping(): void;
-  Object.entries(headers).forEach(([name, value]) => {
+  send(message: Uint8Array): void;
-    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,
-  });
 };

apps/server/src/collaboration/extensions/redis-sync/ws-socket-wrapper.ts

@@ -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.
+ * Wrapper around ws WebSocket that only receives events via emit().
- * Incoming socket events are forwarded separately by the gateway,
+ * This prevents double-handling when used with RedisSyncExtension.
- * which prevents double-handling 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 {

apps/server/src/common/helpers/index.ts

@@ -1,5 +1,4 @@
 export * from './utils';
-export * from './text.utils';
 export * from './nanoid.utils';
 export * from './file.helper';
 export * from './constants';

apps/server/src/common/helpers/text.utils.spec.ts

@@ -1,14 +0,0 @@
-import { collapseBlankLines } from './text.utils';
-
-describe('collapseBlankLines', () => {
-  it.each([
-    ['a\n\n\n\nb', 'a\n\nb'],
-    ['a\n\nb', 'a\n\nb'],
-    ['a\nb', 'a\nb'],
-    ['\n\n\n\na\n\n\n', '\n\na\n\n'],
-    ['no newlines', 'no newlines'],
-    ['', ''],
-  ])('collapses %j to %j', (input, expected) => {
-    expect(collapseBlankLines(input)).toBe(expected);
-  });
-});

apps/server/src/common/helpers/text.utils.ts

@@ -1,3 +0,0 @@
-export function collapseBlankLines(text: string): string {
-  return text.replace(/\n{2,}/g, '\n\n');
-}

apps/server/src/common/helpers/utils.ts

@@ -30,14 +30,13 @@ export type RedisConfig = {
   db: number;
   password?: string;
   family?: number;
-  tls?: { rejectUnauthorized?: boolean };
 };
 
 export function parseRedisUrl(redisUrl: string): RedisConfig {
-  // format - redis[s]://[[username][:password]@][host][:port][/db-number][?family=4|6][&rejectUnauthorized=false]
+  // format - redis[s]://[[username][:password]@][host][:port][/db-number][?family=4|6]
   const url = new URL(redisUrl);
-  const { hostname, port, password, pathname, protocol, searchParams } = url;
+  const { hostname, port, password, pathname, searchParams } = url;
-  const portInt = port ? parseInt(port, 10) : 6379;
+  const portInt = parseInt(port, 10);
 
   let db: number = 0;
   // extract db value if present
@@ -55,14 +54,7 @@ export function parseRedisUrl(redisUrl: string): RedisConfig {
     family = parseInt(familyParam, 10);
   }
 
-  const tls =
+  return { host: hostname, port: portInt, password, db, family };
-    protocol === 'rediss:'
-      ? searchParams.get('rejectUnauthorized') === 'false'
-        ? { rejectUnauthorized: false }
-        : {}
-      : undefined;
-
-  return { host: hostname, port: portInt, password: password || undefined, db, family, tls };
 }
 
 export function createRetryStrategy() {

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

@@ -53,14 +53,8 @@ import { EnvironmentService } from '../../integrations/environment/environment.s
 import { TokenService } from '../auth/services/token.service';
 import { JwtAttachmentPayload, JwtType } from '../auth/dto/jwt-payload';
 import * as path from 'path';
-import {
+import { AttachmentInfoDto, RemoveIconDto } from './dto/attachment.dto';
-  AttachmentInfoDto,
-  PageIdDto,
-  RemoveIconDto,
-} from './dto/attachment.dto';
-import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { PageAccessService } from '../page/page-access/page-access.service';
-import { DomainService } from '../../integrations/environment/domain.service';
 import { AuditEvent, AuditResource } from '../../common/events/audit-events';
 import {
   AUDIT_SERVICE,
@@ -81,7 +75,6 @@ export class AttachmentController {
     private readonly environmentService: EnvironmentService,
     private readonly tokenService: TokenService,
     private readonly pageAccessService: PageAccessService,
-    private readonly domainService: DomainService,
     @Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
   ) {}
 
@@ -158,10 +151,7 @@ export class AttachmentController {
         },
       });
 
-      return res.send({
+      return res.send(fileResponse);
-        ...fileResponse,
-        url: this.buildFileUrl(workspace, fileResponse),
-      });
     } catch (err: any) {
       if (err?.statusCode === 413) {
         const errMessage = `File too large. Exceeds the ${this.environmentService.getFileUploadSizeLimit()} limit`;
@@ -421,37 +411,7 @@ export class AttachmentController {
 
     await this.pageAccessService.validateCanView(page, user);
 
-    return { ...attachment, url: this.buildFileUrl(workspace, attachment) };
+    return attachment;
-  }
-
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  @Post('pages/attachments')
-  async getPageAttachments(
-    @Body() dto: PageIdDto,
-    @Body() pagination: PaginationOptions,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    const page = await this.pageRepo.findById(dto.pageId);
-    if (!page || page.workspaceId !== workspace.id) {
-      throw new NotFoundException('Page not found');
-    }
-
-    await this.pageAccessService.validateCanView(page, user);
-
-    const result = await this.attachmentRepo.findPageAttachments(
-      page.id,
-      pagination,
-    );
-
-    return {
-      ...result,
-      items: result.items.map((attachment) => ({
-        ...attachment,
-        url: this.buildFileUrl(workspace, attachment),
-      })),
-    };
   }
 
   @UseGuards(JwtAuthGuard)
@@ -505,10 +465,6 @@ export class AttachmentController {
     }
   }
 
-  private buildFileUrl(workspace: Workspace, attachment: Attachment): string {
-    return `${this.domainService.getUrl(workspace.hostname)}/api/files/${attachment.id}/${encodeURIComponent(attachment.fileName)}`;
-  }
-
   private async sendFileResponse(
     req: FastifyRequest,
     res: FastifyReply,

apps/server/src/core/attachment/dto/attachment.dto.ts

@@ -1,11 +1,4 @@
-import {
+import { IsEnum, IsIn, IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
-  IsEnum,
-  IsIn,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  IsUUID,
-} from 'class-validator';
 import { AttachmentType } from '../attachment.constants';
 
 export class AttachmentInfoDto {
@@ -14,12 +7,6 @@ export class AttachmentInfoDto {
   attachmentId: string;
 }
 
-export class PageIdDto {
-  @IsString()
-  @IsNotEmpty()
-  pageId: string;
-}
-
 export class RemoveIconDto {
   @IsEnum(AttachmentType)
   @IsIn([

apps/server/src/core/page/services/page.service.ts

@@ -496,21 +496,10 @@ export class PageService {
           },
         );
 
-        await this.aiQueue.add(
+        await this.aiQueue.add(QueueJob.PAGE_MOVED_TO_SPACE, {
-          QueueJob.PAGE_MOVED_TO_SPACE,
-          {
           pageIds: pageIdsToMove,
-            spaceId,
           workspaceId: rootPage.workspaceId,
-          },
+        });
-          {
-            attempts: 2,
-            backoff: {
-              type: 'fixed',
-              delay: 2 * 60 * 1000,
-            },
-          },
-        );
       }
     });
 
@@ -821,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;

apps/server/src/core/space/services/space-member.service.ts

@@ -339,25 +339,15 @@ export class SpaceMemberService {
       return;
     }
 
-    await executeTx(this.db, async (trx) => {
-      await trx
-        .selectFrom('spaces')
-        .select('id')
-        .where('id', '=', dto.spaceId)
-        .forUpdate()
-        .executeTakeFirst();
-
     if (spaceMember.role === SpaceRole.ADMIN) {
-        await this.validateLastAdmin(dto.spaceId, trx);
+      await this.validateLastAdmin(dto.spaceId);
     }
 
     await this.spaceMemberRepo.updateSpaceMember(
       { role: dto.role },
       spaceMember.id,
       dto.spaceId,
-        trx,
     );
-    });
 
     this.auditService.log({
       event: AuditEvent.SPACE_MEMBER_ROLE_CHANGED,
@@ -378,14 +368,10 @@ export class SpaceMemberService {
     });
   }
 
-  async validateLastAdmin(
+  async validateLastAdmin(spaceId: string): Promise<void> {
-    spaceId: string,
-    trx?: KyselyTransaction,
-  ): Promise<void> {
     const spaceOwnerCount = await this.spaceMemberRepo.roleCountBySpaceId(
       SpaceRole.ADMIN,
       spaceId,
-      trx,
     );
     if (spaceOwnerCount === 1) {
       throw new BadRequestException(

apps/server/src/core/workspace/services/workspace.service.ts

@@ -396,10 +396,7 @@ export class WorkspaceService {
       }
     }
 
-    if (
+    if (updateWorkspaceDto.aiSearch) {
-      updateWorkspaceDto.aiSearch &&
-      this.environmentService.getAiVectorDriver() !== 'turbopuffer'
-    ) {
       const tableExists = await isPageEmbeddingsTableExists(this.db);
       if (!tableExists) {
         throw new BadRequestException(

apps/server/src/database/listeners/space.listener.ts

@@ -8,7 +8,6 @@ import { EnvironmentService } from '../../integrations/environment/environment.s
 
 export class SpaceEvent {
   spaceId: string;
-  workspaceId: string;
 }
 
 @Injectable()
@@ -23,12 +22,12 @@ export class SpaceListener {
 
   @OnEvent(EventName.SPACE_DELETED)
   async handleSpaceDeleted(event: SpaceEvent) {
-    const { spaceId, workspaceId } = event;
+    const { spaceId } = event;
     if (this.isTypesense()) {
       await this.searchQueue.add(QueueJob.SPACE_DELETED, { spaceId });
     }
 
-    await this.aiQueue.add(QueueJob.SPACE_DELETED, { spaceId, workspaceId });
+    await this.aiQueue.add(QueueJob.SPACE_DELETED, { spaceId });
   }
 
   isTypesense(): boolean {