types

* fix table

* fix code splitting

* fix: editor ready check

* fix codeblock/mermaid gap cursor

* fix callout

apps/client/src/App.tsx

@@ -46,6 +46,7 @@ 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();
@@ -125,6 +126,10 @@ 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>

apps/client/src/components/settings/settings-sidebar.tsx

@@ -15,6 +15,7 @@ import {
   IconSparkles,
   IconHistory,
   IconShieldCheck,
+  IconFileImport,
 } from "@tabler/icons-react";
 import { Link, useLocation } from "react-router-dom";
 import classes from "./settings.module.css";
@@ -125,6 +126,13 @@ const groupedData: DataGroup[] = [
         role: "owner",
         env: "selfhosted",
       },
+      {
+        label: "Import",
+        icon: IconFileImport,
+        path: "/settings/import/confluence",
+        feature: Feature.CONFLUENCE_IMPORT,
+        role: "admin",
+      },
     ],
   },
   {

apps/client/src/ee/confluence-import/components/confluence-import-history.tsx

@@ -0,0 +1,229 @@
+import { useMemo } from "react";
+import {
+  Badge,
+  Group,
+  Loader,
+  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) {
+  if (cancelled) {
+    return (
+      <Badge
+        color="gray"
+        variant="light"
+        leftSection={<IconX size={12} />}
+        styles={BADGE_STYLES}
+      >
+        Cancelled
+      </Badge>
+    );
+  }
+  if (status === "processing") {
+    return (
+      <Badge
+        color="blue"
+        variant="light"
+        leftSection={<Loader size={10} />}
+        styles={BADGE_STYLES}
+      >
+        Running
+      </Badge>
+    );
+  }
+  if (status === "success") {
+    return (
+      <Badge
+        color="teal"
+        variant="light"
+        leftSection={<IconCheck size={12} />}
+        styles={BADGE_STYLES}
+      >
+        Completed
+      </Badge>
+    );
+  }
+  return (
+    <Badge
+      color="red"
+      variant="light"
+      leftSection={<IconAlertCircle size={12} />}
+      styles={BADGE_STYLES}
+    >
+      Failed
+    </Badge>
+  );
+}
+
+function phaseLabel(phase: string | null): string {
+  if (!phase) return "—";
+  return 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 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 || "?"} pages
+        </Text>
+        <Text fz="xs" c="dimmed" style={{ whiteSpace: "nowrap" }}>
+          · {item.importedSpaces}/{item.totalSpaces || "?"} spaces
+        </Text>
+        <Text fz="xs" c="dimmed" style={{ whiteSpace: "nowrap" }}>
+          · {item.importedUsers}/{item.totalUsers || "?"} users
+        </Text>
+      </Group>
+    </Stack>
+  );
+}
+
+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 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}>
+                <Table.Td>
+                  {statusBadge(item.status, item.cancelled)}
+                  {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)}</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>
+    </Table.ScrollContainer>
+  );
+}

apps/client/src/ee/confluence-import/components/confluence-import-modal.tsx

@@ -0,0 +1,441 @@
+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 (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(
+              "Choose the spaces to import. Users, groups and permissions will be imported for the selected spaces.",
+            )}
+          </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>
+  );
+}

apps/client/src/ee/confluence-import/pages/confluence-import.tsx

@@ -0,0 +1,67 @@
+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_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} />
+    </>
+  );
+}

apps/client/src/ee/confluence-import/queries/confluence-import-queries.ts

@@ -0,0 +1,17 @@
+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;
+    },
+  });
+}

apps/client/src/ee/confluence-import/services/confluence-import-service.ts

@@ -0,0 +1,64 @@
+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;
+}

apps/client/src/ee/confluence-import/types/confluence-import.types.ts

