feat: sync blocks - wip

2026-05-10 16:24:05 +08:00 · 2026-05-04 18:08:34 +01:00
141 changed files with 1548 additions and 1685 deletions
@@ -416,7 +416,6 @@
  "{{latestVersion}} is available": "{{latestVersion}} is available",
  "Default page edit mode": "Default page edit mode",
  "Choose your preferred page edit mode. Avoid accidental edits.": "Choose your preferred page edit mode. Avoid accidental edits.",
-  "Choose {{format}} file": "Choose {{format}} file",
  "Reading": "Reading",
  "Delete member": "Delete member",
  "Member deleted successfully": "Member deleted successfully",
@@ -870,12 +869,6 @@
  "Previous 7 days": "Previous 7 days",
  "Previous 30 days": "Previous 30 days",
  "Search chats...": "Search chats...",
-  "Search chats": "Search chats",
-  "Ask anything... Use @ to mention pages": "Ask anything... Use @ to mention pages",
-  "Ask anything or search your workspace": "Ask anything or search your workspace",
-  "Welcome to {{name}}": "Welcome to {{name}}",
-  "Add files": "Add files",
-  "Mention a page": "Mention a page",
  "Start a new chat to see it here.": "Start a new chat to see it here.",
  "Summarize this page": "Summarize this page",
  "Toggle AI Chat": "Toggle AI Chat",
@@ -908,43 +901,16 @@
  "This action cannot be undone. Your identity provider will stop syncing immediately.": "This action cannot be undone. Your identity provider will stop syncing immediately.",
  "Toggle SCIM provisioning": "Toggle SCIM provisioning",
  "Token": "Token",
-  "Page menu": "Page menu",
-  "Expand": "Expand",
-  "Collapse": "Collapse",
-  "Comment menu": "Comment menu",
-  "Group menu": "Group menu",
-  "Show hidden breadcrumbs": "Show hidden breadcrumbs",
-  "Breadcrumbs": "Breadcrumbs",
-  "Page actions": "Page actions",
-  "Pick emoji": "Pick emoji",
-  "Template menu": "Template menu",
-  "Chat menu": "Chat menu",
-  "API key menu": "API key menu",
-  "Jump to comment selection": "Jump to comment selection",
-  "Slash commands": "Slash commands",
-  "Mention suggestions": "Mention suggestions",
-  "Link suggestions": "Link suggestions",
-  "Diagram editor": "Diagram editor",
-  "Add comment": "Add comment",
-  "Find and replace": "Find and replace",
-  "Main navigation": "Main navigation",
-  "Space navigation": "Space navigation",
-  "Settings navigation": "Settings navigation",
-  "AI navigation": "AI navigation",
-  "Breadcrumb": "Breadcrumb",
-  "Skip to main content": "Skip to main content"
-  "Synced block": "Synced block",
+  "Sync block": "Sync block",
  "Create a block that stays in sync across pages.": "Create a block that stays in sync across pages.",
+  "Sync block name": "Sync block name",
  "Editing original": "Editing original",
  "Copy synced block": "Copy synced block",
  "Unsync": "Unsync",
-  "Delete synced block": "Delete synced block",
+  "Delete sync block": "Delete sync block",
  "Synced to {{count}} other page_one": "Synced to {{count}} other page",
  "Synced to {{count}} other page_other": "Synced to {{count}} other pages",
  "ORIGINAL": "ORIGINAL",
  "THIS PAGE": "THIS PAGE",
-  "No pages": "No pages",
-  "The original synced block no longer exists": "The original synced block no longer exists",
-  "You don't have access to this synced block": "You don't have access to this synced block",
-  "Failed to load this synced block": "Failed to load this synced block"
+  "No pages": "No pages"
 }
@@ -80,12 +80,6 @@ export default function AvatarUploader({
    }
  };

