feat: proper DOCX support

feat: footnotes
2026-08-20 11:04:11 +08:00 · 2026-08-11 01:45:01 +01:00 · 2026-08-11 01:30:26 +01:00
67 changed files with 1011 additions and 2017 deletions
@@ -22,7 +22,6 @@
  "Can view": "Can view",
  "Can view pages in space but not edit.": "Can view pages in space but not edit.",
  "Cancel": "Cancel",
-  "Cancelled": "Cancelled",
  "Change email": "Change email",
  "Change password": "Change password",
  "Change photo": "Change photo",
@@ -30,9 +29,7 @@
  "Choose your preferred color scheme.": "Choose your preferred color scheme.",
  "Choose your preferred interface language.": "Choose your preferred interface language.",
  "Choose your preferred page width.": "Choose your preferred page width.",
-  "Completed": "Completed",
  "Confirm": "Confirm",
-  "Confluence site": "Confluence site",
  "Copy as Markdown": "Copy as Markdown",
  "Copy link": "Copy link",
  "Create": "Create",
@@ -60,10 +57,6 @@
  "e.g Space for product team": "e.g Space for product team",
  "e.g Space for sales team to collaborate": "e.g Space for sales team to collaborate",
  "Edit": "Edit",
-  "Everyone with access to this space": "Everyone with access to this space",
-  "Failed": "Failed",
-  "Import details": "Import details",
-  "Permissions": "Permissions",
  "Read": "Read",
  "Edit group": "Edit group",
  "Email": "Email",
@@ -83,7 +76,6 @@
  "Failed to restore page": "Failed to restore page",
  "Failed to fetch recent pages": "Failed to fetch recent pages",
  "Failed to import pages": "Failed to import pages",
-  "Failed to load comments. An error occurred.": "Failed to load comments. An error occurred.",
  "Failed to load page. An error occurred.": "Failed to load page. An error occurred.",
  "Failed to update data": "Failed to update data",
  "Failed to create base": "Failed to create base",
@@ -158,9 +150,6 @@
  "page": "page",
  "Page deleted successfully": "Page deleted successfully",
  "Page history": "Page history",
-  "Restricted pages": "Restricted pages",
-  "Restrictions": "Restrictions",
-  "Running": "Running",
  "Select version": "Select version",
  "Highlight changes": "Highlight changes",
  "Page import is in progress. Please do not close this tab.": "Page import is in progress. Please do not close this tab.",
@@ -197,7 +186,6 @@
  "Setup workspace": "Setup workspace",
  "Sign In": "Sign In",
  "Sign Up": "Sign Up",
-  "Site": "Site",
  "Slug": "Slug",
  "Space": "Space",
  "Space description": "Space description",
@@ -206,13 +194,10 @@
  "Space settings": "Space settings",
  "Space slug": "Space slug",
  "Spaces": "Spaces",
-  "spaces": "spaces",
  "Spaces you belong to": "Spaces you belong to",
  "No space found": "No space found",
  "Search for spaces": "Search for spaces",
  "Start typing to search...": "Start typing to search...",
-  "Started at": "Started at",
-  "Started by": "Started by",
  "Status": "Status",
  "Successfully imported": "Successfully imported",
  "Successfully restored": "Successfully restored",
@@ -226,8 +211,6 @@
  "Untitled": "Untitled",
  "Updated successfully": "Updated successfully",
  "User": "User",
-  "Users": "Users",
-  "users": "users",
  "Workspace": "Workspace",
  "Workspace Name": "Workspace Name",
  "Workspace settings": "Workspace settings",
@@ -404,6 +387,8 @@
  "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.",
@@ -47,7 +47,6 @@ import FavoritesPage from "@/pages/favorites/favorites-page";
 import AiChat from "@/ee/ai-chat/pages/ai-chat.tsx";
 import VerifyEmail from "@/ee/pages/verify-email.tsx";
 import LabelPage from "@/pages/label/label-page";