@@ -0,0 +1,82 @@
+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;
+  warnings?: string[];
+  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;
+  cancelled: boolean;
+  spaceKeys: string[];
+  warnings: string[];
+  createdAt: string;
+  updatedAt: string;
+  creatorId: string | null;
+  creatorName: string | null;
+  creatorAvatarUrl: string | null;
+};
+
+export type ListImportsResponse = {
+  items: ConfluenceImportHistoryItem[];
+};

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

@@ -166,6 +166,18 @@ 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`);
   };
 

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

@@ -1,6 +1,8 @@
 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";
@@ -47,6 +49,8 @@ const CommentEditor = forwardRef(
           placeholder: placeholder || t("Reply..."),
         }),
         LinkExtension,
+        TextStyle,
+        Color,
         EmojiCommand,
         Mention.configure({
           suggestion: {

apps/client/vite.config.ts

@@ -55,6 +55,7 @@ export default defineConfig(({ mode }) => {
       },
     },
     server: {
+      allowedHosts: ['docmost.nz'],
       proxy: {
         "/api": {
           target: APP_URL,

apps/server/src/app.module.ts

@@ -27,6 +27,7 @@ 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 {
@@ -53,6 +54,7 @@ try {
     CoreModule,
     DatabaseModule,
     EnvironmentModule,
+    EncryptionModule,
     RedisModule.forRootAsync({
       useClass: RedisConfigService,
     }),

apps/server/src/database/types/custom.types.ts

@@ -0,0 +1,30 @@
+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>;
+  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>;
+}

apps/server/src/database/types/db.interface.ts

@@ -1,6 +1,8 @@
 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;
 }

apps/server/src/integrations/encryption/encryption.errors.ts

@@ -0,0 +1,13 @@
+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';
+  }
+}

apps/server/src/integrations/encryption/encryption.module.ts

@@ -0,0 +1,9 @@
+import { Global, Module } from '@nestjs/common';
+import { EncryptionService } from './encryption.service';
+
+@Global()
+@Module({
+  providers: [EncryptionService],
+  exports: [EncryptionService],
+})
+export class EncryptionModule {}

apps/server/src/integrations/encryption/encryption.service.spec.ts

@@ -0,0 +1,184 @@
+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);
+    });
+  });
+});

apps/server/src/integrations/encryption/encryption.service.ts

@@ -0,0 +1,108 @@
+// 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 };
+  }
+}

apps/server/src/integrations/import/processors/file-task.processor.ts

@@ -28,6 +28,9 @@ 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;
@@ -49,6 +52,19 @@ 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);
@@ -74,6 +90,8 @@ 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);
     }
   }
 

apps/server/src/integrations/import/utils/confluence-anchor-id.spec.ts

@@ -0,0 +1,32 @@
+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}$/);
+  });
+});

apps/server/src/integrations/import/utils/confluence-anchor-id.ts

@@ -0,0 +1,28 @@
+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;
+}

apps/server/src/integrations/import/utils/confluence-emoji.spec.ts

@@ -0,0 +1,46 @@
+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();
+  });
+});

apps/server/src/integrations/import/utils/confluence-emoji.ts

@@ -0,0 +1,28 @@
+/**
+ * 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;
+  }
+}

apps/server/src/integrations/import/utils/confluence-indent.spec.ts

@@ -0,0 +1,149 @@
+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>');
+    });
+  });
+});

apps/server/src/integrations/import/utils/confluence-indent.ts

@@ -0,0 +1,76 @@
+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;
+}

apps/server/src/integrations/import/utils/file.utils.ts

@@ -11,6 +11,7 @@ export enum FileImportSource {
   Generic = 'generic',
   Notion = 'notion',
   Confluence = 'confluence',
+  ConfluenceApi = 'confluence-api'
 }
 
 export enum FileTaskStatus {

apps/server/src/integrations/import/utils/import-formatter.ts

@@ -97,14 +97,21 @@ 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);
@@ -120,6 +127,21 @@ 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 = [
   '',
   '',

apps/server/src/integrations/queue/constants/queue.constants.ts

@@ -30,6 +30,7 @@ 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',