-  const ariaLabel = {
-    [AvatarIconType.AVATAR]: t("Change avatar"),
-    [AvatarIconType.SPACE_ICON]: t("Change space icon"),
-    [AvatarIconType.WORKSPACE_ICON]: t("Change workspace icon"),
-  }[type];
-
  const handleRemove = async () => {
    if (disabled) return;

@@ -110,8 +104,6 @@ export default function AvatarUploader({
        ref={fileInputRef}
        onChange={handleFileInputChange}
        accept="image/png,image/jpeg,image/jpg"
-        aria-label={ariaLabel}
-        tabIndex={-1}
        style={{ display: "none" }}
      />

@@ -123,8 +115,6 @@ export default function AvatarUploader({
              size={size}
              avatarUrl={currentImageUrl}
              name={fallbackName}
-              aria-label={ariaLabel}
-              aria-haspopup="menu"
              style={{
                cursor: disabled || isLoading ? "default" : "pointer",
                opacity: isLoading ? 0.6 : 1,
@@ -25,7 +25,6 @@ export default function CopyTextButton({ text, size }: CopyProps) {
            variant="subtle"
            onClick={copy}
            size={size}
-            aria-label={copied ? t("Copied") : t("Copy")}
          >
            {copied ? <IconCheck size={16} /> : <IconCopy size={16} />}
          </ActionIcon>
@@ -4,7 +4,7 @@ import {
  UnstyledButton,
  Badge,
  Table,
-  ThemeIcon,
+  ActionIcon,
  Button,
 } from "@mantine/core";
 import { Link } from "react-router-dom";
@@ -49,9 +49,9 @@ export default function RecentChanges({ spaceId }: Props) {
                  >
                    <Group wrap="nowrap">
                      {page.icon || (
-                        <ThemeIcon variant="transparent" color="gray" size={18}>
+                        <ActionIcon variant="transparent" color="gray" size={18}>
                          <IconFileDescription size={18} />
-                        </ThemeIcon>
+                        </ActionIcon>
                      )}

                      <Text fw={500} size="md" lineClamp={1}>
@@ -6,14 +6,12 @@ import { useTranslation } from "react-i18next";

 export interface SearchInputProps {
  placeholder?: string;
-  ariaLabel?: string;
  debounceDelay?: number;
  onSearch: (value: string) => void;
 }

 export function SearchInput({
  placeholder,
-  ariaLabel,
  debounceDelay = 500,
  onSearch,
 }: SearchInputProps) {
@@ -30,7 +28,6 @@ export function SearchInput({
      <TextInput
        size="sm"
        placeholder={placeholder || t("Search...")}
-        aria-label={ariaLabel || placeholder || t("Search")}
        leftSection={<IconSearch size={16} />}
        value={value}
        onChange={(e) => setValue(e.currentTarget.value)}
@@ -1,11 +1,11 @@
-import { ThemeIcon } from "@mantine/core";
+import { ActionIcon, rem } from "@mantine/core";
 import React from "react";
 import { IconUsersGroup } from "@tabler/icons-react";

 export function IconGroupCircle() {
  return (
-    <ThemeIcon variant="light" size="lg" color="gray" radius="xl">
+    <ActionIcon variant="light" size="lg" color="gray" radius="xl">
      <IconUsersGroup stroke={1.5} />
-    </ThemeIcon>
+    </ActionIcon>
  );
 }
@@ -28,22 +28,4 @@
  }
 }

-.skipLink {
-  position: fixed;
-  left: 8px;
-  top: 8px;
-  padding: 8px 12px;
-  background: var(--mantine-color-blue-6);
-  color: #fff;
-  border-radius: 4px;
-  text-decoration: none;
-  z-index: 1000;
-  transform: translateY(-150%);
-
-  &:focus {
-    transform: translateY(0);
-    outline: 2px solid var(--mantine-color-blue-3);
-  }
-}
-

@@ -1,7 +1,6 @@
 import { AppShell, Container } from "@mantine/core";
 import React, { useEffect, useRef, useState } from "react";
 import { useLocation } from "react-router-dom";
-import { useTranslation } from "react-i18next";
 import SettingsSidebar from "@/components/settings/settings-sidebar.tsx";
 import { useAtom } from "jotai";
 import {
@@ -24,12 +23,11 @@ export default function GlobalAppShell({
 }: {
  children: React.ReactNode;
 }) {
-  const { t } = useTranslation();
  useTrialEndAction();
  const [mobileOpened] = useAtom(mobileSidebarAtom);
  const toggleMobile = useToggleSidebar(mobileSidebarAtom);
  const [desktopOpened] = useAtom(desktopSidebarAtom);
-  const [{ isAsideOpen, tab: asideTab }] = useAtom(asideStateAtom);
+  const [{ isAsideOpen }] = useAtom(asideStateAtom);
  const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
  const [isResizing, setIsResizing] = useState(false);
  const sidebarRef = useRef(null);
@@ -81,11 +79,7 @@ export default function GlobalAppShell({
  const showGlobalSidebar = !isSpaceRoute && !isSettingsRoute && !isAiRoute;

  return (
-    <>
-      <a href="#main-content" className={classes.skipLink}>
-        {t("Skip to main content")}
-      </a>
-      <AppShell
+    <AppShell
      header={{ height: 45 }}
      navbar={{
        width: isSpaceRoute ? sidebarWidth : 300,
@@ -111,15 +105,6 @@ export default function GlobalAppShell({
        className={classes.navbar}
        withBorder={false}
        ref={sidebarRef}
-        aria-label={
-          isSpaceRoute
-            ? t("Space navigation")
-            : isSettingsRoute
-              ? t("Settings navigation")
-              : isAiRoute
-                ? t("AI navigation")
-                : t("Main navigation")
-        }
      >
        {isSpaceRoute && (
          <div className={classes.resizeHandle} onMouseDown={startResizing} />
@@ -129,7 +114,7 @@ export default function GlobalAppShell({
        {isAiRoute && <AiChatSidebar />}
        {showGlobalSidebar && <GlobalSidebar />}
      </AppShell.Navbar>
-      <AppShell.Main id="main-content">
+      <AppShell.Main>
        {isSettingsRoute ? (
          <Container size={900} pb={80}>
            {children}
@@ -140,24 +125,10 @@ export default function GlobalAppShell({
      </AppShell.Main>

      {isPageRoute && (
-        <AppShell.Aside
-          className={classes.aside}
-          p="md"
-          withBorder={false}
-          aria-label={
-            asideTab === "comments"
-              ? t("Comments")
-              : asideTab === "toc"
-                ? t("Table of contents")
-                : asideTab === "chat"
-                  ? t("AI Chat")
-                  : undefined
-          }
-        >
+        <AppShell.Aside className={classes.aside} p="md" withBorder={false}>
          <Aside />
        </AppShell.Aside>
      )}
    </AppShell>
-    </>
  );
 }
@@ -50,7 +50,7 @@
 .sectionHeader {
    padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
    font-size: var(--mantine-font-size-xs);
-    color: var(--mantine-color-dimmed);
+    color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-3));
    font-weight: 600;
    text-transform: uppercase;
    letter-spacing: 0.5px;
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { ScrollArea, Text, Divider, Modal, UnstyledButton } from "@mantine/core";
+import { ScrollArea, Text, Divider, Modal } from "@mantine/core";
 import {
  IconHome,
  IconClock,
@@ -119,13 +119,17 @@ export default function GlobalSidebar() {
      </ScrollArea>

      <div className={classes.bottomSection}>
-        <UnstyledButton
+        <a
          className={classes.link}
-          onClick={openInvite}
+          onClick={(e) => {
+            e.preventDefault();
+            openInvite();
+          }}
+          href="#"
        >
          <IconUserPlus className={classes.linkIcon} stroke={2} />
          <span>{t("Invite People")}</span>
-        </UnstyledButton>
+        </a>
        <Link
          className={classes.link}
          data-active={active.startsWith("/settings") || undefined}
@@ -29,7 +29,7 @@ export default function AppVersion() {
      >
        <Indicator
          label={t("New update")}
-          color="dark"
+          color="gray"
          inline
          size={16}
          position="middle-end"
@@ -230,6 +230,32 @@ export default function SettingsSidebar() {
          }

          const isDisabled = isItemDisabled(item);
+          const linkElement = (
+            <Link
+              onMouseEnter={!isDisabled ? prefetchHandler : undefined}
+              className={classes.link}
+              data-active={active.startsWith(item.path) || undefined}
+              data-disabled={isDisabled || undefined}
+              key={item.label}
+              to={isDisabled ? "#" : item.path}
+              onClick={(e) => {
+                if (isDisabled) {
+                  e.preventDefault();
+                  return;
+                }
+                if (mobileSidebarOpened) {
+                  toggleMobileSidebar();
+                }
+              }}
+              style={{
+                opacity: isDisabled ? 0.5 : 1,
+                cursor: isDisabled ? "not-allowed" : "pointer",
+              }}
+            >
+              <item.icon className={classes.linkIcon} stroke={2} />
+              <span>{t(item.label)}</span>
+            </Link>
+          );

          if (isDisabled) {
            return (
@@ -239,41 +265,12 @@ export default function SettingsSidebar() {
                position="right"
                withArrow
              >
-                <span
-                  className={classes.link}
-                  data-disabled
-                  role="link"
-                  aria-disabled="true"
-                  tabIndex={0}
-                  style={{
-                    opacity: 0.5,
-                    cursor: "not-allowed",
-                  }}
-                >
-                  <item.icon className={classes.linkIcon} stroke={2} />
-                  <span>{t(item.label)}</span>
-                </span>
+                {linkElement}
              </Tooltip>
            );
          }

-          return (
-            <Link
-              onMouseEnter={prefetchHandler}
-              className={classes.link}
-              data-active={active.startsWith(item.path) || undefined}
-              key={item.label}
-              to={item.path}
-              onClick={() => {
-                if (mobileSidebarOpened) {
-                  toggleMobileSidebar();
-                }
-              }}
-            >
-              <item.icon className={classes.linkIcon} stroke={2} />
-              <span>{t(item.label)}</span>
-            </Link>
-          );
+          return linkElement;
        })}
      </div>
    );
@@ -291,7 +288,7 @@ export default function SettingsSidebar() {
          }}
          variant="transparent"
          c="gray"
-          aria-label={t("Back")}
+          aria-label="Back"
        >
          <IconArrowLeft stroke={2} />
        </ActionIcon>
@@ -1,5 +1,5 @@
 import React from "react";
-import { Avatar, MantineColor } from "@mantine/core";
+import { Avatar } from "@mantine/core";
 import { getAvatarUrl } from "@/lib/config.ts";
 import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";

@@ -16,39 +16,11 @@ interface CustomAvatarProps {
  mt?: string | number;
 }

-// `color.shade` pairs whose filled background meets WCAG AA (4.5:1) against
-// white text. Avoids lime/yellow/green/orange — even their dark shades have
-// weak white-text contrast.
-const SAFE_INITIALS_COLORS: MantineColor[] = [
-  "blue.8",
-  "cyan.9",
-  "grape.7",
-  "indigo.7",
-  "pink.8",
-  "red.8",
-  "violet.7",
-];
-
-function hashName(input: string) {
-  let hash = 0;
-  for (let i = 0; i < input.length; i += 1) {
-    hash = (hash << 5) - hash + input.charCodeAt(i);
-    hash |= 0;
-  }
-  return Math.abs(hash);
-}
-
-function pickInitialsColor(name: string) {
-  return SAFE_INITIALS_COLORS[hashName(name) % SAFE_INITIALS_COLORS.length];
-}
-
 export const CustomAvatar = React.forwardRef<
  HTMLInputElement,
  CustomAvatarProps
->(({ avatarUrl, name, type, color, ...props }: CustomAvatarProps, ref) => {
+>(({ avatarUrl, name, type, ...props }: CustomAvatarProps, ref) => {
  const avatarLink = getAvatarUrl(avatarUrl, type);
-  const resolvedColor =
-    !color || color === "initials" ? pickInitialsColor(name ?? "") : color;

  return (
    <Avatar
@@ -56,7 +28,7 @@ export const CustomAvatar = React.forwardRef<
      src={avatarLink}
      name={name}
      alt={name}
-      color={resolvedColor}
+      color="initials"
      {...props}
    />
  );
@@ -74,18 +74,7 @@ export function PageChildren({
        />
      ))}
      {hasNextPage && (
-        <div
-          className={classes.loadMore}
-          onClick={() => fetchNextPage()}
-          onKeyDown={(e) => {
-            if (e.key === "Enter" || e.key === " ") {
-              e.preventDefault();
-              fetchNextPage();
-            }
-          }}
-          role="button"
-          tabIndex={0}
-        >
+        <div className={classes.loadMore} onClick={() => fetchNextPage()}>
          {t("Load more")}
        </div>
      )}
@@ -75,9 +75,6 @@ function EmojiPicker({
          variant={actionIconProps?.variant || "transparent"} 
          size={actionIconProps?.size}
          onClick={handlers.toggle}
-          aria-label={t("Pick emoji")}
-          aria-haspopup="dialog"
-          aria-expanded={opened}
        >
          {icon}
        </ActionIcon>
@@ -132,7 +132,6 @@ export default function AiChatSidebarItem({
              size="xs"
              color="gray"
              onClick={(e) => e.preventDefault()}
-              aria-label={t("Chat menu")}
            >
              <IconDots size={14} />
            </ActionIcon>
@@ -137,8 +137,7 @@ export default function AiChatSidebar() {

      <TextInput
        className={classes.searchInput}
-        placeholder={t("Search chats...")}
-        aria-label={t("Search chats")}
+        placeholder="Search chats..."
        leftSection={<IconSearch size={14} />}
        size="xs"
        value={search}
@@ -178,7 +178,6 @@ export default function AsideChatPanel() {
            href="/ai"
            variant="subtle"
            color="dark"
-            aria-label={t("New chat")}
            onClick={handleNewChat}
          >
            <IconPlus size={20} stroke={1.75} />
@@ -186,23 +185,13 @@ export default function AsideChatPanel() {
        </Tooltip>

        <Tooltip label={t("Open full page")} openDelay={250}>
-          <ActionIcon
-            variant="subtle"
-            color="dark"
-            aria-label={t("Open full page")}
-            onClick={handleExpand}
-          >
+          <ActionIcon variant="subtle" color="dark" onClick={handleExpand}>
            <IconArrowsDiagonal size={18} stroke={1.5} />
          </ActionIcon>
        </Tooltip>

        <Tooltip label={t("Close")} openDelay={250}>
-          <ActionIcon
-            variant="subtle"
-            color="dark"
-            aria-label={t("Close")}
-            onClick={handleClose}
-          >
+          <ActionIcon variant="subtle" color="dark" onClick={handleClose}>
            <IconX size={20} stroke={1.75} />
          </ActionIcon>
        </Tooltip>
@@ -65,7 +65,7 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
          isStreaming={isStreaming}
          onSend={onSend}
          onStop={onStop}
-          placeholder={t("Ask anything... Use @ to mention pages")}
+          placeholder="Ask anything... Use @ to mention pages"
          autofocus
        />
      </div>
@@ -200,7 +200,7 @@ export default function ChatInput({
        link: false,
      }),
      Placeholder.configure({
-        placeholder: placeholder || t("Ask anything... Use @ to mention pages"),
+        placeholder: placeholder || "Ask anything... Use @ to mention pages",
      }),
      CharacterCount.configure({
        limit: 50000,
@@ -225,10 +225,6 @@ export default function ChatInput({
      }),
    ],
    editorProps: {
-      attributes: {
-        "aria-label": placeholder || t("Ask anything... Use @ to mention pages"),
-        "aria-multiline": "true",
-      },
      handleDOMEvents: {
        keydown: (_view, event) => {
          if (
@@ -279,8 +275,6 @@ export default function ChatInput({
        type="file"
        accept={ACCEPTED_FILE_TYPES}
        multiple
-        aria-label={t("Add files")}
-        tabIndex={-1}
        style={{ display: "none" }}
        onChange={(e) => handleFileSelect(e.target.files)}
      />
@@ -31,16 +31,7 @@ export default function ChatToolGroup({ toolCalls, isStreaming }: Props) {
    <div className={classes.toolGroup}>
      <div
        className={classes.toolGroupHeader}
-        role="button"
-        tabIndex={0}
-        aria-expanded={expanded}
        onClick={() => setExpanded((prev) => !prev)}
-        onKeyDown={(event) => {
-          if (event.key === "Enter" || event.key === " ") {
-            event.preventDefault();
-            setExpanded((prev) => !prev);
-          }
-        }}
      >
        {activeLabel ? (
          <IconLoader2 size={12} className={classes.processingSpinner} />
@@ -98,7 +98,7 @@
  font-weight: 600;
  letter-spacing: 0.08em;
  text-transform: uppercase;
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
  margin-bottom: var(--mantine-spacing-xs);
 }

@@ -125,7 +125,7 @@
 .suggestionsLabel {
  font-size: var(--mantine-font-size-xs);
  font-weight: 500;
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
  text-transform: uppercase;
  letter-spacing: 0.5px;
  margin-bottom: var(--mantine-spacing-sm);
@@ -43,7 +43,7 @@
  margin-top: 6px;
  text-align: center;
  font-size: var(--mantine-font-size-xs);
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
 }

 .attachmentChips {
@@ -36,7 +36,7 @@
  padding: 4px var(--mantine-spacing-xs);
  font-size: var(--mantine-font-size-xs);
  font-weight: 600;
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
  user-select: none;
 }

@@ -104,7 +104,7 @@

 .chatItemDate {
  font-size: var(--mantine-font-size-xs);
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
  white-space: nowrap;
  transition: opacity 150ms;
 }
@@ -44,7 +44,7 @@ export function ApiKeyTable({
            <Table.Th>{t("Last used")}</Table.Th>
            <Table.Th>{t("Expires")}</Table.Th>
            <Table.Th>{t("Created")}</Table.Th>
-            <Table.Th aria-label={t("Action")} />
+            <Table.Th></Table.Th>
          </Table.Tr>
        </Table.Thead>

@@ -106,11 +106,7 @@ export function ApiKeyTable({
                <Table.Td>
                  <Menu position="bottom-end" withinPortal>
                    <Menu.Target>
-                      <ActionIcon
-                        variant="subtle"
-                        color="gray"
-                        aria-label={t("API key menu")}
-                      >
+                      <ActionIcon variant="subtle" color="gray">
                        <IconDots size={16} />
                      </ActionIcon>
                    </Menu.Target>
@@ -1,12 +1,4 @@
-import {
-  ActionIcon,
-  Group,
-  Menu,
-  Modal,
-  Text,
-  ThemeIcon,
-  Tooltip,
-} from "@mantine/core";
+import { ActionIcon, Group, Menu, Modal, Text, Tooltip } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
 import {
  IconRosetteDiscountCheckFilled,
@@ -46,7 +38,6 @@ export function PageVerificationModal({
    <Modal
      opened={opened}
      onClose={onClose}
-      aria-label={status === "none" ? t("Set up verification") : t("Verify page")}
      title={
        <Group gap="xs">
          <IconShieldCheck
@@ -106,9 +97,9 @@ export function PageVerificationBadge({
        withArrow
        openDelay={250}
      >
-        <ThemeIcon variant="subtle" color="gray">
+        <ActionIcon variant="subtle" color="gray">
          <IconShieldCheck size={20} stroke={1.5} />
-        </ThemeIcon>
+        </ActionIcon>
      </Tooltip>
    );
  }
@@ -139,12 +130,7 @@ export function PageVerificationBadge({
        </Tooltip>
      ) : !readOnly ? (
        <Tooltip label={t("Set up verification")} withArrow openDelay={250}>
-          <ActionIcon
-            variant="subtle"
-            color="gray"
-            aria-label={t("Set up verification")}
-            onClick={open}
-          >
+          <ActionIcon variant="subtle" color="gray" onClick={open}>
            <IconShieldCheck size={20} stroke={1.5} />
          </ActionIcon>
        </Tooltip>
@@ -37,7 +37,7 @@ export function ScimTokenTable({
            <Table.Th>{t("Created by")}</Table.Th>
            <Table.Th>{t("Last used")}</Table.Th>
            <Table.Th>{t("Created")}</Table.Th>
-            <Table.Th aria-label={t("Action")} />
+            <Table.Th></Table.Th>
          </Table.Tr>
        </Table.Thead>

@@ -141,7 +141,6 @@ export default function SsoProviderList() {
                        <ActionIcon
                          variant="subtle"
                          color="gray"
-                          aria-label={t("Edit {{name}}", { name: provider.name })}
                          onClick={() => handleEdit(provider)}
                        >
                          <IconPencil size={16} />
@@ -153,13 +152,7 @@ export default function SsoProviderList() {
                          withinPortal
                        >
                          <Menu.Target>
-                            <ActionIcon
-                              variant="subtle"
-                              color="gray"
-                              aria-label={t("More actions for {{name}}", {
-                                name: provider.name,
-                              })}
-                            >
+                            <ActionIcon variant="subtle" color="gray">
                              <IconDots size={16} />
                            </ActionIcon>
                          </Menu.Target>
@@ -56,7 +56,6 @@ export default function TemplateCard({
                    color="gray"
                    className={classes.menuTarget}
                    onClick={(e) => e.stopPropagation()}
-                    aria-label={t("Template menu")}
                  >
                    <IconDots size={16} />
                  </ActionIcon>
@@ -24,7 +24,7 @@ export default function TemplatePreviewModal({
  const title = template?.title || t("Untitled");

  return (
-    <Modal.Root size={1200} opened={opened} onClose={onClose} aria-label={title}>
+    <Modal.Root size={1200} opened={opened} onClose={onClose}>
      <Modal.Overlay />
      <Modal.Content style={{ overflow: "hidden" }}>
        <Modal.Header>
@@ -144,7 +144,6 @@ function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) {
      withCloseButton
      withBorder
      data-comment-dialog
-      aria-label={t("Add comment")}
    >
      <Stack gap={2}>
        <Group>
@@ -173,15 +173,6 @@ function CommentListItem({
          <Box
            className={classes.textSelection}
            onClick={() => handleCommentClick(comment)}
-            onKeyDown={(e) => {
-              if (e.key === "Enter" || e.key === " ") {
-                e.preventDefault();
-                handleCommentClick(comment);
-              }
-            }}
-            role="button"
-            tabIndex={0}
-            aria-label={t("Jump to comment selection")}
          >
            <Text size="sm">{comment?.selection}</Text>
          </Box>
@@ -46,11 +46,7 @@ function CommentMenu({
  return (
    <Menu shadow="md" width={200}>
      <Menu.Target>
-        <ActionIcon
-          variant="default"
-          style={{ border: "none" }}
-          aria-label={t("Comment menu")}
-        >
+        <ActionIcon variant="default" style={{ border: "none" }}>
          <IconDots size={20} stroke={2} />
        </ActionIcon>
      </Menu.Target>
@@ -36,7 +36,6 @@ export default function AudioView(props: NodeViewProps) {
            preload="metadata"
            controls
            src={safeSrc}
-            aria-label={placeholder?.name || t("Audio")}
          />
        )}
        {!safeSrc && previewSrc && (
@@ -46,7 +45,6 @@ export default function AudioView(props: NodeViewProps) {
              preload="metadata"
              controls
              src={previewSrc}
-              aria-label={placeholder?.name || t("Audio")}
            />
            <Loader size={20} pos="absolute" top={6} right={6} />
          </Group>
@@ -62,7 +60,7 @@ export default function AudioView(props: NodeViewProps) {
          </Group>
        )}
        {!safeSrc && !previewSrc && !placeholder && (
-          <audio className={classes.audio} controls aria-label={t("Audio")} />
+          <audio className={classes.audio} controls />
        )}
      </div>
    </NodeViewWrapper>
@@ -172,9 +172,6 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
              fontWeight: 500,
              fontSize: rem(16),
            }}
-            aria-label={t("Text color")}
-            aria-haspopup="dialog"
-            aria-expanded={isOpen}
          >
            A
          </Button>
@@ -189,32 +186,20 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                {t("Text color")}
              </Text>
              <SimpleGrid cols={5} spacing="xs">
-                {TEXT_COLORS.map(({ name, color }, index) => {
-                  const applyTextColor = () => {
-                    if (name === "Default") {
-                      editor.commands.unsetColor();
-                    } else {
-                      editor
-                        .chain()
-                        .focus()
-                        .setColor(color || "")
-                        .run();
-                    }
-                    setIsOpen(false);
-                  };
-                  return (
+                {TEXT_COLORS.map(({ name, color }, index) => (
                  <Tooltip key={index} label={t(name)} withArrow>
                    <Box
-                      role="button"
-                      tabIndex={0}
-                      aria-label={t(name)}
-                      aria-pressed={!!editorState[`text_${color}`]}
-                      onClick={applyTextColor}
-                      onKeyDown={(e) => {
-                        if (e.key === "Enter" || e.key === " ") {
-                          e.preventDefault();
-                          applyTextColor();
+                      onClick={() => {
+                        if (name === "Default") {
+                          editor.commands.unsetColor();
+                        } else {
+                          editor
+                            .chain()
+                            .focus()
+                            .setColor(color || "")
+                            .run();
                        }
+                        setIsOpen(false);
                      }}
                      style={{
                        width: rem(28),
@@ -236,8 +221,7 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                      A
                    </Box>
                  </Tooltip>
-                  );
-                })}
+                ))}
              </SimpleGrid>
            </Box>

@@ -246,35 +230,23 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                {t("Highlight color")}
              </Text>
              <SimpleGrid cols={5} spacing="xs">
-                {HIGHLIGHT_COLORS.map(({ name, color }, index) => {
-                  const applyHighlight = () => {
-                    if (name === "Default") {
-                      editor.commands.unsetHighlight();
-                    } else {
-                      editor
-                        .chain()
-                        .focus()
-                        .toggleMark("highlight", {
-                          color: color || "",
-                          colorName: name.toLowerCase() || "",
-                        })
-                        .run();
-                    }
-                    setIsOpen(false);
-                  };
-                  return (
+                {HIGHLIGHT_COLORS.map(({ name, color }, index) => (
                  <Tooltip key={index} label={t(name)} withArrow>
                    <Box
-                      role="button"
-                      tabIndex={0}
-                      aria-label={t(name)}
-                      aria-pressed={!!editorState[`highlight_${color}`]}
-                      onClick={applyHighlight}
-                      onKeyDown={(e) => {
-                        if (e.key === "Enter" || e.key === " ") {
-                          e.preventDefault();
-                          applyHighlight();
+                      onClick={() => {
+                        if (name === "Default") {
+                          editor.commands.unsetHighlight();
+                        } else {
+                          editor
+                            .chain()
+                            .focus()
+                            .toggleMark("highlight", {
+                              color: color || "",
+                              colorName: name.toLowerCase() || "",
+                            })
+                            .run();
                        }
+                        setIsOpen(false);
                      }}
                      style={{
                        width: rem(28),
@@ -302,8 +274,7 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                      )}
                    </Box>
                  </Tooltip>
-                  );
-                })}
+                ))}
              </SimpleGrid>
            </Box>

@@ -60,7 +60,7 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
        isCodeBlock: ctx.editor.isActive("codeBlock"),
        isCallout: ctx.editor.isActive("callout"),
        isDetails: ctx.editor.isActive("details"),
-        isTransclusionSource: ctx.editor.isActive("transclusionSource"),
+        isTransclusion: ctx.editor.isActive("transclusion"),
      };
    },
  });
@@ -124,12 +124,6 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
          .run(),
      isActive: () => editorState?.isBlockquote,
    },
-    {
-      name: "Synced block",
-      icon: IconQuote,
-      command: () => editor.chain().focus().toggleTransclusionSource().run(),
-      isActive: () => editorState?.isTransclusionSource,
-    },
    {
      name: "Code",
      icon: IconCode,
@@ -148,6 +142,12 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
      command: () => editor.chain().focus().setDetails().run(),
      isActive: () => editorState?.isDetails,
    },
+    {
+      name: "Sync block",
+      icon: IconQuote,
+      command: () => editor.chain().focus().toggleTransclusion().run(),
+      isActive: () => editorState?.isTransclusion,
+    },
  ];

  const activeItem = items.filter((item) => item.isActive()).pop() ?? {
@@ -157,12 +157,7 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
  return (
    <Popover opened={isOpen} withArrow>
      <Popover.Target>
-        <Tooltip
-          label={t("Turn into")}
-          withArrow
-          withinPortal={false}
-          disabled={isOpen}
-        >
+        <Tooltip label={t("Turn into")} withArrow withinPortal={false} disabled={isOpen}>
          <Button
            className={classes.buttonRoot}
            variant="default"
@@ -170,9 +165,6 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
            radius="0"
            rightSection={<IconChevronDown size={16} />}
            onClick={() => setIsOpen(!isOpen)}
-            aria-label={t("Turn into")}
-            aria-haspopup="menu"
-            aria-expanded={isOpen}
          >
            {t(activeItem?.name)}
          </Button>
@@ -92,9 +92,6 @@ export const TextAlignmentSelector: FC<TextAlignmentProps> = ({
            radius="0"
            rightSection={<IconChevronDown size={16} />}
            onClick={() => setIsOpen(!isOpen)}
-            aria-label={t("Text align")}
-            aria-haspopup="menu"
-            aria-expanded={isOpen}
          >
            <activeItem.icon style={{ width: rem(16) }} stroke={2} />
          </Button>
@@ -137,13 +137,7 @@ export default function DrawioView(props: NodeViewProps) {

  return (
    <NodeViewWrapper data-drag-handle>
-      <Modal.Root
-        opened={opened}
-        onClose={handleClose}
-        fullScreen
-        closeOnEscape={false}
-        aria-label={t("Diagram editor")}
-      >
+      <Modal.Root opened={opened} onClose={handleClose} fullScreen closeOnEscape={false}>
        <Modal.Overlay />
        <Modal.Content style={{ overflow: "hidden" }}>
          <Modal.Body pos="relative">
@@ -107,17 +107,7 @@ const EmojiList = ({
  }, [selectedIndex]);

  return items.length > 0 || isLoading ? (
-    <Paper
-      id="emoji-command"
-      p="0"
-      shadow="md"
-      withBorder
-      role="listbox"
-      aria-label="Emoji results"
-      aria-activedescendant={
-        items.length > 0 ? `emoji-command-option-${selectedIndex}` : undefined
-      }
-    >
+    <Paper id="emoji-command" p="0" shadow="md" withBorder>
      {isLoading && <Loader m="xs" color="blue" type="dots" />}
      {items.length > 0 && (
        <ScrollArea.Autosize
@@ -130,10 +120,6 @@ const EmojiList = ({
            {items.map((item, index: number) => (
              <ActionIcon
                data-item-index={index}
-                id={`emoji-command-option-${index}`}
-                role="option"
-                aria-selected={index === selectedIndex}
-                aria-label={item.id}
                variant="transparent"
                key={item.id}
                className={clsx(classes.menuBtn, {
@@ -102,14 +102,6 @@ export const LinkEditorPanel = ({
          leftSection={<IconLink size={16} stroke={1.5} color="var(--mantine-color-dimmed)" />}
          classNames={{ input: classes.linkInput }}
          placeholder={t("Paste link or search pages")}
-          aria-label={t("Paste link or search pages")}
-          role="combobox"
-          aria-expanded={showDropdown}
-          aria-controls="link-editor-results"
-          aria-autocomplete="list"
-          aria-activedescendant={
-            showDropdown ? `link-editor-option-${selectedIndex}` : undefined
-          }
          value={state.url}
          onChange={state.onChange}
          onKeyDown={handleKeyDown}
@@ -133,16 +125,10 @@ export const LinkEditorPanel = ({
            scrollbarSize={6}
            mt={state.url.length > 0 ? 8 : 0}
            styles={{ content: { minWidth: 0 } }}
-            id="link-editor-results"
-            role="listbox"
-            aria-label={t("Link suggestions")}
          >
            {showUrlItem && (
              <UnstyledButton
                data-item-index={0}
-                id="link-editor-option-0"
-                role="option"
-                aria-selected={selectedIndex === 0}
                onClick={() => onSetLink(state.url, false)}
                className={clsx(classes.searchItem, {
                  [classes.selectedSearchItem]: selectedIndex === 0,
@@ -170,9 +156,6 @@ export const LinkEditorPanel = ({
              return (
                <UnstyledButton
                  data-item-index={itemIndex}
-                  id={`link-editor-option-${itemIndex}`}
-                  role="option"
-                  aria-selected={itemIndex === selectedIndex}
                  key={page.id || index}
                  onClick={() => selectPage(page)}
                  className={clsx(classes.searchItem, {
@@ -287,16 +287,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
  );

  return (
-    <Paper
-      id="mention"
-      shadow="md"
-      withBorder
-      radius="md"
-      py={6}
-      role="listbox"
-      aria-label={t("Mention suggestions")}
-      aria-activedescendant={`mention-option-${selectedIndex}`}
-    >
+    <Paper id="mention" shadow="md" withBorder radius="md" py={6}>
      <ScrollArea.Autosize
        viewportRef={viewportRef}
        mah={350}
@@ -310,7 +301,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
          if (item.entityType === "header") {
            const isFirst = index === 0;
            return (
-              <div key={`${item.label}-${index}`} role="presentation">
+              <div key={`${item.label}-${index}`}>
                {!isFirst && <Divider my={6} />}
                <Text
                  c="dimmed"
@@ -331,9 +322,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
              <UnstyledButton
                data-item-index={index}
                key={index}
-                id={`mention-option-${index}`}
-                role="option"
-                aria-selected={index === selectedIndex}
                onClick={() => selectItem(index)}
                className={clsx(classes.menuBtn, {
                  [classes.selectedItem]: index === selectedIndex,
@@ -360,9 +348,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
              <UnstyledButton
                data-item-index={index}
                key={index}
-                id={`mention-option-${index}`}
-                role="option"
-                aria-selected={index === selectedIndex}
                onClick={() => selectItem(index)}
                className={clsx(classes.menuBtn, {
                  [classes.selectedItem]: index === selectedIndex,
@@ -373,7 +358,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
                  <ActionIcon
                    variant="subtle"
                    component="div"
-                    aria-hidden="true"
+                    aria-label={item.label}
                    color="gray"
                    size="sm"
                  >
@@ -405,11 +390,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
            {(hasUsers || hasPages) && <Divider my={6} />}
            <UnstyledButton
              data-item-index={renderItems.indexOf(createPageItemData)}
-              id={`mention-option-${renderItems.indexOf(createPageItemData)}`}
-              role="option"
-              aria-selected={
-                renderItems.indexOf(createPageItemData) === selectedIndex
-              }
              onClick={() =>
                selectItem(renderItems.indexOf(createPageItemData))
              }
@@ -425,7 +405,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
                  component="div"
                  color="gray"
                  size="sm"
-                  aria-hidden="true"
                >
                  <IconPlus size={16} stroke={1.5} />
                </ActionIcon>
@@ -92,20 +92,7 @@ export default function PdfView(props: NodeViewProps) {
  if (hasError) {
    return (
      <NodeViewWrapper data-drag-handle>
-        <div
-          data-pdf-error
-          className={clsx(classes.pdfError, { "ProseMirror-selectednode": selected })}
-          onClick={handleSelect}
-          onKeyDown={(e) => {
-            if (e.key === "Enter" || e.key === " ") {
-              e.preventDefault();
-              handleSelect();
-            }
-          }}
-          role="button"
-          tabIndex={0}
-          aria-label={t("Failed to load PDF")}
-        >
+        <div data-pdf-error className={clsx(classes.pdfError, { "ProseMirror-selectednode": selected })} onClick={handleSelect}>
          <IconFileTypePdf size={32} stroke={1.5} />
          <Text size="sm" c="dimmed">
            {t("Failed to load PDF")}
@@ -187,14 +187,12 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
      position={{ top: 90, right: 50 }}
      withBorder
      transitionProps={{ transition: "slide-down" }}
-      aria-label={t("Find and replace")}
    >
      <Stack gap="xs">
        <Flex align="center" gap="xs">
          <Input
            ref={inputRef}
            placeholder={t("Find")}
-            aria-label={t("Find")}
            leftSection={<IconSearch size={16} />}
            rightSection={
              <Text size="xs" ta="right">
@@ -219,12 +217,7 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo

          <ActionIcon.Group>
            <Tooltip label={t("Previous match (Shift+Enter)")}>
-              <ActionIcon
-                variant="subtle"
-                color="gray"
-                onClick={previous}
-                aria-label={t("Previous match (Shift+Enter)")}
-              >
+              <ActionIcon variant="subtle" color="gray" onClick={previous}>
                <IconArrowNarrowUp
                  style={{ width: "70%", height: "70%" }}
                  stroke={1.5}
@@ -232,12 +225,7 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
              </ActionIcon>
            </Tooltip>
            <Tooltip label={t("Next match (Enter)")}>
-              <ActionIcon
-                variant="subtle"
-                color="gray"
-                onClick={next}
-                aria-label={t("Next match (Enter)")}
-              >
+              <ActionIcon variant="subtle" color="gray" onClick={next}>
                <IconArrowNarrowDown
                  style={{ width: "70%", height: "70%" }}
                  stroke={1.5}
@@ -249,8 +237,6 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
                variant="subtle"
                color={caseSensitive.color}
                onClick={() => caseSensitiveToggle()}
-                aria-label={t("Match case (Alt+C)")}
-                aria-pressed={caseSensitive.isCaseSensitive}
              >
                <IconLetterCase
                  style={{ width: "70%", height: "70%" }}
@@ -264,8 +250,6 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
                  variant="subtle"
                  color={replaceButton.color}
                  onClick={() => replaceButtonToggle()}
-                  aria-label={t("Replace")}
-                  aria-pressed={replaceButton.isReplaceShow}
                >
                  <IconReplace
                    style={{ width: "70%", height: "70%" }}
@@ -275,12 +259,7 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
              </Tooltip>
            )}
            <Tooltip label={t("Close (Escape)")}>
-              <ActionIcon
-                variant="subtle"
-                color="gray"
-                onClick={closeDialog}
-                aria-label={t("Close (Escape)")}
-              >
+              <ActionIcon variant="subtle" color="gray" onClick={closeDialog}>
                <IconX style={{ width: "70%", height: "70%" }} stroke={1.5} />
              </ActionIcon>
            </Tooltip>
@@ -290,7 +269,6 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
          <Flex align="center" gap="xs">
            <Input
              placeholder={t("Replace")}
-              aria-label={t("Replace")}
              leftSection={<IconReplace size={16} />}
              rightSection={<div></div>}
              rightSectionPointerEvents="all"
@@ -86,15 +86,7 @@ const CommandList = ({
  }, [selectedIndex]);

  return flatItems.length > 0 ? (
-    <Paper
-      id="slash-command"
-      shadow="md"
-      p="xs"
-      withBorder
-      role="listbox"
-      aria-label={t("Slash commands")}
-      aria-activedescendant={`slash-command-option-${selectedIndex}`}
-    >
+    <Paper id="slash-command" shadow="md" p="xs" withBorder>
      <ScrollArea
        viewportRef={viewportRef}
        h={350}
@@ -102,30 +94,22 @@ const CommandList = ({
        scrollbarSize={8}
        overscrollBehavior="contain"
      >
-        {(() => {
-          let flatIndex = -1;
-          return Object.entries(items).map(([category, categoryItems]) => (
-          <div key={category} role="group" aria-label={category}>
+        {Object.entries(items).map(([category, categoryItems]) => (
+          <div key={category}>
            <Text c="dimmed" mb={4} fw={500} tt="capitalize">
              {category}
            </Text>
-            {categoryItems.map((item: SlashMenuItemType) => {
-              flatIndex += 1;
-              const itemIndex = flatIndex;
-              return (
+            {categoryItems.map((item: SlashMenuItemType, index: number) => (
              <UnstyledButton
-                data-item-index={itemIndex}
-                key={itemIndex}
-                id={`slash-command-option-${itemIndex}`}
-                role="option"
-                aria-selected={itemIndex === selectedIndex}
-                onClick={() => selectItem(itemIndex)}
+                data-item-index={index}
+                key={index}
+                onClick={() => selectItem(index)}
                className={clsx(classes.menuBtn, {
-                  [classes.selectedItem]: itemIndex === selectedIndex,
+                  [classes.selectedItem]: index === selectedIndex,
                })}
              >
                <Group>
-                  <ActionIcon variant="default" component="div" aria-hidden="true">
+                  <ActionIcon variant="default" component="div">
                    <item.icon size={18} />
                  </ActionIcon>

@@ -140,11 +124,9 @@ const CommandList = ({
                  </div>
                </Group>
              </UnstyledButton>
-              );
-            })}
+            ))}
          </div>
-          ));
-        })()}
+        ))}
      </ScrollArea>
    </Paper>
  ) : null;
@@ -232,15 +232,7 @@ const CommandGroups: SlashMenuGroupedItemsType = {
    {
      title: "Audio",
      description: "Upload any audio from your device.",
-      searchTerms: [
-        "audio",
-        "music",
-        "sound",
-        "mp3",
-        "media",
-        "file",
-        "attachment",
-      ],
+      searchTerms: ["audio", "music", "sound", "mp3", "media", "file", "attachment"],
      icon: IconMusic,
      command: ({ editor, range }) => {
        editor.chain().focus().deleteRange(range).run();
@@ -487,12 +479,12 @@ const CommandGroups: SlashMenuGroupedItemsType = {
      },
    },
    {
-      title: "Synced block",
+      title: "Sync block",
      description: "Create a block that stays in sync across pages.",
      searchTerms: [
        "sync",
        "synced",
-        "synced block",
+        "sync block",
        "excerpt",
        "transclusion",
        "reusable",
@@ -500,12 +492,7 @@ const CommandGroups: SlashMenuGroupedItemsType = {
      ],
      icon: IconRotate2,
      command: ({ editor, range }: CommandProps) => {
-        editor
-          .chain()
-          .focus()
-          .deleteRange(range)
-          .insertTransclusionSource()
-          .run();
+        editor.chain().focus().deleteRange(range).insertTransclusion().run();
      },
    },
    {
@@ -92,17 +92,8 @@ export default function StatusView(props: NodeViewProps) {
              colorClassMap[color],
            )}
            onClick={() => isEditable && setOpened(true)}
-            onKeyDown={(e) => {
-              if (isEditable && (e.key === "Enter" || e.key === " ")) {
-                e.preventDefault();
-                setOpened(true);
-              }
-            }}
            role="button"
            tabIndex={0}
-            aria-label={text || "SET STATUS"}
-            aria-haspopup="dialog"
-            aria-expanded={opened}
          >
            {text || "SET STATUS"}
          </span>
@@ -136,16 +127,6 @@ export default function StatusView(props: NodeViewProps) {
                )}
                style={{ backgroundColor: bg }}
                onClick={() => handleColorChange(name)}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" || e.key === " ") {
-                    e.preventDefault();
-                    handleColorChange(name);
-                  }
-                }}
-                role="button"
-                tabIndex={0}
-                aria-label={name}
-                aria-pressed={color === name}
              >
                {color === name && <IconCheck size={14} />}
              </Box>
@@ -7,11 +7,16 @@ export default function ErrorPlaceholder() {
  return (
    <div className={classes.placeholder}>
      <IconAlertTriangle
-        size={18}
-        stroke={1.6}
+        size={20}
+        stroke={1.5}
        className={classes.placeholderIcon}
      />
-      <span>{t("Failed to load this synced block")}</span>
+      <div className={classes.placeholderTitle}>
+        {t("Failed to load transclusion")}
+      </div>
+      <div className={classes.placeholderSubtext}>
+        {t("An error occurred while rendering this reference")}
+      </div>
    </div>
  );
 }
@@ -6,8 +6,11 @@ export default function NoAccessPlaceholder() {
  const { t } = useTranslation();
  return (
    <div className={classes.placeholder}>
-      <IconEyeOff size={18} stroke={1.6} className={classes.placeholderIcon} />
-      <span>{t("You don't have access to this synced block")}</span>
+      <IconEyeOff size={20} stroke={1.5} className={classes.placeholderIcon} />
+      <div className={classes.placeholderTitle}>{t("No access")}</div>
+      <div className={classes.placeholderSubtext}>
+        {t("You don't have access to this content")}
+      </div>
    </div>
  );
 }
@@ -1,4 +1,4 @@
-import { IconInfoCircle } from "@tabler/icons-react";
+import { IconQuestionMark } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import classes from "./transclusion.module.css";

@@ -6,12 +6,19 @@ export default function NotFoundPlaceholder() {
  const { t } = useTranslation();
  return (
    <div className={classes.placeholder}>
-      <IconInfoCircle
-        size={18}
-        stroke={1.6}
+      <IconQuestionMark
+        size={20}
+        stroke={1.5}
        className={classes.placeholderIcon}
      />
-      <span>{t("The original synced block no longer exists")}</span>
+      <div className={classes.placeholderTitle}>
+        {t("Synced block unavailable")}
+      </div>
+      <div className={classes.placeholderSubtext}>
+        {t(
+          "The source may have been removed, or embedding it here would create a loop.",
+        )}
+      </div>
    </div>
  );
 }
@@ -2,12 +2,14 @@ import { EditorProvider } from "@tiptap/react";
 import { useMemo } from "react";
 import { mainExtensions } from "@/features/editor/extensions/extensions";
 import { UniqueID } from "@docmost/editor-ext";
+import { TransclusionLookupProvider } from "./transclusion-lookup-context";

 type Props = {
+  hostPageId: string;
  content: unknown;
 };

-export default function TransclusionContent({ content }: Props) {
+export default function TransclusionContent({ hostPageId, content }: Props) {
  const extensions = useMemo(() => {
    const filtered = mainExtensions.filter(
      (e: any) => e.name !== "uniqueID" && e.name !== "globalDragHandle",
@@ -15,7 +17,7 @@ export default function TransclusionContent({ content }: Props) {
    return [
      ...filtered,
      UniqueID.configure({
-        types: ["heading", "paragraph", "transclusionSource"],
+        types: ["heading", "paragraph", "transclusion"],
        updateDocument: false,
      }),
    ];
@@ -30,19 +32,21 @@ export default function TransclusionContent({ content }: Props) {
  const stop = (e: React.SyntheticEvent) => e.stopPropagation();

  return (
-    <div
-      onMouseDown={stop}
-      onClick={stop}
-      onDragStart={stop}
-      onDragOver={stop}
-      onDrop={stop}
-    >
-      <EditorProvider
-        editable={false}
-        immediatelyRender={true}
-        extensions={extensions}
-        content={content as any}
-      />
-    </div>
+    <TransclusionLookupProvider hostPageId={hostPageId}>
+      <div
+        onMouseDown={stop}
+        onClick={stop}
+        onDragStart={stop}
+        onDragOver={stop}
+        onDrop={stop}
+      >
+        <EditorProvider
+          editable={false}
+          immediatelyRender={true}
+          extensions={extensions}
+          content={content as any}
+        />
+      </div>
+    </TransclusionLookupProvider>
  );
 }
@@ -7,10 +7,7 @@ import React, {
  useRef,
  useState,
 } from "react";
-import {
-  lookupTransclusion,
-  lookupTransclusionForShare,
-} from "@/features/transclusion/services/transclusion-api";
+import { lookupTransclusion } from "@/features/transclusion/services/transclusion-api";
 import type { TransclusionLookup } from "@/features/transclusion/types/transclusion.types";

 type LookupKey = string; // `${sourcePageId}::${transclusionId}`
@@ -37,24 +34,18 @@ const TransclusionLookupContext = createContext<ContextValue | null>(null);

 export function TransclusionLookupProvider({
  children,
-  shareId,
 }: {
-  children: React.ReactNode;
  /**
-   * When set, lookups go through the share-scoped public endpoint and are
-   * gated by the share graph (source page must have its own share or inherit
-   * one). Used by the public share viewer; left undefined in the authenticated
-   * app, where personal permissions gate access.
+   * Retained for API compatibility with previous callers that passed the
+   * host page id; no longer used internally now that cycle prevention lives
+   * on the server side and lookups are stateless.
   */
-  shareId?: string;
+  hostPageId?: string;
+  children: React.ReactNode;
 }) {
  const subscribersRef = useRef(new Map<LookupKey, Subscriber[]>());
  const queueRef = useRef(new Set<LookupKey>());
  const tickRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  // Read inside flush() via ref so changing share context doesn't churn the
-  // memoized callbacks (and thus doesn't re-render every consumer).
-  const shareIdRef = useRef<string | undefined>(shareId);
-  shareIdRef.current = shareId;
  // Last looked-up value for each key. Re-subscribers (e.g. when the editor
  // remounts after switching from static to live) get this immediately
  // instead of triggering a duplicate fetch.
@@ -90,13 +81,7 @@ export function TransclusionLookupProvider({
    };

    try {
-      const activeShareId = shareIdRef.current;
-      const { items } = activeShareId
-        ? await lookupTransclusionForShare({
-            shareId: activeShareId,
-            references,
-          })
-        : await lookupTransclusion({ references });
+      const { items } = await lookupTransclusion({ references });
      for (const r of items) {
        const key = `${r.sourcePageId}::${r.transclusionId}`;
        resultCacheRef.current.set(key, r);
@@ -2,8 +2,8 @@ import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
 import { ActionIcon, Menu, Tooltip } from "@mantine/core";
 import {
  IconDots,
+  IconExternalLink,
  IconLinkOff,
-  IconPencil,
  IconRefresh,
  IconTrash,
 } from "@tabler/icons-react";
@@ -87,13 +87,10 @@ function TransclusionReferenceBody({
  );
  const sourcePageHref = (() => {
    const source = referencesQuery.data?.source;
-    const base = source?.spaceSlug
-      ? buildPageUrl(source.spaceSlug, source.slugId, source.title)
-      : sourcePageId
-        ? `/p/${sourcePageId}`
-        : null;
-    if (!base) return null;
-    return transclusionId ? `${base}#${transclusionId}` : base;
+    if (source?.spaceSlug) {
+      return buildPageUrl(source.spaceSlug, source.slugId, source.title);
+    }
+    return sourcePageId ? `/p/${sourcePageId}` : null;
  })();

  const handleUnsync = async () => {
@@ -121,11 +118,7 @@ function TransclusionReferenceBody({
  return (
    <>
      {isEditable && (
-        <div
-          className={classes.includeControls}
-          contentEditable={false}
-          onMouseDown={(e) => e.preventDefault()}
-        >
+        <div className={classes.includeControls} contentEditable={false}>
          {sourcePageId && transclusionId && hostPageId && (
            <SyncBlockReferencesDropdown
              sourcePageId={sourcePageId}
@@ -149,19 +142,15 @@ function TransclusionReferenceBody({
            </ActionIcon>
          </Tooltip>
          {sourcePageHref && (
-            <Tooltip label={t("Edit source")}>
+            <Tooltip label={t("Go to source page")}>
              <ActionIcon
                component={Link}
                to={sourcePageHref}
                variant="subtle"
                color="gray"
                size="sm"
-                style={{
-                  textDecoration: "none",
-                  borderBottom: "none",
-                }}
              >
-                <IconPencil size={14} />
+                <IconExternalLink size={14} />
              </ActionIcon>
            </Tooltip>
          )}
@@ -201,7 +190,10 @@ function TransclusionReferenceBody({
      ) : !result ? (
        <div style={{ minHeight: 24 }} />
      ) : !("status" in result) ? (
-        <TransclusionContent content={result.content} />
+        <TransclusionContent
+          hostPageId={hostPageId ?? sourcePageId}
+          content={result.content}
+        />
      ) : result.status === "no_access" ? (
        <NoAccessPlaceholder />
      ) : (
@@ -56,21 +56,17 @@ export default function TransclusionView(props: NodeViewProps) {
  };

  const handleUnsync = () => {
-    editor.chain().focus().unsyncTransclusionSource().run();
+    editor.chain().focus().unsyncTransclusion().run();
  };

  return (
    <NodeViewWrapper
      className={classes.transclusionWrap}
+      data-drag-handle
      data-menu-open={openMenus > 0 ? "true" : "false"}
-      data-id={transclusionId ?? undefined}
    >
      {isEditable && (
-        <div
-          className={classes.transclusionControls}
-          contentEditable={false}
-          onMouseDown={(e) => e.preventDefault()}
-        >
+        <div className={classes.transclusionControls} contentEditable={false}>
          {sourcePageId && transclusionId && (
            <SyncBlockReferencesDropdown
              sourcePageId={sourcePageId}
@@ -113,7 +109,7 @@ export default function TransclusionView(props: NodeViewProps) {
                leftSection={<IconTrash size={14} />}
                onClick={() => deleteNode()}
              >
-                {t("Delete synced block")}
+                {t("Delete sync block")}
              </Menu.Item>
            </Menu.Dropdown>
          </Menu>
@@ -1,22 +1,33 @@
 .placeholder {
  display: flex;
-  flex-direction: row;
+  flex-direction: column;
  align-items: center;
-  gap: 8px;
-  padding: 8px 12px;
+  justify-content: center;
+  gap: 4px;
+  padding: var(--mantine-spacing-md);
  border-radius: var(--mantine-radius-md);
  background: light-dark(
    var(--mantine-color-gray-0),
    var(--mantine-color-dark-6)
  );
+  border: 1px dashed
+    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
-  font-size: var(--mantine-font-size-sm);
-  user-select: none;
 }

 .placeholderIcon {
-  flex: none;
+  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
+}
+
+.placeholderTitle {
+  font-weight: 600;
+  font-size: var(--mantine-font-size-sm);
+}
+
+.placeholderSubtext {
+  font-size: var(--mantine-font-size-xs);
  color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
+  text-align: center;
 }

 .transclusionBadge {
@@ -39,18 +50,15 @@
  margin-right: -3rem;
  width: calc(100% + 6rem);
  padding: 0.5em 3rem;
-  border-radius: 8px;
-  border: 2px solid transparent;
+  border-radius: 4px;
+  border: 1px solid transparent;
  transition: border 0.3s;
 }

 .transclusionWrap:hover,
 .transclusionWrap:focus-within {
-  border: 2px solid
-    light-dark(
-      var(--mantine-color-orange-2),
-      color-mix(in srgb, var(--mantine-color-orange-9), transparent 55%)
-    );
+  border: 1px solid
+    light-dark(var(--mantine-color-gray-3), var(--mantine-color-gray-7));
 }

 .transclusionControls {
@@ -96,32 +104,22 @@
  background: var(--mantine-color-default-border);
 }

-.transclusionControls a[href],
-.includeControls a[href] {
-  color: var(--ai-color);
-  border-bottom: none;
-  font-weight: inherit;
-}
-
 .includeWrap {
  position: relative;
  margin-left: -3rem;
  margin-right: -3rem;
  width: calc(100% + 6rem);
  padding: 0.5em 0;
-  border-radius: 8px;
-  border: 2px solid transparent;
+  border-radius: 4px;
+  border: 1px solid transparent;
  transition: border 0.3s;
 }

 .includeWrap:hover,
 .includeWrap[data-focused="true"],
 .includeWrap[data-menu-open="true"] {
-  border: 2px solid
-    light-dark(
-      var(--mantine-color-orange-2),
-      color-mix(in srgb, var(--mantine-color-orange-9), transparent 55%)
-    );
+  border: 1px solid
+    light-dark(var(--mantine-color-gray-3), var(--mantine-color-gray-7));
 }

 .includeControls {
@@ -161,7 +159,7 @@
  pointer-events: auto;
 }

-:global(.react-renderer.node-transclusionSource.ProseMirror-selectednode),
+:global(.react-renderer.node-transclusion.ProseMirror-selectednode),
 :global(.react-renderer.node-transclusionReference.ProseMirror-selectednode) {
  outline: none;
 }
@@ -185,14 +183,6 @@
  .includeControls {
    display: none !important;
  }
-  .transclusionWrap,
-  .includeWrap {
-    border: none !important;
-    margin-left: 0 !important;
-    margin-right: 0 !important;
-    width: 100% !important;
-    padding: 0 !important;
-  }
 }

 .editingOriginalTag {
@@ -47,7 +47,6 @@ export default function VideoView(props: NodeViewProps) {
            preload="metadata"
            controls
            src={getFileUrl(src)}
-            aria-label={placeholder?.name || t("Video")}
          />
        )}
        {!src && previewSrc && (
@@ -57,7 +56,6 @@ export default function VideoView(props: NodeViewProps) {
              preload="metadata"
              controls
              src={previewSrc}
-              aria-label={placeholder?.name || t("Video")}
            />
            <Loader size={20} pos="absolute" top={6} right={6} />
          </Group>
@@ -73,7 +71,7 @@ export default function VideoView(props: NodeViewProps) {
          </Group>
        )}
        {!src && !previewSrc && !placeholder && (
-          <video className={classes.video} controls aria-label={t("Video")} />
+          <video className={classes.video} controls />
        )}
      </div>
    </NodeViewWrapper>
@@ -396,7 +396,7 @@ const GlobalDragHandle = Extension.create({
  addOptions() {
    return {
      dragHandleWidth: 20,
-      scrollThreshold: 100,
+      scrollTreshold: 100,
      excludedTags: [],
      customNodes: [],
    };
@@ -51,7 +51,7 @@ import {
  Columns,
  Column,
  Status,
-  TransclusionSource,
+  Transclusion,
  TransclusionReference,
 } from "@docmost/editor-ext";
 import {
@@ -171,7 +171,7 @@ export const mainExtensions = [
  SharedStorage,
  Heading,
  UniqueID.configure({
-    types: ["heading", "paragraph", "transclusionSource"],
+    types: ["heading", "paragraph", "transclusion"],
    filterTransaction: (transaction) => !isChangeOrigin(transaction),
  }),
  Placeholder.configure({
@@ -220,7 +220,7 @@ export const mainExtensions = [
  Typography,
  TrailingNode,
  GlobalDragHandle.configure({
-    customNodes: ["transclusionSource", "transclusionReference"],
+    customNodes: ["transclusion", "transclusionReference"],
  }),
  TextStyle,
  Color,
@@ -357,7 +357,7 @@ export const mainExtensions = [
  Status.configure({
    view: StatusView,
  }),
-  TransclusionSource.configure({
+  Transclusion.configure({
    view: TransclusionView,
  }),
  TransclusionReference.configure({
@@ -401,7 +401,7 @@ export default function PageEditor({
  }, [yjsConnectionStatus, isSynced]);

  return (
-    <TransclusionLookupProvider>
+    <TransclusionLookupProvider hostPageId={pageId}>
      {showStatic ? (
        <EditorProvider
          editable={false}
@@ -15,20 +15,12 @@ interface PageEditorProps {
  title: string;
  content: any;
  pageId?: string;
-  /**
-   * When rendering inside a public share, pass the share's id (or key). Lookups
-   * for transclusion content then resolve against the share graph instead of
-   * the viewer's personal permissions, so a share never leaks source content
-   * that isn't itself shared.
-   */
-  shareId?: string;
 }

 export default function ReadonlyPageEditor({
  title,
  content,
  pageId,
-  shareId,
 }: PageEditorProps) {
  const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
  const isComponentMounted = useRef(false);
@@ -74,7 +66,7 @@ export default function ReadonlyPageEditor({
  ];

  return (
-    <TransclusionLookupProvider shareId={shareId}>
+    <TransclusionLookupProvider hostPageId={pageId ?? "anonymous"}>
      <div className="page-title">
        <EditorProvider
          editable={false}
@@ -53,17 +53,15 @@ export default function StarButton(props: StarButtonProps) {
    }
  };

-  const label = isFavorited
-    ? t("Remove from favorites")
-    : t("Add to favorites");
-
  return (
-    <Tooltip label={label} openDelay={250} withArrow>
+    <Tooltip
+      label={isFavorited ? t("Remove from favorites") : t("Add to favorites")}
+      openDelay={250}
+      withArrow
+    >
      <ActionIcon
        variant="subtle"
        color={isFavorited ? "yellow" : "gray"}
-        aria-label={label}
-        aria-pressed={isFavorited}
        onClick={handleToggle}
        loading={isPending}
      >
@@ -53,7 +53,7 @@ export default function GroupActionMenu() {
            arrowPosition="center"
          >
            <Menu.Target>
-              <ActionIcon variant="light" aria-label={t("Group menu")}>
+              <ActionIcon variant="light">
                <IconDots size={20} stroke={2} />
              </ActionIcon>
            </Menu.Target>
@@ -54,7 +54,7 @@ export default function GroupMembersList() {
            <Table.Tr>
              <Table.Th>{t("User")}</Table.Th>
              <Table.Th>{t("Status")}</Table.Th>
-              <Table.Th aria-label={t("Action")} />
+              <Table.Th></Table.Th>
            </Table.Tr>
          </Table.Thead>

@@ -4,7 +4,7 @@ import {
  UnstyledButton,
  Badge,
  Table,
-  ThemeIcon,
+  ActionIcon,
  Button,
 } from "@mantine/core";
 import { Link } from "react-router-dom";
@@ -61,13 +61,13 @@ export default function CreatedByMe({ spaceId }: Props) {
                  >
                    <Group wrap="nowrap">
                      {page.icon || (
-                        <ThemeIcon
+                        <ActionIcon
                          variant="transparent"
                          color="gray"
                          size={18}
                        >
                          <IconFileDescription size={18} />
-                        </ThemeIcon>
+                        </ActionIcon>
                      )}
                      <Text fw={500} size="md" lineClamp={1}>
                        {page.title || t("Untitled")}
@@ -4,7 +4,7 @@ import {
  UnstyledButton,
  Badge,
  Table,
-  ThemeIcon,
+  ActionIcon,
  Button,
 } from "@mantine/core";
 import { Link } from "react-router-dom";
@@ -62,13 +62,13 @@ export default function FavoritesPages({ spaceId }: Props) {
                    >
                      <Group wrap="nowrap">
                        {fav.page.icon || (
-                          <ThemeIcon
+                          <ActionIcon
                            variant="transparent"
                            color="gray"
                            size={18}
                          >
                            <IconFileDescription size={18} />
-                          </ThemeIcon>
+                          </ActionIcon>
                        )}
                        <Text fw={500} size="md" lineClamp={1}>
                          {fav.page.title || t("Untitled")}
@@ -16,7 +16,7 @@

 .subtitle {
  font-size: var(--mantine-font-size-sm);
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
  text-align: center;
  margin-top: 6px;
  margin-bottom: var(--mantine-spacing-lg);
@@ -58,9 +58,6 @@ export function NotificationPopover() {
            variant="subtle"
            color="dark"
            size="sm"
-            aria-label={t("Notifications")}
-            aria-haspopup="dialog"
-            aria-expanded={opened}
            onClick={() => setOpened((o) => !o)}
          >
            <Indicator
@@ -22,7 +22,6 @@ export default function HistoryModal({ pageId, pageTitle }: Props) {
        opened={isModalOpen}
        onClose={() => setModalOpen(false)}
        fullScreen
-        aria-label={t("Page history")}
      >
        <Modal.Overlay />
        <Modal.Content style={{ overflow: "hidden" }}>
@@ -50,7 +49,6 @@ export default function HistoryModal({ pageId, pageTitle }: Props) {
      size={1400}
      opened={isModalOpen}
      onClose={() => setModalOpen(false)}
-      aria-label={t("Page history")}
    >
      <Modal.Overlay />
      <Modal.Content style={{ overflow: "hidden" }}>
@@ -19,7 +19,6 @@ import { buildPageUrl } from "@/features/page/page.utils.ts";
 import { usePageQuery } from "@/features/page/queries/page-query.ts";
 import { extractPageSlugId } from "@/lib";
 import { useMediaQuery } from "@mantine/hooks";
-import { useTranslation } from "react-i18next";

 function getTitle(name: string, icon: string) {
  if (icon) {
@@ -29,7 +28,6 @@ function getTitle(name: string, icon: string) {
 }

 export default function Breadcrumb() {
-  const { t } = useTranslation();
  const treeData = useAtomValue(treeDataAtom);
  const [breadcrumbNodes, setBreadcrumbNodes] = useState<
    SpaceTreeNode[] | null
@@ -82,7 +80,7 @@ export default function Breadcrumb() {
    ));

  const renderAnchor = useCallback(
-    (node: SpaceTreeNode, isCurrent = false) => (
+    (node: SpaceTreeNode) => (
      <Tooltip label={node.name} key={node.id}>
        <Anchor
          component={Link}
@@ -91,7 +89,6 @@ export default function Breadcrumb() {
          fz="sm"
          key={node.id}
          className={classes.truncatedText}
-          aria-current={isCurrent ? "page" : undefined}
        >
          {getTitle(node.name, node.icon)}
        </Anchor>
@@ -118,11 +115,7 @@ export default function Breadcrumb() {
          key="hidden-nodes"
        >
          <Popover.Target>
-            <ActionIcon
-              color="gray"
-              variant="transparent"
-              aria-label={t("Show hidden breadcrumbs")}
-            >
+            <ActionIcon color="gray" variant="transparent">
              <IconDots size={20} stroke={2} />
            </ActionIcon>
          </Popover.Target>
@@ -131,13 +124,11 @@ export default function Breadcrumb() {
          </Popover.Dropdown>
        </Popover>,
        //renderAnchor(secondLastNode),
-        renderAnchor(lastNode, true),
+        renderAnchor(lastNode),
      ];
    }

-    return breadcrumbNodes.map((node, i) =>
-      renderAnchor(node, i === breadcrumbNodes.length - 1),
-    );
+    return breadcrumbNodes.map(renderAnchor);
  };

  const getMobileBreadcrumbItems = () => {
@@ -153,12 +144,8 @@ export default function Breadcrumb() {
          key="mobile-hidden-nodes"
        >
          <Popover.Target>
-            <Tooltip label={t("Breadcrumbs")}>
-              <ActionIcon
-                color="gray"
-                variant="transparent"
-                aria-label={t("Breadcrumbs")}
-              >
+            <Tooltip label="Breadcrumbs">
+              <ActionIcon color="gray" variant="transparent">
                <IconCornerDownRightDouble size={20} stroke={2} />
              </ActionIcon>
            </Tooltip>
@@ -170,18 +157,16 @@ export default function Breadcrumb() {
      ];
    }

-    return breadcrumbNodes.map((node, i) =>
-      renderAnchor(node, i === breadcrumbNodes.length - 1),
-    );
+    return breadcrumbNodes.map(renderAnchor);
  };

  return (
-    <nav aria-label={t("Breadcrumb")} className={classes.breadcrumbDiv}>
+    <div className={classes.breadcrumbDiv}>
      {breadcrumbNodes && (
        <Breadcrumbs className={classes.breadcrumbs}>
          {isMobile ? getMobileBreadcrumbItems() : getBreadcrumbItems()}
        </Breadcrumbs>
      )}
-    </nav>
+    </div>
  );
 }
@@ -1,4 +1,4 @@
-import { ActionIcon, Group, Menu, Text, ThemeIcon, Tooltip } from "@mantine/core";
+import { ActionIcon, Group, Menu, Text, Tooltip } from "@mantine/core";
 import {
  IconArrowRight,
  IconArrowsHorizontal,
@@ -99,7 +99,6 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
        <ActionIcon
          variant="subtle"
          color="dark"
-          aria-label={t("Comments")}
          onClick={() => toggleAside("comments")}
        >
          <IconMessage size={20} stroke={2} />
@@ -110,7 +109,6 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
        <ActionIcon
          variant="subtle"
          color="dark"
-          aria-label={t("Table of contents")}
          onClick={() => toggleAside("toc")}
        >
          <IconList size={20} stroke={2} />
@@ -207,11 +205,7 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
        arrowPosition="center"
      >
        <Menu.Target>
-          <ActionIcon
-            variant="subtle"
-            color="dark"
-            aria-label={t("Page actions")}
-          >
+          <ActionIcon variant="subtle" color="dark">
            <IconDots size={20} />
          </ActionIcon>
        </Menu.Target>
@@ -422,15 +416,9 @@ function ConnectionWarning() {
      openDelay={250}
      withArrow
    >
-      <ThemeIcon
-        variant="default"
-        c="red"
-        role="status"
-        aria-label={t("Real-time editor connection lost. Retrying...")}
-        style={{ border: "none" }}
-      >
+      <ActionIcon variant="default" c="red" style={{ border: "none" }}>
        <IconWifiOff size={20} stroke={2} />
-      </ThemeIcon>
+      </ActionIcon>
    </Tooltip>
  );
 }
@@ -67,7 +67,7 @@ export default function PageImportModal({
        <Modal.Content style={{ overflow: "hidden" }}>
          <Modal.Header py={0}>
            <Modal.Title fw={500}>{t("Import pages")}</Modal.Title>
-            <Modal.CloseButton aria-label={t("Close")} />
+            <Modal.CloseButton />
          </Modal.Header>
          <Modal.Body>
            <ImportFormatSelection spaceId={spaceId} onClose={onClose} />
@@ -332,15 +332,7 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
  return (
    <>
      <SimpleGrid cols={2}>
-        <FileButton
-          onChange={handleFileUpload}
-          accept=".md"
-          multiple
-          resetRef={markdownFileRef}
-          inputProps={{
-            "aria-label": t("Choose {{format}} file", { format: "Markdown" }),
-          }}
-        >
+        <FileButton onChange={handleFileUpload} accept=".md" multiple resetRef={markdownFileRef}>
          {(props) => (
            <Button
              justify="start"
@@ -353,15 +345,7 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
          )}
        </FileButton>

-        <FileButton
-          onChange={handleFileUpload}
-          accept="text/html"
-          multiple
-          resetRef={htmlFileRef}
-          inputProps={{
-            "aria-label": t("Choose {{format}} file", { format: "HTML" }),
-          }}
-        >
+        <FileButton onChange={handleFileUpload} accept="text/html" multiple resetRef={htmlFileRef}>
          {(props) => (
            <Button
              justify="start"
@@ -379,9 +363,6 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
          accept=".docx"
          multiple
          resetRef={docxFileRef}
-          inputProps={{
-            "aria-label": t("Choose {{format}} file", { format: "Word (DOCX)" }),
-          }}
        >
          {(props) => (
            <Tooltip
@@ -406,9 +387,6 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
          accept=".pdf"
          multiple
          resetRef={pdfFileRef}
-          inputProps={{
-            "aria-label": t("Choose {{format}} file", { format: "PDF" }),
-          }}
        >
          {(props) => (
            <Tooltip
@@ -432,9 +410,6 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
          onChange={(file) => handleZipUpload(file, "notion")}
          accept="application/zip"
          resetRef={notionFileRef}
-          inputProps={{
-            "aria-label": t("Choose {{format}} file", { format: "Notion" }),
-          }}
        >
          {(props) => (
            <Button
@@ -451,9 +426,6 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
          onChange={(file) => handleZipUpload(file, "confluence")}
          accept="application/zip"
          resetRef={confluenceFileRef}
-          inputProps={{
-            "aria-label": t("Choose {{format}} file", { format: "Confluence" }),
-          }}
        >
          {(props) => (
            <Tooltip
@@ -491,9 +463,6 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
            onChange={(file) => handleZipUpload(file, "generic")}
            accept="application/zip"
            resetRef={zipFileRef}
-            inputProps={{
-              "aria-label": t("Choose {{format}} file", { format: "ZIP" }),
-            }}
          >
            {(props) => (
              <Group justify="center">
@@ -19,7 +19,7 @@ export default function TrashPageContentModal({
  const title = pageTitle || t("Untitled");

  return (
-    <Modal.Root size={1200} opened={opened} onClose={onClose} aria-label={t("Preview")}>
+    <Modal.Root size={1200} opened={opened} onClose={onClose}>
      <Modal.Overlay />
      <Modal.Content style={{ overflow: "hidden" }}>
        <Modal.Header>
@@ -129,7 +129,7 @@ export default function Trash() {
                  <Table.Th style={{ whiteSpace: "nowrap" }}>
                    {t("Deleted at")}
                  </Table.Th>
-                  <Table.Th aria-label={t("Action")} />
+                  <Table.Th></Table.Th>
                </Table.Tr>
              </Table.Thead>
              <Table.Tbody>
@@ -458,8 +458,6 @@ interface CreateNodeProps {
 }

 function CreateNode({ node, treeApi, onExpandTree }: CreateNodeProps) {
-  const { t } = useTranslation();
-
  function handleCreate() {
    if (node.data.hasChildren && node.children.length === 0) {
      node.toggle();
@@ -477,7 +475,6 @@ function CreateNode({ node, treeApi, onExpandTree }: CreateNodeProps) {
    <ActionIcon
      variant="transparent"
      c="gray"
-      aria-label={t("Create page")}
      onClick={(e) => {
        e.preventDefault();
        e.stopPropagation();
@@ -594,7 +591,6 @@ function NodeMenu({ node, treeApi, spaceId }: NodeMenuProps) {
          <ActionIcon
            variant="transparent"
            c="gray"
-            aria-label={t("Page menu")}
            onClick={(e) => {
              e.preventDefault();
              e.stopPropagation();
@@ -729,8 +725,6 @@ interface PageArrowProps {
 }

 function PageArrow({ node, onExpandTree }: PageArrowProps) {
-  const { t } = useTranslation();
-
  useEffect(() => {
    if (node.isOpen) {
      onExpandTree();
@@ -742,8 +736,6 @@ function PageArrow({ node, onExpandTree }: PageArrowProps) {
      size={20}
      variant="subtle"
      c="gray"
-      aria-label={node.isOpen ? t("Collapse") : t("Expand")}
-      aria-expanded={node.isInternal ? node.isOpen : undefined}
      onClick={(e) => {
        e.preventDefault();
        e.stopPropagation();
@@ -47,7 +47,6 @@ export function SearchMobileControl({ onSearch }: SearchMobileControlProps) {
      <ActionIcon
        variant="subtle"
        color="dark"
-        aria-label={t("Search")}
        onClick={onSearch}
        size="sm"
      >
@@ -37,7 +37,7 @@ export default function SessionList() {
          <Table.Tr>
            <Table.Th>{t("Device Name")}</Table.Th>
            <Table.Th>{t("Last Active")}</Table.Th>
-            <Table.Th aria-label={t("Action")} />
+            <Table.Th />
          </Table.Tr>
        </Table.Thead>
        <Table.Tbody>
@@ -94,7 +94,7 @@ export default function SessionList() {
          <Table.Tr>
            <Table.Th>{t("Device Name")}</Table.Th>
            <Table.Th>{t("Last Active")}</Table.Th>
-            {otherSessions.length > 0 && <Table.Th aria-label={t("Action")} />}
+            {otherSessions.length > 0 && <Table.Th />}
          </Table.Tr>
        </Table.Thead>
        <Table.Tbody>
@@ -75,7 +75,7 @@ export default function ShareActionMenu({ share }: Props) {
        arrowPosition="center"
      >
        <Menu.Target>
-          <ActionIcon variant="subtle" c="gray" aria-label={t("More options")}>
+          <ActionIcon variant="subtle" c="gray">
            <IconDots size={20} stroke={2} />
          </ActionIcon>
        </Menu.Target>
@@ -148,7 +148,6 @@ export default function ShareShell({
                  onClick={toggleTocMobile}
                  hiddenFrom="sm"
                  size="sm"
-                  aria-label={t("Table of contents")}
                >
                  <IconList size={20} stroke={2} />
                </ActionIcon>
@@ -158,7 +157,6 @@ export default function ShareShell({
                <ActionIcon
                  variant="default"
                  style={{ border: "none" }}
-                  aria-label={t("Table of contents")}
                  onClick={toggleToc}
                  visibleFrom="sm"
                  size="sm"
@@ -143,7 +143,7 @@ export default function SpaceMembersList({
              <Table.Tr>
                <Table.Th>{t("Member")}</Table.Th>
                <Table.Th>{t("Role")}</Table.Th>
-                <Table.Th aria-label={t("Action")} />
+                <Table.Th></Table.Th>
              </Table.Tr>
            </Table.Thead>

@@ -49,15 +49,15 @@ function WatchButton({ spaceId, watchedIds, size = 16 }: { spaceId: string; watc
    }
  };

-  const label = isWatching ? t("Stop watching space") : t("Watch space");
-
  return (
-    <Tooltip label={label} openDelay={250} withArrow>
+    <Tooltip
+      label={isWatching ? t("Stop watching space") : t("Watch space")}
+      openDelay={250}
+      withArrow
+    >
      <ActionIcon
        variant="subtle"
        color={isWatching ? "blue" : "gray"}
-        aria-label={label}
-        aria-pressed={isWatching}
        onClick={handleToggle}
        loading={isPending}
      >
@@ -111,7 +111,7 @@ export default function AllSpacesList({
            <Table.Tr>
              <Table.Th>{t("Space")}</Table.Th>
              <Table.Th>{t("Members")}</Table.Th>
-              <Table.Th w={130} aria-label={t("Action")} />
+              <Table.Th w={130}></Table.Th>
            </Table.Tr>
          </Table.Thead>

@@ -168,11 +168,7 @@ export default function AllSpacesList({
                      <WatchButton spaceId={space.id} watchedIds={watchedIds} size={16} />
                      <Menu position="bottom-end">
                        <Menu.Target>
-                          <ActionIcon
-                            variant="subtle"
-                            color="gray"
-                            aria-label={t("Space menu")}
-                          >
+                          <ActionIcon variant="subtle" color="gray">
                            <IconDots size={16} />
                          </ActionIcon>
                        </Menu.Target>
@@ -11,14 +11,6 @@ export async function lookupTransclusion(params: {
  return r.data;
 }

-export async function lookupTransclusionForShare(params: {
-  shareId: string;
-  references: Array<{ sourcePageId: string; transclusionId: string }>;
-}): Promise<{ items: TransclusionLookup[] }> {
-  const r = await api.post("/shares/transclusion/lookup", params);
-  return r.data;
-}
-
 export async function listReferences(params: {
  sourcePageId: string;
  transclusionId: string;
@@ -83,11 +83,7 @@ export default function MemberActionMenu({ userId, deactivatedAt }: Props) {
        arrowPosition="center"
      >
        <Menu.Target>
-          <ActionIcon
-            variant="subtle"
-            c="gray"
-            aria-label={t("Member actions")}
-          >
+          <ActionIcon variant="subtle" c="gray">
            <IconDots size={20} stroke={2} />
          </ActionIcon>
        </Menu.Target>
@@ -34,7 +34,6 @@ export default function WorkspaceInvitesTable() {
              <Table.Th>{t("Email")}</Table.Th>
              <Table.Th>{t("Role")}</Table.Th>
              <Table.Th>{t("Date")}</Table.Th>
-              <Table.Th aria-label={t("Action")} />
            </Table.Tr>
          </Table.Thead>

@@ -61,7 +61,6 @@ export default function WorkspaceMembersTable() {
              <Table.Th>{t("User")}</Table.Th>
              <Table.Th>{t("Status")}</Table.Th>
              <Table.Th>{t("Role")}</Table.Th>
-              <Table.Th aria-label={t("Action")} />
            </Table.Tr>
          </Table.Thead>

@@ -6,7 +6,7 @@ import {
  Table,
  Container,
  Title,
-  ThemeIcon,
+  ActionIcon,
  Button,
 } from "@mantine/core";
 import { Link } from "react-router-dom";
@@ -71,13 +71,13 @@ export default function FavoritesPage() {
                        >
                          <Group wrap="nowrap">
                            {fav.page.icon || (
-                              <ThemeIcon
+                              <ActionIcon
                                variant="transparent"
                                color="gray"
                                size={18}
                              >
                                <IconFileDescription size={18} />
-                              </ThemeIcon>
+                              </ActionIcon>
                            )}
                            <Text fw={500} size="md" lineClamp={1}>
                              {fav.page.title || t("Untitled")}
@@ -65,7 +65,6 @@ export default function SharedPage() {
          title={data.page.title}
          content={data.page.content}
          pageId={data.page.id}
-          shareId={data.share.id}
        />
      </Container>

@@ -71,7 +71,7 @@ export const mantineCssResolver: CSSVariablesResolver = (theme) => ({
    "--input-error-size": theme.fontSizes.sm,
  },
  light: {
-    "--mantine-color-dimmed": "#4b5563",
+    "--mantine-color-dimmed": "#6b7280",
    "--mantine-color-dark-light-color": "#4e5359",
    "--mantine-color-dark-light-hover": "var(--mantine-color-gray-light-hover)",
  },
@@ -63,6 +63,8 @@
    "@nestjs/throttler": "^6.5.0",
    "@nestjs/websockets": "^11.1.19",
    "@node-saml/passport-saml": "^5.1.0",
+    "@react-email/components": "1.0.10",
+    "@react-email/render": "2.0.4",
    "@socket.io/redis-adapter": "^8.3.0",
    "ai": "^6.0.134",
    "ai-sdk-ollama": "^3.8.1",
@@ -106,7 +108,6 @@
    "postgres": "^3.4.8",
    "postmark": "^4.0.7",
    "react": "^18.3.1",
-    "react-email": "6.0.8",
    "reflect-metadata": "^0.2.2",
    "rxjs": "^7.8.2",
    "sanitize-filename": "1.6.3",
@@ -145,6 +146,7 @@
    "jest": "^30.3.0",
    "kysely-codegen": "^0.20.0",
    "prettier": "^3.8.1",
+    "react-email": "5.2.10",
    "source-map-support": "^0.5.21",
    "supertest": "^7.2.2",
    "ts-jest": "^29.4.6",
@@ -1,4 +1,10 @@
-import { Logger, Module, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+import {
+  Global,
+  Logger,
+  Module,
+  OnModuleDestroy,
+  OnModuleInit,
+} from '@nestjs/common';
 import { AuthenticationExtension } from './extensions/authentication.extension';
 import { PersistenceExtension } from './extensions/persistence.extension';
 import { CollaborationGateway } from './collaboration.gateway';
@@ -13,9 +19,6 @@ import { CollaborationHandler } from './collaboration.handler';
 import { CollabHistoryService } from './services/collab-history.service';
 import { WatcherModule } from '../core/watcher/watcher.module';
 import { TransclusionService } from '../core/page/transclusion/transclusion.service';
-import { TransclusionModule } from '../core/page/transclusion/transclusion.module';
-import { StorageModule } from '../integrations/storage/storage.module';
-import { EnvironmentModule } from '../integrations/environment/environment.module';

@Module({
  providers: [
@@ -29,14 +32,7 @@ import { EnvironmentModule } from '../integrations/environment/environment.modul
    TransclusionService,
  ],
  exports: [CollaborationGateway],
-  imports: [
-    TokenModule,
-    WatcherModule,
-    StorageModule.forRootAsync({
-      imports: [EnvironmentModule],
-    }),
-    TransclusionModule,
-  ],
+  imports: [TokenModule, WatcherModule],
 })
 export class CollaborationModule implements OnModuleInit, OnModuleDestroy {
  private readonly logger = new Logger(CollaborationModule.name);
@@ -40,7 +40,7 @@ import {
  Status,
  addUniqueIdsToDoc,
  htmlToMarkdown,
-  TransclusionSource,
+  Transclusion,
  TransclusionReference,
 } from '@docmost/editor-ext';
 import { generateText, getSchema, JSONContent } from '@tiptap/core';
@@ -103,7 +103,7 @@ export const tiptapExtensions = [
  Columns,
  Column,
  Status,
-  TransclusionSource,
+  Transclusion,
  TransclusionReference,
 ] as any;

@@ -165,7 +165,7 @@ export class PersistenceExtension implements Extension {
    }

    if (page) {
-      await this.syncTransclusion(pageId, page.workspaceId, tiptapJson);
+      await this.syncTransclusion(pageId, tiptapJson);
    }

    if (page) {
@@ -250,31 +250,19 @@ export class PersistenceExtension implements Extension {
   */
  private async syncTransclusion(
    pageId: string,
-    workspaceId: string,
    tiptapJson: unknown,
  ): Promise<void> {
    try {
-      await this.transclusionService.syncPageTransclusions(
-        pageId,
-        workspaceId,
-        tiptapJson,
-      );
+      await this.transclusionService.syncPageTransclusions(pageId, tiptapJson);
    } catch (err) {
-      this.logger.error(
-        { err, pageId },
-        'Failed to sync transclusions for page',
-      );
+      this.logger.error(`Failed to sync transclusions for page ${pageId}`, err);
    }
    try {
-      await this.transclusionService.syncPageReferences(
-        pageId,
-        workspaceId,
-        tiptapJson,
-      );
+      await this.transclusionService.syncPageReferences(pageId, tiptapJson);
    } catch (err) {
      this.logger.error(
-        { err, pageId },
-        'Failed to sync transclusion references for page',
+        `Failed to sync transclusion references for page ${pageId}`,
+        err,
      );
    }
  }
@@ -62,14 +62,14 @@ function applyMarkToYFragment(
 ) {
  let pos = 0;

-  const processItem = (item: any, parentNodeName?: string): boolean => {
+  const processItem = (item: any): boolean => {
    if (pos >= to) return false;

    if (item instanceof Y.XmlText) {
      const textLength = item.length;
      const itemEnd = pos + textLength;

-      if (itemEnd > from && pos < to && parentNodeName !== 'codeBlock') {
+      if (itemEnd > from && pos < to) {
        const formatFrom = Math.max(0, from - pos);
        const formatTo = Math.min(textLength, to - pos);
        const formatLength = formatTo - formatFrom;
@@ -82,7 +82,7 @@ function applyMarkToYFragment(
    } else if (item instanceof Y.XmlElement) {
      pos++; // Opening tag
      for (let i = 0; i < item.length; i++) {
-        if (!processItem(item.get(i), item.nodeName)) return false;
+        if (!processItem(item.get(i))) return false;
      }
      pos++; // Closing tag
    }
@@ -1,13 +0,0 @@
-const ATTACHMENT_NODE_TYPES = [
-  'attachment',
-  'image',
-  'video',
-  'audio',
-  'pdf',
-  'excalidraw',
-  'drawio',
-];
-
-export function isAttachmentNode(nodeType: string): boolean {
-  return ATTACHMENT_NODE_TYPES.includes(nodeType);
-}
@@ -1,2 +1,2 @@
-export * from './generateHTML';
-export * from './generateJSON';
+export * from './generateHTML.js';
+export * from './generateJSON.js';
@@ -11,7 +11,6 @@ import {
  INTERNAL_LINK_REGEX,
  extractPageSlugId,
 } from '../../../integrations/export/utils';
-import { isAttachmentNode } from './attachment-node-types';

 export interface MentionNode {
  id: string;
@@ -123,7 +122,18 @@ export function getProsemirrorContent(content: any) {
  );
 }

-export { isAttachmentNode };
+export function isAttachmentNode(nodeType: string) {
+  const attachmentNodeTypes = [
+    'attachment',
+    'image',
+    'video',
+    'audio',
+    'pdf',
+    'excalidraw',
+    'drawio',
+  ];
+  return attachmentNodeTypes.includes(nodeType);
+}

 export function getAttachmentIds(prosemirrorJson: any) {
  const doc = jsonToNode(prosemirrorJson);
@@ -677,11 +677,7 @@ export class PageService {
    // pages never have prior rows so we can skip the diff and just bulk-insert.
    try {
      await this.transclusionService.insertTransclusionsForPages(
-        insertablePages.map((p) => ({
-          id: p.id,
-          workspaceId: p.workspaceId,
-          content: p.content,
-        })),
+        insertablePages.map((p) => ({ id: p.id, content: p.content })),
      );
    } catch (err) {
      this.logger.error(
@@ -692,11 +688,7 @@ export class PageService {

    try {
      await this.transclusionService.insertReferencesForPages(
-        insertablePages.map((p) => ({
-          id: p.id,
-          workspaceId: p.workspaceId,
-          content: p.content,
-        })),
+        insertablePages.map((p) => ({ id: p.id, content: p.content })),
      );
    } catch (err) {
      this.logger.error(
@@ -4,7 +4,6 @@ import {
  IsArray,
  IsString,
  IsUUID,
-  MaxLength,
  ValidateNested,
 } from 'class-validator';

@@ -13,7 +12,6 @@ export class LookupReferenceDto {
  sourcePageId!: string;

  @IsString()
-  @MaxLength(36)
  transclusionId!: string;
 }

@@ -17,13 +17,13 @@ describe('collectTransclusionsFromPmJson', () => {
    expect(collectTransclusionsFromPmJson(doc)).toEqual([]);
  });

-  it('extracts a top-level transclusion with id and content', () => {
+  it('extracts a top-level transclusion with id, name and content', () => {
    const doc = {
      type: 'doc',
      content: [
        {
-          type: 'transclusionSource',
-          attrs: { id: 'abc123' },
+          type: 'transclusion',
+          attrs: { id: 'abc123', name: 'Pricing' },
          content: [{ type: 'paragraph', content: [{ type: 'text', text: 'Body' }] }],
        },
      ],
@@ -31,6 +31,7 @@ describe('collectTransclusionsFromPmJson', () => {
    const got = collectTransclusionsFromPmJson(doc);
    expect(got).toHaveLength(1);
    expect(got[0].transclusionId).toBe('abc123');
+    expect(got[0].name).toBe('Pricing');
    expect(got[0].content).toEqual({
      type: 'doc',
      content: [{ type: 'paragraph', content: [{ type: 'text', text: 'Body' }] }],
@@ -41,7 +42,7 @@ describe('collectTransclusionsFromPmJson', () => {
    const doc = {
      type: 'doc',
      content: [
-        { type: 'transclusionSource', attrs: {}, content: [{ type: 'paragraph' }] },
+        { type: 'transclusion', attrs: {}, content: [{ type: 'paragraph' }] },
      ],
    };
    expect(collectTransclusionsFromPmJson(doc)).toEqual([]);
@@ -51,8 +52,8 @@ describe('collectTransclusionsFromPmJson', () => {
    const doc = {
      type: 'doc',
      content: [
-        { type: 'transclusionSource', attrs: { id: 'a' }, content: [{ type: 'paragraph' }] },
-        { type: 'transclusionSource', attrs: { id: 'b' }, content: [{ type: 'paragraph' }] },
+        { type: 'transclusion', attrs: { id: 'a' }, content: [{ type: 'paragraph' }] },
+        { type: 'transclusion', attrs: { id: 'b', name: 'Two' }, content: [{ type: 'paragraph' }] },
      ],
    };
    const got = collectTransclusionsFromPmJson(doc);
@@ -64,11 +65,11 @@ describe('collectTransclusionsFromPmJson', () => {
      type: 'doc',
      content: [
        {
-          type: 'transclusionSource',
+          type: 'transclusion',
          attrs: { id: 'outer' },
          content: [
            {
-              type: 'transclusionSource',
+              type: 'transclusion',
              attrs: { id: 'inner' },
              content: [{ type: 'paragraph' }],
            },
@@ -87,7 +88,7 @@ describe('collectTransclusionsFromPmJson', () => {
        {
          type: 'column',
          content: [
-            { type: 'transclusionSource', attrs: { id: 'inCol' }, content: [{ type: 'paragraph' }] },
+            { type: 'transclusion', attrs: { id: 'inCol' }, content: [{ type: 'paragraph' }] },
          ],
        },
      ],
@@ -101,24 +102,13 @@ describe('collectTransclusionsFromPmJson', () => {
    const doc = {
      type: 'doc',
      content: [
-        {
-          type: 'transclusionSource',
-          attrs: { id: 'dup' },
-          content: [{ type: 'paragraph', content: [{ type: 'text', text: 'first' }] }],
-        },
-        {
-          type: 'transclusionSource',
-          attrs: { id: 'dup' },
-          content: [{ type: 'paragraph', content: [{ type: 'text', text: 'second' }] }],
-        },
+        { type: 'transclusion', attrs: { id: 'dup', name: 'first' }, content: [{ type: 'paragraph' }] },
+        { type: 'transclusion', attrs: { id: 'dup', name: 'second' }, content: [{ type: 'paragraph' }] },
      ],
    };
    const got = collectTransclusionsFromPmJson(doc);
    expect(got).toHaveLength(1);
-    expect(got[0].content).toEqual({
-      type: 'doc',
-      content: [{ type: 'paragraph', content: [{ type: 'text', text: 'second' }] }],
-    });
+    expect(got[0].name).toBe('second');
  });
 });

@@ -149,7 +139,7 @@ describe('collectReferencesFromPmJson', () => {
      ],
    };
    expect(collectReferencesFromPmJson(doc)).toEqual([
-      { sourcePageId: 'p1', transclusionId: 'e1' },
+      { containingTransclusionId: null, sourcePageId: 'p1', transclusionId: 'e1' },
    ]);
  });

@@ -190,17 +180,17 @@ describe('collectReferencesFromPmJson', () => {
      ],
    };
    expect(collectReferencesFromPmJson(doc)).toEqual([
-      { sourcePageId: 'p1', transclusionId: 'e1' },
-      { sourcePageId: 'p2', transclusionId: 'e2' },
+      { containingTransclusionId: null, sourcePageId: 'p1', transclusionId: 'e1' },
+      { containingTransclusionId: null, sourcePageId: 'p2', transclusionId: 'e2' },
    ]);
  });

-  it('does not recurse into a transclusion source (schema forbids references inside)', () => {
+  it('also finds references nested inside a transclusion (source) node', () => {
    const doc = {
      type: 'doc',
      content: [
        {
-          type: 'transclusionSource',
+          type: 'transclusion',
          attrs: { id: 'src1' },
          content: [
            {
@@ -211,10 +201,12 @@ describe('collectReferencesFromPmJson', () => {
        },
      ],
    };
-    expect(collectReferencesFromPmJson(doc)).toEqual([]);
+    expect(collectReferencesFromPmJson(doc)).toEqual([
+      { containingTransclusionId: 'src1', sourcePageId: 'p1', transclusionId: 'e1' },
+    ]);
  });

-  it('dedupes identical (sourcePageId, transclusionId) pairs', () => {
+  it('dedupes identical (containingTransclusionId, sourcePageId, transclusionId) triples', () => {
    const doc = {
      type: 'doc',
      content: [
@@ -233,8 +225,8 @@ describe('collectReferencesFromPmJson', () => {
      ],
    };
    expect(collectReferencesFromPmJson(doc)).toEqual([
-      { sourcePageId: 'p1', transclusionId: 'e1' },
-      { sourcePageId: 'p2', transclusionId: 'e2' },
+      { containingTransclusionId: null, sourcePageId: 'p1', transclusionId: 'e1' },
+      { containingTransclusionId: null, sourcePageId: 'p2', transclusionId: 'e2' },
    ]);
  });
 });
@@ -25,10 +25,10 @@ describe('TransclusionController.lookup', () => {
    controller = module.get(TransclusionController);
  });

-  const user = { id: 'u1', workspaceId: 'w1' } as any;
+  const user = { id: 'u1' } as any;
  const ref = { sourcePageId: 'p1', transclusionId: 'e1' };

-  it('passes the references, viewer id and workspace id through to the service and returns its result', async () => {
+  it('returns content when lookup succeeds', async () => {
    service.lookup.mockResolvedValue({
      items: [
        {
@@ -43,6 +43,36 @@ describe('TransclusionController.lookup', () => {
    const out = await controller.lookup({ references: [ref] } as any, user);
    expect(out.items[0]).not.toHaveProperty('status');
    expect((out.items[0] as any).content).toEqual({ type: 'doc' });
-    expect(service.lookup).toHaveBeenCalledWith([ref], 'u1', 'w1');
+    expect(service.lookup).toHaveBeenCalledWith([ref], 'u1');
+  });
+
+  it('returns no_access when service says no_access', async () => {
+    service.lookup.mockResolvedValue({
+      items: [
+        {
+          sourcePageId: 'p1',
+          transclusionId: 'e1',
+          status: 'no_access',
+        },
+      ],
+    } as any);
+
+    const out = await controller.lookup({ references: [ref] } as any, user);
+    expect((out.items[0] as { status?: string }).status).toBe('no_access');
+  });
+
+  it('returns not_found when service says not_found', async () => {
+    service.lookup.mockResolvedValue({
+      items: [
+        {
+          sourcePageId: 'p1',
+          transclusionId: 'e1',
+          status: 'not_found',
+        },
+      ],
+    } as any);
+
+    const out = await controller.lookup({ references: [ref] } as any, user);
+    expect((out.items[0] as { status?: string }).status).toBe('not_found');
  });
 });
@@ -1,12 +1,11 @@
 import { Test } from '@nestjs/testing';
 import { TransclusionService } from '../transclusion.service';
 import { PageTransclusionsRepo } from '@docmost/db/repos/page-transclusions/page-transclusions.repo';
-import { PageTransclusionReferencesRepo } from '@docmost/db/repos/page-transclusions/page-transclusion-references.repo';
+import { PageTransclusionReferencesRepo } from '@docmost/db/repos/page-transclusion-references/page-transclusion-references.repo';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
 import { AttachmentRepo } from '@docmost/db/repos/attachment/attachment.repo';
 import { StorageService } from '../../../../integrations/storage/storage.service';
-import { PageAccessService } from '../../page-access/page-access.service';

 describe('TransclusionService.syncPageTransclusions', () => {
  let service: TransclusionService;
@@ -28,7 +27,6 @@ describe('TransclusionService.syncPageTransclusions', () => {
        { provide: PagePermissionRepo, useValue: {} },
        { provide: AttachmentRepo, useValue: {} },
        { provide: StorageService, useValue: {} },
-        { provide: PageAccessService, useValue: {} },
      ],
    }).compile();
    service = module.get(TransclusionService);
@@ -36,7 +34,6 @@ describe('TransclusionService.syncPageTransclusions', () => {
  });

  const pageId = '00000000-0000-0000-0000-000000000001';
-  const workspaceId = '00000000-0000-0000-0000-000000000099';

  it('inserts new transclusions that did not exist before', async () => {
    repo.findByPageId.mockResolvedValue([]);
@@ -44,14 +41,14 @@ describe('TransclusionService.syncPageTransclusions', () => {
      type: 'doc',
      content: [
        {
-          type: 'transclusionSource',
-          attrs: { id: 'a' },
+          type: 'transclusion',
+          attrs: { id: 'a', name: 'Hello' },
          content: [{ type: 'paragraph' }],
        },
      ],
    };

-    const result = await service.syncPageTransclusions(pageId, workspaceId, pm);
+    const result = await service.syncPageTransclusions(pageId, pm);

    expect(result).toEqual({ inserted: 1, updated: 0, deleted: 0 });
    expect(repo.insert).toHaveBeenCalledTimes(1);
@@ -59,6 +56,7 @@ describe('TransclusionService.syncPageTransclusions', () => {
      expect.objectContaining({
        pageId,
        transclusionId: 'a',
+        name: 'Hello',
      }),
      undefined,
    );
@@ -66,46 +64,43 @@ describe('TransclusionService.syncPageTransclusions', () => {
    expect(repo.deleteByPageAndTransclusionIds).not.toHaveBeenCalled();
  });

-  it('updates transclusions whose content changed', async () => {
+  it('updates transclusions whose name or content changed', async () => {
    repo.findByPageId.mockResolvedValue([
      {
        id: 'row1',
        pageId,
        transclusionId: 'a',
+        name: 'Old',
        content: { type: 'doc', content: [{ type: 'paragraph' }] },
        createdAt: new Date(),
        updatedAt: new Date(),
      } as any,
    ]);
-    const newContent = {
-      type: 'doc',
-      content: [
-        { type: 'paragraph', content: [{ type: 'text', text: 'X' }] },
-      ],
-    };
    const pm = {
      type: 'doc',
      content: [
        {
-          type: 'transclusionSource',
-          attrs: { id: 'a' },
-          content: newContent.content,
+          type: 'transclusion',
+          attrs: { id: 'a', name: 'New' },
+          content: [
+            { type: 'paragraph', content: [{ type: 'text', text: 'X' }] },
+          ],
        },
      ],
    };

-    const result = await service.syncPageTransclusions(pageId, workspaceId, pm);
+    const result = await service.syncPageTransclusions(pageId, pm);

    expect(result).toEqual({ inserted: 0, updated: 1, deleted: 0 });
    expect(repo.update).toHaveBeenCalledWith(
      pageId,
      'a',
-      expect.objectContaining({ content: newContent }),
+      expect.objectContaining({ name: 'New' }),
      undefined,
    );
  });

-  it('skips update when content is unchanged', async () => {
+  it('skips update when name and content are unchanged', async () => {
    const sameContent = {
      type: 'doc',
      content: [{ type: 'paragraph' }],
@@ -115,6 +110,7 @@ describe('TransclusionService.syncPageTransclusions', () => {
        id: 'row1',
        pageId,
        transclusionId: 'a',
+        name: 'Same',
        content: sameContent,
        createdAt: new Date(),
        updatedAt: new Date(),
@@ -124,14 +120,14 @@ describe('TransclusionService.syncPageTransclusions', () => {
      type: 'doc',
      content: [
        {
-          type: 'transclusionSource',
-          attrs: { id: 'a' },
+          type: 'transclusion',
+          attrs: { id: 'a', name: 'Same' },
          content: sameContent.content,
        },
      ],
    };

-    const result = await service.syncPageTransclusions(pageId, workspaceId, pm);
+    const result = await service.syncPageTransclusions(pageId, pm);

    expect(result).toEqual({ inserted: 0, updated: 0, deleted: 0 });
    expect(repo.update).not.toHaveBeenCalled();
@@ -143,6 +139,7 @@ describe('TransclusionService.syncPageTransclusions', () => {
        id: 'r',
        pageId,
        transclusionId: 'gone',
+        name: null,
        content: { type: 'doc', content: [] },
        createdAt: new Date(),
        updatedAt: new Date(),
@@ -150,7 +147,7 @@ describe('TransclusionService.syncPageTransclusions', () => {
    ]);
    const pm = { type: 'doc', content: [{ type: 'paragraph' }] };

-    const result = await service.syncPageTransclusions(pageId, workspaceId, pm);
+    const result = await service.syncPageTransclusions(pageId, pm);

    expect(result).toEqual({ inserted: 0, updated: 0, deleted: 1 });
    expect(repo.deleteByPageAndTransclusionIds).toHaveBeenCalledWith(
@@ -162,12 +159,28 @@ describe('TransclusionService.syncPageTransclusions', () => {

  it('handles empty doc → noop', async () => {
    repo.findByPageId.mockResolvedValue([]);
-    const result = await service.syncPageTransclusions(pageId, workspaceId, null);
+    const result = await service.syncPageTransclusions(pageId, null);
    expect(result).toEqual({ inserted: 0, updated: 0, deleted: 0 });
    expect(repo.insert).not.toHaveBeenCalled();
    expect(repo.update).not.toHaveBeenCalled();
    expect(repo.deleteByPageAndTransclusionIds).not.toHaveBeenCalled();
  });
+
+  it('passes through the trx parameter to repo calls', async () => {
+    repo.findByPageId.mockResolvedValue([]);
+    const trx = { mock: 'trx' } as any;
+    const pm = {
+      type: 'doc',
+      content: [
+        { type: 'transclusion', attrs: { id: 'a' }, content: [{ type: 'paragraph' }] },
+      ],
+    };
+
+    await service.syncPageTransclusions(pageId, pm, trx);
+
+    expect(repo.findByPageId).toHaveBeenCalledWith(pageId, trx);
+    expect(repo.insert).toHaveBeenCalledWith(expect.anything(), trx);
+  });
 });

 describe('TransclusionService.syncPageReferences', () => {
@@ -180,6 +193,8 @@ describe('TransclusionService.syncPageReferences', () => {
      findByReferencePageId: jest.fn(),
      insertMany: jest.fn(),
      deleteByReferenceAndKeys: jest.fn(),
+      findCyclicEdgesForSource: jest.fn().mockResolvedValue([]),
+      deleteByIds: jest.fn(),
    };
    const module = await Test.createTestingModule({
      providers: [
@@ -190,7 +205,6 @@ describe('TransclusionService.syncPageReferences', () => {
        { provide: PagePermissionRepo, useValue: {} },
        { provide: AttachmentRepo, useValue: {} },
        { provide: StorageService, useValue: {} },
-        { provide: PageAccessService, useValue: {} },
      ],
    }).compile();
    service = module.get(TransclusionService);
@@ -198,7 +212,6 @@ describe('TransclusionService.syncPageReferences', () => {
  });

  const referencePageId = '00000000-0000-0000-0000-000000000001';
-  const workspaceId = '00000000-0000-0000-0000-000000000099';

  it('inserts new loose references, no deletes when none existed', async () => {
    refRepo.findByReferencePageId.mockResolvedValue([]);
@@ -216,20 +229,20 @@ describe('TransclusionService.syncPageReferences', () => {
      ],
    };

-    const result = await service.syncPageReferences(referencePageId, workspaceId, pm);
+    const result = await service.syncPageReferences(referencePageId, pm);

    expect(result).toEqual({ inserted: 2, deleted: 0 });
    expect(refRepo.insertMany).toHaveBeenCalledWith(
      [
        {
-          workspaceId,
          referencePageId,
+          containingTransclusionId: null,
          sourcePageId: 'p1',
          transclusionId: 'e1',
        },
        {
-          workspaceId,
          referencePageId,
+          containingTransclusionId: null,
          sourcePageId: 'p2',
          transclusionId: 'e2',
        },
@@ -237,15 +250,17 @@ describe('TransclusionService.syncPageReferences', () => {
      undefined,
    );
    expect(refRepo.deleteByReferenceAndKeys).not.toHaveBeenCalled();
+    // Loose references never seed cycle detection.
+    expect(refRepo.findCyclicEdgesForSource).not.toHaveBeenCalled();
  });

-  it('ignores references nested inside a source (schema-forbidden)', async () => {
+  it('records the containing transclusion when references nest in a source', async () => {
    refRepo.findByReferencePageId.mockResolvedValue([]);
    const pm = {
      type: 'doc',
      content: [
        {
-          type: 'transclusionSource',
+          type: 'transclusion',
          attrs: { id: 's1' },
          content: [
            {
@@ -257,10 +272,62 @@ describe('TransclusionService.syncPageReferences', () => {
      ],
    };

-    const result = await service.syncPageReferences(referencePageId, workspaceId, pm);
+    const result = await service.syncPageReferences(referencePageId, pm);
+
+    expect(result).toEqual({ inserted: 1, deleted: 0 });
+    expect(refRepo.insertMany).toHaveBeenCalledWith(
+      [
+        {
+          referencePageId,
+          containingTransclusionId: 's1',
+          sourcePageId: 'p2',
+          transclusionId: 'e2',
+        },
+      ],
+      undefined,
+    );
+    expect(refRepo.findCyclicEdgesForSource).toHaveBeenCalledWith(
+      'p2',
+      'e2',
+      undefined,
+    );
+  });
+
+  it('deletes edges that close a cycle and excludes them from the inserted count', async () => {
+    refRepo.findByReferencePageId.mockResolvedValue([]);
+    refRepo.findCyclicEdgesForSource.mockResolvedValue([
+      {
+        id: 'closing-edge-id',
+        referencePageId,
+        containingTransclusionId: 's1',
+        sourcePageId: 'p2',
+        transclusionId: 'e2',
+        createdAt: new Date(),
+      } as any,
+    ]);
+    const pm = {
+      type: 'doc',
+      content: [
+        {
+          type: 'transclusion',
+          attrs: { id: 's1' },
+          content: [
+            {
+              type: 'transclusionReference',
+              attrs: { sourcePageId: 'p2', transclusionId: 'e2' },
+            },
+          ],
+        },
+      ],
+    };
+
+    const result = await service.syncPageReferences(referencePageId, pm);

    expect(result).toEqual({ inserted: 0, deleted: 0 });
-    expect(refRepo.insertMany).not.toHaveBeenCalled();
+    expect(refRepo.deleteByIds).toHaveBeenCalledWith(
+      ['closing-edge-id'],
+      undefined,
+    );
  });

  it('deletes references that no longer appear', async () => {
@@ -268,6 +335,7 @@ describe('TransclusionService.syncPageReferences', () => {
      {
        id: 'r1',
        referencePageId,
+        containingTransclusionId: null,
        sourcePageId: 'p1',
        transclusionId: 'e1',
        createdAt: new Date(),
@@ -275,13 +343,14 @@ describe('TransclusionService.syncPageReferences', () => {
    ]);
    const pm = { type: 'doc', content: [{ type: 'paragraph' }] };

-    const result = await service.syncPageReferences(referencePageId, workspaceId, pm);
+    const result = await service.syncPageReferences(referencePageId, pm);

    expect(result).toEqual({ inserted: 0, deleted: 1 });
    expect(refRepo.deleteByReferenceAndKeys).toHaveBeenCalledWith(
      referencePageId,
      [
        {
+          containingTransclusionId: null,
          sourcePageId: 'p1',
          transclusionId: 'e1',
        },
@@ -296,6 +365,7 @@ describe('TransclusionService.syncPageReferences', () => {
      {
        id: 'r',
        referencePageId,
+        containingTransclusionId: null,
        sourcePageId: 'p1',
        transclusionId: 'e1',
        createdAt: new Date(),
@@ -311,10 +381,32 @@ describe('TransclusionService.syncPageReferences', () => {
      ],
    };

-    const result = await service.syncPageReferences(referencePageId, workspaceId, pm);
+    const result = await service.syncPageReferences(referencePageId, pm);

    expect(result).toEqual({ inserted: 0, deleted: 0 });
    expect(refRepo.insertMany).not.toHaveBeenCalled();
    expect(refRepo.deleteByReferenceAndKeys).not.toHaveBeenCalled();
  });
+
+  it('passes through trx parameter to repo calls', async () => {
+    refRepo.findByReferencePageId.mockResolvedValue([]);
+    const trx = { mock: 'trx' } as any;
+    const pm = {
+      type: 'doc',
+      content: [
+        {
+          type: 'transclusionReference',
+          attrs: { sourcePageId: 'p1', transclusionId: 'e1' },
+        },
+      ],
+    };
+
+    await service.syncPageReferences(referencePageId, pm, trx);
+
+    expect(refRepo.findByReferencePageId).toHaveBeenCalledWith(
+      referencePageId,
+      trx,
+    );
+    expect(refRepo.insertMany).toHaveBeenCalledWith(expect.anything(), trx);
+  });
 });
@@ -24,8 +24,7 @@ export class TransclusionController {
  async lookup(@Body() dto: LookupDto, @AuthUser() user: User) {
    return this.transclusionService.lookup(
      dto.references,
-      user.id,
-      user.workspaceId,
+      user?.id ?? null,
    );
  }

@@ -39,7 +38,6 @@ export class TransclusionController {
      sourcePageId: dto.sourcePageId,
      transclusionId: dto.transclusionId,
      viewerUserId: user.id,
-      workspaceId: user.workspaceId,
    });
  }

@@ -53,7 +51,7 @@ export class TransclusionController {
      dto.referencePageId,
      dto.sourcePageId,
      dto.transclusionId,
-      user,
+      user.id,
    );
  }
 }
--- a/Show More
+++ b/Show More