-import ConfluenceImportPage from "@/ee/confluence-import/pages/confluence-import.tsx";

 export default function App() {
  const { t } = useTranslation();
@@ -129,10 +128,6 @@ export default function App() {
            <Route path={"ai/mcp"} element={<AiSettings />} />
            <Route path={"audit"} element={<AuditLogs />} />
            <Route path={"verifications"} element={<VerifiedPages />} />
-            <Route
-              path={"import/confluence"}
-              element={<ConfluenceImportPage />}
-            />
            {!isCloud() && <Route path={"license"} element={<License />} />}
            {isCloud() && <Route path={"billing"} element={<Billing />} />}
          </Route>
@@ -1,7 +1,6 @@
 import { ActionIcon, Box, Group, ScrollArea, Title, Tooltip } from "@mantine/core";
 import { IconX } from "@tabler/icons-react";
 import CommentListWithTabs from "@/features/comment/components/comment-list-with-tabs.tsx";
-import { CommentErrorBoundary } from "@/features/comment/components/comment-error-boundary.tsx";
 import { useAtom } from "jotai";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import React, { ReactNode, useEffect } from "react";
@@ -29,11 +28,7 @@ export default function Aside() {

  switch (tab) {
    case "comments":
-      component = (
-        <CommentErrorBoundary>
-          <CommentListWithTabs />
-        </CommentErrorBoundary>
-      );
+      component = <CommentListWithTabs />;
      title = "Comments";
      break;
    case "toc":
@@ -15,12 +15,11 @@ import {
  IconSparkles,
  IconHistory,
  IconShieldCheck,
-  IconFileImport,
 } from "@tabler/icons-react";
 import { Link, useLocation } from "react-router-dom";
 import classes from "./settings.module.css";
 import { useTranslation } from "react-i18next";
-import { isBetaConfluenceImporter, isCloud } from "@/lib/config.ts";
+import { isCloud } from "@/lib/config.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { useAtom } from "jotai";
 import { entitlementAtom } from "@/ee/entitlement/entitlement-atom";
@@ -52,7 +51,6 @@ type DataItem = {
  feature?: string;
  role?: "admin" | "owner";
  env?: "cloud" | "selfhosted";
-  show?: () => boolean;
 };

 type DataGroup = {
@@ -127,14 +125,6 @@ const groupedData: DataGroup[] = [
        role: "owner",
        env: "selfhosted",
      },
-      {
-        label: "Import",
-        icon: IconFileImport,
-        path: "/settings/import/confluence",
-        feature: Feature.CONFLUENCE_API_IMPORT,
-        role: "admin",
-        show: () => isBetaConfluenceImporter(),
-      },
    ],
  },
  {
@@ -168,7 +158,6 @@ export default function SettingsSidebar() {
    entitlements?.features?.includes(f) ?? false;

  const canShowItem = (item: DataItem) => {
-    if (item.show && !item.show()) return false;
    if (item.env === "cloud" && !isCloud()) return false;
    if (item.env === "selfhosted" && isCloud()) return false;
    if (item.role === "admin" && !isAdmin) return false;
@@ -1,340 +0,0 @@
-import { useMemo, useState } from "react";
-import {
-  Badge,
-  Group,
-  Loader,
-  Modal,
-  Progress,
-  Skeleton,
-  Stack,
-  Table,
-  Text,
-  Tooltip,
-} from "@mantine/core";
-import { IconAlertCircle, IconCheck, IconX } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import {
-  ConfluenceImportHistoryItem,
-  ConfluenceImportStatus,
-} from "@/ee/confluence-import/types/confluence-import.types";
-import { CustomAvatar } from "@/components/ui/custom-avatar";
-import { formattedDate } from "@/lib/time";
-import NoTableResults from "@/components/common/no-table-results";
-import { useConfluenceImportsQuery } from "@/ee/confluence-import/queries/confluence-import-queries";
-
-const BADGE_STYLES = {
-  root: { flexShrink: 0 },
-  label: { overflow: "visible" as const },
-};
-
-function statusBadge(
-  status: ConfluenceImportStatus,
-  cancelled: boolean,
-  t: (key: string) => string,
-) {
-  if (cancelled) {
-    return (
-      <Badge
-        color="gray"
-        variant="light"
-        leftSection={<IconX size={12} />}
-        styles={BADGE_STYLES}
-      >
-        {t("Cancelled")}
-      </Badge>
-    );
-  }
-  if (status === "processing") {
-    return (
-      <Badge
-        color="blue"
-        variant="light"
-        leftSection={<Loader size={10} />}
-        styles={BADGE_STYLES}
-      >
-        {t("Running")}
-      </Badge>
-    );
-  }
-  if (status === "success") {
-    return (
-      <Badge
-        color="teal"
-        variant="light"
-        leftSection={<IconCheck size={12} />}
-        styles={BADGE_STYLES}
-      >
-        {t("Completed")}
-      </Badge>
-    );
-  }
-  return (
-    <Badge
-      color="red"
-      variant="light"
-      leftSection={<IconAlertCircle size={12} />}
-      styles={BADGE_STYLES}
-    >
-      {t("Failed")}
-    </Badge>
-  );
-}
-
-function phaseLabel(phase: string | null, t: (key: string) => string): string {
-  if (!phase) return "—";
-  return t(phase.charAt(0).toUpperCase() + phase.slice(1));
-}
-
-function progressValue(item: ConfluenceImportHistoryItem) {
-  if (item.status === "success") return 100;
-  if (item.totalPages > 0) {
-    return Math.min(
-      100,
-      Math.round((item.importedPages / item.totalPages) * 100),
-    );
-  }
-  return item.status === "processing" ? 5 : 0;
-}
-
-function ProgressCell({ item }: { item: ConfluenceImportHistoryItem }) {
-  const { t } = useTranslation();
-  const value = progressValue(item);
-  const color =
-    item.status === "failed"
-      ? "red"
-      : item.status === "success"
-        ? "teal"
-        : "blue";
-
-  return (
-    <Stack gap={4}>
-      <Progress value={value} color={color} size="xs" animated={item.status === "processing"} />
-      <Group gap="xs" wrap="nowrap">
-        <Text fz="xs" c="dimmed" style={{ whiteSpace: "nowrap" }}>
-          {item.importedPages}/{item.totalPages || "?"} {t("pages")}
-        </Text>
-        <Text fz="xs" c="dimmed" style={{ whiteSpace: "nowrap" }}>
-          · {item.importedSpaces}/{item.totalSpaces || "?"} {t("spaces")}
-        </Text>
-        <Text fz="xs" c="dimmed" style={{ whiteSpace: "nowrap" }}>
-          · {item.importedUsers}/{item.totalUsers || "?"} {t("users")}
-        </Text>
-      </Group>
-    </Stack>
-  );
-}
-
-function ImportStatsModal({
-  item,
-  onClose,
-}: {
-  item: ConfluenceImportHistoryItem | null;
-  onClose: () => void;
-}) {
-  const { t } = useTranslation();
-
-  const stats = item
-    ? [
-        {
-          label: t("Spaces"),
-          imported: item.importedSpaces,
-          total: item.totalSpaces,
-        },
-        {
-          label: t("Pages"),
-          imported: item.importedPages,
-          total: item.totalPages,
-        },
-        {
-          label: t("Users"),
-          imported: item.importedUsers,
-          total: item.totalUsers,
-        },
-        {
-          label: t("Groups"),
-          imported: item.importedGroups,
-          total: item.totalGroups,
-        },
-        {
-          label: t("Attachments"),
-          imported: item.importedAttachments,
-          total: item.totalAttachments,
-        },
-        {
-          label: t("Labels"),
-          imported: item.importedLabels,
-          total: item.totalLabels,
-        },
-        {
-          label: t("Restricted pages"),
-          imported: item.importedRestrictedPages,
-          total: item.totalRestrictedPages,
-        },
-      ]
-    : [];
-
-  return (
-    <Modal
-      opened={!!item}
-      onClose={onClose}
-      title={t("Import details")}
-      size="md"
-    >
-      {item && (
-        <Stack gap="sm">
-          <div>
-            <Text fz="sm" c="dimmed">
-              {t("Confluence site")}
-            </Text>
-            <Text fz="sm" fw={500} lineClamp={1}>
-              {item.siteUrl}
-            </Text>
-          </div>
-          <div>
-            <Text fz="sm" c="dimmed">
-              {t("Started at")}
-            </Text>
-            <Text fz="sm">{formattedDate(new Date(item.createdAt))}</Text>
-          </div>
-          <Table verticalSpacing="xs" fz="sm">
-            <Table.Tbody>
-              {stats.map((stat) => (
-                <Table.Tr key={stat.label}>
-                  <Table.Td>
-                    <Text fz="sm">{stat.label}</Text>
-                  </Table.Td>
-                  <Table.Td>
-                    <Text fz="sm" ta="right">
-                      {stat.imported} / {stat.total}
-                    </Text>
-                  </Table.Td>
-                </Table.Tr>
-              ))}
-            </Table.Tbody>
-          </Table>
-        </Stack>
-      )}
-    </Modal>
-  );
-}
-
-function TableSkeleton() {
-  return (
-    <>
-      {Array.from({ length: 3 }).map((_, i) => (
-        <Table.Tr key={i}>
-          <Table.Td>
-            <Skeleton height={14} width={120} />
-          </Table.Td>
-          <Table.Td>
-            <Skeleton height={14} width={180} />
-          </Table.Td>
-          <Table.Td>
-            <Skeleton height={14} width={80} />
-          </Table.Td>
-          <Table.Td>
-            <Skeleton height={14} width={140} />
-          </Table.Td>
-          <Table.Td>
-            <Skeleton height={14} width={120} />
-          </Table.Td>
-          <Table.Td>
-            <Skeleton height={14} width={120} />
-          </Table.Td>
-        </Table.Tr>
-      ))}
-    </>
-  );
-}
-
-export default function ConfluenceImportHistory() {
-  const { t } = useTranslation();
-  const { data, isLoading } = useConfluenceImportsQuery();
-  const [selectedItem, setSelectedItem] =
-    useState<ConfluenceImportHistoryItem | null>(null);
-
-  const items = useMemo(() => data?.items ?? [], [data]);
-
-  return (
-    <Table.ScrollContainer minWidth={720}>
-      <Table verticalSpacing="xs" highlightOnHover>
-        <Table.Thead>
-          <Table.Tr>
-            <Table.Th>{t("Status")}</Table.Th>
-            <Table.Th>{t("Site")}</Table.Th>
-            <Table.Th>{t("Phase")}</Table.Th>
-            <Table.Th>{t("Progress")}</Table.Th>
-            <Table.Th>{t("Started by")}</Table.Th>
-            <Table.Th>{t("Started at")}</Table.Th>
-          </Table.Tr>
-        </Table.Thead>
-
-        <Table.Tbody>
-          {isLoading ? (
-            <TableSkeleton />
-          ) : items.length > 0 ? (
-            items.map((item) => (
-              <Table.Tr
-                key={item.fileTaskId}
-                onClick={() => setSelectedItem(item)}
-                style={{ cursor: "pointer" }}
-              >
-                <Table.Td>
-                  {statusBadge(item.status, item.cancelled, t)}
-                  {item.status === "failed" && item.errorMessage && (
-                    <Tooltip label={item.errorMessage} multiline w={320}>
-                      <Text fz="xs" c="red" lineClamp={1} maw={180}>
-                        {item.errorMessage}
-                      </Text>
-                    </Tooltip>
-                  )}
-                </Table.Td>
-                <Table.Td>
-                  <Text fz="sm" lineClamp={1} maw={240}>
-                    {item.siteUrl}
-                  </Text>
-                </Table.Td>
-                <Table.Td>
-                  <Text fz="sm">{phaseLabel(item.currentPhase, t)}</Text>
-                </Table.Td>
-                <Table.Td>
-                  <ProgressCell item={item} />
-                </Table.Td>
-                <Table.Td>
-                  {item.creatorName ? (
-                    <Group gap="sm" wrap="nowrap">
-                      <CustomAvatar
-                        avatarUrl={item.creatorAvatarUrl}
-                        name={item.creatorName}
-                        size={24}
-                      />
-                      <Text fz="sm" lineClamp={1}>
-                        {item.creatorName}
-                      </Text>
-                    </Group>
-                  ) : (
-                    <Text fz="sm" c="dimmed">
-                      —
-                    </Text>
-                  )}
-                </Table.Td>
-                <Table.Td>
-                  <Text fz="sm" style={{ whiteSpace: "nowrap" }}>
-                    {formattedDate(new Date(item.createdAt))}
-                  </Text>
-                </Table.Td>
-              </Table.Tr>
-            ))
-          ) : (
-            <NoTableResults colSpan={6} />
-          )}
-        </Table.Tbody>
-      </Table>
-
-      <ImportStatsModal
-        item={selectedItem}
-        onClose={() => setSelectedItem(null)}
-      />
-    </Table.ScrollContainer>
-  );
-}
@@ -1,445 +0,0 @@
-import React, { useEffect, useMemo, useState } from "react";
-import {
-  Alert,
-  Button,
-  Checkbox,
-  Group,
-  Modal,
-  PasswordInput,
-  ScrollArea,
-  SegmentedControl,
-  Stack,
-  Stepper,
-  Text,
-  TextInput,
-} from "@mantine/core";
-import {
-  IconAlertCircle,
-  IconCheck,
-  IconCloudCheck,
-  IconPlug,
-} from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useForm } from "@mantine/form";
-import { notifications } from "@mantine/notifications";
-import { useQueryClient } from "@tanstack/react-query";
-import {
-  listConfluenceSpaces,
-  startConfluenceImport,
-  testConfluenceConnection,
-} from "@/ee/confluence-import/services/confluence-import-service";
-import {
-  ConfluenceAuthType,
-  ConfluenceCredentials,
-  ConfluenceSpaceSummary,
-} from "@/ee/confluence-import/types/confluence-import.types";
-import { confluenceImportsQueryKey } from "@/ee/confluence-import/queries/confluence-import-queries";
-
-type ConfluenceEditionChoice = "cloud" | "server";
-
-type CredentialsFormValues = {
-  edition: ConfluenceEditionChoice;
-  authType: ConfluenceAuthType;
-  siteUrl: string;
-  email: string;
-  token: string;
-  username: string;
-  password: string;
-};
-
-type Props = {
-  opened: boolean;
-  onClose: () => void;
-};
-
-export default function ConfluenceImportModal({ opened, onClose }: Props) {
-  const { t } = useTranslation();
-  const queryClient = useQueryClient();
-  const [active, setActive] = useState(0);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [spaces, setSpaces] = useState<ConfluenceSpaceSummary[]>([]);
-  const [selectedKeys, setSelectedKeys] = useState<string[]>([]);
-  const [importAll, setImportAll] = useState(true);
-
-  const form = useForm<CredentialsFormValues>({
-    initialValues: {
-      edition: "server",
-      authType: "pat",
-      siteUrl: "",
-      email: "",
-      token: "",
-      username: "",
-      password: "",
-    },
-    validate: {
-      siteUrl: (value) =>
-        !value?.trim()
-          ? t("Site URL is required")
-          : !/^https?:\/\//i.test(value.trim())
-            ? t("Site URL must start with http:// or https://")
-            : null,
-      email: (value, values) =>
-        values.edition === "cloud" && !value?.trim()
-          ? t("Email is required")
-          : null,
-      token: (value, values) =>
-        (values.authType === "cloud_token" || values.authType === "pat") &&
-        !value?.trim()
-          ? t("API token is required")
-          : null,
-      username: (value, values) =>
-        values.authType === "basic" && !value?.trim()
-          ? t("Username is required")
-          : null,
-      password: (value, values) =>
-        values.authType === "basic" && !value?.trim()
-          ? t("Password is required")
-          : null,
-    },
-  });
-
-  useEffect(() => {
-    if (!opened) {
-      setActive(0);
-      setError(null);
-      setSpaces([]);
-      setSelectedKeys([]);
-      setImportAll(true);
-      setLoading(false);
-      form.reset();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [opened]);
-
-  const credentials: ConfluenceCredentials = useMemo(() => {
-    const values = form.values;
-    return {
-      siteUrl: values.siteUrl.trim().replace(/\/+$/, ""),
-      authType: values.authType,
-      email: values.email?.trim() || undefined,
-      token: values.token?.trim() || undefined,
-      username: values.username?.trim() || undefined,
-      password: values.password || undefined,
-    };
-  }, [form.values]);
-
-  const handleEditionChange = (edition: ConfluenceEditionChoice) => {
-    form.setFieldValue("edition", edition);
-    if (edition === "cloud") {
-      form.setFieldValue("authType", "cloud_token");
-    } else if (form.values.authType === "cloud_token") {
-      form.setFieldValue("authType", "pat");
-    }
-  };
-
-  const handleNextFromCredentials = async () => {
-    if ((await form.validate()).hasErrors) return;
-    setLoading(true);
-    setError(null);
-    try {
-      const test = await testConfluenceConnection(credentials);
-      if (!test.success) {
-        setError(test.error || t("Connection failed"));
-        return;
-      }
-      const list = await listConfluenceSpaces(credentials);
-      if (!list.success || !list.spaces) {
-        setError(list.error || t("Failed to load spaces"));
-        return;
-      }
-      setSpaces(list.spaces);
-      setSelectedKeys(list.spaces.map((s) => s.key));
-      setImportAll(true);
-      setActive(1);
-    } catch (err: any) {
-      setError(
-        err?.response?.data?.message || err?.message || t("Unexpected error"),
-      );
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const toggleSpace = (key: string, checked: boolean) => {
-    setSelectedKeys((prev) =>
-      checked
-        ? Array.from(new Set([...prev, key]))
-        : prev.filter((k) => k !== key),
-    );
-  };
-
-  const toggleAll = (checked: boolean) => {
-    setImportAll(checked);
-    setSelectedKeys(checked ? spaces.map((s) => s.key) : []);
-  };
-
-  const handleStartImport = async () => {
-    const spaceKeys = importAll ? [] : selectedKeys;
-    if (!importAll && spaceKeys.length === 0) {
-      setError(t("Select at least one space to import"));
-      return;
-    }
-
-    setLoading(true);
-    setError(null);
-    try {
-      const result = await startConfluenceImport({
-        ...credentials,
-        spaceKeys,
-      });
-      if (!result.success || !result.fileTaskId) {
-        setError(result.error || t("Failed to start import"));
-        setLoading(false);
-        return;
-      }
-
-      await queryClient.invalidateQueries({
-        queryKey: confluenceImportsQueryKey,
-      });
-
-      notifications.show({
-        title: t("Confluence import started"),
-        message: t("Track progress below. This runs in the background."),
-        color: "blue",
-        icon: <IconCheck size={18} />,
-        autoClose: 4000,
-      });
-
-      onClose();
-    } catch (err: any) {
-      setError(
-        err?.response?.data?.message || err?.message || t("Unexpected error"),
-      );
-      setLoading(false);
-    }
-  };
-
-  const handleCancelFlow = async () => {
-    onClose();
-  };
-
-  const editionSegment = (
-    <SegmentedControl
-      value={form.values.edition}
-      onChange={(val) => handleEditionChange(val as ConfluenceEditionChoice)}
-      data={[
-        { value: "server", label: t("Data Center / Server") },
-        { value: "cloud", label: t("Cloud") },
-      ]}
-      fullWidth
-    />
-  );
-
-  const authTypeSegment = form.values.edition === "server" && (
-    <SegmentedControl
-      value={form.values.authType}
-      onChange={(val) =>
-        form.setFieldValue("authType", val as ConfluenceAuthType)
-      }
-      data={[
-        { value: "pat", label: t("Personal Access Token") },
-        { value: "basic", label: t("Username + password") },
-      ]}
-      fullWidth
-    />
-  );
-
-  const selectedCount = importAll ? spaces.length : selectedKeys.length;
-
-  return (
-    <Modal
-      opened={opened}
-      onClose={onClose}
-      title={t("Import from Confluence")}
-      size={720}
-      centered
-      closeOnClickOutside={!loading}
-      closeOnEscape={!loading}
-    >
-      <Stepper active={active} size="sm" mb="md" allowNextStepsSelect={false}>
-        <Stepper.Step
-          label={t("Connect")}
-          description={t("Credentials")}
-          icon={<IconPlug size={18} />}
-        />
-        <Stepper.Step
-          label={t("Select spaces")}
-          description={t("Choose what to import")}
-          icon={<IconCloudCheck size={18} />}
-        />
-      </Stepper>
-
-      {active === 0 && (
-        <Stack>
-          <Text size="sm" c="dimmed">
-            {t(
-              "Enter your Confluence URL and credentials. We'll validate the connection before continuing.",
-            )}
-          </Text>
-          {editionSegment}
-          {authTypeSegment}
-          <TextInput
-            label={t("Site URL")}
-            placeholder={
-              form.values.edition === "cloud"
-                ? "https://your-site.atlassian.net/wiki"
-                : "https://confluence.example.com"
-            }
-            required
-            {...form.getInputProps("siteUrl")}
-          />
-
-          {form.values.edition === "cloud" && (
-            <>
-              <TextInput
-                label={t("Email")}
-                placeholder="you@company.com"
-                required
-                {...form.getInputProps("email")}
-              />
-              <PasswordInput
-                label={t("API token")}
-                description={t(
-                  "Create at id.atlassian.com/manage-profile/security/api-tokens",
-                )}
-                required
-                {...form.getInputProps("token")}
-              />
-            </>
-          )}
-
-          {form.values.edition === "server" &&
-            form.values.authType === "pat" && (
-              <>
-                <TextInput
-                  label={t("Email")}
-                  placeholder="you@company.com"
-                  {...form.getInputProps("email")}
-                />
-                <PasswordInput
-                  label={t("Personal Access Token")}
-                  required
-                  {...form.getInputProps("token")}
-                />
-              </>
-            )}
-
-          {form.values.edition === "server" &&
-            form.values.authType === "basic" && (
-              <>
-                <TextInput
-                  label={t("Username")}
-                  required
-                  {...form.getInputProps("username")}
-                />
-                <PasswordInput
-                  label={t("Password")}
-                  required
-                  {...form.getInputProps("password")}
-                />
-                <TextInput
-                  label={t("Email (optional)")}
-                  placeholder="you@company.com"
-                  {...form.getInputProps("email")}
-                />
-              </>
-            )}
-
-          {error && (
-            <Alert color="red" icon={<IconAlertCircle size={18} />}>
-              {error}
-            </Alert>
-          )}
-
-          <Group justify="flex-end">
-            <Button
-              variant="default"
-              onClick={handleCancelFlow}
-              disabled={loading}
-            >
-              {t("Cancel")}
-            </Button>
-            <Button onClick={handleNextFromCredentials} loading={loading}>
-              {t("Test & continue")}
-            </Button>
-          </Group>
-        </Stack>
-      )}
-
-      {active === 1 && (
-        <Stack>
-          <Text size="sm" c="dimmed">
-            {t(
-              "Pages, comments, page labels, users, groups, spaces and permissions will be imported.",
-            )}
-          </Text>
-
-          <Checkbox
-            label={t("Import all spaces ({{count}})", {
-              count: spaces.length,
-            })}
-            checked={importAll}
-            onChange={(e) => toggleAll(e.currentTarget.checked)}
-          />
-
-          <ScrollArea h={320} type="auto" offsetScrollbars>
-            <Stack gap="xs">
-              {spaces.map((space) => (
-                <Checkbox
-                  key={space.id}
-                  label={
-                    <Group gap={6} wrap="nowrap">
-                      <Text fw={500}>{space.name}</Text>
-                      <Text size="xs" c="dimmed">
-                        ({space.key})
-                      </Text>
-                    </Group>
-                  }
-                  checked={importAll || selectedKeys.includes(space.key)}
-                  disabled={importAll}
-                  onChange={(e) =>
-                    toggleSpace(space.key, e.currentTarget.checked)
-                  }
-                />
-              ))}
-              {spaces.length === 0 && (
-                <Text c="dimmed" ta="center" py="lg">
-                  {t("No spaces found for this account.")}
-                </Text>
-              )}
-            </Stack>
-          </ScrollArea>
-
-          {error && (
-            <Alert color="red" icon={<IconAlertCircle size={18} />}>
-              {error}
-            </Alert>
-          )}
-
-          <Group justify="space-between">
-            <Text size="sm" c="dimmed">
-              {t("{{count}} selected", { count: selectedCount })}
-            </Text>
-            <Group>
-              <Button
-                variant="default"
-                onClick={() => setActive(0)}
-                disabled={loading}
-              >
-                {t("Back")}
-              </Button>
-              <Button
-                onClick={handleStartImport}
-                loading={loading}
-                disabled={!importAll && selectedKeys.length === 0}
-              >
-                {t("Start import")}
-              </Button>
-            </Group>
-          </Group>
-        </Stack>
-      )}
-    </Modal>
-  );
-}
@@ -1,67 +0,0 @@
-import { Helmet } from "react-helmet-async";
-import { useTranslation } from "react-i18next";
-import {
-  Button,
-  Divider,
-  Group,
-  Paper,
-  Stack,
-  Text,
-  Tooltip,
-} from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
-import SettingsTitle from "@/components/settings/settings-title";
-import { ConfluenceIcon } from "@/components/icons/confluence-icon";
-import ConfluenceImportModal from "@/ee/confluence-import/components/confluence-import-modal";
-import ConfluenceImportHistory from "@/ee/confluence-import/components/confluence-import-history";
-import { getAppName } from "@/lib/config";
-import { useHasFeature } from "@/ee/hooks/use-feature";
-import { Feature } from "@/ee/features";
-import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
-
-export default function ConfluenceImportPage() {
-  const { t } = useTranslation();
-  const [opened, { open, close }] = useDisclosure(false);
-  const hasConfluenceImport = useHasFeature(Feature.CONFLUENCE_API_IMPORT);
-  const upgradeLabel = useUpgradeLabel();
-
-  return (
-    <>
-      <Helmet>
-        <title>
-          {t("Import from Confluence")} - {getAppName()}
-        </title>
-      </Helmet>
-
-      <SettingsTitle title={t("Import from Confluence")} />
-
-      <Paper withBorder p="lg" radius="md" mb="lg">
-        <Group align="flex-start" justify="space-between" wrap="nowrap">
-          <Group align="flex-start" wrap="nowrap">
-            <ConfluenceIcon size={32} />
-            <Stack gap={4}>
-              <Text fw={600}>{t("Confluence API import")}</Text>
-              <Text size="sm" c="dimmed" maw={560}>
-                {t(
-                  "Connect to Confluence Cloud or Data Center to import spaces, pages, attachments, comments, users, groups and permissions directly via the API.",
-                )}
-              </Text>
-            </Stack>
-          </Group>
-
-          <Tooltip label={upgradeLabel} disabled={hasConfluenceImport}>
-            <Button onClick={open} disabled={!hasConfluenceImport}>
-              {t("Start import")}
-            </Button>
-          </Tooltip>
-        </Group>
-      </Paper>
-
-      <Divider my="md" label={t("Import history")} labelPosition="left" />
-
-      <ConfluenceImportHistory />
-
-      <ConfluenceImportModal opened={opened} onClose={close} />
-    </>
-  );
-}
@@ -1,17 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { listConfluenceImports } from "@/ee/confluence-import/services/confluence-import-service";
-
-export const confluenceImportsQueryKey = ["confluence-imports"] as const;
-
-export function useConfluenceImportsQuery() {
-  return useQuery({
-    queryKey: confluenceImportsQueryKey,
-    queryFn: listConfluenceImports,
-    refetchInterval: (query) => {
-      const hasRunning = query.state.data?.items?.some(
-        (i) => i.status === "processing",
-      );
-      return hasRunning ? 3000 : false;
-    },
-  });
-}
@@ -1,64 +0,0 @@
-import api from "@/lib/api-client";
-import {
-  ConfluenceCredentials,
-  ImportStatusResponse,
-  ListImportsResponse,
-  ListSpacesResponse,
-  StartImportResponse,
-  TestConnectionResponse,
-} from "@/ee/confluence-import/types/confluence-import.types";
-
-export async function testConfluenceConnection(
-  data: ConfluenceCredentials,
-): Promise<TestConnectionResponse> {
-  const req = await api.post<TestConnectionResponse>(
-    "/confluence-import/test-connection",
-    data,
-  );
-  return req.data;
-}
-
-export async function listConfluenceSpaces(
-  data: ConfluenceCredentials,
-): Promise<ListSpacesResponse> {
-  const req = await api.post<ListSpacesResponse>(
-    "/confluence-import/spaces",
-    data,
-  );
-  return req.data;
-}
-
-export async function startConfluenceImport(
-  data: ConfluenceCredentials & { spaceKeys?: string[] },
-): Promise<StartImportResponse> {
-  const req = await api.post<StartImportResponse>(
-    "/confluence-import/start",
-    data,
-  );
-  return req.data;
-}
-
-export async function getConfluenceImportStatus(
-  fileTaskId: string,
-): Promise<ImportStatusResponse> {
-  const req = await api.post<ImportStatusResponse>(
-    "/confluence-import/status",
-    { fileTaskId },
-  );
-  return req.data;
-}
-
-export async function listConfluenceImports(): Promise<ListImportsResponse> {
-  const req = await api.post<ListImportsResponse>("/confluence-import/history");
-  return req.data;
-}
-
-export async function cancelConfluenceImport(
-  fileTaskId: string,
-): Promise<{ success: boolean }> {
-  const req = await api.post<{ success: boolean }>(
-    "/confluence-import/cancel",
-    { fileTaskId },
-  );
-  return req.data;
-}
@@ -1,92 +0,0 @@
-export type ConfluenceAuthType = "cloud_token" | "pat" | "basic";
-
-export type ConfluenceCredentials = {
-  siteUrl: string;
-  authType: ConfluenceAuthType;
-  email?: string;
-  token?: string;
-  username?: string;
-  password?: string;
-};
-
-export type ConfluenceSpaceSummary = {
-  id: string;
-  key: string;
-  name: string;
-  type?: string;
-  status?: string;
-};
-
-export type TestConnectionResponse = {
-  success: boolean;
-  edition?: string;
-  spaceCount?: number;
-  error?: string;
-};
-
-export type ListSpacesResponse = {
-  success: boolean;
-  spaces?: ConfluenceSpaceSummary[];
-  error?: string;
-};
-
-export type StartImportResponse = {
-  success: boolean;
-  fileTaskId?: string;
-  error?: string;
-};
-
-export type ConfluenceImportStatus = "processing" | "success" | "failed";
-
-export type ImportStatusResponse = {
-  fileTaskId?: string;
-  status?: ConfluenceImportStatus;
-  errorMessage?: string | null;
-  currentPhase?: string | null;
-  totalSpaces?: number;
-  importedSpaces?: number;
-  totalPages?: number;
-  importedPages?: number;
-  totalUsers?: number;
-  importedUsers?: number;
-  totalGroups?: number;
-  importedGroups?: number;
-  totalRestrictedPages?: number;
-  importedRestrictedPages?: number;
-  createdAt?: string;
-  updatedAt?: string;
-  error?: string;
-};
-
-export type ConfluenceImportHistoryItem = {
-  fileTaskId: string;
-  siteUrl: string;
-  status: ConfluenceImportStatus;
-  errorMessage: string | null;
-  currentPhase: string | null;
-  totalSpaces: number;
-  importedSpaces: number;
-  totalPages: number;
-  importedPages: number;
-  totalUsers: number;
-  importedUsers: number;
-  totalGroups: number;
-  importedGroups: number;
-  totalAttachments: number;
-  importedAttachments: number;
-  totalLabels: number;
-  importedLabels: number;
-  totalRestrictedPages: number;
-  importedRestrictedPages: number;
-  cancelled: boolean;
-  spaceKeys: string[];
-  createdAt: string;
-  updatedAt: string;
-  creatorId: string | null;
-  creatorName: string | null;
-  creatorAvatarUrl: string | null;
-};
-
-export type ListImportsResponse = {
-  items: ConfluenceImportHistoryItem[];
-};
@@ -7,7 +7,6 @@ export const Feature = {
  PAGE_PERMISSIONS: 'page:permissions',
  AI: 'ai',
  CONFLUENCE_IMPORT: 'import:confluence',
-  CONFLUENCE_API_IMPORT: 'import:confluence-api',
  DOCX_IMPORT: 'import:docx',
  PDF_IMPORT: 'import:pdf',
  ATTACHMENT_INDEXING: 'attachment:indexing',
@@ -53,14 +53,7 @@ export function PagePermissionItem({
            {isCurrentUser && <Text span c="dimmed"> ({t("You")})</Text>}
          </AutoTooltipText>
          <AutoTooltipText fz="xs" c="dimmed">
-            {member.type === "user"
-              ? member.email
-              : member.isDefault
-                ? // Page access still requires space membership, so the
-                  // workspace-wide member count would overstate who can
-                  // actually see the page.
-                  t("Everyone with access to this space")
-                : formatMemberCount(member.memberCount, t)}
+            {member.type === "user" ? member.email : formatMemberCount(member.memberCount, t)}
          </AutoTooltipText>
        </div>
      </div>
@@ -166,18 +166,6 @@ export default function useAuth() {
  const handleLogout = async () => {
    setCurrentUser(RESET);
    await logout();
-
-    try {
-      if (typeof indexedDB?.databases === "function") {
-        const dbs = await indexedDB.databases();
-        dbs
-          .filter((db) => db.name?.startsWith("page."))
-          .forEach((db) => indexedDB.deleteDatabase(db.name!));
-      }
-    } catch {
-      //
-    }
-
    window.location.replace(`${APP_ROUTE.AUTH.LOGIN}?logout=1`);
  };

@@ -11,7 +11,6 @@ import {
 } from "@/features/comment/atoms/comment-atom";
 import CommentEditor from "@/features/comment/components/comment-editor";
 import CommentActions from "@/features/comment/components/comment-actions";
-import { CommentErrorBoundary } from "@/features/comment/components/comment-error-boundary";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import { useCreateCommentMutation } from "@/features/comment/queries/comment-query";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom";
@@ -171,16 +170,14 @@ function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) {
          </div>
        </Group>

-        <CommentErrorBoundary>
-          <CommentEditor
-            onUpdate={handleCommentEditorChange}
-            onSave={handleAddComment}
-            placeholder={t("Write a comment")}
-            editable={true}
-            autofocus={true}
-          />
-          <CommentActions onSave={handleAddComment} isLoading={isPending} />
-        </CommentErrorBoundary>
+        <CommentEditor
+          onUpdate={handleCommentEditorChange}
+          onSave={handleAddComment}
+          placeholder={t("Write a comment")}
+          editable={true}
+          autofocus={true}
+        />
+        <CommentActions onSave={handleAddComment} isLoading={isPending} />
      </Stack>
    </Dialog>
  );
@@ -1,8 +1,6 @@
 import { EditorContent, ReactNodeViewRenderer, useEditor } from "@tiptap/react";
 import { Placeholder } from "@tiptap/extension-placeholder";
 import { StarterKit } from "@tiptap/starter-kit";
-import { TextStyle } from "@tiptap/extension-text-style";
-import { Color } from "@tiptap/extension-color";
 import { Mention, LinkExtension } from "@docmost/editor-ext";
 import classes from "./comment.module.css";
 import { useFocusWithin } from "@mantine/hooks";
@@ -13,8 +11,6 @@ import EmojiCommand from "@/features/editor/extensions/emoji-command";
 import mentionRenderItems from "@/features/editor/components/mention/mention-suggestion";
 import MentionView from "@/features/editor/components/mention/mention-view";
 import { platformModifierKey } from "@/lib";
-import { TableKit } from "@tiptap/extension-table";
-import { TaskList, TaskItem } from "@tiptap/extension-list";

 interface CommentEditorProps {
  defaultContent?: any;
@@ -53,8 +49,6 @@ const CommentEditor = forwardRef(
          placeholder: placeholder || t("Reply..."),
        }),
        LinkExtension,
-        TextStyle,
-        Color,
        EmojiCommand,
        Mention.configure({
          suggestion: {
@@ -72,11 +66,6 @@ const CommentEditor = forwardRef(
            return ReactNodeViewRenderer(MentionView);
          },
        }),
-        TableKit,
-        TaskList,
-        TaskItem.configure({
-          nested: true,
-        }),
      ],
      editorProps: {
        attributes: {
@@ -123,12 +112,7 @@ const CommentEditor = forwardRef(
    // websocket on another browser). Skip for editable editors to avoid
    // resetting the cursor position on every keystroke.
    useEffect(() => {
-      if (
-        !editable &&
-        commentEditor &&
-        !commentEditor.isDestroyed &&
-        defaultContent
-      ) {
+      if (!editable && commentEditor && !commentEditor.isDestroyed && defaultContent) {
        commentEditor.commands.setContent(defaultContent);
      }
    }, [defaultContent, editable, commentEditor]);
@@ -1,38 +0,0 @@
-import { ReactNode } from "react";
-import { ErrorBoundary } from "react-error-boundary";
-import { Button } from "@mantine/core";
-import { IconAlertTriangle } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { EmptyState } from "@/components/ui/empty-state.tsx";
-
-type CommentErrorBoundaryProps = {
-  children: ReactNode;
-};
-
-// Contain comment-editor render throws (e.g. schema errors) so they don't unmount the whole app.
-export function CommentErrorBoundary({ children }: CommentErrorBoundaryProps) {
-  const { t } = useTranslation();
-
-  return (
-    <ErrorBoundary
-      fallbackRender={({ resetErrorBoundary }) => (
-        <EmptyState
-          icon={IconAlertTriangle}
-          title={t("Failed to load comments. An error occurred.")}
-          action={
-            <Button
-              variant="default"
-              size="sm"
-              mt="xs"
-              onClick={resetErrorBoundary}
-            >
-              {t("Try again")}
-            </Button>
-          }
-        />
-      )}
-    >
-      {children}
-    </ErrorBoundary>
-  );
-}
@@ -53,10 +53,6 @@
        margin-block-end: 0;
    }

-    .ProseMirror :global(.tableWrapper) table {
-        min-width: 100% !important;
-    }
-
    .actions {

    }
@@ -12,6 +12,7 @@ import {
  IconMathFunction,
  IconRotate2,
  IconSitemap,
+  IconSuperscript,
  IconTable,
  IconTag,
 } from "@tabler/icons-react";
@@ -270,6 +271,12 @@ export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
        >
          {t("Math block")}
        </Menu.Item>
+        <Menu.Item
+          leftSection={<IconSuperscript size={16} />}
+          onClick={() => editor.chain().focus().addFootnote().run()}
+        >
+          {t("Footnote")}
+        </Menu.Item>
      </Menu.Dropdown>
    </Menu>
  );
@@ -30,6 +30,7 @@ import {
  IconTag,
  IconMoodSmile,
  IconRotate2,
+  IconSuperscript,
 } from "@tabler/icons-react";
 import {
  CommandProps,
@@ -177,6 +178,16 @@ const CommandGroups: SlashMenuGroupedItemsType = {
      command: ({ editor, range }: CommandProps) =>
        editor.chain().focus().deleteRange(range).setPageBreak().run(),
    },
+    {
+      title: "Footnote",
+      description: "Insert a footnote reference.",
+      searchTerms: ["footnote", "reference", "citation", "note"],
+      icon: IconSuperscript,
+      command: ({ editor, range }: CommandProps) => {
+        editor.chain().focus().deleteRange(range).run();
+        editor.commands.addFootnote();
+      },
+    },
    {
      title: "Image",
      description: "Upload any image from your device.",
@@ -1,5 +1,6 @@
 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";
@@ -63,6 +64,9 @@ import {
  TransclusionReference,
  TableView,
  BaseEmbed as BaseEmbedNode,
+  Footnotes,
+  Footnote,
+  FootnoteReference,
 } from "@docmost/editor-ext";
 import {
  randomElement,
@@ -132,6 +136,7 @@ lowlight.register("scala", scala);
 // @ts-ignore
 export const mainExtensions = [
  StarterKit.configure({
+    document: false,
    heading: false,
    undoRedo: false,
    link: false,
@@ -143,6 +148,9 @@ 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,7 +211,8 @@ export const mainExtensions = [
            parentName === "tableCell" ||
            parentName === "tableHeader" ||
            parentName === "callout" ||
-            parentName === "blockquote"
+            parentName === "blockquote" ||
+            parentName === "footnote"
          ) {
            return i18n.t("Write...");
          }
@@ -417,6 +426,9 @@ export const mainExtensions = [
  }).configure(),
  Columns,
  Column,
+  Footnotes,
+  Footnote,
+  FootnoteReference,
  AutoJoiner.configure({
    elementsToJoin: [],
  }),
@@ -0,0 +1,26 @@
+.ProseMirror sup a.footnote-ref {
+  color: var(--mantine-primary-color-filled);
+  text-decoration: none;
+  cursor: pointer;
+  font-weight: 600;
+}
+
+.ProseMirror sup:has(a.footnote-ref) {
+  padding: 0 1px;
+}
+
+.ProseMirror ol.footnotes {
+  margin-top: 2rem;
+  padding-top: 0.75rem;
+  font-size: 0.875rem;
+  color: var(--mantine-color-dimmed);
+  list-style-type: decimal;
+}
+
+.ProseMirror ol.footnotes:has(li) {
+  border-top: 1px solid var(--mantine-color-default-border);
+}
+
+.ProseMirror ol.footnotes li p {
+  margin: 0.15rem 0;
+}
@@ -18,3 +18,4 @@
@import "./columns.css";
@import "./status.css";
@import "./base-embed.css";
+@import "./footnotes.css";
@@ -86,16 +86,6 @@
 .ProseMirror {
  table {
    @mixin dark {
-      /* Arbitrary (imported) colors: derive a dark variant; the hand-tuned
-         palette rules below override this for native colors. */
-      td[data-background-color],
-      th[data-background-color] {
-        background-color: oklch(
-          from var(--cell-bg, #fff) min(l, clamp(0.28, calc(1.22 - l), 0.45))
-            min(calc(c * 1.8), 0.09) h
-        ) !important;
-      }
-
      /* Blue */
      td[data-background-color="#b4d5ff"],
      th[data-background-color="#b4d5ff"] {
@@ -43,10 +43,6 @@ export function isCloud(): boolean {
  return castToBoolean(getConfigValue("CLOUD"));
 }

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

  return {
@@ -32,7 +31,6 @@ export default defineConfig(({ mode }) => {
        BILLING_TRIAL_DAYS,
        POSTHOG_HOST,
        POSTHOG_KEY,
-        BETA_CONFLUENCE_IMPORTER
      },
      APP_VERSION: JSON.stringify(process.env.npm_package_version),
    },
@@ -57,7 +55,6 @@ export default defineConfig(({ mode }) => {
      },
    },
    server: {
-      allowedHosts: ['docmost.nz'],
      proxy: {
        "/api": {
          target: APP_URL,
@@ -77,7 +77,6 @@
    "class-validator": "0.15.1",
    "cookie": "1.1.1",
    "csv-stringify": "6.8.0",
-    "entities": "7.0.1",
    "fast-bm25": "0.0.5",
    "fastify-ip": "2.0.0",
    "fs-extra": "11.3.4",
@@ -27,7 +27,6 @@ import { LoggerModule } from './common/logger/logger.module';
 import { ClsModule } from 'nestjs-cls';
 import { NoopAuditModule } from './integrations/audit/audit.module';
 import { ThrottleModule } from './integrations/throttle/throttle.module';
-import { EncryptionModule } from './integrations/encryption/encryption.module';

 const enterpriseModules = [];
 try {
@@ -54,7 +53,6 @@ try {
    CoreModule,
    DatabaseModule,
    EnvironmentModule,
-    EncryptionModule,
    RedisModule.forRootAsync({
      useClass: RedisConfigService,
    }),
@@ -1,4 +1,5 @@
 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';
@@ -45,6 +46,9 @@ import {
  TransclusionSource,
  TransclusionReference,
  BaseEmbed,
+  Footnotes,
+  Footnote,
+  FootnoteReference,
 } from '@docmost/editor-ext';
 import { generateText, getSchema, JSONContent } from '@tiptap/core';
 import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
@@ -58,11 +62,15 @@ import { Logger } from '@nestjs/common';

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

 export function jsonToHtml(tiptapJson: any) {
@@ -7,7 +7,6 @@ export const Feature = {
  PAGE_PERMISSIONS: 'page:permissions',
  AI: 'ai',
  CONFLUENCE_IMPORT: 'import:confluence',
-  CONFLUENCE_API_IMPORT: 'import:confluence-api',
  DOCX_IMPORT: 'import:docx',
  PDF_IMPORT: 'import:pdf',
  ATTACHMENT_INDEXING: 'attachment:indexing',
@@ -1,34 +0,0 @@
-import { Json, Timestamp, Generated } from '@docmost/db/types/db';
-
-export interface ConfluenceApiImports {
-  id: Generated<string>;
-  fileTaskId: string;
-  siteUrl: string;
-  authType: string;
-  authEmail: string | null;
-  authToken: string | null;
-  authUsername: string | null;
-  totalSpaces: Generated<number>;
-  importedSpaces: Generated<number>;
-  totalPages: Generated<number>;
-  importedPages: Generated<number>;
-  totalUsers: Generated<number>;
-  importedUsers: Generated<number>;
-  totalAttachments: Generated<number>;
-  importedAttachments: Generated<number>;
-  totalLabels: Generated<number>;
-  importedLabels: Generated<number>;
-  totalGroups: Generated<number>;
-  importedGroups: Generated<number>;
-  totalRestrictedPages: Generated<number>;
-  importedRestrictedPages: Generated<number>;
-  idMapping: Generated<Json>;
-  warnings: Generated<Json>;
-  currentPhase: string | null;
-  cancelled: Generated<boolean>;
-  spaceKeys: Generated<Json>;
-  workspaceId: string;
-  creatorId: string | null;
-  createdAt: Generated<Timestamp>;
-  updatedAt: Generated<Timestamp>;
-}
@@ -1,8 +1,6 @@
 import { DB } from '@docmost/db/types/db';
 import { PageEmbeddings } from '@docmost/db/types/embeddings.types';
-import { ConfluenceApiImports } from './custom.types';

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

-  isBetaConfluenceImporter(): boolean {
-    const flag = this.configService
-      .get<string>('BETA_CONFLUENCE_IMPORTER', 'false')
-      .toLowerCase();
-    return flag === 'true';
-  }
-
  getStripePublishableKey(): string {
    return this.configService.get<string>('STRIPE_PUBLISHABLE_KEY');
  }
@@ -28,9 +28,6 @@ export class FileTaskProcessor extends WorkerHost implements OnModuleDestroy {
        case QueueJob.IMPORT_TASK:
          await this.fileTaskService.processZIpImport(job.data.fileTaskId);
          break;
-        case QueueJob.CONFLUENCE_API_IMPORT:
-          await this.processConfluenceApiImport(job.data.fileTaskId);
-          break;
        case QueueJob.PDF_EXPORT_TASK:
          await this.processExportTask(job.data.fileTaskId);
          break;
@@ -52,19 +49,6 @@ export class FileTaskProcessor extends WorkerHost implements OnModuleDestroy {
    });
  }

-  private getConfluenceApiImportService() {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const mod = require('./../../../ee/confluence-api-import/confluence-api-import.service');
-    return this.moduleRef.get(mod.ConfluenceApiImportService, {
-      strict: false,
-    });
-  }
-
-  private async processConfluenceApiImport(fileTaskId: string): Promise<void> {
-    const service = this.getConfluenceApiImportService();
-    await service.processImport(fileTaskId);
-  }
-
  private async processExportTask(fileTaskId: string): Promise<void> {
    const pdfExportService = this.getPdfExportService();
    await pdfExportService.generateAndStorePdf(fileTaskId);
@@ -93,8 +77,6 @@ export class FileTaskProcessor extends WorkerHost implements OnModuleDestroy {
      await this.handleFailedImportJob(job);
    } else if (job.name === QueueJob.PDF_EXPORT_TASK) {
      await this.handleFailedExportJob(job);
-    } else if (job.name === QueueJob.CONFLUENCE_API_IMPORT) {
-      await this.handleFailedExportJob(job);
    }
  }

@@ -452,7 +452,16 @@ export class ImportAttachmentService {

      const audioExtensions = new Set(['.mp3', '.wav', '.ogg', '.m4a', '.webm', '.flac', '.aac']);

-      if (ext === '.mp4') {
+      if (ext === '.pdf') {
+        const $pdf = $('<div>')
+          .attr('data-type', 'pdf')
+          .attr('src', apiFilePath)
+          .attr('data-attachment-id', attachmentId)
+          .attr('width', '800')
+          .attr('height', '600');
+        $a.replaceWith($pdf);
+        unwrapFromParagraph($, $pdf);
+      } else if (ext === '.mp4') {
        const $video = $('<video>')
          .attr('src', apiFilePath)
          .attr('data-attachment-id', attachmentId)
@@ -1,32 +0,0 @@
-import { nodeIdFromConfluenceAnchor } from './confluence-anchor-id';
-
-describe('nodeIdFromConfluenceAnchor', () => {
-  it('is deterministic for the same (pageId, anchorName)', () => {
-    const a = nodeIdFromConfluenceAnchor('page-1', 'My Anchor');
-    const b = nodeIdFromConfluenceAnchor('page-1', 'My Anchor');
-    expect(a).toBe(b);
-  });
-
-  it('returns different ids when the anchor name differs', () => {
-    const a = nodeIdFromConfluenceAnchor('page-1', 'one');
-    const b = nodeIdFromConfluenceAnchor('page-1', 'two');
-    expect(a).not.toBe(b);
-  });
-
-  it('returns different ids when the pageId differs', () => {
-    const a = nodeIdFromConfluenceAnchor('page-1', 'same');
-    const b = nodeIdFromConfluenceAnchor('page-2', 'same');
-    expect(a).not.toBe(b);
-  });
-
-  it('returns exactly 12 lowercase a-z characters', () => {
-    const id = nodeIdFromConfluenceAnchor('page-xyz', 'Section · 1');
-    expect(id).toHaveLength(12);
-    expect(id).toMatch(/^[a-z]{12}$/);
-  });
-
-  it('treats an empty anchor name as a valid input', () => {
-    const id = nodeIdFromConfluenceAnchor('page-1', '');
-    expect(id).toMatch(/^[a-z]{12}$/);
-  });
-});
@@ -1,28 +0,0 @@
-import { createHash } from 'crypto';
-
-// Matches the alphabet used by generateNodeId() in
-// packages/editor-ext/src/lib/utils.ts (customAlphabet from nanoid).
-const ALPHABET = 'abcdefghijklmnopqrstuvwxyz';
-const NODE_ID_LENGTH = 12;
-
-/**
- * Returns a deterministic 12-character nodeId for a Confluence anchor.
- * The same (pageId, anchorName) pair always produces the same result, so
- * cross-page anchor links resolve to the anchor target without a
- * precomputed map. The output uses the same alphabet and length as
- * generateNodeId() from @docmost/editor-ext, so it is interchangeable
- * with editor-generated nodeIds.
- */
-export function nodeIdFromConfluenceAnchor(
-  pageId: string,
-  anchorName: string,
-): string {
-  const digest = createHash('sha256')
-    .update(`${pageId}#${anchorName}`)
-    .digest();
-  let out = '';
-  for (let i = 0; i < NODE_ID_LENGTH; i++) {
-    out += ALPHABET[digest[i] % ALPHABET.length];
-  }
-  return out;
-}
@@ -1,46 +0,0 @@
-import { parseConfluenceEmojiId } from './confluence-emoji';
-
-describe('parseConfluenceEmojiId', () => {
-  it('parses a single code point id', () => {
-    expect(parseConfluenceEmojiId('1f600')).toBe('😀');
-    expect(parseConfluenceEmojiId('1F600')).toBe('😀');
-  });
-
-  it('parses a country flag (two regional indicator code points)', () => {
-    expect(parseConfluenceEmojiId('1f1f3-1f1ec')).toBe('🇳🇬');
-    expect(parseConfluenceEmojiId('1f1fa-1f1f8')).toBe('🇺🇸');
-  });
-
-  it('parses a ZWJ sequence (three code points)', () => {
-    expect(parseConfluenceEmojiId('1f468-200d-1f4bb')).toBe('👨‍💻');
-  });
-
-  it('parses a five-component family ZWJ sequence', () => {
-    // 👨‍👩‍👧‍👦 = man, ZWJ, woman, ZWJ, girl, ZWJ, boy
-    expect(parseConfluenceEmojiId('1f468-200d-1f469-200d-1f467-200d-1f466')).toBe(
-      '👨‍👩‍👧‍👦',
-    );
-  });
-
-  it('returns null for missing input', () => {
-    expect(parseConfluenceEmojiId(undefined)).toBeNull();
-    expect(parseConfluenceEmojiId(null)).toBeNull();
-    expect(parseConfluenceEmojiId('')).toBeNull();
-  });
-
-  it('returns null when any segment is not pure hex', () => {
-    expect(parseConfluenceEmojiId('1f600-NG')).toBeNull();
-    expect(parseConfluenceEmojiId('not-hex')).toBeNull();
-    expect(parseConfluenceEmojiId('1f600--1f1ec')).toBeNull();
-    expect(parseConfluenceEmojiId('1f600 1f1ec')).toBeNull();
-  });
-
-  it('returns null when a segment parses to a non-positive value', () => {
-    expect(parseConfluenceEmojiId('0')).toBeNull();
-  });
-
-  it('returns null for code points outside the valid Unicode range', () => {
-    // 0x110000 is one past the highest valid code point.
-    expect(parseConfluenceEmojiId('110000')).toBeNull();
-  });
-});
@@ -1,28 +0,0 @@
-/**
- * Parse a Confluence emoji id (hex code points joined by hyphens) into a
- * Unicode string. Confluence emits ids in both single- and multi-code-point
- * forms:
- *
- *   "1f600"             → "😀"
- *   "1f1f3-1f1ec"       → "🇳🇬" (flag: Nigeria)
- *   "1f468-200d-1f4bb"  → "👨‍💻" (man technologist, ZWJ sequence)
- *
- * Returns null when the input is missing, empty, or doesn't parse cleanly as
- * hyphen-separated hex code points.
- */
-export function parseConfluenceEmojiId(
-  raw: string | undefined | null,
-): string | null {
-  if (!raw) return null;
-  const parts = raw.split('-');
-  if (parts.length === 0) return null;
-  if (!parts.every((p) => /^[0-9a-fA-F]+$/.test(p))) return null;
-  const codePoints = parts.map((p) => parseInt(p, 16));
-  if (codePoints.some((cp) => !Number.isFinite(cp) || cp <= 0)) return null;
-  try {
-    return String.fromCodePoint(...codePoints);
-  } catch {
-    // Out-of-range code points throw RangeError on String.fromCodePoint.
-    return null;
-  }
-}
@@ -1,41 +0,0 @@
-import { mapConfluenceHighlightColor } from './confluence-highlight-color';
-
-describe('mapConfluenceHighlightColor', () => {
-  it('maps named DC colours to the Docmost table palette', () => {
-    expect(mapConfluenceHighlightColor('grey')).toEqual({
-      color: '#eaecef',
-      name: 'gray',
-    });
-    expect(mapConfluenceHighlightColor('red')).toEqual({
-      color: '#ffbead',
-      name: 'red',
-    });
-    expect(mapConfluenceHighlightColor('yellow')).toEqual({
-      color: '#fef1b4',
-      name: 'yellow',
-    });
-  });
-
-  it('is case- and whitespace-insensitive', () => {
-    expect(mapConfluenceHighlightColor(' Grey ')).toEqual({
-      color: '#eaecef',
-      name: 'gray',
-    });
-  });
-
-  it('maps teal to the closest Docmost colour', () => {
-    expect(mapConfluenceHighlightColor('teal')).toEqual({
-      color: '#b4d5ff',
-      name: 'blue',
-    });
-  });
-
-  it('passes hex values through untouched', () => {
-    expect(mapConfluenceHighlightColor('#f4f5f7')).toEqual({
-      color: '#f4f5f7',
-    });
-    expect(mapConfluenceHighlightColor('#4c9aff')).toEqual({
-      color: '#4c9aff',
-    });
-  });
-});
@@ -1,24 +0,0 @@
-const CONFLUENCE_HIGHLIGHT_TO_DOCMOST: Record<
-  string,
-  { color: string; name: string }
-> = {
-  grey: { color: '#eaecef', name: 'gray' },
-  gray: { color: '#eaecef', name: 'gray' },
-  blue: { color: '#b4d5ff', name: 'blue' },
-  teal: { color: '#b4d5ff', name: 'blue' },
-  green: { color: '#acf5d2', name: 'green' },
-  yellow: { color: '#fef1b4', name: 'yellow' },
-  red: { color: '#ffbead', name: 'red' },
-  purple: { color: '#c1b7f2', name: 'purple' },
-};
-
-export function mapConfluenceHighlightColor(colour: string): {
-  color: string;
-  name?: string;
-} {
-  return (
-    CONFLUENCE_HIGHLIGHT_TO_DOCMOST[colour.trim().toLowerCase()] ?? {
-      color: colour,
-    }
-  );
-}
@@ -1,149 +0,0 @@
-import { load } from 'cheerio';
-import { applyConfluenceMarginLeftIndent } from './confluence-indent';
-
-function run(html: string): string {
-  const $ = load(html);
-  applyConfluenceMarginLeftIndent($, $.root());
-  // cheerio's html() includes <html><body>; return the body's inner HTML so
-  // tests can assert on the meaningful portion.
-  return $('body').html() ?? $.html();
-}
-
-describe('applyConfluenceMarginLeftIndent', () => {
-  describe('Confluence Cloud (30 px per level, max 6)', () => {
-    it('maps 30/60/90/120/150/180 px to data-indent 1..6', () => {
-      const html =
-        '<p style="margin-left: 30.0px;">L1</p>' +
-        '<p style="margin-left: 60.0px;">L2</p>' +
-        '<p style="margin-left: 90.0px;">L3</p>' +
-        '<p style="margin-left: 120.0px;">L4</p>' +
-        '<p style="margin-left: 150.0px;">L5</p>' +
-        '<p style="margin-left: 180.0px;">L6</p>';
-      const out = run(html);
-      expect(out).toContain('<p data-indent="1">L1</p>');
-      expect(out).toContain('<p data-indent="2">L2</p>');
-      expect(out).toContain('<p data-indent="3">L3</p>');
-      expect(out).toContain('<p data-indent="4">L4</p>');
-      expect(out).toContain('<p data-indent="5">L5</p>');
-      expect(out).toContain('<p data-indent="6">L6</p>');
-      expect(out).not.toContain('margin-left');
-    });
-  });
-
-  describe('Confluence Data Center (40 px per level, no upper bound)', () => {
-    it('maps 40/80/120/160/200/240 px to data-indent 1..6', () => {
-      const html =
-        '<p style="margin-left: 40.0px;">one</p>' +
-        '<p style="margin-left: 80.0px;">two</p>' +
-        '<p style="margin-left: 120.0px;">three</p>' +
-        '<p style="margin-left: 160.0px;">four</p>' +
-        '<p style="margin-left: 200.0px;">five</p>' +
-        '<p style="margin-left: 240.0px;">six</p>';
-      const out = run(html);
-      expect(out).toContain('<p data-indent="1">one</p>');
-      expect(out).toContain('<p data-indent="2">two</p>');
-      expect(out).toContain('<p data-indent="3">three</p>');
-      expect(out).toContain('<p data-indent="4">four</p>');
-      expect(out).toContain('<p data-indent="5">five</p>');
-      expect(out).toContain('<p data-indent="6">six</p>');
-      expect(out).not.toContain('margin-left');
-    });
-
-    it('clamps DC levels above 8 down to 8', () => {
-      const html =
-        '<p style="margin-left: 320.0px;">L8</p>' +
-        '<p style="margin-left: 360.0px;">L9</p>' +
-        '<p style="margin-left: 600.0px;">L15</p>';
-      const out = run(html);
-      expect(out).toContain('<p data-indent="8">L8</p>');
-      expect(out).toContain('<p data-indent="8">L9</p>');
-      expect(out).toContain('<p data-indent="8">L15</p>');
-    });
-  });
-
-  describe('headings', () => {
-    it('handles indent on h1-h6 the same way as paragraphs', () => {
-      const html =
-        '<h1 style="margin-left: 30px;">a</h1>' +
-        '<h6 style="margin-left: 90px;">b</h6>';
-      const out = run(html);
-      expect(out).toContain('<h1 data-indent="1">a</h1>');
-      expect(out).toContain('<h6 data-indent="3">b</h6>');
-    });
-  });
-
-  describe('style attribute handling', () => {
-    it('strips margin-left but preserves other inline styles', () => {
-      const html =
-        '<p style="color: red; margin-left: 30px; font-weight: bold;">x</p>';
-      const out = run(html);
-      expect(out).toMatch(/<p style="color: red;\s+font-weight: bold;?" data-indent="1">x<\/p>/);
-      expect(out).not.toContain('margin-left');
-    });
-
-    it('removes the style attribute entirely when only margin-left was set', () => {
-      // Two values so GCD detection sees a real unit (60 px) instead of
-      // collapsing to the lone value. The point of this test is the style
-      // attribute being stripped, not the level number.
-      const html =
-        '<p style="margin-left: 60px;">x</p>' +
-        '<p style="margin-left: 120px;">y</p>';
-      const out = run(html);
-      expect(out).toContain('<p data-indent="1">x</p>');
-      expect(out).toContain('<p data-indent="2">y</p>');
-      expect(out).not.toContain('style=');
-    });
-  });
-
-  describe('scope and edge cases', () => {
-    it('leaves elements without margin-left untouched', () => {
-      const html = '<p>plain</p><h2>heading</h2>';
-      const out = run(html);
-      expect(out).toBe('<p>plain</p><h2>heading</h2>');
-    });
-
-    it('does not touch divs, spans, or list items', () => {
-      const html =
-        '<div style="margin-left: 30px;">div</div>' +
-        '<li style="margin-left: 30px;">li</li>' +
-        '<span style="margin-left: 30px;">span</span>';
-      const out = run(html);
-      expect(out).not.toContain('data-indent');
-      expect(out).toContain('margin-left: 30px');
-    });
-
-    it('ignores zero, negative, and unparseable margin-left values', () => {
-      const html =
-        '<p style="margin-left: 0px;">zero</p>' +
-        '<p style="margin-left: -30px;">neg</p>' +
-        '<p style="margin-left: auto;">auto</p>';
-      const out = run(html);
-      expect(out).not.toContain('data-indent');
-    });
-
-    it('honors an explicit pxPerLevel override', () => {
-      // Mixed Cloud-and-DC nominal values forced to 40 px/level interpretation.
-      const $ = load(
-        '<p style="margin-left: 40px;">a</p>' +
-          '<p style="margin-left: 80px;">b</p>',
-      );
-      applyConfluenceMarginLeftIndent($, $.root(), { pxPerLevel: 40 });
-      const out = $('body').html() ?? '';
-      expect(out).toContain('<p data-indent="1">a</p>');
-      expect(out).toContain('<p data-indent="2">b</p>');
-    });
-
-    it('returns a no-op when no indented elements are present', () => {
-      const html = '<p>hi</p>';
-      const out = run(html);
-      expect(out).toBe('<p>hi</p>');
-    });
-
-    it('handles a single ambiguous value by clamping to level 1', () => {
-      // GCD of a single value is the value itself, so 120 / 120 = 1.
-      const html = '<p style="margin-left: 120px;">only</p>';
-      const out = run(html);
-      expect(out).toContain('<p data-indent="1">only</p>');
-    });
-  });
-});
@@ -1,76 +0,0 @@
-import { Cheerio, CheerioAPI } from 'cheerio';
-
-// Maximum indent level supported by the Indent editor extension (see
-// packages/editor-ext/src/lib/indent.ts). Values above this clamp down.
-const MAX_INDENT_LEVEL = 8;
-const MARGIN_LEFT_RE = /margin-left\s*:\s*(-?\d*\.?\d+)\s*px/i;
-const MARGIN_LEFT_STRIP_RE = /margin-left\s*:\s*-?\d*\.?\d+\s*px\s*;?/i;
-
-/**
- * Confluence encodes paragraph indent as inline `style="margin-left: Npx"`.
- * The per-level pixel value differs by edition: Cloud uses 30 (max 6 levels),
- * Data Center uses 40 (no upper limit). The HTML-export ZIP path has no
- * edition information available, so we auto-detect the per-level unit from
- * the GCD of all margin-left values in the document. The API converter can
- * pass `pxPerLevel` explicitly when the edition is known.
- *
- * Levels are written to `data-indent` for the TipTap Indent extension to
- * pick up; the margin-left style is stripped from the element so the
- * normalized indent doesn't double up with the editor's own indent padding.
- */
-export function applyConfluenceMarginLeftIndent(
-  $: CheerioAPI,
-  $root: Cheerio<any>,
-  options?: { pxPerLevel?: number },
-): void {
-  const $els = $root.find('p, h1, h2, h3, h4, h5, h6');
-
-  const values: number[] = [];
-  $els.each((_, el) => {
-    const style = $(el).attr('style');
-    if (!style) return;
-    const match = MARGIN_LEFT_RE.exec(style);
-    if (!match) return;
-    const px = parseFloat(match[1]);
-    if (Number.isFinite(px) && px > 0) values.push(px);
-  });
-  if (values.length === 0) return;
-
-  const unit = options?.pxPerLevel ?? detectIndentUnit(values);
-  if (!unit || unit <= 0) return;
-
-  $els.each((_, el) => {
-    const $el = $(el);
-    const style = $el.attr('style');
-    if (!style) return;
-    const match = MARGIN_LEFT_RE.exec(style);
-    if (!match) return;
-    const px = parseFloat(match[1]);
-    if (!Number.isFinite(px) || px <= 0) return;
-    const level = Math.min(
-      MAX_INDENT_LEVEL,
-      Math.max(1, Math.round(px / unit)),
-    );
-    $el.attr('data-indent', String(level));
-    const remaining = style.replace(MARGIN_LEFT_STRIP_RE, '').trim();
-    if (remaining) {
-      $el.attr('style', remaining);
-    } else {
-      $el.removeAttr('style');
-    }
-  });
-}
-
-function detectIndentUnit(values: number[]): number {
-  // Confluence emits floats like "30.0"; round to ints for a clean GCD.
-  const ints = values.map((v) => Math.round(v)).filter((v) => v > 0);
-  if (ints.length === 0) return 0;
-  return ints.reduce((a, b) => gcd(a, b));
-}
-
-function gcd(a: number, b: number): number {
-  while (b !== 0) {
-    [a, b] = [b, a % b];
-  }
-  return a;
-}
@@ -11,7 +11,6 @@ export enum FileImportSource {
  Generic = 'generic',
  Notion = 'notion',
  Confluence = 'confluence',
-  ConfluenceApi = 'confluence-api'
 }

 export enum FileTaskStatus {
@@ -97,21 +97,14 @@ export function xwikiFormatter($: CheerioAPI, $root: Cheerio<any>) {
  }
 }

-import { applyConfluenceMarginLeftIndent } from './confluence-indent';
-export { applyConfluenceMarginLeftIndent };
-
 export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
  normalizeTableColumnWidths($, $root);
-  applyConfluenceMarginLeftIndent($, $root);

-  // Auto-embed only when the <a> is the sole meaningful child of its parent
-  // block. A link mixed with surrounding text stays an inline link.
  $root.find('a[href]').each((_, el) => {
    const $el = $(el);
    const url = $el.attr('href')!;
    const { provider } = getEmbedUrlAndProvider(url);
    if (provider === 'iframe') return;
-    if (!isSoleMeaningfulChild($el, el)) return;

    const embed = `<div data-type=\"embed\" data-src=\"${url}\" data-provider=\"${provider}\" data-align=\"center\" data-width=\"640\" data-height=\"480\"></div>`;
    $el.replaceWith(embed);
@@ -127,21 +120,6 @@ export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
  });
 }

-function isSoleMeaningfulChild(
-  $el: Cheerio<any>,
-  rawEl: any,
-): boolean {
-  const $parent = $el.parent();
-  if ($parent.length === 0) return true;
-  const others = $parent.contents().toArray().filter((n: any) => {
-    if (n === rawEl) return false;
-    if (n.type === 'text') return (n.data ?? '').trim() !== '';
-    if (n.type === 'tag' && n.name === 'br') return false;
-    return true;
-  });
-  return others.length === 0;
-}
-
 const COLUMN_LAYOUTS = [
  '',
  '',
@@ -31,7 +31,6 @@ export enum QueueJob {
  FIRST_PAYMENT_EMAIL = 'first-payment-email',

  IMPORT_TASK = 'import-task',
-  CONFLUENCE_API_IMPORT = 'confluence-api-import-task',
  EXPORT_TASK = 'export-task',

  SEARCH_INDEX_PAGE = 'search-index-page',
@@ -49,8 +49,6 @@ export class StaticModule implements OnModuleInit {
          : undefined,
        POSTHOG_HOST: this.environmentService.getPostHogHost(),
        POSTHOG_KEY: this.environmentService.getPostHogKey(),
-        BETA_CONFLUENCE_IMPORTER:
-          this.environmentService.isBetaConfluenceImporter(),
      };

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

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

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

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

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

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

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

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

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

          if (!shouldInsertNodeAtEnd) {
            return;
          }

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

-            const lastNode = tr.doc.lastChild
+            const lastNode = lastNodeBeforeFootnotes(tr.doc)
            return !nodeEqualsType({ node: lastNode, types: disabledNodes })
          },
        },
@@ -626,9 +626,6 @@ importers:
      csv-stringify:
        specifier: 6.8.0
        version: 6.8.0
-      entities:
-        specifier: 7.0.1
-        version: 7.0.1
      fast-bm25:
        specifier: 0.0.5
        version: 0.0.5(typescript@5.9.3)
Author	SHA1	Message	Date
Philipinho	c17369411d	feat: proper DOCX support	2026-08-11 01:45:01 +01:00
Philipinho	0a5206f19e	feat: footnotes	2026-08-11 01:30:26 +01:00