fix: use ACL username and decode credentials in Redis URL parsing (#2434 )

* fix: use ACL username and decode credentials in Redis URL parsing * fix: pass family and TLS options to the collab app module
New Crowdin updates (#2332 )
2026-08-27 08:47:06 +08:00 · 2026-08-26 14:16:18 +01:00 · 2026-08-26 14:08:10 +01:00 · 2026-08-26 13:45:28 +01:00 · 2026-08-26 12:56:15 +01:00 · 2026-08-26 12:55:30 +01:00
136 changed files with 4909 additions and 1004 deletions
@@ -1,7 +1,7 @@
 FROM node:26-slim AS base
 LABEL org.opencontainers.image.source="https://github.com/docmost/docmost"

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

 FROM base AS builder

@@ -18,6 +18,15 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends curl bash \
  && rm -rf /var/lib/apt/lists/*

+# drop npm and corepack
+RUN rm -rf /usr/local/lib/node_modules/npm \
+  && rm -rf /usr/local/lib/node_modules/corepack \
+  && rm -rf /usr/local/bin/npm \
+  && rm -rf /usr/local/bin/npx \
+  && rm -rf /usr/local/bin/corepack \
+  && rm -rf /root/.npm \
+  && rm -rf /root/.node-gyp
+
 WORKDIR /app

 # Copy apps
@@ -52,7 +52,7 @@
    "mantine-form-zod-resolver": "1.3.0",
    "mermaid": "11.16.1",
    "mitt": "3.0.1",
-    "nanoid": "3.3.17",
+    "nanoid": "3.3.18",
    "posthog-js": "1.391.2",
    "react": "19.2.7",
    "react-clear-modal": "^2.0.18",
@@ -64,6 +64,7 @@
    "react-router-dom": "7.18.2",
    "semver": "7.7.4",
    "socket.io-client": "4.8.3",
+    "yet-another-react-lightbox": "^3.32.2",
    "zod": "4.3.6"
  },
  "devDependencies": {
@@ -294,6 +294,7 @@
  "Export space": "Bereich exportieren",
  "Export {{type}}": "Exportiere {{type}}",
  "File exceeds the {{limit}} attachment limit": "Datei überschreitet das Anhängelimit von {{limit}}",
+  "Media": "Medien",
  "Align left": "Links ausrichten",
  "Align right": "Rechts ausrichten",
  "Align center": "Zentrieren",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "Horizontale Trennlinie einfügen",
  "Page break": "Seitenumbruch",
  "Insert a page break for printing.": "Einen Seitenumbruch zum Drucken einfügen.",
+  "Footnote": "Fußnote",
+  "Insert a footnote reference.": "Einen Fußnotenverweis einfügen.",
  "Upload any image from your device.": "Laden Sie ein beliebiges Bild von Ihrem Gerät hoch.",
  "Upload any video from your device.": "Laden Sie ein beliebiges Video von Ihrem Gerät hoch.",
  "Upload any audio from your device.": "Laden Sie beliebige Audiodateien von Ihrem Gerät hoch.",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "Upgrade Ihres Plans",
  "Available with a paid license": "Verfügbar mit einer kostenpflichtigen Lizenz",
  "Upgrade your license tier.": "Stufen Sie Ihre Lizenz hoch.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "KI ist nur in der Docmost Enterprise-Edition verfügbar. Kontaktieren Sie sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "KI ist in den kostenpflichtigen Docmost-Editionen verfügbar. Kontaktieren Sie sales@docmost.com.",
  "AI & MCP": "KI & MCP",
  "AI": "KI",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Aktivieren Sie den MCP-Server, damit KI-Assistenten und -Tools mit den Inhalten Ihres Arbeitsbereichs interagieren können.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP ist nur in der Docmost Enterprise-Edition verfügbar. Kontaktieren Sie sales@docmost.com.",
  "MCP Server URL": "MCP-Server-URL",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Verwenden Sie Ihren API-Schlüssel zur Authentifizierung. API-Schlüssel können in Ihren Kontoeinstellungen verwaltet werden.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Verbinde AI-Assistenten über OAuth mit deinem Docmost-Konto.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "AI-Assistenten müssen sich über OAuth mit einem Docmost-Konto verbinden. API-Schlüssel können nicht mit dem MCP-Server verwendet werden.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Unterstützte Tools",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "In Ihrem Arbeitsbereich ist MCP aktiviert. Verwenden Sie Ihren API-Schlüssel, um KI-Assistenten anzubinden.",
  "MCP server URL:": "MCP-Server-URL:",
  "Learn more": "Mehr erfahren",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Verwalten Sie API-Schlüssel für alle Nutzer im Arbeitsbereich. Siehe die <anchor>API-Dokumentation</anchor> für Details zur Verwendung.",
@@ -1289,5 +1294,48 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "Vergleichen",
+  "Compare versions": "Versionen vergleichen",
+  "Select version from {{date}}": "Version vom {{date}} auswählen",
+  "Version actions for {{date}}": "Versionsaktionen für {{date}}",
+  "Comparing {{newer}} and {{older}}": "{{newer}} und {{older}} werden verglichen",
+  "Exit compare": "Vergleich beenden",
+  "Search attachments...": "Anhänge suchen...",
+  "Error loading attachments.": "Fehler beim Laden der Anhänge.",
+  "No attachments on this page yet.": "Auf dieser Seite gibt es noch keine Anhänge.",
+  "Uploaded by {{name}}": "Hochgeladen von {{name}}",
+  "Download {{name}}": "{{name}} herunterladen",
+  "Access revoked": "Zugriff widerrufen",
+  "Authorize application": "Anwendung autorisieren",
+  "{{name}} wants to access {{workspace}}": "{{name}} möchte auf {{workspace}} zugreifen",
+  "Not you? Switch account": "Nicht du? Konto wechseln",
+  "This application will be able to:": "Diese Anwendung kann Folgendes:",
+  "Write": "Schreiben",
+  "Invalid authorization request": "Ungültige Autorisierungsanfrage",
+  "Authorize": "Autorisieren",
+  "Application": "Anwendung",
+  "Permissions": "Berechtigungen",
+  "Authorized": "Autorisiert",
+  "Revoke access": "Zugriff widerrufen",
+  "Revoke access for {{name}}": "Zugriff für {{name}} widerrufen",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Möchtest du den Zugriff für {{name}} wirklich widerrufen? Die Anwendung kann dann nicht mehr auf dein Konto zugreifen.",
+  "Something went wrong. Please try again.": "Etwas ist schiefgelaufen. Bitte versuche es erneut.",
+  "Remove {{name}}": "{{name}} entfernen",
+  "Make sure you trust this application before authorizing it.": "Stelle sicher, dass du dieser Anwendung vertraust, bevor du sie autorisierst.",
+  "You will be redirected to": "Du wirst weitergeleitet zu",
+  "View content without making changes.": "Inhalte ansehen, ohne Änderungen vorzunehmen.",
+  "Create and modify content.": "Inhalte erstellen und bearbeiten.",
+  "Applications and AI assistants you have authorized to access your account.": "Anwendungen und AI-Assistenten, denen du den Zugriff auf dein Konto autorisiert hast.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "MCP ist für deinen Workspace aktiviert. Verbinde AI-Assistenten über OAuth mit deinem Docmost-Konto.",
+  "Authorized apps": "Autorisierte Apps",
+  "No authorized apps yet.": "Noch keine autorisierten Apps.",
+  "Workspace knowledge only": "Nur Workspace-Wissen",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Beschränke den AI-Chat darauf, nur anhand deiner Workspace-Seiten und hochgeladenen Dateien zu antworten. Es wird kein externes Wissen verwendet.",
+  "Toggle workspace knowledge only": "Nur Workspace-Wissen umschalten",
+  "Read-only mode": "Schreibgeschützter Modus",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI-Chat kann Workspace-Inhalte durchsuchen und lesen, aber keine Seiten erstellen oder bearbeiten.",
+  "Toggle AI Chat read-only mode": "Schreibgeschützten Modus für AI-Chat umschalten",
+  "Title only": "Nur Titel",
+  "you": "du"
 }
@@ -47,24 +47,24 @@
  "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.": "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.",
  "Description": "Description",
  "Details": "Details",
-  "e.g ACME": "e.g ACME",
-  "e.g ACME Inc": "e.g ACME Inc",
-  "e.g Developers": "e.g Developers",
-  "e.g Group for developers": "e.g Group for developers",
-  "e.g product": "e.g product",
-  "e.g Product Team": "e.g Product Team",
-  "e.g Sales": "e.g Sales",
-  "e.g Space for product team": "e.g Space for product team",
-  "e.g Space for sales team to collaborate": "e.g Space for sales team to collaborate",
+  "e.g ACME": "e.g. ACME",
+  "e.g ACME Inc": "e.g. ACME Inc",
+  "e.g Developers": "e.g. Developers",
+  "e.g Group for developers": "e.g. Group for developers",
+  "e.g product": "e.g. product",
+  "e.g Product Team": "e.g. Product Team",
+  "e.g Sales": "e.g. Sales",
+  "e.g Space for product team": "e.g. Space for product team",
+  "e.g Space for sales team to collaborate": "e.g. Space for sales team to collaborate",
  "Edit": "Edit",
  "Read": "Read",
  "Edit group": "Edit group",
  "Email": "Email",
  "Enter a strong password": "Enter a strong password",
  "Enter valid email addresses separated by comma or space max_50": "Enter valid email addresses separated by comma or space [max: 50]",
-  "enter valid emails addresses": "enter valid emails addresses",
+  "enter valid emails addresses": "Enter valid email addresses",
  "Enter your current password": "Enter your current password",
-  "enter your full name": "enter your full name",
+  "enter your full name": "Enter your full name",
  "Enter your new password": "Enter your new password",
  "Enter your new preferred email": "Enter your new preferred email",
  "Enter your password": "Enter your password",
@@ -112,7 +112,7 @@
  "Import pages": "Import pages",
  "Import pages & space settings": "Import pages & space settings",
  "Importing pages": "Importing pages",
-  "invalid invitation link": "invalid invitation link",
+  "invalid invitation link": "Invalid invitation link",
  "Invitation signup": "Invitation signup",
  "Invite by email": "Invite by email",
  "Invite members": "Invite members",
@@ -223,7 +223,7 @@
  "Your password must be a minimum of 8 characters.": "Your password must be a minimum of 8 characters.",
  "Sidebar toggle": "Sidebar toggle",
  "Comments": "Comments",
-  "404 page not found": "404 page not found",
+  "404 page not found": "404! Page not found",
  "Sorry, we can't find the page you are looking for.": "Sorry, we can't find the page you are looking for.",
  "Take me back to homepage": "Take me back to homepage",
  "Forgot password": "Forgot password",
@@ -294,6 +294,7 @@
  "Export space": "Export space",
  "Export {{type}}": "Export {{type}}",
  "File exceeds the {{limit}} attachment limit": "File exceeds the {{limit}} attachment limit",
+  "Media": "Media",
  "Align left": "Align left",
  "Align right": "Align right",
  "Align center": "Align center",
@@ -422,7 +423,7 @@
  "Insert current date": "Insert current date",
  "Time": "Time",
  "Insert current time": "Insert current time",
-  "Draw and sketch excalidraw diagrams": "Draw and sketch excalidraw diagrams",
+  "Draw and sketch excalidraw diagrams": "Draw and sketch Excalidraw diagrams",
  "Multiple": "Multiple",
  "Turn into": "Turn into",
  "Text align": "Text align",
@@ -563,7 +564,7 @@
  "Make sure to save these codes in a secure place. Your old backup codes are no longer valid.": "Make sure to save these codes in a secure place. Your old backup codes are no longer valid.",
  "Your new backup codes": "Your new backup codes",
  "I've saved my backup codes": "I've saved my backup codes",
-  "Failed to setup MFA": "Failed to setup MFA",
+  "Failed to setup MFA": "Failed to set up MFA",
  "Setup & Verify": "Setup & Verify",
  "Add to authenticator": "Add to authenticator",
  "1. Scan this QR code with your authenticator app": "1. Scan this QR code with your authenticator app",
@@ -637,7 +638,7 @@
  "Enterprise": "Enterprise",
  "Download attachment": "Download attachment",
  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can sign up via SSO.",
  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
  "Enforce two-factor authentication": "Enforce two-factor authentication",
  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
@@ -698,7 +699,7 @@
  "Upgrade your plan": "Upgrade your plan",
  "Available with a paid license": "Available with a paid license",
  "Upgrade your license tier.": "Upgrade your license tier.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI is available in the Docmost paid editions. Contact sales@docmost.com.",
  "AI & MCP": "AI & MCP",
  "AI": "AI",
  "MCP": "MCP",
@@ -706,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.",
  "MCP Server URL": "MCP Server URL",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Use your API key for authentication. You can manage API keys in your account settings.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Connect AI assistants with your Docmost account via OAuth.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Supported tools",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Your workspace has MCP enabled. Use your API key to connect AI assistants.",
  "MCP server URL:": "MCP server URL:",
  "Learn more": "Learn more",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.",
@@ -826,7 +829,7 @@
  "Choose how this page should stay accurate.": "Choose how this page should stay accurate.",
  "Recurring verification": "Recurring verification",
  "Verifiers re-confirm this page on a schedule.": "Verifiers re-confirm this page on a schedule.",
-  "Re-verify on a schedule (e.g every 30 days )": "Re-verify on a schedule (e.g every 30 days )",
+  "Re-verify on a schedule (e.g every 30 days )": "Re-verify on a schedule (e.g. every 30 days)",
  "Page stays editable at all times": "Page stays editable at all times",
  "Best for runbooks, FAQs, living documentation": "Best for runbooks, FAQs, living documentation",
  "Approval workflow": "Approval workflow",
@@ -902,7 +905,7 @@
  "Publish": "Publish",
  "Security": "Security",
  "Enforce SSO": "Enforce SSO",
-  "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to login with email and password.",
+  "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to log in with email and password.",
  "AI-generated content may not be accurate.": "AI-generated content may not be accurate.",
  "AI Chat": "AI Chat",
  "Analyze for insights": "Analyze for insights",
@@ -1248,7 +1251,7 @@
  "Not started": "Not started",
  "Number": "Number",
  "One month ago": "One month ago",
-  "One month from now": "One month from now",
+  "One month from now": "In one month",
  "One week ago": "One week ago",
  "One week from now": "One week from now",
  "Open as page": "Open as page",
@@ -1302,5 +1305,37 @@
  "Error loading attachments.": "Error loading attachments.",
  "No attachments on this page yet.": "No attachments on this page yet.",
  "Uploaded by {{name}}": "Uploaded by {{name}}",
-  "Download {{name}}": "Download {{name}}"
+  "Download {{name}}": "Download {{name}}",
+  "Access revoked": "Access revoked",
+  "Authorize application": "Authorize application",
+  "{{name}} wants to access {{workspace}}": "{{name}} wants to access {{workspace}}",
+  "Not you? Switch account": "Not you? Switch account",
+  "This application will be able to:": "This application will be able to:",
+  "Write": "Write",
+  "Invalid authorization request": "Invalid authorization request",
+  "Authorize": "Authorize",
+  "Application": "Application",
+  "Permissions": "Permissions",
+  "Authorized": "Authorized",
+  "Revoke access": "Revoke access",
+  "Revoke access for {{name}}": "Revoke access for {{name}}",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.",
+  "Something went wrong. Please try again.": "Something went wrong. Please try again.",
+  "Remove {{name}}": "Remove {{name}}",
+  "Make sure you trust this application before authorizing it.": "Make sure you trust this application before authorizing it.",
+  "You will be redirected to": "You will be redirected to",
+  "View content without making changes.": "View content without making changes.",
+  "Create and modify content.": "Create and modify content.",
+  "Applications and AI assistants you have authorized to access your account.": "Applications and AI assistants you have authorized to access your account.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.",
+  "Authorized apps": "Authorized apps",
+  "No authorized apps yet.": "No authorized apps yet.",
+  "Workspace knowledge only": "Workspace knowledge only",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.",
+  "Toggle workspace knowledge only": "Toggle workspace knowledge only",
+  "Read-only mode": "Read-only mode",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI Chat can search and read workspace content, but cannot create or edit pages.",
+  "Toggle AI Chat read-only mode": "Toggle AI Chat read-only mode",
+  "Title only": "Title only",
+  "you": "you"
 }
@@ -294,6 +294,7 @@
  "Export space": "Exportar espacio",
  "Export {{type}}": "Exportar {{type}}",
  "File exceeds the {{limit}} attachment limit": "El archivo supera el límite de {{limit}} adjuntos",
+  "Media": "Multimedia",
  "Align left": "Alinear a la izquierda",
  "Align right": "Alinear a la derecha",
  "Align center": "Alinear al centro",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "Insertar regla horizontal",
  "Page break": "Salto de página",
  "Insert a page break for printing.": "Inserta un salto de página para imprimir.",
+  "Footnote": "Nota al pie",
+  "Insert a footnote reference.": "Insertar una referencia de nota al pie.",
  "Upload any image from your device.": "Sube cualquier imagen desde tu dispositivo.",
  "Upload any video from your device.": "Sube cualquier video desde tu dispositivo.",
  "Upload any audio from your device.": "Sube cualquier audio desde tu dispositivo.",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "Mejora tu plan",
  "Available with a paid license": "Disponible con una licencia de pago",
  "Upgrade your license tier.": "Mejora el nivel de tu licencia.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "La IA solo está disponible en la edición empresarial de Docmost. Contacte con sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "La IA está disponible en las ediciones de pago de Docmost. Contacte con sales@docmost.com.",
  "AI & MCP": "IA y MCP",
  "AI": "IA",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Habilite el servidor MCP para permitir que asistentes de IA y herramientas interactúen con el contenido de su espacio de trabajo.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP solo está disponible en la edición empresarial de Docmost. Contacte con sales@docmost.com.",
  "MCP Server URL": "URL del servidor MCP",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Use su clave API para la autenticación. Puede gestionar las claves API en la configuración de su cuenta.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Conecta asistentes de IA con tu cuenta de Docmost mediante OAuth.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "Los asistentes de IA deben conectarse con una cuenta de Docmost mediante OAuth. No se pueden usar claves API con el servidor MCP.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Herramientas compatibles",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Su espacio de trabajo tiene MCP habilitado. Use su clave API para conectar asistentes de IA.",
  "MCP server URL:": "URL del servidor MCP:",
  "Learn more": "Más información",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Gestiona las claves de API para todos los usuarios en el espacio de trabajo. Consulta la <anchor>documentación de la API</anchor> para detalles de uso.",
@@ -1186,8 +1191,8 @@
  "Default value": "Valor predeterminado",
  "Delete property": "Eliminar propiedad",
  "Delete view": "Eliminar vista",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "¿Eliminar 1 fila?",
+  "Delete {{count}} rows?_other": "¿Eliminar {{count}} filas?",
  "Descending": "Descendente",
  "Discard": "Descartar",
  "Doesn't contain": "No contiene",
@@ -1286,8 +1291,51 @@
  "Value": "Valor",
  "View updated for everyone": "Vista actualizada para todos",
  "You have unsaved changes. Do you want to discard them?": "Tiene cambios no guardados. ¿Quiere descartarlos?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1 fila eliminada",
+  "{{count}} rows deleted_other": "{{count}} filas eliminadas",
+  "{{count}} selected_one": "1 seleccionado",
+  "{{count}} selected_other": "{{count}} seleccionadas",
+  "Compare": "Comparar",
+  "Compare versions": "Comparar versiones",
+  "Select version from {{date}}": "Seleccionar la versión del {{date}}",
+  "Version actions for {{date}}": "Acciones de la versión del {{date}}",
+  "Comparing {{newer}} and {{older}}": "Comparando {{newer}} y {{older}}",
+  "Exit compare": "Salir de la comparación",
+  "Search attachments...": "Buscar archivos adjuntos...",
+  "Error loading attachments.": "Error al cargar los archivos adjuntos.",
+  "No attachments on this page yet.": "Todavía no hay archivos adjuntos en esta página.",
+  "Uploaded by {{name}}": "Subido por {{name}}",
+  "Download {{name}}": "Descargar {{name}}",
+  "Access revoked": "Acceso revocado",
+  "Authorize application": "Autorizar aplicación",
+  "{{name}} wants to access {{workspace}}": "{{name}} quiere acceder a {{workspace}}",
+  "Not you? Switch account": "¿No eres tú? Cambiar de cuenta",
+  "This application will be able to:": "Esta aplicación podrá:",
+  "Write": "Escribir",
+  "Invalid authorization request": "Solicitud de autorización no válida",
+  "Authorize": "Autorizar",
+  "Application": "Aplicación",
+  "Permissions": "Permisos",
+  "Authorized": "Autorizado",
+  "Revoke access": "Revocar acceso",
+  "Revoke access for {{name}}": "Revocar acceso para {{name}}",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "¿Seguro que quieres revocar el acceso de {{name}}? La aplicación ya no podrá acceder a tu cuenta.",
+  "Something went wrong. Please try again.": "Algo salió mal. Inténtalo de nuevo.",
+  "Remove {{name}}": "Eliminar {{name}}",
+  "Make sure you trust this application before authorizing it.": "Asegúrate de confiar en esta aplicación antes de autorizarla.",
+  "You will be redirected to": "Serás redirigido a",
+  "View content without making changes.": "Ver contenido sin realizar cambios.",
+  "Create and modify content.": "Crear y modificar contenido.",
+  "Applications and AI assistants you have authorized to access your account.": "Aplicaciones y asistentes de IA que has autorizado para acceder a tu cuenta.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "Tu espacio de trabajo tiene MCP habilitado. Conecta asistentes de IA con tu cuenta de Docmost mediante OAuth.",
+  "Authorized apps": "Aplicaciones autorizadas",
+  "No authorized apps yet.": "Todavía no hay aplicaciones autorizadas.",
+  "Workspace knowledge only": "Solo conocimiento del espacio de trabajo",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Restringe AI Chat para que responda solo con información de las páginas y archivos subidos de tu espacio de trabajo. No usará conocimiento externo.",
+  "Toggle workspace knowledge only": "Alternar solo conocimiento del espacio de trabajo",
+  "Read-only mode": "Modo de solo lectura",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI Chat puede buscar y leer el contenido del espacio de trabajo, pero no puede crear ni editar páginas.",
+  "Toggle AI Chat read-only mode": "Alternar modo de solo lectura de AI Chat",
+  "Title only": "Solo título",
+  "you": "tú"
 }
@@ -294,6 +294,7 @@
  "Export space": "Exporter l'espace",
  "Export {{type}}": "Exporter {{type}}",
  "File exceeds the {{limit}} attachment limit": "Le fichier dépasse la limite de {{limit}} pièces jointes",
+  "Media": "Médias",
  "Align left": "Aligner à gauche",
  "Align right": "Aligner à droite",
  "Align center": "Aligner au centre",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "Insérer un séparateur de règle horizontale",
  "Page break": "Saut de page",
  "Insert a page break for printing.": "Insérer un saut de page pour l’impression.",
+  "Footnote": "Note de bas de page",
+  "Insert a footnote reference.": "Insérer une référence de note de bas de page.",
  "Upload any image from your device.": "Téléchargez n'importe quelle image depuis votre appareil.",
  "Upload any video from your device.": "Téléchargez n'importe quelle vidéo depuis votre appareil.",
  "Upload any audio from your device.": "Téléchargez n'importe quel fichier audio depuis votre appareil.",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "Mettez à niveau votre forfait",
  "Available with a paid license": "Disponible avec une licence payante",
  "Upgrade your license tier.": "Mettez à niveau votre niveau de licence.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "L'IA n'est disponible que dans l'édition Entreprise de Docmost. Contactez sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "L'IA est disponible dans les éditions payantes de Docmost. Contactez sales@docmost.com.",
  "AI & MCP": "IA & MCP",
  "AI": "IA",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Activez le serveur MCP pour permettre aux assistants et outils IA d'interagir avec le contenu de votre espace de travail.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP n'est disponible que dans l'édition Entreprise de Docmost. Contactez sales@docmost.com.",
  "MCP Server URL": "URL du serveur MCP",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Utilisez votre clé API pour l'authentification. Vous pouvez gérer les clés API dans les paramètres de votre compte.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Connectez des assistants IA à votre compte Docmost via OAuth.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "Les assistants IA doivent se connecter avec un compte Docmost via OAuth. Les clés API ne peuvent pas être utilisées avec le serveur MCP.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Outils pris en charge",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Votre espace de travail a MCP activé. Utilisez votre clé API pour connecter des assistants IA.",
  "MCP server URL:": "URL du serveur MCP :",
  "Learn more": "En savoir plus",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Gérez les clés API pour tous les utilisateurs de l'espace de travail. Consultez la <anchor>documentation API</anchor> pour plus de détails sur l'utilisation.",
@@ -1186,8 +1191,8 @@
  "Default value": "Valeur par défaut",
  "Delete property": "Supprimer la propriété",
  "Delete view": "Supprimer la vue",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "Supprimer 1 ligne ?",
+  "Delete {{count}} rows?_other": "Supprimer {{count}} lignes ?",
  "Descending": "Décroissant",
  "Discard": "Ignorer",
  "Doesn't contain": "Ne contient pas",
@@ -1286,8 +1291,51 @@
  "Value": "Valeur",
  "View updated for everyone": "Vue mise à jour pour tout le monde",
  "You have unsaved changes. Do you want to discard them?": "Vous avez des modifications non enregistrées. Voulez-vous les ignorer ?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1 ligne supprimée",
+  "{{count}} rows deleted_other": "{{count}} lignes supprimées",
+  "{{count}} selected_one": "1 sélectionné(e)",
+  "{{count}} selected_other": "{{count}} sélectionné(e)s",
+  "Compare": "Comparer",
+  "Compare versions": "Comparer les versions",
+  "Select version from {{date}}": "Sélectionner la version du {{date}}",
+  "Version actions for {{date}}": "Actions de version pour le {{date}}",
+  "Comparing {{newer}} and {{older}}": "Comparaison de {{newer}} et {{older}}",
+  "Exit compare": "Quitter la comparaison",
+  "Search attachments...": "Rechercher des pièces jointes...",
+  "Error loading attachments.": "Erreur lors du chargement des pièces jointes.",
+  "No attachments on this page yet.": "Aucune pièce jointe sur cette page pour le moment.",
+  "Uploaded by {{name}}": "Téléversé par {{name}}",
+  "Download {{name}}": "Télécharger {{name}}",
+  "Access revoked": "Accès révoqué",
+  "Authorize application": "Autoriser l’application",
+  "{{name}} wants to access {{workspace}}": "{{name}} souhaite accéder à {{workspace}}",
+  "Not you? Switch account": "Ce n’est pas vous ? Changer de compte",
+  "This application will be able to:": "Cette application pourra :",
+  "Write": "Écriture",
+  "Invalid authorization request": "Demande d’autorisation invalide",
+  "Authorize": "Autoriser",
+  "Application": "Application",
+  "Permissions": "Autorisations",
+  "Authorized": "Autorisé",
+  "Revoke access": "Révoquer l’accès",
+  "Revoke access for {{name}}": "Révoquer l’accès pour {{name}}",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Êtes-vous sûr de vouloir révoquer l’accès pour {{name}} ? L’application ne pourra plus accéder à votre compte.",
+  "Something went wrong. Please try again.": "Une erreur s’est produite. Veuillez réessayer.",
+  "Remove {{name}}": "Supprimer {{name}}",
+  "Make sure you trust this application before authorizing it.": "Assurez-vous de faire confiance à cette application avant de l’autoriser.",
+  "You will be redirected to": "Vous serez redirigé vers",
+  "View content without making changes.": "Afficher le contenu sans apporter de modifications.",
+  "Create and modify content.": "Créer et modifier du contenu.",
+  "Applications and AI assistants you have authorized to access your account.": "Applications et assistants IA que vous avez autorisés à accéder à votre compte.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "MCP est activé dans votre espace de travail. Connectez des assistants IA à votre compte Docmost via OAuth.",
+  "Authorized apps": "Applications autorisées",
+  "No authorized apps yet.": "Aucune application autorisée pour le moment.",
+  "Workspace knowledge only": "Connaissances de l’espace de travail uniquement",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Limiter AI Chat aux réponses provenant uniquement des pages de votre espace de travail et des fichiers téléversés. Il n’utilisera pas de connaissances externes.",
+  "Toggle workspace knowledge only": "Activer/désactiver les connaissances de l’espace de travail uniquement",
+  "Read-only mode": "Mode lecture seule",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI Chat peut rechercher et lire le contenu de l’espace de travail, mais ne peut pas créer ni modifier des pages.",
+  "Toggle AI Chat read-only mode": "Activer/désactiver le mode lecture seule d’AI Chat",
+  "Title only": "Titre uniquement",
+  "you": "vous"
 }
@@ -205,7 +205,7 @@
  "Templates": "Modelli",
  "Theme": "Tema",
  "To change your email, you have to enter your password and new email.": "Per cambiare la tua email, devi inserire la tua password e la nuova email.",
-  "Toggle full page width": "Attiva/disattiva larghezza completa della pagina",
+  "Toggle full page width": "Attiva/disattiva larghezza intera della pagina",
  "Unable to import pages. Please try again.": "Impossibile importare le pagine. Riprova.",
  "untitled": "senza titolo",
  "Untitled": "Senza titolo",
@@ -294,6 +294,7 @@
  "Export space": "Esporta spazio",
  "Export {{type}}": "Esporta {{type}}",
  "File exceeds the {{limit}} attachment limit": "Il file supera il limite per gli allegati di {{limit}}",
+  "Media": "Contenuti multimediali",
  "Align left": "Allinea a sinistra",
  "Align right": "Allinea a destra",
  "Align center": "Allinea al centro",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "Inserisci divisore di regola orizzontale",
  "Page break": "Interruzione di pagina",
  "Insert a page break for printing.": "Inserisci un'interruzione di pagina per la stampa.",
+  "Footnote": "Nota a piè di pagina",
+  "Insert a footnote reference.": "Inserisci un riferimento a una nota a piè di pagina.",
  "Upload any image from your device.": "Carica un'immagine dal tuo dispositivo.",
  "Upload any video from your device.": "Carica qualsiasi video dal tuo dispositivo.",
  "Upload any audio from your device.": "Carica qualsiasi audio dal tuo dispositivo.",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "Aggiorna il tuo piano",
  "Available with a paid license": "Disponibile con una licenza a pagamento",
  "Upgrade your license tier.": "Aggiorna il livello della tua licenza.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "L'IA è disponibile solo nell'edizione Enterprise di Docmost. Contatta sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "L'IA è disponibile nelle edizioni a pagamento di Docmost. Contatta sales@docmost.com.",
  "AI & MCP": "IA e MCP",
  "AI": "IA",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Abilita il server MCP per consentire ad assistenti e strumenti IA di interagire con i contenuti del tuo spazio di lavoro.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP è disponibile solo nell'edizione Enterprise di Docmost. Contatta sales@docmost.com.",
  "MCP Server URL": "URL del server MCP",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Usa la tua chiave API per l'autenticazione. Puoi gestire le chiavi API nelle impostazioni del tuo account.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Connetti gli assistenti AI al tuo account Docmost tramite OAuth.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "Gli assistenti AI devono connettersi con un account Docmost tramite OAuth. Le chiavi API non possono essere utilizzate con il server MCP.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Strumenti supportati",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Il tuo spazio di lavoro ha MCP abilitato. Usa la tua chiave API per collegare gli assistenti IA.",
  "MCP server URL:": "URL del server MCP:",
  "Learn more": "Scopri di più",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Gestisci le API key per tutti gli utenti nello spazio di lavoro. Consulta la <anchor>documentazione API</anchor> per i dettagli sull'utilizzo.",
@@ -1186,8 +1191,8 @@
  "Default value": "Valore predefinito",
  "Delete property": "Elimina proprietà",
  "Delete view": "Elimina vista",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "Eliminare 1 riga?",
+  "Delete {{count}} rows?_other": "Eliminare {{count}} righe?",
  "Descending": "Decrescente",
  "Discard": "Ignora",
  "Doesn't contain": "Non contiene",
@@ -1286,8 +1291,51 @@
  "Value": "Valore",
  "View updated for everyone": "Vista aggiornata per tutti",
  "You have unsaved changes. Do you want to discard them?": "Hai modifiche non salvate. Vuoi ignorarle?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1 riga eliminata",
+  "{{count}} rows deleted_other": "{{count}} righe eliminate",
+  "{{count}} selected_one": "1 selezionato",
+  "{{count}} selected_other": "{{count}} selezionati",
+  "Compare": "Confronta",
+  "Compare versions": "Confronta versioni",
+  "Select version from {{date}}": "Seleziona la versione del {{date}}",
+  "Version actions for {{date}}": "Azioni della versione del {{date}}",
+  "Comparing {{newer}} and {{older}}": "Confronto tra {{newer}} e {{older}}",
+  "Exit compare": "Esci dal confronto",
+  "Search attachments...": "Cerca allegati...",
+  "Error loading attachments.": "Errore durante il caricamento degli allegati.",
+  "No attachments on this page yet.": "Ancora nessun allegato in questa pagina.",
+  "Uploaded by {{name}}": "Caricato da {{name}}",
+  "Download {{name}}": "Scarica {{name}}",
+  "Access revoked": "Accesso revocato",
+  "Authorize application": "Autorizza applicazione",
+  "{{name}} wants to access {{workspace}}": "{{name}} vuole accedere a {{workspace}}",
+  "Not you? Switch account": "Non sei tu? Cambia account",
+  "This application will be able to:": "Questa applicazione potrà:",
+  "Write": "Scrivere",
+  "Invalid authorization request": "Richiesta di autorizzazione non valida",
+  "Authorize": "Autorizza",
+  "Application": "Applicazione",
+  "Permissions": "Autorizzazioni",
+  "Authorized": "Autorizzato",
+  "Revoke access": "Revoca accesso",
+  "Revoke access for {{name}}": "Revoca l'accesso per {{name}}",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Sei sicuro di voler revocare l'accesso per {{name}}? L'applicazione non potrà più accedere al tuo account.",
+  "Something went wrong. Please try again.": "Qualcosa è andato storto. Riprova.",
+  "Remove {{name}}": "Rimuovi {{name}}",
+  "Make sure you trust this application before authorizing it.": "Assicurati di fidarti di questa applicazione prima di autorizzarla.",
+  "You will be redirected to": "Verrai reindirizzato a",
+  "View content without making changes.": "Visualizza il contenuto senza apportare modifiche.",
+  "Create and modify content.": "Crea e modifica contenuti.",
+  "Applications and AI assistants you have authorized to access your account.": "Applicazioni e assistenti AI che hai autorizzato ad accedere al tuo account.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "Il tuo workspace ha MCP abilitato. Connetti gli assistenti AI al tuo account Docmost tramite OAuth.",
+  "Authorized apps": "App autorizzate",
+  "No authorized apps yet.": "Ancora nessuna app autorizzata.",
+  "Workspace knowledge only": "Solo conoscenze del workspace",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Limita AI Chat a rispondere solo in base alle pagine del tuo workspace e ai file caricati. Non userà conoscenze esterne.",
+  "Toggle workspace knowledge only": "Attiva/disattiva solo conoscenze del workspace",
+  "Read-only mode": "Modalità di sola lettura",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI Chat può cercare e leggere i contenuti del workspace, ma non può creare o modificare pagine.",
+  "Toggle AI Chat read-only mode": "Attiva/disattiva la modalità di sola lettura di AI Chat",
+  "Title only": "Solo titolo",
+  "you": "tu"
 }
@@ -294,6 +294,7 @@
  "Export space": "エクスポートスペース",
  "Export {{type}}": "{{type}}をエクスポート",
  "File exceeds the {{limit}} attachment limit": "ファイルが{{limit}}の添付制限を超えています",
+  "Media": "メディア",
  "Align left": "左揃え",
  "Align right": "右揃え",
  "Align center": "中央揃え",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "区切り線を挿入します",
  "Page break": "改ページ",
  "Insert a page break for printing.": "印刷用に改ページを挿入します。",
+  "Footnote": "脚注",
+  "Insert a footnote reference.": "脚注参照を挿入します。",
  "Upload any image from your device.": "デバイスから画像をアップロードします",
  "Upload any video from your device.": "デバイスから動画をアップロードします",
  "Upload any audio from your device.": "デバイスから音声ファイルをアップロードします。",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "プランをアップグレードする",
  "Available with a paid license": "有料ライセンスで利用可能",
  "Upgrade your license tier.": "ライセンスタイアをアップグレードしてください。",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI は Docmost のエンタープライズ版でのみ利用可能です。sales@docmost.com までお問い合わせください。",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI は Docmost の有料版で利用可能です。sales@docmost.com までお問い合わせください。",
  "AI & MCP": "AI と MCP",
  "AI": "AI",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "MCP サーバーを有効にして、AI アシスタントやツールがワークスペースのコンテンツとやり取りできるようにします。",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP は Docmost のエンタープライズ版でのみ利用可能です。sales@docmost.com までお問い合わせください。",
  "MCP Server URL": "MCP サーバーの URL",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "認証には API キーを使用してください。API キーはアカウント設定で管理できます。",
+  "Connect AI assistants with your Docmost account via OAuth.": "OAuth を使用して AI アシスタントを Docmost アカウントに接続します。",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "AI アシスタントは OAuth を使用して Docmost アカウントに接続する必要があります。MCP サーバーでは API キーは使用できません。",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "サポートされているツール",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "このワークスペースでは MCP が有効になっています。AI アシスタントを接続するには API キーを使用してください。",
  "MCP server URL:": "MCP サーバーの URL:",
  "Learn more": "詳細を見る",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "ワークスペース内のすべてのユーザーのAPIキーを管理します。利用方法の詳細は<anchor>APIドキュメント</anchor>をご覧ください。",
@@ -1289,5 +1294,48 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "比較",
+  "Compare versions": "バージョンを比較",
+  "Select version from {{date}}": "{{date}} のバージョンを選択",
+  "Version actions for {{date}}": "{{date}} のバージョンの操作",
+  "Comparing {{newer}} and {{older}}": "{{newer}} と {{older}} を比較中",
+  "Exit compare": "比較を終了",
+  "Search attachments...": "添付ファイルを検索…",
+  "Error loading attachments.": "添付ファイルの読み込み中にエラーが発生しました。",
+  "No attachments on this page yet.": "このページにはまだ添付ファイルがありません。",
+  "Uploaded by {{name}}": "アップロード者: {{name}}",
+  "Download {{name}}": "{{name}} をダウンロード",
+  "Access revoked": "アクセスが取り消されました",
+  "Authorize application": "アプリケーションを認可",
+  "{{name}} wants to access {{workspace}}": "{{name}} が {{workspace}} へのアクセスを求めています",
+  "Not you? Switch account": "あなたではありませんか？ アカウントを切り替え",
+  "This application will be able to:": "このアプリケーションで可能なこと：",
+  "Write": "書き込み",
+  "Invalid authorization request": "無効な認可リクエストです",
+  "Authorize": "認可",
+  "Application": "アプリケーション",
+  "Permissions": "権限",
+  "Authorized": "認可済み",
+  "Revoke access": "アクセスを取り消す",
+  "Revoke access for {{name}}": "{{name}} のアクセスを取り消す",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "{{name}} のアクセスを取り消してもよろしいですか？ このアプリケーションは今後あなたのアカウントにアクセスできなくなります。",
+  "Something went wrong. Please try again.": "問題が発生しました。もう一度お試しください。",
+  "Remove {{name}}": "{{name}} を削除",
+  "Make sure you trust this application before authorizing it.": "認可する前に、このアプリケーションを信頼できることを確認してください。",
+  "You will be redirected to": "次へリダイレクトされます",
+  "View content without making changes.": "変更を加えずにコンテンツを表示します。",
+  "Create and modify content.": "コンテンツを作成および変更します。",
+  "Applications and AI assistants you have authorized to access your account.": "あなたのアカウントへのアクセスを認可したアプリケーションと AI アシスタント。",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "このワークスペースでは MCP が有効になっています。OAuth を使用して AI アシスタントを Docmost アカウントに接続します。",
+  "Authorized apps": "認可済みアプリ",
+  "No authorized apps yet.": "認可済みアプリはまだありません。",
+  "Workspace knowledge only": "ワークスペースの知識のみ",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "AIチャットの回答を、ワークスペース内のページとアップロードされたファイルのみに制限します。外部の知識は使用されません。",
+  "Toggle workspace knowledge only": "「ワークスペースの知識のみ」を切り替え",
+  "Read-only mode": "読み取り専用モード",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AIチャットはワークスペースのコンテンツを検索および閲覧できますが、ページの作成や編集はできません。",
+  "Toggle AI Chat read-only mode": "AIチャットの読み取り専用モードを切り替え",
+  "Title only": "タイトルのみ",
+  "you": "あなた"
 }
@@ -2,23 +2,23 @@
  "Account": "계정",
  "Active": "활성",
  "Add": "추가",
-  "Add group members": "팀에 사용자 추가",
-  "Add groups": "팀 생성",
+  "Add group members": "그룹에 멤버 추가",
+  "Add groups": "그룹 추가",
  "Add members": "사용자 추가",
-  "Add to groups": "팀에 추가",
+  "Add to groups": "그룹에 추가",
  "Add space members": "Space에 사용자 추가",
  "Add to favorites": "즐겨찾기에 추가",
  "Admin": "관리자",
-  "Are you sure you want to delete this group? Members will lose access to resources this group has access to.": "이 팀을 삭제하시겠습니까? 해당 팀에 속한 사용자들은 이 팀이 가진 모든 권한을 잃게 됩니다.",
+  "Are you sure you want to delete this group? Members will lose access to resources this group has access to.": "이 그룹을 삭제하시겠습니까? 그룹 멤버는 이 그룹이 가진 모든 권한을 잃게 됩니다.",
  "Are you sure you want to delete this page?": "이 페이지를 삭제하시겠습니까?",
-  "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "이 사용자를 팀에서 제거하시겠습니까? 사용자는 이 팀이 가진 모든 권한을 잃게 됩니다.",
+  "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "이 사용자를 그룹에서 제거하시겠습니까? 사용자는 이 그룹이 가진 모든 권한을 잃게 됩니다.",
  "Are you sure you want to remove this user from the space? The user will lose all access to this space.": "이 사용자를 Space에서 제거하시겠습니까? 사용자는 이 Space에 대한 모든 접근 권한을 잃게 됩니다.",
  "Are you sure you want to restore this version? Any changes not versioned will be lost.": "이 버전으로 복원하시겠습니까? 저장되지 않은 모든 변경사항이 손실됩니다.",
-  "Can become members of groups and spaces in workspace": "Workspace 내 팀 및 Space의 사용자가 될 수 있습니다.",
+  "Can become members of groups and spaces in workspace": "워크스페이스의 그룹 및 스페이스의 멤버가 될 수 있음",
  "Can create and edit pages in space.": "Space에 페이지를 생성하고 편집할 수 있습니다.",
  "Can edit": "편집할 수 있음",
-  "Can manage workspace": "Workspace를 관리할 수 있음",
-  "Can manage workspace but cannot delete it": "Workspace를 관리할 수 있지만, 삭제는 불가능.",
+  "Can manage workspace": "워크스페이스를 관리할 수 있음",
+  "Can manage workspace but cannot delete it": "워크스페이스를 관리할 수 있지만, 삭제할 수 없음",
  "Can view": "볼 수 있음",
  "Can view pages in space but not edit.": "Space의 페이지를 볼 수 있지만, 편집은 불가능.",
  "Cancel": "취소",
@@ -33,17 +33,17 @@
  "Copy as Markdown": "Markdown으로 복사",
  "Copy link": "링크 복사",
  "Create": "생성",
-  "Create group": "팀 생성",
+  "Create group": "그룹 생성",
  "Create page": "페이지 생성",
  "Create space": "Space 생성",
-  "Create workspace": "Workspace 생성",
+  "Create workspace": "워크스페이스 생성",
  "Current password": "현재 비밀번호",
  "Dark": "어두운",
  "Date": "날짜",
  "Delete": "삭제",
  "Remove from page": "페이지에서 제거",
  "Base options": "베이스 옵션",
-  "Delete group": "팀 삭제",
+  "Delete group": "그룹 삭제",
  "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.": "이 페이지를 삭제하시겠습니까? 하위 페이지와 페이지 기록이 모두 삭제됩니다. 이 작업은 되돌릴 수 없습니다.",
  "Description": "설명",
  "Details": "세부사항",
@@ -58,7 +58,7 @@
  "e.g Space for sales team to collaborate": "예: 영업 팀이 협업하는 스페이스",
  "Edit": "편집",
  "Read": "읽기",
-  "Edit group": "팀 편집",
+  "Edit group": "그룹 편집",
  "Email": "이메일",
  "Enter a strong password": "강력한 비밀번호를 입력하세요",
  "Enter valid email addresses separated by comma or space max_50": "유효한 이메일 주소를 쉼표나 공백으로 구분하여 입력하세요 [최대: 50]",
@@ -103,10 +103,10 @@
  "Full page width": "전체 페이지 너비",
  "Full width": "전체 너비",
  "General": "일반",
-  "Group": "팀",
-  "Group description": "팀 설명",
-  "Group name": "팀 이름",
-  "Groups": "팀",
+  "Group": "그룹",
+  "Group description": "그룹 설명",
+  "Group name": "그룹 이름",
+  "Groups": "그룹",
  "Has full access to space settings and pages.": "Space 설정과 페이지에 대한 전체 접근 권한이 있습니다.",
  "Home": "홈",
  "Import pages": "페이지 가져오기",
@@ -119,14 +119,14 @@
  "Invite new members": "새 사용자 초대",
  "Invite People": "사용자 초대",
  "Invited members who are yet to accept their invitation will appear here.": "초대를 아직 수락하지 않은 초대된 사용자가 여기에 표시됩니다.",
-  "Invited members will be granted access to spaces the groups can access": "초대된 사용자는 팀이 접근할 수 있는 Space에 대한 접근 권한을 받게 됩니다",
-  "Join the workspace": "Workspace 참여",
+  "Invited members will be granted access to spaces the groups can access": "초대된 멤버에게는 그룹이 접근할 수 있는 스페이스에 대한 액세스 권한이 부여됩니다",
+  "Join the workspace": "워크스페이스 참여",
  "Language": "언어",
  "Light": "밝은",
  "Link copied": "링크 복사됨",
  "Login": "로그인",
  "Logout": "로그아웃",
-  "Manage Group": "팀 관리",
+  "Manage Group": "그룹 관리",
  "Manage members": "사용자 관리",
  "member": "사용자",
  "Member": "사용자",
@@ -139,7 +139,7 @@
  "New email": "새 이메일",
  "New page": "새 페이지",
  "New password": "새 비밀번호",
-  "No group found": "그룹을 찾을 수 없습니다",
+  "No group found": "그룹을 찾을 수 없음",
  "No page history saved yet.": "아직 저장된 페이지 기록이 없습니다.",
  "No pages yet": "아직 페이지가 없습니다",
  "No shared pages": "공유된 페이지가 없습니다.",
@@ -148,7 +148,7 @@
  "Overview": "개요",
  "Owner": "소유자",
  "page": "페이지",
-  "Page deleted successfully": "페이지 삭제 완료",
+  "Page deleted successfully": "페이지 삭제됨",
  "Page history": "페이지 기록",
  "Select version": "버전 선택",
  "Highlight changes": "변경 사항 강조",
@@ -156,7 +156,7 @@
  "Pages": "페이지",
  "pages": "페이지",
  "Password": "비밀번호",
-  "Password changed successfully": "비밀번호 변경 완료",
+  "Password changed successfully": "비밀번호 변경됨",
  "People": "사용자",
  "Pending": "대기 중",
  "Please confirm your action": "작업을 확인해 주세요",
@@ -166,15 +166,15 @@
  "Recently updated": "최근 업데이트",
  "Remove": "제거",
  "Remove from favorites": "즐겨찾기에서 제거",
-  "Remove group member": "팀에서 사용자 제거",
+  "Remove group member": "그룹 멤버 제거",
  "Remove space member": "Space에서 사용자 제거",
  "Restore": "복원",
  "Role": "역할",
  "Save": "저장",
  "Search": "검색",
-  "Search for groups": "팀 검색",
+  "Search for groups": "그룹 검색",
  "Search for users": "사용자 검색",
-  "Search for users and groups": "사용자 및 팀 검색",
+  "Search for users and groups": "사용자 및 그룹 검색",
  "Search...": "검색...",
  "Select language": "언어 선택",
  "Select role": "역할 선택",
@@ -199,8 +199,8 @@
  "Search for spaces": "스페이스 검색",
  "Start typing to search...": "검색하려면 입력을 시작하세요...",
  "Status": "상태",
-  "Successfully imported": "가져오기에 성공했습니다",
-  "Successfully restored": "복원에 성공했습니다",
+  "Successfully imported": "가져오기 완료",
+  "Successfully restored": "복원 완료",
  "System settings": "시스템 설정",
  "Templates": "템플릿",
  "Theme": "테마",
@@ -209,7 +209,7 @@
  "Unable to import pages. Please try again.": "페이지를 가져올 수 없습니다. 다시 시도해주세요.",
  "untitled": "제목 없음",
  "Untitled": "제목 없음",
-  "Updated successfully": "성공적으로 업데이트되었습니다",
+  "Updated successfully": "업데이트 완료",
  "User": "사용자",
  "Workspace": "워크스페이스",
  "Workspace Name": "워크스페이스 이름",
@@ -245,15 +245,15 @@
  "Are you sure you want to delete this comment?": "이 댓글을 삭제하시겠습니까?",
  "Delete chat": "채팅 삭제",
  "Are you sure you want to delete '{{title}}'? This action cannot be undone.": "'{{title}}'을(를) 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
-  "Comment created successfully": "댓글 생성 완료",
+  "Comment created successfully": "댓글 생성됨",
  "Error creating comment": "댓글 생성 오류",
-  "Comment updated successfully": "댓글 업데이트 완료",
+  "Comment updated successfully": "댓글 업데이트됨",
  "Failed to update comment": "댓글 업데이트 실패",
-  "Comment deleted successfully": "댓글 삭제 완료",
+  "Comment deleted successfully": "댓글 삭제됨",
  "Failed to delete comment": "댓글 삭제 실패",
-  "Comment resolved successfully": "댓글 처리 완료",
-  "Comment re-opened successfully": "댓글이 성공적으로 다시 열렸습니다",
-  "Comment unresolved successfully": "댓글 해결이 성공적으로 취소되었습니다",
+  "Comment resolved successfully": "댓글이 해결로 표시됨",
+  "Comment re-opened successfully": "댓글이 열린 상태로 표시됨",
+  "Comment unresolved successfully": "댓글이 미해결로 표시됨",
  "Failed to resolve comment": "댓글 처리 실패",
  "Resolve comment": "댓글 해결",
  "Unresolve comment": "댓글 해결 취소",
@@ -263,19 +263,19 @@
  "Are you sure you want to unresolve this comment thread?": "이 댓글 스레드를 미해결로 변경하시겠습니까?",
  "Resolved": "해결됨",
  "No active comments.": "활성 댓글이 없습니다.",
-  "Revoke invitation": "초대 취소",
-  "Revoke": "취소",
+  "Revoke invitation": "초대 폐기",
+  "Revoke": "폐기",
  "Don't": "하지 않음",
-  "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "이 초대를 취소하시겠습니까? 사용자가 Workspace에 참여할 수 없게 됩니다.",
+  "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "이 초대를 폐기하시겠습니까? 사용자가 워크스페이스에 참여할 수 없게 됩니다.",
  "Resend invitation": "초대 재전송",
-  "Anyone with this link can join this workspace.": "이 링크를 가진 모든 사용자가 이 Workspace에 참여할 수 있습니다.",
+  "Anyone with this link can join this workspace.": "이 링크를 가진 모든 사용자가 이 워크스페이스에 참여할 수 있습니다.",
  "Invite link": "초대 링크",
  "Copy": "복사",
  "Copy to space": "스페이스로 복사",
  "Copied": "복사됨",
  "Duplicate": "복제",
  "Select a user": "사용자 선택",
-  "Select a group": "팀 선택",
+  "Select a group": "그룹 선택",
  "Export all pages and attachments in this space.": "이 Space의 모든 페이지와 첨부파일을 내보냅니다.",
  "Delete space": "Space 삭제",
  "Are you sure you want to delete this space?": "이 Space을 삭제하시겠습니까?",
@@ -290,10 +290,11 @@
  "Export failed:": "내보내기 실패:",
  "export error": "내보내기 오류",
  "Export page": "페이지 내보내기",
-  "Export successful": "내보내기 성공",
+  "Export successful": "내보내기 완료",
  "Export space": "Space 내보내기",
  "Export {{type}}": "{{type}} 내보내기",
  "File exceeds the {{limit}} attachment limit": "첨부 파일 크기 제한 {{limit}}을 초과했습니다",
+  "Media": "미디어",
  "Align left": "왼쪽 정렬",
  "Align right": "오른쪽 정렬",
  "Align center": "가운데 정렬",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "가로 구분선 삽입",
  "Page break": "페이지 나누기",
  "Insert a page break for printing.": "인쇄용 페이지 나누기를 삽입합니다.",
+  "Footnote": "각주",
+  "Insert a footnote reference.": "각주 참조를 삽입합니다.",
  "Upload any image from your device.": "기기에서 이미지를 업로드하세요.",
  "Upload any video from your device.": "기기에서 비디오를 업로드하세요.",
  "Upload any audio from your device.": "기기에서 오디오를 업로드하세요.",
@@ -447,12 +450,12 @@
  "Today, {{time}}": "오늘, {{time}}",
  "Yesterday, {{time}}": "어제, {{time}}",
  "now": "지금",
-  "Space created successfully": "스페이스가 성공적으로 생성되었습니다",
-  "Space updated successfully": "스페이스가 성공적으로 업데이트되었습니다",
-  "Space deleted successfully": "스페이스가 성공적으로 삭제되었습니다",
-  "Members added successfully": "멤버가 성공적으로 추가되었습니다",
-  "Member removed successfully": "멤버가 성공적으로 제거되었습니다",
-  "Member role updated successfully": "멤버 역할이 성공적으로 업데이트되었습니다",
+  "Space created successfully": "스페이스 생성됨",
+  "Space updated successfully": "스페이스 업데이트됨",
+  "Space deleted successfully": "스페이스 삭제됨",
+  "Members added successfully": "멤버 추가됨",
+  "Member removed successfully": "멤버 삭제됨",
+  "Member role updated successfully": "멤버 역할 업데이트됨",
  "Created by: <b>{{creatorName}}</b>": "작성자: <b>{{creatorName}}</b>",
  "Created at: {{time}}": "작성 시간: {{time}}",
  "Edited by {{name}} {{time}}": "{{name}}님이 {{time}}에 편집함",
@@ -465,7 +468,7 @@
  "Choose {{format}} file": "{{format}} 파일 선택",
  "Reading": "읽기",
  "Delete member": "멤버 삭제",
-  "Member deleted successfully": "멤버가 성공적으로 삭제되었습니다",
+  "Member deleted successfully": "멤버 삭제됨",
  "Are you sure you want to delete this workspace member? This action is irreversible.": "이 워크스페이스 멤버를 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
  "Deactivate member": "멤버 비활성화",
  "Activate member": "멤버 활성화",
@@ -498,32 +501,32 @@
  "Delete share": "공유 삭제",
  "Are you sure you want to delete this shared link?": "이 공유 링크를 삭제하시겠습니까?",
  "Publicly shared pages from spaces you are a member of will appear here": "회원으로 속한 스페이스의 공개 공유 페이지가 여기에 표시됩니다",
-  "Share deleted successfully": "공유가 성공적으로 삭제되었습니다",
+  "Share deleted successfully": "공유 삭제됨",
  "Share not found": "공유를 찾을 수 없습니다",
  "Failed to share page": "페이지 공유에 실패했습니다",
-  "Disable public sharing": "공유 비활성화",
-  "Prevent members from sharing pages publicly.": "멤버들이 페이지를 공개적으로 공유하지 못하도록 방지하십시오.",
-  "Toggle public sharing": "공유 전환",
-  "Toggle space public sharing": "공간 공유 전환",
+  "Disable public sharing": "공개 공유 비활성화",
+  "Prevent members from sharing pages publicly.": "멤버가 페이지를 공개적으로 공유하지 못하게 합니다.",
+  "Toggle public sharing": "공개 공유 전환",
+  "Toggle space public sharing": "스페이스 공개 공유 전환",
  "Allow viewers to comment": "뷰어가 댓글을 달 수 있도록 허용",
  "Allow viewers to add comments on pages in this space.": "이 공간 내 페이지에 뷰어가 댓글을 추가할 수 있도록 허용합니다.",
  "Toggle viewer comments": "뷰어 댓글 전환",
-  "Public sharing is disabled at the workspace level": "워크스페이스 수준에서 공유가 비활성화되었습니다.",
-  "Prevent pages in this space from being shared publicly.": "이 공간의 페이지가 공개적으로 공유되지 않도록 방지하십시오.",
+  "Public sharing is disabled at the workspace level": "공개 공유가 워크스페이스 수준에서 비활성화됨",
+  "Prevent pages in this space from being shared publicly.": "이 스페이스의 페이지가 공개 공유되지 않도록 합니다.",
  "Page permissions": "페이지 권한},{",
  "Control who can view and edit individual pages. Available with an enterprise license.": "개별 페이지의 조회 및 편집 권한을 제어합니다. 엔터프라이즈 라이선스에서 이용 가능합니다.",
-  "Enable public sharing": "공유 활성화",
-  "Are you sure you want to enable public sharing? Members will be able to share pages publicly.": "공유를 활성화하시겠습니까? 멤버들이 페이지를 공개적으로 공유할 수 있게 됩니다.",
-  "Are you sure you want to disable public sharing? All existing shared links in this workspace will be deleted.": "정말로 공유를 비활성화하시겠습니까? 이 워크스페이스의 모든 기존 공유 링크가 삭제됩니다.",
-  "Are you sure you want to enable public sharing for this space?": "이 공간의 공유를 활성화하시겠습니까?",
-  "Are you sure you want to disable public sharing? All existing shared links in this space will be deleted.": "정말로 공유를 비활성화하시겠습니까? 이 공간의 모든 기존 공유 링크가 삭제됩니다.",
-  "Public sharing is disabled": "공유가 비활성화되었습니다.",
-  "Public sharing has been disabled at the workspace level.": "워크스페이스 수준에서 공유가 비활성화되었습니다.",
-  "Public sharing has been disabled for this space.": "이 공간의 공유가 비활성화되었습니다.",
+  "Enable public sharing": "공개 공유 활성화",
+  "Are you sure you want to enable public sharing? Members will be able to share pages publicly.": "공개 공유를 활성화하시겠습니까? 멤버가 페이지를 공개적으로 공유할 수 있게 됩니다.",
+  "Are you sure you want to disable public sharing? All existing shared links in this workspace will be deleted.": "공개 공유를 비활성화하시겠습니까? 이 워크스페이스의 기존 공유 링크가 모두 삭제됩니다.",
+  "Are you sure you want to enable public sharing for this space?": "이 스페이스에 대해 공개 공유를 활성화하시겠습니까?",
+  "Are you sure you want to disable public sharing? All existing shared links in this space will be deleted.": "공개 공유를 비활성화하시겠습니까? 이 스페이스의 기존 공유 링크가 모두 삭제됩니다.",
+  "Public sharing is disabled": "공개 공유가 비활성화됨",
+  "Public sharing has been disabled at the workspace level.": "공개 공유가 워크스페이스 수준에서 비활성화되었습니다.",
+  "Public sharing has been disabled for this space.": "이 스페이스의 공개 공유가 비활성화되었습니다.",
  "Copy page": "페이지 복사",
  "Copy page to a different space.": "다른 공간으로 페이지 복사하기.",
-  "Page copied successfully": "페이지가 성공적으로 복사되었습니다",
-  "Page duplicated successfully": "페이지가 성공적으로 복제되었습니다",
+  "Page copied successfully": "페이지 복사됨",
+  "Page duplicated successfully": "페이지 복제됨",
  "Find": "찾기",
  "Not found": "찾을 수 없음",
  "Previous Match (Shift+Enter)": "이전 일치 항목 (Shift+Enter)",
@@ -539,13 +542,13 @@
  "Error": "오류",
  "Failed to disable MFA": "MFA 비활성화에 실패했습니다",
  "Disable two-factor authentication": "2단계 인증 비활성화",
-  "Disabling two-factor authentication will make your account less secure. You'll only need your password to sign in.": "이중 인증을 비활성화하면 계정의 보안이 낮아집니다. 로그인 시 비밀번호만 필요하게 됩니다.",
-  "Please enter your password to disable two-factor authentication:": "이중 인증 비활성화를 위해 비밀번호를 입력하세요:",
-  "Two-factor authentication has been enabled": "2단계 인증이 활성화되었습니다",
-  "Two-factor authentication has been disabled": "2단계 인증이 비활성화되었습니다",
+  "Disabling two-factor authentication will make your account less secure. You'll only need your password to sign in.": "2단계 인증을 비활성화하면 계정의 보안이 낮아집니다. 로그인 시 비밀번호만 필요하게 됩니다.",
+  "Please enter your password to disable two-factor authentication:": "2단계 인증 비활성화를 위해 비밀번호를 입력하세요:",
+  "Two-factor authentication has been enabled": "2단계 인증이 활성화됨",
+  "Two-factor authentication has been disabled": "2단계 인증이 비활성화됨",
  "2-step verification": "2단계 인증",
  "Protect your account with an additional verification layer when signing in.": "로그인 시 추가 인증 단계를 통해 계정을 보호하세요.",
-  "Two-factor authentication is active on your account.": "이중 인증이 계정에 활성화되어 있습니다.",
+  "Two-factor authentication is active on your account.": "2단계 인증이 계정에 활성화되어 있습니다.",
  "Add 2FA method": "2FA 방법 추가",
  "Backup codes": "백업 코드",
  "Disable": "비활성화",
@@ -575,13 +578,13 @@
  "Save your backup codes": "백업 코드를 저장하세요",
  "These codes can be used to access your account if you lose access to your authenticator app. Each code can only be used once.": "인증 앱에 대한 접근 권한을 잃은 경우, 이 코드를 사용하여 귀하의 계정에 접근할 수 있습니다. 각 코드는 한 번만 사용할 수 있습니다.",
  "Print": "인쇄",
-  "Two-factor authentication has been set up. Please log in again.": "이중 인증이 설정되었습니다. 다시 로그인해 주세요.",
-  "Two-Factor authentication required": "2단계 인증이 필요합니다",
+  "Two-factor authentication has been set up. Please log in again.": "2단계 인증이 설정되었습니다. 다시 로그인해 주세요.",
+  "Two-Factor authentication required": "2단계 인증 필요",
  "Your workspace requires two-factor authentication for all users": "이 워크스페이스는 모든 사용자에게 2단계 인증을 요구합니다",
-  "To continue accessing your workspace, you must set up two-factor authentication. This adds an extra layer of security to your account.": "워크스페이스 접근을 계속하려면 이중 인증을 설정해야 합니다. 이는 계정에 추가 보안 계층을 추가합니다.",
+  "To continue accessing your workspace, you must set up two-factor authentication. This adds an extra layer of security to your account.": "워크스페이스에 계속 액세스하려면 2단계 인증을 설정해야 합니다. 이는 계정의 보안을 한층 강화합니다.",
  "Set up two-factor authentication": "2단계 인증 설정",
  "Cancel and logout": "취소하고 로그아웃",
-  "Your workspace requires two-factor authentication. Please set it up to continue.": "워크스페이스에서는 이중 인증이 필요합니다. 계속하려면 설정해 주세요.",
+  "Your workspace requires two-factor authentication. Please set it up to continue.": "워크스페이스에서는 2단계 인증이 필요합니다. 계속하려면 설정해 주세요.",
  "This adds an extra layer of security to your account by requiring a verification code from your authenticator app.": "인증앱에서 얻은 인증 코드를 요구하여 계정의 보안에 추가적인 계층을 추가합니다.",
  "Password is required": "비밀번호는 필수입니다",
  "Password must be at least 8 characters": "비밀번호는 8자 이상이어야 합니다",
@@ -590,10 +593,10 @@
  "Enter the 6-digit code found in your authenticator app": "인증 앱에 표시된 6자리 코드를 입력하세요",
  "Need help authenticating?": "인증에 도움이 필요하십니까?",
  "MFA QR Code": "MFA QR 코드",
-  "Account created successfully. Please log in to set up two-factor authentication.": "계정이 성공적으로 생성되었습니다. 이중 인증을 설정하려면 로그인해 주세요.",
-  "Password reset successful. Please log in with your new password and complete two-factor authentication.": "비밀번호 재설정 성공. 새 비밀번호로 로그인하여 이중 인증을 완료하세요.",
-  "Password reset successful. Please log in with your new password to set up two-factor authentication.": "비밀번호 재설정 성공. 새 비밀번호로 로그인하여 이중 인증을 설정하세요.",
-  "Password reset was successful. Please log in with your new password.": "비밀번호 재설정이 성공적으로 완료되었습니다. 새 비밀번호로 로그인하세요.",
+  "Account created successfully. Please log in to set up two-factor authentication.": "계정 생성됨. 2단계 인증을 설정하려면 로그인해 주세요.",
+  "Password reset successful. Please log in with your new password and complete two-factor authentication.": "비밀번호 재설정됨. 새 비밀번호로 로그인하여 2단계 인증을 완료하세요.",
+  "Password reset successful. Please log in with your new password to set up two-factor authentication.": "비밀번호 재설정됨. 새 비밀번호로 로그인하여 2단계 인증을 설정하세요.",
+  "Password reset was successful. Please log in with your new password.": "비밀번호 재설정됨. 새 비밀번호로 로그인하세요.",
  "Two-factor authentication": "2단계 인증",
  "Use authenticator app instead": "대신 인증 앱 사용",
  "Verify backup code": "백업 코드 확인",
@@ -615,7 +618,7 @@
  "Permanently delete": "영구 삭제",
  "<b>{{name}}</b> moved this page to Trash {{time}}.": "<b>{{name}}</b>님이 {{time}}에 이 페이지를 휴지통으로 이동했습니다.",
  "Page moved to trash": "페이지가 휴지통으로 이동되었습니다",
-  "Page restored successfully": "페이지가 성공적으로 복원되었습니다",
+  "Page restored successfully": "페이지 복원됨",
  "Deleted by": "삭제한 사람",
  "Deleted at": "삭제 시간",
  "Preview": "미리보기",
@@ -638,7 +641,7 @@
  "Only users with email addresses from these domains can signup via SSO.": "이 도메인의 이메일 주소를 가진 사용자만 SSO를 통해 가입할 수 있습니다.",
  "Enter valid domain names separated by comma or space": "쉼표 또는 공백으로 구분된 유효한 도메인 이름을 입력하세요",
  "Enforce two-factor authentication": "2단계 인증 강제",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "시행되면 모든 멤버가 작업 공간에 액세스하기 위해 이중 인증을 활성화해야 합니다.",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "시행되면 모든 멤버가 워크스페이스에 액세스하기 위해 2단계 인증을 활성화해야 합니다.",
  "Toggle MFA enforcement": "MFA 강제 설정 전환",
  "Display name": "표시 이름",
  "Allow signup": "가입 허용",
@@ -657,7 +660,7 @@
  "Remove image": "이미지 제거",
  "Failed to remove image": "이미지 제거 실패",
  "Image exceeds 10MB limit.": "이미지가 10MB 용량 제한을 초과합니다.",
-  "Image removed successfully": "이미지가 성공적으로 제거되었습니다",
+  "Image removed successfully": "이미지 삭제됨",
  "API key": "API 키",
  "API keys": "API 키",
  "API management": "API 관리",
@@ -669,7 +672,7 @@
  "Last use": "최근 사용",
  "No API keys found": "API 키를 찾을 수 없습니다",
  "No expiration": "유효기간 없음",
-  "Revoked successfully": "성공적으로 취소되었습니다",
+  "Revoked successfully": "폐기 완료",
  "Select expiration date": "만료일 선택",
  "This action cannot be undone. Any applications using this API key will stop working.": "이 작업은 되돌릴 수 없습니다. 이 API 키를 사용하는 모든 응용 프로그램이 작동을 멈출 것입니다.",
  "Update": "업데이트",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "요금제를 업그레이드하세요",
  "Available with a paid license": "유료 라이선스에서만 사용 가능합니다",
  "Upgrade your license tier.": "라이선스 등급을 업그레이드하세요.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI는 Docmost 엔터프라이즈 에디션에서만 제공됩니다. sales@docmost.com으로 문의하세요.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI는 Docmost 유료 에디션에서 제공됩니다. sales@docmost.com으로 문의하세요.",
  "AI & MCP": "AI 및 MCP",
  "AI": "AI",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "AI 어시스턴트와 도구가 워크스페이스 콘텐츠와 상호작용할 수 있도록 MCP 서버를 활성화하세요.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP는 Docmost 엔터프라이즈 에디션에서만 제공됩니다. sales@docmost.com으로 문의하세요.",
  "MCP Server URL": "MCP 서버 URL",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "인증을 위해 API 키를 사용하세요. API 키는 계정 설정에서 관리할 수 있습니다.",
+  "Connect AI assistants with your Docmost account via OAuth.": "OAuth를 통해 AI 도우미를 Docmost 계정에 연결합니다.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "AI 도우미는 OAuth를 통해 Docmost 계정에 연결해야 합니다. MCP 서버에서는 API 키를 사용할 수 없습니다.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "지원되는 도구",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "워크스페이스에 MCP가 활성화되어 있습니다. AI 어시스턴트를 연결하려면 API 키를 사용하세요.",
  "MCP server URL:": "MCP 서버 URL:",
  "Learn more": "자세히 알아보기",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "워크스페이스의 모든 사용자를 위한 API 키를 관리하세요. 사용 방법은 <anchor>API 문서</anchor>를 참고하세요.",
@@ -939,8 +944,8 @@
  "Try again": "다시 시도",
  "Untitled chat": "제목 없는 채팅",
  "What can I help you with?": "무엇을 도와드릴까요?",
-  "Are you sure you want to revoke this {{credential}}": "이 {{credential}}을 취소하시겠습니까?",
-  "Automatically provision users and groups from your identity provider via SCIM.": "SCIM을 통해 ID 공급자에서 사용자와 그룹을 자동으로 프로비저닝합니다.",
+  "Are you sure you want to revoke this {{credential}}": "이 {{credential}}을(를) 폐기하시겠습니까?",
+  "Automatically provision users and groups from your identity provider via SCIM.": "SCIM을 통해 ID 공급자로부터 사용자와 그룹을 자동으로 프로비저닝합니다.",
  "Configure your identity provider with this URL to provision users and groups.": "사용자와 그룹을 프로비저닝할 수 있도록 이 URL로 ID 공급자를 구성하세요.",
  "Create {{credential}}": "{{credential}} 만들기",
  "{{credential}} created": "{{credential}} 생성됨",
@@ -953,7 +958,7 @@
  "Important": "중요",
  "Make sure to copy your {{credential}} now. You won't be able to see it again!": "지금 {{credential}}를 복사해 두세요. 다시는 볼 수 없습니다!",
  "Never": "안 함",
-  "Revoke {{credential}}": "{{credential}} 취소",
+  "Revoke {{credential}}": "{{credential}} 폐기",
  "SCIM endpoint URL": "SCIM 엔드포인트 URL",
  "SCIM provisioning": "SCIM 프로비저닝",
  "SCIM takes precedence over SSO group sync while enabled.": "SCIM이 활성화되어 있는 동안에는 SSO 그룹 동기화보다 SCIM이 우선 적용됩니다.",
@@ -1186,8 +1191,8 @@
  "Default value": "기본값",
  "Delete property": "속성 삭제",
  "Delete view": "보기 삭제",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "1개 행을 삭제하시겠습니까?",
+  "Delete {{count}} rows?_other": "{{count}}개 행을 삭제하시겠습니까?",
  "Descending": "내림차순",
  "Discard": "삭제",
  "Doesn't contain": "포함하지 않음",
@@ -1286,8 +1291,51 @@
  "Value": "값",
  "View updated for everyone": "보기가 모두에게 업데이트되었습니다",
  "You have unsaved changes. Do you want to discard them?": "저장되지 않은 변경 사항이 있습니다. 버리시겠습니까?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1개 행 삭제 완료",
+  "{{count}} rows deleted_other": "{{count}}개 행 삭제 완료",
+  "{{count}} selected_one": "1개 선택됨",
+  "{{count}} selected_other": "{{count}}개 선택됨",
+  "Compare": "비교",
+  "Compare versions": "버전 비교",
+  "Select version from {{date}}": "{{date}}의 버전 선택",
+  "Version actions for {{date}}": "{{date}} 버전 작업",
+  "Comparing {{newer}} and {{older}}": "{{newer}} 및 {{older}} 비교 중",
+  "Exit compare": "비교 종료",
+  "Search attachments...": "첨부파일 검색...",
+  "Error loading attachments.": "첨부파일을 불러오는 중 오류가 발생했습니다.",
+  "No attachments on this page yet.": "이 페이지에는 아직 첨부파일이 없습니다.",
+  "Uploaded by {{name}}": "업로드한 사람: {{name}}",
+  "Download {{name}}": "{{name}} 다운로드",
+  "Access revoked": "액세스가 취소되었습니다",
+  "Authorize application": "애플리케이션 승인",
+  "{{name}} wants to access {{workspace}}": "{{name}}에서 {{workspace}}에 액세스하려고 합니다",
+  "Not you? Switch account": "본인이 아니신가요? 계정을 전환하세요",
+  "This application will be able to:": "이 애플리케이션이 수행할 수 있는 작업:",
+  "Write": "쓰기",
+  "Invalid authorization request": "잘못된 승인 요청",
+  "Authorize": "승인",
+  "Application": "애플리케이션",
+  "Permissions": "권한",
+  "Authorized": "승인됨",
+  "Revoke access": "액세스 취소",
+  "Revoke access for {{name}}": "{{name}}의 액세스 취소",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "정말로 {{name}}의 액세스를 취소하시겠습니까? 이 애플리케이션은 더 이상 회원님의 계정에 액세스할 수 없습니다.",
+  "Something went wrong. Please try again.": "문제가 발생했습니다. 다시 시도해 주세요.",
+  "Remove {{name}}": "{{name}} 제거",
+  "Make sure you trust this application before authorizing it.": "이 애플리케이션을 승인하기 전에 신뢰할 수 있는지 확인하세요.",
+  "You will be redirected to": "다음으로 리디렉션됩니다",
+  "View content without making changes.": "변경하지 않고 콘텐츠를 봅니다.",
+  "Create and modify content.": "콘텐츠를 생성하고 수정합니다.",
+  "Applications and AI assistants you have authorized to access your account.": "회원님의 계정에 액세스하도록 승인한 애플리케이션 및 AI 도우미입니다.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "워크스페이스에서 MCP가 활성화되어 있습니다. OAuth를 통해 AI 도우미를 Docmost 계정에 연결하세요.",
+  "Authorized apps": "승인된 앱",
+  "No authorized apps yet.": "아직 승인된 앱이 없습니다.",
+  "Workspace knowledge only": "워크스페이스 지식만 사용",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "AI 채팅이 워크스페이스 페이지와 업로드된 파일의 내용만 바탕으로 답변하도록 제한합니다. 외부 지식은 사용하지 않습니다.",
+  "Toggle workspace knowledge only": "워크스페이스 지식만 사용 전환",
+  "Read-only mode": "읽기 전용 모드",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI 채팅은 워크스페이스 콘텐츠를 검색하고 읽을 수 있지만, 페이지를 생성하거나 편집할 수는 없습니다.",
+  "Toggle AI Chat read-only mode": "AI 채팅 읽기 전용 모드 전환",
+  "Title only": "제목만",
+  "you": "회원님"
 }
@@ -294,6 +294,7 @@
  "Export space": "Exporteer ruimte",
  "Export {{type}}": "Exporteer {{type}}",
  "File exceeds the {{limit}} attachment limit": "Bestand overschrijdt de bijlagelimiet van {{limit}}",
+  "Media": "Media",
  "Align left": "Links uitlijnen",
  "Align right": "Rechts uitlijnen",
  "Align center": "Centreren",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "Horizontale lijn invoegen",
  "Page break": "Pagina-einde",
  "Insert a page break for printing.": "Voeg een pagina-einde in voor het afdrukken.",
+  "Footnote": "Voetnoot",
+  "Insert a footnote reference.": "Voeg een voetnootverwijzing in.",
  "Upload any image from your device.": "Upload een afbeelding vanaf uw apparaat.",
  "Upload any video from your device.": "Upload een video vanaf uw apparaat.",
  "Upload any audio from your device.": "Upload een audio vanaf uw apparaat.",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "Upgrade je abonnement",
  "Available with a paid license": "Beschikbaar met een betaalde licentie",
  "Upgrade your license tier.": "Upgrade je licentieniveau.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI is alleen beschikbaar in de Docmost Enterprise-editie. Neem contact op met sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI is beschikbaar in de betaalde edities van Docmost. Neem contact op met sales@docmost.com.",
  "AI & MCP": "AI & MCP",
  "AI": "AI",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Schakel de MCP-server in zodat AI-assistenten en tools kunnen interageren met de inhoud van uw werkruimte.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP is alleen beschikbaar in de Docmost Enterprise-editie. Neem contact op met sales@docmost.com.",
  "MCP Server URL": "MCP-server-URL",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Gebruik uw API-sleutel voor authenticatie. U kunt API-sleutels beheren in uw accountinstellingen.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Verbind AI-assistenten met je Docmost-account via OAuth.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "AI-assistenten moeten verbinding maken met een Docmost-account via OAuth. API-sleutels kunnen niet worden gebruikt met de MCP-server.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Ondersteunde tools",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "In uw werkruimte is MCP ingeschakeld. Gebruik uw API-sleutel om AI-assistenten te koppelen.",
  "MCP server URL:": "MCP-server-URL:",
  "Learn more": "Meer informatie",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Beheer API-sleutels voor alle gebruikers in de werkruimte. Bekijk de <anchor>API-documentatie</anchor> voor gebruiksdetails.",
@@ -1289,5 +1294,48 @@
  "{{count}} rows deleted_one": "1 rij verwijderd",
  "{{count}} rows deleted_other": "{{count}} rijen verwijderd",
  "{{count}} selected_one": "1 geselecteerd",
-  "{{count}} selected_other": "{{count}} geselecteerd"
+  "{{count}} selected_other": "{{count}} geselecteerd",
+  "Compare": "Vergelijken",
+  "Compare versions": "Versies vergelijken",
+  "Select version from {{date}}": "Selecteer versie van {{date}}",
+  "Version actions for {{date}}": "Versieacties voor {{date}}",
+  "Comparing {{newer}} and {{older}}": "{{newer}} en {{older}} vergelijken",
+  "Exit compare": "Vergelijken afsluiten",
+  "Search attachments...": "Bijlagen zoeken...",
+  "Error loading attachments.": "Fout bij het laden van bijlagen.",
+  "No attachments on this page yet.": "Er zijn nog geen bijlagen op deze pagina.",
+  "Uploaded by {{name}}": "Geüpload door {{name}}",
+  "Download {{name}}": "{{name}} downloaden",
+  "Access revoked": "Toegang ingetrokken",
+  "Authorize application": "Applicatie autoriseren",
+  "{{name}} wants to access {{workspace}}": "{{name}} wil toegang tot {{workspace}}",
+  "Not you? Switch account": "Ben jij dit niet? Wissel van account",
+  "This application will be able to:": "Deze applicatie kan het volgende doen:",
+  "Write": "Schrijven",
+  "Invalid authorization request": "Ongeldig autorisatieverzoek",
+  "Authorize": "Autoriseren",
+  "Application": "Applicatie",
+  "Permissions": "Machtigingen",
+  "Authorized": "Geautoriseerd",
+  "Revoke access": "Toegang intrekken",
+  "Revoke access for {{name}}": "Toegang voor {{name}} intrekken",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Weet je zeker dat je de toegang voor {{name}} wilt intrekken? De applicatie heeft dan geen toegang meer tot je account.",
+  "Something went wrong. Please try again.": "Er is iets misgegaan. Probeer het opnieuw.",
+  "Remove {{name}}": "{{name}} verwijderen",
+  "Make sure you trust this application before authorizing it.": "Zorg ervoor dat je deze applicatie vertrouwt voordat je haar autoriseert.",
+  "You will be redirected to": "Je wordt doorgestuurd naar",
+  "View content without making changes.": "Inhoud bekijken zonder wijzigingen aan te brengen.",
+  "Create and modify content.": "Inhoud maken en wijzigen.",
+  "Applications and AI assistants you have authorized to access your account.": "Applicaties en AI-assistenten die je hebt geautoriseerd om toegang te krijgen tot je account.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "MCP is ingeschakeld voor je werkruimte. Verbind AI-assistenten met je Docmost-account via OAuth.",
+  "Authorized apps": "Geautoriseerde apps",
+  "No authorized apps yet.": "Nog geen geautoriseerde apps.",
+  "Workspace knowledge only": "Alleen werkruimtek kennis",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Beperk AI Chat tot het beantwoorden op basis van alleen je werkruimtepagina's en geüploade bestanden. Er wordt geen externe kennis gebruikt.",
+  "Toggle workspace knowledge only": "Alleen werkruimtekennis in-/uitschakelen",
+  "Read-only mode": "Alleen-lezenmodus",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI Chat kan werkruimte-inhoud doorzoeken en lezen, maar kan geen pagina's maken of bewerken.",
+  "Toggle AI Chat read-only mode": "Alleen-lezenmodus voor AI Chat in-/uitschakelen",
+  "Title only": "Alleen titel",
+  "you": "jij"
 }
@@ -294,6 +294,7 @@
  "Export space": "Exportar espaço",
  "Export {{type}}": "Exportar para {{type}}",
  "File exceeds the {{limit}} attachment limit": "O arquivo excede o limite de anexos {{limit}}",
+  "Media": "Mídia",
  "Align left": "Alinhar à esquerda",
  "Align right": "Alinhar à direita",
  "Align center": "Alinhar ao centro",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "Insira um divisor horizontal",
  "Page break": "Quebra de página",
  "Insert a page break for printing.": "Insira uma quebra de página para impressão.",
+  "Footnote": "Nota de rodapé",
+  "Insert a footnote reference.": "Inserir uma referência de nota de rodapé.",
  "Upload any image from your device.": "Envie qualquer imagem do seu dispositivo.",
  "Upload any video from your device.": "Envie qualquer vídeo do seu dispositivo.",
  "Upload any audio from your device.": "Envie qualquer áudio do seu dispositivo.",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "Faça upgrade do seu plano",
  "Available with a paid license": "Disponível com uma licença paga",
  "Upgrade your license tier.": "Faça upgrade do seu nível de licença.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "A IA está disponível apenas na edição empresarial do Docmost. Contate sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "A IA está disponível nas edições pagas do Docmost. Contate sales@docmost.com.",
  "AI & MCP": "IA e MCP",
  "AI": "IA",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Ative o servidor MCP para permitir que assistentes de IA e ferramentas interajam com o conteúdo do seu espaço de trabalho.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "O MCP está disponível apenas na edição empresarial do Docmost. Contate sales@docmost.com.",
  "MCP Server URL": "URL do servidor MCP",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Use sua chave de API para autenticação. Você pode gerenciar chaves de API nas configurações da sua conta.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Conecte assistentes de IA à sua conta do Docmost via OAuth.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "Os assistentes de IA devem se conectar com uma conta do Docmost via OAuth. Chaves de API não podem ser usadas com o servidor MCP.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Ferramentas compatíveis",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Seu espaço de trabalho tem MCP habilitado. Use sua chave de API para conectar assistentes de IA.",
  "MCP server URL:": "URL do servidor MCP:",
  "Learn more": "Saiba mais",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Gerencie as chaves de API de todos os usuários do workspace. Veja a <anchor>documentação da API</anchor> para detalhes de uso.",
@@ -1289,5 +1294,48 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "Comparar",
+  "Compare versions": "Comparar versões",
+  "Select version from {{date}}": "Selecionar versão de {{date}}",
+  "Version actions for {{date}}": "Ações da versão de {{date}}",
+  "Comparing {{newer}} and {{older}}": "Comparando {{newer}} e {{older}}",
+  "Exit compare": "Sair da comparação",
+  "Search attachments...": "Pesquisar anexos...",
+  "Error loading attachments.": "Erro ao carregar anexos.",
+  "No attachments on this page yet.": "Ainda não há anexos nesta página.",
+  "Uploaded by {{name}}": "Enviado por {{name}}",
+  "Download {{name}}": "Baixar {{name}}",
+  "Access revoked": "Acesso revogado",
+  "Authorize application": "Autorizar aplicativo",
+  "{{name}} wants to access {{workspace}}": "{{name}} quer acessar {{workspace}}",
+  "Not you? Switch account": "Não é você? Trocar conta",
+  "This application will be able to:": "Este aplicativo poderá:",
+  "Write": "Escrever",
+  "Invalid authorization request": "Solicitação de autorização inválida",
+  "Authorize": "Autorizar",
+  "Application": "Aplicativo",
+  "Permissions": "Permissões",
+  "Authorized": "Autorizado",
+  "Revoke access": "Revogar acesso",
+  "Revoke access for {{name}}": "Revogar acesso de {{name}}",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Tem certeza de que deseja revogar o acesso de {{name}}? O aplicativo não poderá mais acessar sua conta.",
+  "Something went wrong. Please try again.": "Algo deu errado. Tente novamente.",
+  "Remove {{name}}": "Remover {{name}}",
+  "Make sure you trust this application before authorizing it.": "Certifique-se de confiar neste aplicativo antes de autorizá-lo.",
+  "You will be redirected to": "Você será redirecionado para",
+  "View content without making changes.": "Visualizar conteúdo sem fazer alterações.",
+  "Create and modify content.": "Criar e modificar conteúdo.",
+  "Applications and AI assistants you have authorized to access your account.": "Aplicativos e assistentes de IA que você autorizou a acessar sua conta.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "Seu workspace tem o MCP ativado. Conecte assistentes de IA à sua conta do Docmost via OAuth.",
+  "Authorized apps": "Aplicativos autorizados",
+  "No authorized apps yet.": "Ainda não há aplicativos autorizados.",
+  "Workspace knowledge only": "Somente conhecimento do workspace",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Restrinja o AI Chat para responder apenas com base nas páginas do seu workspace e nos arquivos enviados. Ele não usará conhecimento externo.",
+  "Toggle workspace knowledge only": "Alternar somente conhecimento do workspace",
+  "Read-only mode": "Modo somente leitura",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "O AI Chat pode pesquisar e ler o conteúdo do workspace, mas não pode criar nem editar páginas.",
+  "Toggle AI Chat read-only mode": "Alternar modo somente leitura do AI Chat",
+  "Title only": "Somente título",
+  "you": "você"
 }
@@ -294,6 +294,7 @@
  "Export space": "Экспорт пространства",
  "Export {{type}}": "Экспорт {{type}}",
  "File exceeds the {{limit}} attachment limit": "Файл превышает лимит вложений {{limit}}",
+  "Media": "Медиа",
  "Align left": "По левому краю",
  "Align right": "По правому краю",
  "Align center": "По центру",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "Вставить горизонтальный разделитель",
  "Page break": "Разрыв страницы",
  "Insert a page break for printing.": "Вставить разрыв страницы для печати.",
+  "Footnote": "Сноска",
+  "Insert a footnote reference.": "Вставить ссылку на сноску.",
  "Upload any image from your device.": "Загрузить любое изображение с вашего устройства.",
  "Upload any video from your device.": "Загрузить любое видео с вашего устройства.",
  "Upload any audio from your device.": "Загрузите любой аудиофайл с вашего устройства.",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "Обновите свой тарифный план",
  "Available with a paid license": "Доступно с платной лицензией",
  "Upgrade your license tier.": "Обновите уровень вашей лицензии.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "ИИ доступен только в корпоративной версии Docmost. Свяжитесь по адресу sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "ИИ доступен в платных версиях Docmost. Свяжитесь по адресу sales@docmost.com.",
  "AI & MCP": "ИИ и MCP",
  "AI": "ИИ",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Включите сервер MCP, чтобы ИИ-ассистенты и инструменты могли взаимодействовать с содержимым вашего рабочего пространства.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP доступен только в корпоративной версии Docmost. Свяжитесь по адресу sales@docmost.com.",
  "MCP Server URL": "URL сервера MCP",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Используйте ваш API-ключ для аутентификации. Управлять API-ключами можно в настройках аккаунта.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Подключайте AI-помощников к вашей учетной записи Docmost через OAuth.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "AI-помощники должны подключаться к учетной записи Docmost через OAuth. Ключи API нельзя использовать с MCP-сервером.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Поддерживаемые инструменты",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "В вашем рабочем пространстве включён MCP. Используйте свой API-ключ для подключения ИИ-ассистентов.",
  "MCP server URL:": "URL сервера MCP:",
  "Learn more": "Подробнее",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Управляйте API-ключами для всех пользователей в рабочем пространстве. Смотрите <anchor>документацию по API</anchor> для получения информации об использовании.",
@@ -1186,8 +1191,8 @@
  "Default value": "Значение по умолчанию",
  "Delete property": "Удалить свойство",
  "Delete view": "Удалить представление",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "Удалить 1 строку?",
+  "Delete {{count}} rows?_other": "Удалить {{count}} строк?",
  "Descending": "По убыванию",
  "Discard": "Отменить",
  "Doesn't contain": "Не содержит",
@@ -1286,8 +1291,51 @@
  "Value": "Значение",
  "View updated for everyone": "Представление обновлено для всех",
  "You have unsaved changes. Do you want to discard them?": "У вас есть несохранённые изменения. Хотите их отменить?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1 строка удалена",
+  "{{count}} rows deleted_other": "{{count}} строк удалено",
+  "{{count}} selected_one": "1 выбрано",
+  "{{count}} selected_other": "{{count}} выбрано",
+  "Compare": "Сравнить",
+  "Compare versions": "Сравнить версии",
+  "Select version from {{date}}": "Выбрать версию от {{date}}",
+  "Version actions for {{date}}": "Действия с версией от {{date}}",
+  "Comparing {{newer}} and {{older}}": "Сравнение {{newer}} и {{older}}",
+  "Exit compare": "Выйти из режима сравнения",
+  "Search attachments...": "Поиск вложений...",
+  "Error loading attachments.": "Ошибка при загрузке вложений.",
+  "No attachments on this page yet.": "На этой странице пока нет вложений.",
+  "Uploaded by {{name}}": "Загружено пользователем {{name}}",
+  "Download {{name}}": "Скачать {{name}}",
+  "Access revoked": "Доступ отозван",
+  "Authorize application": "Авторизовать приложение",
+  "{{name}} wants to access {{workspace}}": "{{name}} запрашивает доступ к {{workspace}}",
+  "Not you? Switch account": "Не вы? Сменить аккаунт",
+  "This application will be able to:": "Это приложение сможет:",
+  "Write": "Запись",
+  "Invalid authorization request": "Недопустимый запрос на авторизацию",
+  "Authorize": "Авторизовать",
+  "Application": "Приложение",
+  "Permissions": "Разрешения",
+  "Authorized": "Авторизовано",
+  "Revoke access": "Отозвать доступ",
+  "Revoke access for {{name}}": "Отозвать доступ для {{name}}",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Вы уверены, что хотите отозвать доступ для {{name}}? Приложение больше не сможет получить доступ к вашей учетной записи.",
+  "Something went wrong. Please try again.": "Что-то пошло не так. Пожалуйста, попробуйте еще раз.",
+  "Remove {{name}}": "Удалить {{name}}",
+  "Make sure you trust this application before authorizing it.": "Прежде чем авторизовать это приложение, убедитесь, что вы ему доверяете.",
+  "You will be redirected to": "Вы будете перенаправлены на",
+  "View content without making changes.": "Просматривать содержимое без внесения изменений.",
+  "Create and modify content.": "Создавать и изменять содержимое.",
+  "Applications and AI assistants you have authorized to access your account.": "Приложения и AI-помощники, которым вы разрешили доступ к своей учетной записи.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "В вашем рабочем пространстве включен MCP. Подключайте AI-помощников к вашей учетной записи Docmost через OAuth.",
+  "Authorized apps": "Авторизованные приложения",
+  "No authorized apps yet.": "Пока нет авторизованных приложений.",
+  "Workspace knowledge only": "Только знания рабочего пространства",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Ограничить AI Chat ответами только на основе страниц вашего рабочего пространства и загруженных файлов. Внешние знания использоваться не будут.",
+  "Toggle workspace knowledge only": "Переключить режим \"Только знания рабочего пространства\"",
+  "Read-only mode": "Режим только для чтения",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI Chat может искать и читать содержимое рабочего пространства, но не может создавать или редактировать страницы.",
+  "Toggle AI Chat read-only mode": "Переключить режим только для чтения для AI Chat",
+  "Title only": "Только заголовок",
+  "you": "вы"
 }
@@ -294,6 +294,7 @@
  "Export space": "Експорт простору",
  "Export {{type}}": "Експорт {{type}}",
  "File exceeds the {{limit}} attachment limit": "Файл перевищує ліміт вкладень {{limit}}",
+  "Media": "Медіа",
  "Align left": "По лівому краю",
  "Align right": "По правому краю",
  "Align center": "По центру",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "Вставити горизонтальний роздільник",
  "Page break": "Розрив сторінки",
  "Insert a page break for printing.": "Вставте розрив сторінки для друку.",
+  "Footnote": "Виноска",
+  "Insert a footnote reference.": "Вставити посилання на виноску.",
  "Upload any image from your device.": "Завантажити будь-яке зображення з вашого пристрою.",
  "Upload any video from your device.": "Завантажити будь-яке відео з вашого пристрою.",
  "Upload any audio from your device.": "Завантажте будь-який аудіофайл зі свого пристрою.",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "Оновіть свій тарифний план",
  "Available with a paid license": "Доступно за платною ліцензією",
  "Upgrade your license tier.": "Оновіть рівень своєї ліцензії.",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "ШІ доступний лише в корпоративній редакції Docmost. Зверніться до sales@docmost.com.",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "ШІ доступний у платних редакціях Docmost. Зверніться до sales@docmost.com.",
  "AI & MCP": "ШІ та MCP",
  "AI": "ШІ",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Увімкніть MCP‑сервер, щоб дозволити ШІ‑помічникам та інструментам взаємодіяти з вмістом вашого робочого простору.",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP доступний лише в корпоративній редакції Docmost. Зверніться до sales@docmost.com.",
  "MCP Server URL": "URL сервера MCP",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "Використовуйте свій API‑ключ для аутентифікації. Ви можете керувати API‑ключами в налаштуваннях облікового запису.",
+  "Connect AI assistants with your Docmost account via OAuth.": "Підключайте AI-асистентів до свого облікового запису Docmost через OAuth.",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "AI-асистенти повинні підключатися до облікового запису Docmost через OAuth. Ключі API не можна використовувати з MCP-сервером.",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "Підтримувані інструменти",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "У вашому робочому просторі MCP увімкнено. Використайте свій API‑ключ, щоб підключити ШІ‑помічників.",
  "MCP server URL:": "URL сервера MCP:",
  "Learn more": "Дізнатися більше",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "Керуйте ключами API для всіх користувачів у робочому просторі. Перегляньте <anchor>документацію API</anchor> для деталей використання.",
@@ -1289,5 +1294,48 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "Порівняти",
+  "Compare versions": "Порівняти версії",
+  "Select version from {{date}}": "Виберіть версію від {{date}}",
+  "Version actions for {{date}}": "Дії з версією від {{date}}",
+  "Comparing {{newer}} and {{older}}": "Порівняння {{newer}} і {{older}}",
+  "Exit compare": "Вийти з режиму порівняння",
+  "Search attachments...": "Пошук вкладень...",
+  "Error loading attachments.": "Помилка завантаження вкладень.",
+  "No attachments on this page yet.": "На цій сторінці ще немає вкладень.",
+  "Uploaded by {{name}}": "Завантажено користувачем {{name}}",
+  "Download {{name}}": "Завантажити {{name}}",
+  "Access revoked": "Доступ відкликано",
+  "Authorize application": "Авторизувати застосунок",
+  "{{name}} wants to access {{workspace}}": "{{name}} хоче отримати доступ до {{workspace}}",
+  "Not you? Switch account": "Не ви? Змінити обліковий запис",
+  "This application will be able to:": "Цей застосунок зможе:",
+  "Write": "Запис",
+  "Invalid authorization request": "Недійсний запит на авторизацію",
+  "Authorize": "Авторизувати",
+  "Application": "Застосунок",
+  "Permissions": "Дозволи",
+  "Authorized": "Авторизовано",
+  "Revoke access": "Відкликати доступ",
+  "Revoke access for {{name}}": "Відкликати доступ для {{name}}",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Ви впевнені, що хочете відкликати доступ для {{name}}? Застосунок більше не зможе отримувати доступ до вашого облікового запису.",
+  "Something went wrong. Please try again.": "Щось пішло не так. Спробуйте ще раз.",
+  "Remove {{name}}": "Видалити {{name}}",
+  "Make sure you trust this application before authorizing it.": "Перш ніж авторизувати цей застосунок, переконайтеся, що ви йому довіряєте.",
+  "You will be redirected to": "Вас буде перенаправлено на",
+  "View content without making changes.": "Переглядати вміст без внесення змін.",
+  "Create and modify content.": "Створювати та змінювати вміст.",
+  "Applications and AI assistants you have authorized to access your account.": "Застосунки та AI-асистенти, яким ви надали дозвіл на доступ до свого облікового запису.",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "У вашому робочому просторі ввімкнено MCP. Підключайте AI-асистентів до свого облікового запису Docmost через OAuth.",
+  "Authorized apps": "Авторизовані застосунки",
+  "No authorized apps yet.": "Авторизованих застосунків ще немає.",
+  "Workspace knowledge only": "Лише знання робочого простору",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Обмежити AI Chat відповідями лише на основі сторінок вашого робочого простору та завантажених файлів. Зовнішні знання не використовуватимуться.",
+  "Toggle workspace knowledge only": "Перемкнути режим лише знань робочого простору",
+  "Read-only mode": "Режим лише читання",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI Chat може шукати та читати вміст робочого простору, але не може створювати або редагувати сторінки.",
+  "Toggle AI Chat read-only mode": "Перемкнути режим лише читання для AI Chat",
+  "Title only": "Лише заголовок",
+  "you": "ви"
 }
@@ -294,6 +294,7 @@
  "Export space": "导出空间",
  "Export {{type}}": "导出为 {{type}}",
  "File exceeds the {{limit}} attachment limit": "文件超出了 {{limit}} 类型附件限制",
+  "Media": "媒体",
  "Align left": "靠左对齐",
  "Align right": "靠右对齐",
  "Align center": "居中对齐",
@@ -387,6 +388,8 @@
  "Insert horizontal rule divider": "插入水平分割线",
  "Page break": "分页符",
  "Insert a page break for printing.": "插入一个用于打印的分页符。",
+  "Footnote": "脚注",
+  "Insert a footnote reference.": "插入脚注引用。",
  "Upload any image from your device.": "从设备上传任何图像",
  "Upload any video from your device.": "从设备上传任何视频",
  "Upload any audio from your device.": "从您的设备上传任意音频文件。",
@@ -696,7 +699,7 @@
  "Upgrade your plan": "升级您的方案",
  "Available with a paid license": "需付费许可才可用",
  "Upgrade your license tier.": "升级您的许可等级。",
-  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI 仅在 Docmost 企业版中提供。请联系 sales@docmost.com。",
+  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI 在 Docmost 付费版中提供。请联系 sales@docmost.com。",
  "AI & MCP": "AI 与 MCP",
  "AI": "AI",
  "MCP": "MCP",
@@ -704,9 +707,11 @@
  "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "启用 MCP 服务器以允许 AI 助手和工具与您的工作区内容交互。",
  "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP 仅在 Docmost 企业版中提供。请联系 sales@docmost.com。",
  "MCP Server URL": "MCP 服务器 URL",
-  "Use your API key for authentication. You can manage API keys in your account settings.": "使用您的 API 密钥进行身份验证。您可以在账户设置中管理 API 密钥。",
+  "Connect AI assistants with your Docmost account via OAuth.": "通过 OAuth 将 AI 助手连接到你的 Docmost 账户。",
+  "Enforce OAuth": "Enforce OAuth",
+  "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.": "AI 助手必须通过 OAuth 使用 Docmost 账户连接。MCP 服务器不能使用 API 密钥。",
+  "Toggle enforce OAuth for MCP": "Toggle enforce OAuth for MCP",
  "Supported tools": "支持的工具",
-  "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "您的工作区已启用 MCP。使用您的 API 密钥连接 AI 助手。",
  "MCP server URL:": "MCP 服务器 URL：",
  "Learn more": "了解更多",
  "Manage API keys for all users in the workspace. View the <anchor>API documentation</anchor> for usage details.": "为工作区内所有用户管理 API 密钥。有关使用详情，请查阅<anchor>API 文档</anchor>。",
@@ -1289,5 +1294,48 @@
  "{{count}} rows deleted_one": "已删除 1 行",
  "{{count}} rows deleted_other": "已删除 {{count}} 行",
  "{{count}} selected_one": "已选择 1 项",
-  "{{count}} selected_other": "已选择 {{count}} 项"
+  "{{count}} selected_other": "已选择 {{count}} 项",
+  "Compare": "比较",
+  "Compare versions": "比较版本",
+  "Select version from {{date}}": "选择 {{date}} 的版本",
+  "Version actions for {{date}}": "{{date}} 的版本操作",
+  "Comparing {{newer}} and {{older}}": "正在比较 {{newer}} 和 {{older}}",
+  "Exit compare": "退出比较",
+  "Search attachments...": "搜索附件……",
+  "Error loading attachments.": "加载附件时出错。",
+  "No attachments on this page yet.": "此页面上还没有附件。",
+  "Uploaded by {{name}}": "由 {{name}} 上传",
+  "Download {{name}}": "下载 {{name}}",
+  "Access revoked": "访问权限已撤销",
+  "Authorize application": "授权应用程序",
+  "{{name}} wants to access {{workspace}}": "{{name}} 想要访问 {{workspace}}",
+  "Not you? Switch account": "不是你？切换账户",
+  "This application will be able to:": "此应用程序将能够：",
+  "Write": "写入",
+  "Invalid authorization request": "无效的授权请求",
+  "Authorize": "授权",
+  "Application": "应用程序",
+  "Permissions": "权限",
+  "Authorized": "已授权",
+  "Revoke access": "撤销访问权限",
+  "Revoke access for {{name}}": "撤销 {{name}} 的访问权限",
+  "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "你确定要撤销 {{name}} 的访问权限吗？该应用程序将无法再访问你的账户。",
+  "Something went wrong. Please try again.": "出了点问题。请重试。",
+  "Remove {{name}}": "移除 {{name}}",
+  "Make sure you trust this application before authorizing it.": "在授权之前，请确保你信任此应用程序。",
+  "You will be redirected to": "你将被重定向到",
+  "View content without making changes.": "查看内容而不进行更改。",
+  "Create and modify content.": "创建和修改内容。",
+  "Applications and AI assistants you have authorized to access your account.": "你已授权访问你账户的应用程序和 AI 助手。",
+  "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "你的工作区已启用 MCP。通过 OAuth 将 AI 助手连接到你的 Docmost 账户。",
+  "Authorized apps": "已授权的应用",
+  "No authorized apps yet.": "尚无已授权的应用。",
+  "Workspace knowledge only": "仅限工作区知识",
+  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "将 AI 聊天限制为仅根据你的工作区页面和已上传文件进行回答。它不会使用外部知识。",
+  "Toggle workspace knowledge only": "切换“仅限工作区知识”",
+  "Read-only mode": "只读模式",
+  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI 聊天可以搜索和读取工作区内容，但不能创建或编辑页面。",
+  "Toggle AI Chat read-only mode": "切换 AI 聊天只读模式",
+  "Title only": "仅标题",
+  "you": "你"
 }
@@ -1,60 +1,94 @@
+import { lazy, Suspense, useEffect } from "react";
 import { Navigate, Route, Routes } from "react-router-dom";
-import SetupWorkspace from "@/pages/auth/setup-workspace.tsx";
-import LoginPage from "@/pages/auth/login";
-import Home from "@/pages/dashboard/home";
-import Page from "@/pages/page/page";
-import AccountSettings from "@/pages/settings/account/account-settings";
-import WorkspaceMembers from "@/pages/settings/workspace/workspace-members";
-import WorkspaceSettings from "@/pages/settings/workspace/workspace-settings";
-import Groups from "@/pages/settings/group/groups";
-import GroupInfo from "./pages/settings/group/group-info";
-import Spaces from "@/pages/settings/space/spaces.tsx";
-import { Error404 } from "@/components/ui/error-404.tsx";
-import AccountPreferences from "@/pages/settings/account/account-preferences.tsx";
-import SpaceHome from "@/pages/space/space-home.tsx";
-import PageRedirect from "@/pages/page/page-redirect.tsx";
 import Layout from "@/components/layouts/global/layout.tsx";
-import InviteSignup from "@/pages/auth/invite-signup.tsx";
-import ForgotPassword from "@/pages/auth/forgot-password.tsx";
-import PasswordReset from "./pages/auth/password-reset";
-import Billing from "@/ee/billing/pages/billing.tsx";
-import CloudLogin from "@/ee/pages/cloud-login.tsx";
-import CreateWorkspace from "@/ee/pages/create-workspace.tsx";
+import { Error404 } from "@/components/ui/error-404.tsx";
 import { isCloud } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
-import Security from "@/ee/security/pages/security.tsx";
-import License from "@/ee/licence/pages/license.tsx";
 import { useRedirectToCloudSelect } from "@/ee/hooks/use-redirect-to-cloud-select.tsx";
-import SharedPage from "@/pages/share/shared-page.tsx";
-import PdfRenderPage from "@/ee/pdf-export/pdf-render-page.tsx";
-import Shares from "@/pages/settings/shares/shares.tsx";
-import ShareLayout from "@/features/share/components/share-layout.tsx";
-import ShareRedirect from "@/pages/share/share-redirect.tsx";
 import { useTrackOrigin } from "@/hooks/use-track-origin";
-import SpacesPage from "@/pages/spaces/spaces.tsx";
-import { MfaChallengePage } from "@/ee/mfa/pages/mfa-challenge-page";
-import { MfaSetupRequiredPage } from "@/ee/mfa/pages/mfa-setup-required-page";
-import SpaceTrash from "@/pages/space/space-trash.tsx";
-import UserApiKeys from "@/ee/api-key/pages/user-api-keys";
-import WorkspaceApiKeys from "@/ee/api-key/pages/workspace-api-keys";
-import AiSettings from "@/ee/ai/pages/ai-settings.tsx";
-import BasePage from "@/ee/base/pages/base-page.tsx";
-import AuditLogs from "@/ee/audit/pages/audit-logs.tsx";
-import VerifiedPages from "@/ee/page-verification/pages/verified-pages.tsx";
-import TemplateList from "@/ee/template/pages/template-list";
-import TemplateEditor from "@/ee/template/pages/template-editor";
-import FavoritesPage from "@/pages/favorites/favorites-page";
-import AiChat from "@/ee/ai-chat/pages/ai-chat.tsx";
-import VerifyEmail from "@/ee/pages/verify-email.tsx";
-import LabelPage from "@/pages/label/label-page";
+
+
+const SetupWorkspace = lazy(() => import("@/pages/auth/setup-workspace.tsx"));
+const LoginPage = lazy(() => import("@/pages/auth/login"));
+const Home = lazy(() => import("@/pages/dashboard/home"));
+const Page = lazy(() => import("@/pages/page/page"));
+const AccountSettings = lazy(
+  () => import("@/pages/settings/account/account-settings"),
+);
+const WorkspaceMembers = lazy(
+  () => import("@/pages/settings/workspace/workspace-members"),
+);
+const WorkspaceSettings = lazy(
+  () => import("@/pages/settings/workspace/workspace-settings"),
+);
+const Groups = lazy(() => import("@/pages/settings/group/groups"));
+const GroupInfo = lazy(() => import("./pages/settings/group/group-info"));
+const Spaces = lazy(() => import("@/pages/settings/space/spaces.tsx"));
+const AccountPreferences = lazy(
+  () => import("@/pages/settings/account/account-preferences.tsx"),
+);
+const SpaceHome = lazy(() => import("@/pages/space/space-home.tsx"));
+const PageRedirect = lazy(() => import("@/pages/page/page-redirect.tsx"));
+const InviteSignup = lazy(() => import("@/pages/auth/invite-signup.tsx"));
+const ForgotPassword = lazy(() => import("@/pages/auth/forgot-password.tsx"));
+const PasswordReset = lazy(() => import("./pages/auth/password-reset"));
+const Billing = lazy(() => import("@/ee/billing/pages/billing.tsx"));
+const CloudLogin = lazy(() => import("@/ee/pages/cloud-login.tsx"));
+const CreateWorkspace = lazy(() => import("@/ee/pages/create-workspace.tsx"));
+const Security = lazy(() => import("@/ee/security/pages/security.tsx"));
+const License = lazy(() => import("@/ee/licence/pages/license.tsx"));
+const SharedPage = lazy(() => import("@/pages/share/shared-page.tsx"));
+const PdfRenderPage = lazy(() => import("@/ee/pdf-export/pdf-render-page.tsx"));
+const Shares = lazy(() => import("@/pages/settings/shares/shares.tsx"));
+const ShareLayout = lazy(
+  () => import("@/features/share/components/share-layout.tsx"),
+);
+const ShareRedirect = lazy(() => import("@/pages/share/share-redirect.tsx"));
+const SpacesPage = lazy(() => import("@/pages/spaces/spaces.tsx"));
+const MfaChallengePage = lazy(() =>
+  import("@/ee/mfa/pages/mfa-challenge-page").then((m) => ({
+    default: m.MfaChallengePage,
+  })),
+);
+const MfaSetupRequiredPage = lazy(() =>
+  import("@/ee/mfa/pages/mfa-setup-required-page").then((m) => ({
+    default: m.MfaSetupRequiredPage,
+  })),
+);
+const SpaceTrash = lazy(() => import("@/pages/space/space-trash.tsx"));
+const UserApiKeys = lazy(() => import("@/ee/api-key/pages/user-api-keys"));
+const WorkspaceApiKeys = lazy(
+  () => import("@/ee/api-key/pages/workspace-api-keys"),
+);
+const AiSettings = lazy(() => import("@/ee/ai/pages/ai-settings.tsx"));
+const BasePage = lazy(() => import("@/ee/base/pages/base-page.tsx"));
+const AuditLogs = lazy(() => import("@/ee/audit/pages/audit-logs.tsx"));
+const VerifiedPages = lazy(
+  () => import("@/ee/page-verification/pages/verified-pages.tsx"),
+);
+const TemplateList = lazy(() => import("@/ee/template/pages/template-list"));
+const TemplateEditor = lazy(
+  () => import("@/ee/template/pages/template-editor"),
+);
+const FavoritesPage = lazy(() => import("@/pages/favorites/favorites-page"));
+const AiChat = lazy(() => import("@/ee/ai-chat/pages/ai-chat.tsx"));
+const VerifyEmail = lazy(() => import("@/ee/pages/verify-email.tsx"));
+const LabelPage = lazy(() => import("@/pages/label/label-page"));
+const OAuthConsent = lazy(() => import("@/ee/oauth/pages/oauth-consent.tsx"));

 export default function App() {
  const { t } = useTranslation();
  useRedirectToCloudSelect();
  useTrackOrigin();

+  useEffect(() => {
+    // warm the editor chunk so opening a page doesn't wait on the network
+    const timer = setTimeout(() => import("@/pages/page/page"), 3000);
+    return () => clearTimeout(timer);
+  }, []);
+
  return (
-    <>
+    <Suspense fallback={null}>
      <Routes>
        <Route index element={<Navigate to="/home" />} />
        <Route path={"/login"} element={<LoginPage />} />
@@ -63,6 +97,7 @@ export default function App() {
        <Route path={"/password-reset"} element={<PasswordReset />} />
        <Route path={"/login/mfa"} element={<MfaChallengePage />} />
        <Route path={"/login/mfa/setup"} element={<MfaSetupRequiredPage />} />
+        <Route path={"/oauth/consent"} element={<OAuthConsent />} />

        {!isCloud() && (
          <Route path={"/setup/register"} element={<SetupWorkspace />} />
@@ -116,6 +151,10 @@ export default function App() {
              element={<AccountPreferences />}
            />
            <Route path={"account/api-keys"} element={<UserApiKeys />} />
+            <Route
+              path={"account/api-keys/authorized-apps"}
+              element={<UserApiKeys />}
+            />
            <Route path={"workspace"} element={<WorkspaceSettings />} />
            <Route path={"members"} element={<WorkspaceMembers />} />
            <Route path={"api-keys"} element={<WorkspaceApiKeys />} />
@@ -135,6 +174,6 @@ export default function App() {

        <Route path="*" element={<Error404 />} />
      </Routes>
-    </>
+    </Suspense>
  );
 }
@@ -1,17 +1,30 @@
 import { ActionIcon, Box, Group, ScrollArea, Title, Tooltip } from "@mantine/core";
 import { IconX } from "@tabler/icons-react";
-import CommentListWithTabs from "@/features/comment/components/comment-list-with-tabs.tsx";
 import { useAtom } from "jotai";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
-import React, { ReactNode, useEffect } from "react";
+import React, { lazy, ReactNode, Suspense, useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import { TableOfContents } from "@/features/editor/components/table-of-contents/table-of-contents.tsx";
 import { useAtomValue } from "jotai";
 import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
-import AsideChatPanel from "@/ee/ai-chat/components/aside-chat-panel";
-import { PageDetailsAside } from "@/features/page-details/components/page-details-aside.tsx";
 import { ASIDE_PANEL_ID } from "@/hooks/use-toggle-aside.tsx";

+const CommentListWithTabs = lazy(
+  () => import("@/features/comment/components/comment-list-with-tabs.tsx"),
+);
+const TableOfContents = lazy(() =>
+  import(
+    "@/features/editor/components/table-of-contents/table-of-contents.tsx"
+  ).then((m) => ({ default: m.TableOfContents })),
+);
+const AsideChatPanel = lazy(
+  () => import("@/ee/ai-chat/components/aside-chat-panel"),
+);
+const PageDetailsAside = lazy(() =>
+  import("@/features/page-details/components/page-details-aside.tsx").then(
+    (m) => ({ default: m.PageDetailsAside }),
+  ),
+);
+
 export default function Aside() {
  const [{ tab, isAsideOpen }, setAsideState] = useAtom(asideStateAtom);
  const { t } = useTranslation();
@@ -68,17 +81,19 @@ export default function Aside() {
            </Group>
          )}

-          {tab === "comments" || tab === "chat" ? (
-            component
-          ) : (
-            <ScrollArea
-              style={{ height: "85vh" }}
-              scrollbarSize={5}
-              type="scroll"
-            >
-              <div style={{ paddingBottom: "200px" }}>{component}</div>
-            </ScrollArea>
-          )}
+          <Suspense fallback={null}>
+            {tab === "comments" || tab === "chat" ? (
+              component
+            ) : (
+              <ScrollArea
+                style={{ height: "85vh" }}
+                scrollbarSize={5}
+                type="scroll"
+              >
+                <div style={{ paddingBottom: "200px" }}>{component}</div>
+              </ScrollArea>
+            )}
+          </Suspense>
        </>
      )}
    </Box>
@@ -11,7 +11,10 @@ import {
  sidebarWidthAtom,
 } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { SpaceSidebar } from "@/features/space/components/sidebar/space-sidebar.tsx";
-import AiChatSidebar from "@/ee/ai-chat/components/ai-chat-sidebar.tsx";
+
+const AiChatSidebar = React.lazy(
+  () => import("@/ee/ai-chat/components/ai-chat-sidebar.tsx"),
+);
 import { AppHeader } from "@/components/layouts/global/app-header.tsx";
 import Aside from "@/components/layouts/global/aside.tsx";
 import classes from "./app-shell.module.css";
@@ -126,7 +129,11 @@ export default function GlobalAppShell({
        )}
        {isSpaceRoute && <SpaceSidebar />}
        {isSettingsRoute && <SettingsSidebar />}
-        {isAiRoute && <AiChatSidebar />}
+        {isAiRoute && (
+          <React.Suspense fallback={null}>
+            <AiChatSidebar />
+          </React.Suspense>
+        )}
        {showGlobalSidebar && <GlobalSidebar />}
      </AppShell.Navbar>
      <AppShell.Main id={MAIN_CONTENT_ID} tabIndex={-1}>
@@ -0,0 +1,12 @@
+import { UnstyledButton } from "@mantine/core";
+import { type ComponentPropsWithoutRef, forwardRef } from "react";
+
+// Menu.Item hard-codes role="menuitem"; use as its `component` to restore role="menuitemcheckbox" so aria-checked works.
+export const CheckboxMenuItem = forwardRef<
+  HTMLButtonElement,
+  ComponentPropsWithoutRef<"button">
+>((props, ref) => (
+  <UnstyledButton ref={ref} {...props} role="menuitemcheckbox" />
+));
+
+CheckboxMenuItem.displayName = "CheckboxMenuItem";
@@ -0,0 +1,74 @@
+import { Badge, Group, Text, Switch, Tooltip } from "@mantine/core";
+import { useAtom } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
+import { notifications } from "@mantine/notifications";
+import { useHasFeature } from "@/ee/hooks/use-feature";
+import { Feature } from "@/ee/features";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
+
+export default function AiChatReadOnly() {
+  const { t } = useTranslation();
+  const hasAccess = useHasFeature(Feature.AI_CONTROLS);
+
+  return (
+    <Group justify="space-between" wrap="nowrap" gap="xl">
+      <div>
+        <Group gap="xs" align="center">
+          <Text size="md">{t("Read-only mode")}</Text>
+          {!hasAccess && (
+            <Badge variant="light" size="sm" radius="sm">
+              {t("Enterprise")}
+            </Badge>
+          )}
+        </Group>
+        <Text size="sm" c="dimmed">
+          {t(
+            "AI Chat can search and read workspace content, but cannot create or edit pages.",
+          )}
+        </Text>
+      </div>
+
+      <AiChatReadOnlyToggle />
+    </Group>
+  );
+}
+
+function AiChatReadOnlyToggle() {
+  const { t } = useTranslation();
+  const [workspace, setWorkspace] = useAtom(workspaceAtom);
+  const [checked, setChecked] = useState(
+    workspace?.settings?.ai?.chatReadOnly,
+  );
+  const hasAccess = useHasFeature(Feature.AI_CONTROLS);
+  const upgradeLabel = useUpgradeLabel();
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    try {
+      const updatedWorkspace = await updateWorkspace({
+        aiChatReadOnly: value,
+      });
+      setChecked(value);
+      setWorkspace(updatedWorkspace);
+    } catch (err: any) {
+      notifications.show({
+        message: err?.response?.data?.message,
+        color: "red",
+      });
+    }
+  };
+
+  return (
+    <Tooltip label={upgradeLabel} disabled={hasAccess} refProp="rootRef">
+      <Switch
+        defaultChecked={checked}
+        onChange={handleChange}
+        disabled={!hasAccess}
+        aria-label={t("Toggle AI Chat read-only mode")}
+      />
+    </Tooltip>
+  );
+}
@@ -0,0 +1,74 @@
+import { Badge, Group, Text, Switch, Tooltip } from "@mantine/core";
+import { useAtom } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
+import { notifications } from "@mantine/notifications";
+import { useHasFeature } from "@/ee/hooks/use-feature";
+import { Feature } from "@/ee/features";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
+
+export default function AiChatWorkspaceKnowledgeOnly() {
+  const { t } = useTranslation();
+  const hasAccess = useHasFeature(Feature.AI_CONTROLS);
+
+  return (
+    <Group justify="space-between" wrap="nowrap" gap="xl">
+      <div>
+        <Group gap="xs" align="center">
+          <Text size="md">{t("Workspace knowledge only")}</Text>
+          {!hasAccess && (
+            <Badge variant="light" size="sm" radius="sm">
+              {t("Enterprise")}
+            </Badge>
+          )}
+        </Group>
+        <Text size="sm" c="dimmed">
+          {t(
+            "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.",
+          )}
+        </Text>
+      </div>
+
+      <AiChatWorkspaceKnowledgeOnlyToggle />
+    </Group>
+  );
+}
+
+function AiChatWorkspaceKnowledgeOnlyToggle() {
+  const { t } = useTranslation();
+  const [workspace, setWorkspace] = useAtom(workspaceAtom);
+  const [checked, setChecked] = useState(
+    workspace?.settings?.ai?.chatWorkspaceKnowledgeOnly,
+  );
+  const hasAccess = useHasFeature(Feature.AI_CONTROLS);
+  const upgradeLabel = useUpgradeLabel();
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    try {
+      const updatedWorkspace = await updateWorkspace({
+        aiChatWorkspaceKnowledgeOnly: value,
+      });
+      setChecked(value);
+      setWorkspace(updatedWorkspace);
+    } catch (err: any) {
+      notifications.show({
+        message: err?.response?.data?.message,
+        color: "red",
+      });
+    }
+  };
+
+  return (
+    <Tooltip label={upgradeLabel} disabled={hasAccess} refProp="rootRef">
+      <Switch
+        defaultChecked={checked}
+        onChange={handleChange}
+        disabled={!hasAccess}
+        aria-label={t("Toggle workspace knowledge only")}
+      />
+    </Tooltip>
+  );
+}
@@ -6,7 +6,10 @@ import {
  IconFileText,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
-import ChatInput from "./chat-input";
+import { useAtomValue } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { useRef } from "react";
+import ChatInput, { ChatInputHandle } from "./chat-input";
 import type { ChatAttachment, PageMention } from "../types/ai-chat.types";
 import classes from "../styles/ai-chat.module.css";

@@ -14,6 +17,7 @@ type Suggestion = {
  icon: React.ReactNode;
  text: string;
  prompt: string;
+  write?: boolean;
 };

 const SUGGESTIONS: Suggestion[] = [
@@ -26,6 +30,7 @@ const SUGGESTIONS: Suggestion[] = [
    icon: <IconFilePlus size={16} />,
    text: "Create a new page",
    prompt: "Create a new page titled ",
+    write: true,
  },
  {
    icon: <IconFileText size={16} />,
@@ -36,6 +41,7 @@ const SUGGESTIONS: Suggestion[] = [
    icon: <IconEdit size={16} />,
    text: "Update page content",
    prompt: "Update the page @",
+    write: true,
  },
 ];

@@ -47,9 +53,13 @@ type Props = {

 export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
  const { t } = useTranslation();
+  const workspace = useAtomValue(workspaceAtom);
+  const writesDisabled = workspace?.settings?.ai?.chatReadOnly === true;
+
+  const inputRef = useRef<ChatInputHandle>(null);

  const handleSuggestionClick = (prompt: string) => {
-    onSend(prompt, [], []);
+    inputRef.current?.prefill(prompt);
  };

  return (
@@ -62,6 +72,7 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {

      <div className={classes.emptyStateInput}>
        <ChatInput
+          ref={inputRef}
          isStreaming={isStreaming}
          onSend={onSend}
          onStop={onStop}
@@ -73,7 +84,7 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
      <div className={classes.suggestionsSection}>
        <h2 className={classes.suggestionsLabel}>{t("Get started")}</h2>
        <div className={classes.suggestionsGrid}>
-          {SUGGESTIONS.map((s) => (
+          {SUGGESTIONS.filter((s) => !writesDisabled || !s.write).map((s) => (
            <button
              key={s.text}
              type="button"
@@ -1,4 +1,12 @@
-import { useCallback, useId, useRef, useEffect, useState } from "react";
+import {
+  forwardRef,
+  useCallback,
+  useId,
+  useImperativeHandle,
+  useRef,
+  useEffect,
+  useState,
+} from "react";
 import { useTranslation } from "react-i18next";
 import { IconArrowUp, IconPaperclip, IconPlayerStopFilled, IconX, IconFile, IconPhoto, IconPlus, IconAt, IconFileText } from "@tabler/icons-react";
 import { Popover } from "@mantine/core";
@@ -35,6 +43,10 @@ type Props = {
  chatId?: string;
 };

+export type ChatInputHandle = {
+  prefill: (text: string) => void;
+};
+
 function extractMentions(json: any): PageMention[] {
  const mentions: PageMention[] = [];
  const seen = new Set<string>();
@@ -89,7 +101,7 @@ function editorJsonToText(json: any): string {
  return text;
 }

-export default function ChatInput({
+const ChatInput = forwardRef<ChatInputHandle, Props>(function ChatInput({
  isStreaming,
  onSend,
  onStop,
@@ -100,7 +112,7 @@ export default function ChatInput({
  variant = "card",
  showDisclaimer = true,
  chatId,
-}: Props) {
+}: Props, ref) {
  const chatIdRef = useRef(chatId);
  chatIdRef.current = chatId;
  const { t } = useTranslation();
@@ -270,6 +282,19 @@ export default function ChatInput({
    }
  }, [editor]);

+  useImperativeHandle(
+    ref,
+    () => ({
+      prefill: (text: string) => {
+        if (!editor || editor.isDestroyed) return;
+        editor.commands.clearContent();
+        editor.commands.insertContent(text);
+        editor.commands.focus();
+      },
+    }),
+    [editor],
+  );
+
  const hasContent = !isEmpty || pendingAttachments.some((a) => !a.uploading) || (contextPages?.length ?? 0) > 0;

  const wrapperClass = variant === "flat" ? classes.inputWrapperFlat : classes.inputWrapper;
@@ -429,4 +454,6 @@ export default function ChatInput({
    )}
    </>
  );
-}
+});
+
+export default ChatInput;
@@ -1,5 +1,6 @@
 import {
  Anchor,
+  Badge,
  Group,
  List,
  Text,
@@ -107,11 +108,11 @@ export default function McpSettings() {
            </CopyButton>
          </Group>
          <Text size="sm" c="dimmed" mt="xs">
-            {t(
-              "Use your API key for authentication. You can manage API keys in your account settings.",
-            )}
+            {t("Connect AI assistants with your Docmost account via OAuth.")}
          </Text>

+          <McpEnforceOauthSetting />
+
          <div>
            <Text size="sm" fw={500} mt="md" mb={4}>
              {t("Supported tools")}
@@ -154,3 +155,56 @@ export default function McpSettings() {
    </Stack>
  );
 }
+
+function McpEnforceOauthSetting() {
+  const { t } = useTranslation();
+  const [workspace, setWorkspace] = useAtom(workspaceAtom);
+  const [checked, setChecked] = useState(workspace?.settings?.ai?.enforceMcpOauth);
+  const hasAccess = useHasFeature(Feature.MCP_CONTROLS);
+  const upgradeLabel = useUpgradeLabel();
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    try {
+      const updatedWorkspace = await updateWorkspace({ enforceMcpOauth: value });
+      setChecked(value);
+      setWorkspace(updatedWorkspace);
+    } catch (err) {
+      notifications.show({
+        message: err?.response?.data?.message,
+        color: "red",
+      });
+    }
+  };
+
+  return (
+    <Group justify="space-between" wrap="nowrap" gap="xl" mt="md">
+      <div>
+        <Group gap="xs" align="center">
+          <Text size="sm" fw={500}>
+            {t("Enforce OAuth")}
+          </Text>
+          {!hasAccess && (
+            <Badge variant="light" size="sm" radius="sm">
+              {t("Enterprise")}
+            </Badge>
+          )}
+        </Group>
+        <Text size="sm" c="dimmed">
+          {t(
+            "AI assistants must connect with a Docmost account via OAuth. API keys cannot be used with the MCP server.",
+          )}
+        </Text>
+      </div>
+
+      <Tooltip label={upgradeLabel} disabled={hasAccess} refProp="rootRef">
+        <Switch
+          defaultChecked={checked}
+          onChange={handleChange}
+          disabled={!hasAccess}
+          aria-label={t("Toggle enforce OAuth for MCP")}
+        />
+      </Tooltip>
+    </Group>
+  );
+}
@@ -5,8 +5,10 @@ import { useTranslation } from "react-i18next";
 import EnableAiSearch from "@/ee/ai/components/enable-ai-search.tsx";
 import EnableGenerativeAi from "@/ee/ai/components/enable-generative-ai.tsx";
 import EnableAiChat from "@/ee/ai-chat/components/enable-ai-chat.tsx";
+import AiChatReadOnly from "@/ee/ai-chat/components/ai-chat-read-only.tsx";
+import AiChatWorkspaceKnowledgeOnly from "@/ee/ai-chat/components/ai-chat-workspace-knowledge-only.tsx";
 import McpSettings from "@/ee/ai/components/mcp-settings.tsx";
-import { Alert, Stack, Tabs } from "@mantine/core";
+import { Alert, Collapse, Stack, Tabs } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
@@ -14,12 +16,16 @@ import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 import { isCloud } from "@/lib/config.ts";
 import { useLocation, useNavigate } from "react-router-dom";
 import { DocumentTitle } from "@/components/ui/document-title.tsx";
+import { useAtomValue } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";

 export default function AiSettings() {
  const { t } = useTranslation();
  const { isAdmin } = useUserRole();
  const hasAccess = useHasFeature(Feature.AI);
  const upgradeLabel = useUpgradeLabel();
+  const workspace = useAtomValue(workspaceAtom);
+  const aiChatEnabled = workspace?.settings?.ai?.chat === true;
  const location = useLocation();
  const navigate = useNavigate();

@@ -61,7 +67,7 @@ export default function AiSettings() {
              mb="lg"
            >
              {t(
-                "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.",
+                "AI is available in the Docmost paid editions. Contact sales@docmost.com.",
              )}
            </Alert>
          )}
@@ -70,6 +76,20 @@ export default function AiSettings() {
            {!isCloud() && <EnableAiSearch />}
            <EnableGenerativeAi />
            <EnableAiChat />
+            <Collapse expanded={aiChatEnabled}>
+              <Stack
+                gap="md"
+                pl="md"
+                ml="xs"
+                style={{
+                  borderLeft:
+                    "2px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4))",
+                }}
+              >
+                <AiChatReadOnly />
+                <AiChatWorkspaceKnowledgeOnly />
+              </Stack>
+            </Collapse>
          </Stack>
        </Tabs.Panel>

@@ -15,6 +15,14 @@ export interface IAiSearchResponse {
  }>;
 }

+export async function hintVectorCache(): Promise<void> {
+  try {
+    await api.post("/ai/vector-cache-hint");
+  } catch {
+    // best-effort cache hint
+  }
+}
+
 export async function aiAnswers(
  params: IPageSearchParams,
  onChunk?: (chunk: { content?: string; sources?: any[] }) => void,
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Anchor, Alert, Button, Group, Space, Text } from "@mantine/core";
+import { Anchor, Alert, Button, Group, Space, Tabs, Text } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
 import { Trans, useTranslation } from "react-i18next";
 import SettingsTitle from "@/components/settings/settings-title";
@@ -17,6 +17,8 @@ import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { DocumentTitle } from "@/components/ui/document-title.tsx";
+import { useLocation, useNavigate } from "react-router-dom";
+import { AuthorizedAppsPanel } from "@/ee/oauth/components/authorized-apps-panel.tsx";

 export default function UserApiKeys() {
  const { t } = useTranslation();
@@ -29,6 +31,11 @@ export default function UserApiKeys() {
  const { data, isLoading } = useGetApiKeysQuery({ cursor });
  const [workspace] = useAtom(workspaceAtom);
  const { isAdmin } = useUserRole();
+  const location = useLocation();
+  const navigate = useNavigate();
+  const activeTab = location.pathname.endsWith("/authorized-apps")
+    ? "authorized-apps"
+    : "api-keys";
  const mcpEnabled = workspace?.settings?.ai?.mcp === true;
  const restrictToAdmins = workspace?.settings?.api?.restrictToAdmins === true;
  const canCreate = !restrictToAdmins || isAdmin;
@@ -47,26 +54,27 @@ export default function UserApiKeys() {
    setRevokeModalOpened(true);
  };

+  const handleTabChange = (value: string | null) => {
+    navigate(
+      value === "authorized-apps"
+        ? "/settings/account/api-keys/authorized-apps"
+        : "/settings/account/api-keys",
+    );
+  };
+
  return (
    <>
-      <DocumentTitle title={t("API keys")} />
+      <DocumentTitle
+        title={activeTab === "authorized-apps" ? t("Authorized apps") : t("API keys")}
+      />

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

-      <Text size="sm" c="dimmed" mb="md">
-        <Trans
-          i18nKey="View the <anchor>API documentation</anchor> for usage details."
-          components={{
-            anchor: <Anchor href="https://docmost.com/api-docs" target="_blank" size="sm" />,
-          }}
-        />
-      </Text>
-
-      {mcpEnabled && canCreate && (
+      {mcpEnabled && (
        <Alert variant="light" color="blue" mb="md" p="sm" icon={<IconInfoCircle />}>
          <Text size="sm">
            {t(
-              "Your workspace has MCP enabled. Use your API key to connect AI assistants.",
+              "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.",
            )}{" "}
            <Anchor
              href="https://docmost.com/docs/user-guide/mcp"
@@ -85,37 +93,70 @@ export default function UserApiKeys() {
        </Alert>
      )}

-      {canCreate ? (
-        <Group justify="flex-end" mb="md">
-          <Button onClick={() => setCreateModalOpened(true)}>
-            {t("Create API Key")}
-          </Button>
-        </Group>
-      ) : restrictToAdmins ? (
-        <Alert variant="light" color="yellow" mb="md" p="sm" icon={<IconInfoCircle />}>
-          <Text size="sm">
-            {t("API key creation is restricted to admins by your workspace administrator.")}
+      <Tabs color="dark" value={activeTab} onChange={handleTabChange}>
+        <Tabs.List>
+          <Tabs.Tab fw={500} value="api-keys">
+            {t("API keys")}
+          </Tabs.Tab>
+          <Tabs.Tab fw={500} value="authorized-apps">
+            {t("Authorized apps")}
+          </Tabs.Tab>
+        </Tabs.List>
+
+        <Tabs.Panel value="api-keys" pt="md">
+
+        <Group justify="space-between" align="center" mb="md">
+          <Text size="sm" c="dimmed">
+            <Trans
+              i18nKey="View the <anchor>API documentation</anchor> for usage details."
+              components={{
+                anchor: <Anchor href="https://docmost.com/api-docs" target="_blank" size="sm" />,
+              }}
+            />
          </Text>
-        </Alert>
-      ) : null}

-      <ApiKeyTable
-        apiKeys={data?.items || []}
-        isLoading={isLoading}
-        onUpdate={handleUpdate}
-        onRevoke={handleRevoke}
-      />
+          {canCreate && (
+            <Button
+              onClick={() => setCreateModalOpened(true)}
+              style={{ flexShrink: 0 }}
+            >
+              {t("Create API Key")}
+            </Button>
+          )}
+        </Group>

-      <Space h="md" />
+        {!canCreate && restrictToAdmins && (
+          <Alert variant="light" color="yellow" mb="md" p="sm" icon={<IconInfoCircle />}>
+            <Text size="sm">
+              {t("API key creation is restricted to admins by your workspace administrator.")}
+            </Text>
+          </Alert>
+        )}

-      {data?.items.length > 0 && (
-        <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+        <ApiKeyTable
+          apiKeys={data?.items || []}
+          isLoading={isLoading}
+          onUpdate={handleUpdate}
+          onRevoke={handleRevoke}
        />
-      )}
+
+        <Space h="md" />
+
+        {data?.items.length > 0 && (
+          <Paginate
+            hasPrevPage={data?.meta?.hasPrevPage}
+            hasNextPage={data?.meta?.hasNextPage}
+            onNext={() => goNext(data?.meta?.nextCursor)}
+            onPrev={goPrev}
+          />
+        )}
+
+        </Tabs.Panel>
+
+        <Tabs.Panel value="authorized-apps" pt="md">
+          <AuthorizedAppsPanel />
+        </Tabs.Panel>
+      </Tabs>

      <CreateApiKeyModal
        opened={createModalOpened}
@@ -9,6 +9,7 @@ import {
  Text,
  UnstyledButton,
  Button,
+  MultiSelect,
 } from "@mantine/core";
 import { IconPlus, IconTrash } from "@tabler/icons-react";
 import {
@@ -52,6 +53,9 @@ const NO_VALUE_OPERATORS: FilterOperator[] = ["isEmpty", "isNotEmpty"];
 // stored value so a stale shape isn't sent to the engine.
 function valueClass(op: FilterOperator, inputKind: string): string {
  if (NO_VALUE_OPERATORS.includes(op)) return "none";
+  if (inputKind === "choices") {
+    return op === "any" || op === "none" ? "choicesMulti" : "choicesSingle";
+  }
  if (inputKind === "person") {
    return op === "any" || op === "none" ? "personMulti" : "personSingle";
  }
@@ -70,6 +74,10 @@ function getOperatorsForType(type: string): FilterOperator[] {
    DEFAULT_FILTER_OPERATORS) as FilterOperator[];
 }

+function isMultiChoice(op: FilterCondition["op"]): boolean {
+  return op === "any" || op === "none";
+}
+
 function FilterValueInput({
  condition,
  property,
@@ -121,6 +129,32 @@ function FilterValueInput({
    const typeOptions = property.typeOptions as SelectTypeOptions | undefined;
    const choices = typeOptions?.choices ?? [];
    const choiceOptions = choices.map((c) => ({ value: c.id, label: c.name }));
+
+    if (isMultiChoice(condition.op)) {
+      const { value } = condition;
+      const selected = (
+        Array.isArray(value) ? value : value ? [value] : []
+      ).filter((id) => choices.some((c) => c.id === id));
+
+      return (
+        <MultiSelect
+          size="xs"
+          data={choiceOptions}
+          comboboxProps={{ withinPortal: false }}
+          value={selected}
+          onChange={(values) => onChange(values)}
+          w={160}
+          styles={{
+            pillsList: {
+              maxHeight: 70,
+              overflowY: "auto",
+            },
+          }}
+          maxDropdownHeight={220}
+        />
+      );
+    }
+
    return (
      <Select
        size="xs"
@@ -199,11 +233,18 @@ export function ViewFilterConfigPopover({
    label: p.name,
  }));

+  const [unSaved, setUnSaved] = useState(false)
  const [draft, setDraft] = useState<FilterCondition | null>(null);
+  const [draftConditions, setDraftConditions] =
+    useState<FilterCondition[]>(conditions);

  useEffect(() => {
-    if (!opened) setDraft(null);
-  }, [opened]);
+    if (opened) {
+      setDraftConditions(conditions);
+      setDraft(null);
+      setUnSaved(false)
+    }
+  }, [opened, conditions]);

  const handleStartDraft = useCallback(() => {
    const firstProperty = properties[0];
@@ -216,14 +257,21 @@ export function ViewFilterConfigPopover({
  }, [properties]);

  const handleSaveDraft = useCallback(() => {
-    if (!draft) return;
-    onChange([...conditions, draft]);
+    const nextConditions = draft
+      ? [...draftConditions, draft]
+      : draftConditions;
+
+    onChange(nextConditions);
    setDraft(null);
-  }, [draft, conditions, onChange]);
+    setUnSaved(false)
+
+  }, [draft, draftConditions, onChange]);

  const handleCancelDraft = useCallback(() => {
+    setDraftConditions(conditions)
    setDraft(null);
-  }, []);
+    setUnSaved(false)
+  }, [conditions]);

  const handleDraftPropertyChange = useCallback(
    (propertyId: string | null) => {
@@ -272,17 +320,19 @@ export function ViewFilterConfigPopover({

  const handleRemove = useCallback(
    (index: number) => {
-      onChange(conditions.filter((_, i) => i !== index));
+      setUnSaved(true);
+      setDraftConditions((current) => current.filter((_, i) => i !== index));
    },
-    [conditions, onChange],
+    [],
  );

  const handlePropertyChange = useCallback(
    (index: number, propertyId: string | null) => {
      if (!propertyId) return;
      const newProperty = properties.find((p) => p.id === propertyId);
-      onChange(
-        conditions.map((f, i) => {
+      setUnSaved(true)
+      setDraftConditions((current) =>
+        current.map((f, i) => {
          if (i !== index) return f;
          if (newProperty) {
            const validOperators = getOperatorsForType(newProperty.type);
@@ -302,15 +352,16 @@ export function ViewFilterConfigPopover({
        }),
      );
    },
-    [conditions, properties, onChange],
+    [properties],
  );

  const handleOperatorChange = useCallback(
    (index: number, operator: string | null) => {
      if (!operator) return;
      const op = operator as FilterOperator;
-      onChange(
-        conditions.map((f, i) => {
+      setUnSaved(true)
+      setDraftConditions((current) =>
+        current.map((f, i) => {
          if (i !== index) return f;
          const kind = inputKindForProperty(
            properties.find((p) => p.id === f.propertyId),
@@ -320,16 +371,17 @@ export function ViewFilterConfigPopover({
        }),
      );
    },
-    [conditions, properties, onChange],
+    [properties],
  );

  const handleValueChange = useCallback(
    (index: number, value: unknown) => {
-      onChange(
-        conditions.map((f, i) => (i === index ? { ...f, value } : f)),
+      setUnSaved(true)
+      setDraftConditions((current) =>
+        current.map((f, i) => (i === index ? { ...f, value } : f)),
      );
    },
-    [conditions, onChange],
+    [],
  );

  return (
@@ -362,13 +414,13 @@ export function ViewFilterConfigPopover({
            {t("Filter by")}
          </Text>

-          {conditions.length === 0 && !draft && (
+          {draftConditions.length === 0 && !draft && (
            <Text size="xs" c="dimmed">
              {t("No filters applied")}
            </Text>
          )}

-          {conditions.map((condition, index) => {
+          {draftConditions.map((condition, index) => {
            const needsValue = !NO_VALUE_OPERATORS.includes(condition.op);
            const property = properties.find(
              (p) => p.id === condition.propertyId,
@@ -471,14 +523,6 @@ export function ViewFilterConfigPopover({
                    />
                  )}
                </Group>
-                <Group justify="flex-end" gap="xs">
-                  <Button variant="default" size="xs" onClick={handleCancelDraft}>
-                    {t("Cancel")}
-                  </Button>
-                  <Button size="xs" onClick={handleSaveDraft}>
-                    {t("Save")}
-                  </Button>
-                </Group>
              </Stack>
            );
          })()}
@@ -492,6 +536,20 @@ export function ViewFilterConfigPopover({
              {t("Add filter")}
            </UnstyledButton>
          )}
+          <Group justify="flex-end" gap="xs">
+            <Button
+              variant="default"
+              size="xs"
+              onClick={handleCancelDraft}
+              disabled={!draft && !unSaved}
+            >
+              {t("Cancel")}
+            </Button>
+
+            <Button size="xs" onClick={handleSaveDraft} disabled={!draft && !unSaved}>
+              {t("Save")}
+            </Button>
+          </Group>
        </Stack>
      </Popover.Dropdown>
    </Popover>
@@ -22,4 +22,7 @@ export const Feature = {
  PERSONAL_SPACES: 'spaces:personal',
  DOCX_EXPORT: 'export:docx',
  BASES: 'bases',
+  OAUTH: 'oauth',
+  AI_CONTROLS: 'ai:controls',
+  MCP_CONTROLS: 'mcp:controls',
 } as const;
@@ -0,0 +1,19 @@
+import { Text } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+import { OAuthGrantsTable } from "@/ee/oauth/components/oauth-grants-table";
+import { useOAuthGrantsQuery } from "@/ee/oauth/queries/oauth-query";
+
+export function AuthorizedAppsPanel() {
+  const { t } = useTranslation();
+  const { data, isLoading } = useOAuthGrantsQuery();
+
+  return (
+    <>
+      <Text size="sm" c="dimmed" mb="md">
+        {t("Applications and AI assistants you have authorized to access your account.")}
+      </Text>
+
+      <OAuthGrantsTable grants={data || []} isLoading={isLoading} />
+    </>
+  );
+}
@@ -0,0 +1,178 @@
+import { ActionIcon, Badge, Group, Skeleton, Table, Text, Tooltip } from "@mantine/core";
+import { IconTrash } from "@tabler/icons-react";
+import { modals } from "@mantine/modals";
+import { useTranslation } from "react-i18next";
+import NoTableResults from "@/components/common/no-table-results";
+import { formatLocalized, useDateFnsLocale } from "@/lib/date-locale.ts";
+import { IOAuthGrant } from "@/ee/oauth/types/oauth.types";
+import { useRevokeOAuthGrantMutation } from "@/ee/oauth/queries/oauth-query";
+
+// Callback hosts identify the app; the full URL belongs on the consent screen.
+function callbackHosts(redirectUris: string[] = []): string[] {
+  const hosts = redirectUris.map((uri) => {
+    try {
+      const url = new URL(uri);
+      return url.protocol === "http:" || url.protocol === "https:"
+        ? url.host
+        : url.protocol;
+    } catch {
+      return uri;
+    }
+  });
+  return Array.from(new Set(hosts));
+}
+
+type OAuthGrantsTableProps = {
+  grants: IOAuthGrant[];
+  isLoading?: boolean;
+};
+
+function TableSkeleton() {
+  return (
+    <>
+      {Array.from({ length: 3 }).map((_, i) => (
+        <Table.Tr key={i}>
+          <Table.Td>
+            <Skeleton height={14} width={140} />
+          </Table.Td>
+          <Table.Td>
+            <Group gap={4}>
+              <Skeleton height={20} width={50} />
+              <Skeleton height={20} width={55} />
+            </Group>
+          </Table.Td>
+          <Table.Td>
+            <Skeleton height={14} width={90} />
+          </Table.Td>
+          <Table.Td>
+            <Skeleton height={14} width={90} />
+          </Table.Td>
+          <Table.Td>
+            <Skeleton height={28} width={28} circle />
+          </Table.Td>
+        </Table.Tr>
+      ))}
+    </>
+  );
+}
+
+export function OAuthGrantsTable({ grants, isLoading }: OAuthGrantsTableProps) {
+  const { t } = useTranslation();
+  const locale = useDateFnsLocale();
+  const revokeMutation = useRevokeOAuthGrantMutation();
+
+  const scopeMeta: Record<string, { color: string; label: string }> = {
+    read: { color: "blue", label: t("Read") },
+    write: { color: "orange", label: t("Write") },
+  };
+
+  const formatDate = (date: string | null) => {
+    if (!date) return t("Never");
+    return formatLocalized(date, "MMM dd, yyyy", "PP", locale);
+  };
+
+  const openRevokeModal = (grant: IOAuthGrant) =>
+    modals.openConfirmModal({
+      title: t("Revoke access"),
+      centered: true,
+      children: (
+        <Text size="sm">
+          {t(
+            "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.",
+            { name: grant.clientName },
+          )}
+        </Text>
+      ),
+      labels: { confirm: t("Revoke access"), cancel: t("Cancel") },
+      confirmProps: { color: "red" },
+      onConfirm: () => revokeMutation.mutate(grant.id),
+    });
+
+  return (
+    <Table.ScrollContainer minWidth={600}>
+      <Table highlightOnHover verticalSpacing="sm">
+        <Table.Thead>
+          <Table.Tr>
+            <Table.Th>{t("Application")}</Table.Th>
+            <Table.Th>{t("Permissions")}</Table.Th>
+            <Table.Th>{t("Authorized")}</Table.Th>
+            <Table.Th>{t("Last used")}</Table.Th>
+            <Table.Th aria-label={t("Action")} />
+          </Table.Tr>
+        </Table.Thead>
+
+        <Table.Tbody>
+          {isLoading ? (
+            <TableSkeleton />
+          ) : grants.length > 0 ? (
+            grants.map((grant) => (
+              <Table.Tr key={grant.id}>
+                <Table.Td>
+                  <Text fz="sm" fw={500}>
+                    {grant.clientName}
+                  </Text>
+                  <Text
+                    fz="xs"
+                    c="dimmed"
+                    title={grant.redirectUris?.join("\n")}
+                    style={{ overflowWrap: "anywhere" }}
+                  >
+                    {callbackHosts(grant.redirectUris).join(", ")}
+                  </Text>
+                </Table.Td>
+
+                <Table.Td>
+                  <Group gap={4}>
+                    {grant.scopes.map((scope) => {
+                      const meta = scopeMeta[scope];
+                      if (!meta) return null;
+                      return (
+                        <Badge
+                          key={scope}
+                          variant="light"
+                          color={meta.color}
+                          size="sm"
+                        >
+                          {meta.label}
+                        </Badge>
+                      );
+                    })}
+                  </Group>
+                </Table.Td>
+
+                <Table.Td>
+                  <Text fz="sm" style={{ whiteSpace: "nowrap" }}>
+                    {formatDate(grant.createdAt)}
+                  </Text>
+                </Table.Td>
+
+                <Table.Td>
+                  <Text fz="sm" style={{ whiteSpace: "nowrap" }}>
+                    {formatDate(grant.lastUsedAt)}
+                  </Text>
+                </Table.Td>
+
+                <Table.Td>
+                  <Tooltip label={t("Revoke access")}>
+                    <ActionIcon
+                      variant="subtle"
+                      color="red"
+                      aria-label={t("Revoke access for {{name}}", {
+                        name: grant.clientName,
+                      })}
+                      onClick={() => openRevokeModal(grant)}
+                    >
+                      <IconTrash size={16} />
+                    </ActionIcon>
+                  </Tooltip>
+                </Table.Td>
+              </Table.Tr>
+            ))
+          ) : (
+            <NoTableResults colSpan={5} text={t("No authorized apps yet.")} />
+          )}
+        </Table.Tbody>
+      </Table>
+    </Table.ScrollContainer>
+  );
+}
@@ -0,0 +1,333 @@
+import React, { useEffect, useMemo, useState } from "react";
+import {
+  Alert,
+  Anchor,
+  Box,
+  Button,
+  Center,
+  Checkbox,
+  Container,
+  Divider,
+  Group,
+  Loader,
+  Paper,
+  Stack,
+  Text,
+  ThemeIcon,
+  Title,
+} from "@mantine/core";
+import { notifications } from "@mantine/notifications";
+import {
+  IconAlertTriangle,
+  IconEye,
+  IconPencil,
+} from "@tabler/icons-react";
+import { useQuery } from "@tanstack/react-query";
+import { useAtom } from "jotai";
+import { RESET } from "jotai/utils";
+import { useTranslation } from "react-i18next";
+import { useLocation, useSearchParams } from "react-router-dom";
+import { AuthLayout } from "@/features/auth/components/auth-layout.tsx";
+import classes from "@/features/auth/components/auth.module.css";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
+import { UserInfo } from "@/components/common/user-info.tsx";
+import useCurrentUser from "@/features/user/hooks/use-current-user";
+import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
+import { logout } from "@/features/auth/services/auth-service";
+import { ICurrentUser } from "@/features/user/types/user.types";
+import APP_ROUTE from "@/lib/app-route.ts";
+import {
+  approveOAuthAuthorization,
+  getOAuthAuthorizeInfo,
+} from "@/ee/oauth/services/oauth-service";
+import {
+  IApproveAuthorizationPayload,
+  IAuthorizeParams,
+  IOAuthAuthorizeInfo,
+} from "@/ee/oauth/types/oauth.types";
+
+function loginRedirectUrl(pathname: string, search: string): string {
+  return `${APP_ROUTE.AUTH.LOGIN}?redirect=${encodeURIComponent(pathname + search)}`;
+}
+
+function errorStatus(error: any): number | undefined {
+  return error?.response?.status;
+}
+
+function errorText(error: any): string | undefined {
+  const data = error?.response?.data;
+  if (typeof data?.error_description === "string") return data.error_description;
+  if (Array.isArray(data?.message)) return data.message.join(", ");
+  return data?.message;
+}
+
+const OAUTH_PARAM_NAMES = [
+  "response_type",
+  "client_id",
+  "redirect_uri",
+  "state",
+  "code_challenge",
+  "code_challenge_method",
+  "scope",
+  "resource",
+];
+
+function pickOAuthParams(params: IAuthorizeParams): IAuthorizeParams {
+  const picked: IAuthorizeParams = {};
+  for (const name of OAUTH_PARAM_NAMES) {
+    if (params[name] !== undefined) {
+      picked[name] = params[name];
+    }
+  }
+  return picked;
+}
+
+export default function OAuthConsent() {
+  const { t } = useTranslation();
+  const location = useLocation();
+  const [searchParams] = useSearchParams();
+
+  const params = useMemo<IAuthorizeParams>(
+    () => Object.fromEntries(searchParams.entries()),
+    [searchParams],
+  );
+
+  const currentUserQuery = useCurrentUser();
+  const infoQuery = useQuery({
+    queryKey: ["oauth-authorize-info", params],
+    queryFn: () => getOAuthAuthorizeInfo(params),
+  });
+
+  const isUnauthenticated =
+    errorStatus(currentUserQuery.error) === 401 ||
+    errorStatus(infoQuery.error) === 401;
+
+  useEffect(() => {
+    if (isUnauthenticated) {
+      window.location.replace(
+        loginRedirectUrl(location.pathname, location.search),
+      );
+    }
+  }, [isUnauthenticated, location.pathname, location.search]);
+
+  const isLoading =
+    isUnauthenticated || currentUserQuery.isLoading || infoQuery.isLoading;
+
+  return (
+    <AuthLayout>
+      <DocumentTitle title={t("Authorize application")} />
+      <Container size={460} className={classes.container}>
+        <Box p="xl">
+          {isLoading ? (
+            <Center mih={200}>
+              <Loader />
+            </Center>
+          ) : infoQuery.data && currentUserQuery.data ? (
+            <ConsentCard
+              info={infoQuery.data}
+              currentUser={currentUserQuery.data}
+              params={params}
+            />
+          ) : (
+            <InvalidRequestCard
+              description={errorText(infoQuery.error ?? currentUserQuery.error)}
+            />
+          )}
+        </Box>
+      </Container>
+    </AuthLayout>
+  );
+}
+
+function InvalidRequestCard({ description }: { description?: string }) {
+  const { t } = useTranslation();
+
+  return (
+    <Stack align="center" gap="sm">
+      <ThemeIcon size={48} radius="xl" variant="light" color="red">
+        <IconAlertTriangle size={26} stroke={1.5} />
+      </ThemeIcon>
+      <Title order={3} ta="center" fw={600}>
+        {t("Invalid authorization request")}
+      </Title>
+      {description && (
+        <Text size="sm" c="dimmed" ta="center">
+          {description}
+        </Text>
+      )}
+    </Stack>
+  );
+}
+
+type ConsentCardProps = {
+  info: IOAuthAuthorizeInfo;
+  currentUser: ICurrentUser;
+  params: IAuthorizeParams;
+};
+
+function ConsentCard({ info, currentUser, params }: ConsentCardProps) {
+  const { t } = useTranslation();
+  const location = useLocation();
+  const [, setCurrentUser] = useAtom(currentUserAtom);
+  const [approvedScopes, setApprovedScopes] = useState<string[]>(
+    info.scopes.filter((scope) => scope === "read" || scope === "write"),
+  );
+  const [submitting, setSubmitting] = useState<"approve" | "deny" | null>(null);
+
+  const scopeRows = [
+    {
+      scope: "read",
+      icon: <IconEye size={16} stroke={1.5} />,
+      label: t("Read"),
+      description: t("View data in your workspace without making changes."),
+    },
+    {
+      scope: "write",
+      icon: <IconPencil size={16} stroke={1.5} />,
+      label: t("Write"),
+      description: t("Create and modify data in your workspace."),
+    },
+  ];
+
+  function toggleScope(scope: string, checked: boolean) {
+    setApprovedScopes((prev) =>
+      checked ? [...prev, scope] : prev.filter((item) => item !== scope),
+    );
+  }
+
+  async function submitDecision(approved: boolean) {
+    setSubmitting(approved ? "approve" : "deny");
+    const oauthParams = pickOAuthParams(params);
+    const payload: IApproveAuthorizationPayload = approved
+      ? { ...oauthParams, approved: true, approvedScopes }
+      : { ...oauthParams, approved: false };
+
+    try {
+      const res = await approveOAuthAuthorization(payload);
+      window.location.replace(res.redirectUrl);
+    } catch (err) {
+      if (errorStatus(err) === 401) {
+        window.location.replace(
+          loginRedirectUrl(location.pathname, location.search),
+        );
+        return;
+      }
+      setSubmitting(null);
+      notifications.show({
+        message: errorText(err) || t("Something went wrong. Please try again."),
+        color: "red",
+      });
+    }
+  }
+
+  async function switchAccount() {
+    if (submitting !== null) {
+      return;
+    }
+    setCurrentUser(RESET);
+    try {
+      await logout();
+    } finally {
+      window.location.replace(
+        loginRedirectUrl(location.pathname, location.search),
+      );
+    }
+  }
+
+  return (
+    <Stack gap="lg">
+      <Title order={3} ta="center" fw={600}>
+        {t("{{name}} wants to access {{workspace}}", {
+          name: info.clientName,
+          workspace: currentUser.workspace.name,
+        })}
+      </Title>
+
+      <Paper withBorder radius="md" p="sm">
+        <Group justify="space-between" wrap="nowrap">
+          <UserInfo user={currentUser.user} />
+          <Anchor
+            component="button"
+            type="button"
+            size="xs"
+            c="dimmed"
+            disabled={submitting !== null}
+            onClick={switchAccount}
+            style={{ whiteSpace: "nowrap" }}
+          >
+            {t("Not you? Switch account")}
+          </Anchor>
+        </Group>
+      </Paper>
+
+      <Divider />
+
+      <Stack gap="sm">
+        <Text size="sm" fw={500}>
+          {t("This application will be able to:")}
+        </Text>
+        {scopeRows.map((row) => {
+          const requested = info.scopes.includes(row.scope);
+          return (
+            <Checkbox
+              key={row.scope}
+              size="sm"
+              checked={approvedScopes.includes(row.scope)}
+              disabled={!requested || submitting !== null}
+              onChange={(event) =>
+                toggleScope(row.scope, event.currentTarget.checked)
+              }
+              label={
+                <Group gap={6} wrap="nowrap">
+                  {row.icon}
+                  <Text size="sm" fw={500}>
+                    {row.label}
+                  </Text>
+                </Group>
+              }
+              description={row.description}
+            />
+          );
+        })}
+      </Stack>
+
+      <div>
+        <Text size="xs" c="dimmed">
+          {t("You will be redirected to")}
+        </Text>
+        <Text size="xs" ff="monospace" style={{ overflowWrap: "anywhere" }}>
+          {info.redirectUri}
+        </Text>
+      </div>
+
+      {!info.verified && (
+        <Alert
+          variant="light"
+          color="yellow"
+          py="xs"
+          icon={<IconAlertTriangle size={16} />}
+        >
+          {t("Make sure you trust this application before authorizing it.")}
+        </Alert>
+      )}
+
+      <Group grow>
+        <Button
+          variant="default"
+          onClick={() => submitDecision(false)}
+          loading={submitting === "deny"}
+          disabled={submitting === "approve"}
+        >
+          {t("Cancel")}
+        </Button>
+        <Button
+          onClick={() => submitDecision(true)}
+          loading={submitting === "approve"}
+          disabled={approvedScopes.length === 0 || submitting === "deny"}
+        >
+          {t("Authorize")}
+        </Button>
+      </Group>
+    </Stack>
+  );
+}
@@ -0,0 +1,45 @@
+import {
+  useMutation,
+  useQuery,
+  useQueryClient,
+  UseQueryResult,
+} from "@tanstack/react-query";
+import {
+  getOAuthGrants,
+  revokeOAuthGrant,
+} from "@/ee/oauth/services/oauth-service";
+import { IOAuthGrant } from "@/ee/oauth/types/oauth.types";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+
+export function useOAuthGrantsQuery(): UseQueryResult<IOAuthGrant[], Error> {
+  return useQuery({
+    queryKey: ["oauth-grants"],
+    queryFn: () => getOAuthGrants(),
+    staleTime: 0,
+    gcTime: 0,
+  });
+}
+
+export function useRevokeOAuthGrantMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+
+  return useMutation<void, Error, string>({
+    mutationFn: (grantId) => revokeOAuthGrant(grantId),
+    onSuccess: () => {
+      notifications.show({ message: t("Access revoked") });
+      queryClient.invalidateQueries({
+        predicate: (item) =>
+          ["oauth-grants"].includes(item.queryKey[0] as string),
+      });
+    },
+    onError: (error) => {
+      const errorMessage = error["response"]?.data?.message;
+      notifications.show({
+        message: errorMessage || t("Something went wrong. Please try again."),
+        color: "red",
+      });
+    },
+  });
+}
@@ -0,0 +1,36 @@
+import api from "@/lib/api-client";
+import {
+  IApproveAuthorizationPayload,
+  IAuthorizeParams,
+  IOAuthAuthorizeInfo,
+  IOAuthGrant,
+} from "@/ee/oauth/types/oauth.types";
+
+export async function getOAuthAuthorizeInfo(
+  params: IAuthorizeParams,
+): Promise<IOAuthAuthorizeInfo> {
+  const req = await api.post<IOAuthAuthorizeInfo>(
+    "/oauth/authorize-info",
+    params,
+  );
+  return req.data;
+}
+
+export async function approveOAuthAuthorization(
+  payload: IApproveAuthorizationPayload,
+): Promise<{ redirectUrl: string }> {
+  const req = await api.post<{ redirectUrl: string }>(
+    "/oauth/authorize",
+    payload,
+  );
+  return req.data;
+}
+
+export async function getOAuthGrants(): Promise<IOAuthGrant[]> {
+  const req = await api.post<IOAuthGrant[]>("/oauth/grants", {});
+  return req.data;
+}
+
+export async function revokeOAuthGrant(grantId: string): Promise<void> {
+  await api.post("/oauth/grants/revoke", { grantId });
+}
@@ -0,0 +1,24 @@
+export interface IOAuthAuthorizeInfo {
+  clientName: string;
+  redirectUri: string;
+  scopes: string[];
+  clientCreatedAt: string;
+  verified: boolean;
+}
+
+export interface IOAuthGrant {
+  id: string;
+  clientName: string;
+  redirectUris: string[];
+  scopes: string[];
+  createdAt: string;
+  lastUsedAt: string | null;
+}
+
+export type IAuthorizeParams = Record<string, string>;
+
+export type IApproveAuthorizationPayload = {
+  [param: string]: unknown;
+  approved: boolean;
+  approvedScopes?: string[];
+};
@@ -16,6 +16,14 @@ export const showAiMenuAtom = atom(false);

 export const showLinkMenuAtom = atom(false);

+export type LightboxRequest = {
+  src: string;
+  type: "image" | "video";
+} | null;
+
+const initialLightboxRequest: LightboxRequest = null;
+export const lightboxRequestAtom = atom(initialLightboxRequest);
+
 // Current page's edit mode — initialized from the user's saved preference on
 // first load, can be toggled locally without persisting to the server.
 export const currentPageEditModeAtom = atom<PageEditMode>(PageEditMode.Edit);
@@ -23,11 +23,21 @@ import {
 } from "@/features/comment/atoms/comment-atom";
 import { useAtom, useAtomValue } from "jotai";
 import { v7 as uuid7 } from "uuid";
-import { isCellSelection, isEditorReady, isTextSelected } from "@docmost/editor-ext";
+import {
+  isCellSelection,
+  isEditorReady,
+  isTextSelected,
+} from "@docmost/editor-ext";
 import { LinkSelector } from "@/features/editor/components/bubble-menu/link-selector.tsx";
 import { useTranslation } from "react-i18next";
-import { showAiMenuAtom, showLinkMenuAtom } from "@/features/editor/atoms/editor-atoms";
-import { userAtom, workspaceAtom } from "@/features/user/atoms/current-user-atom";
+import {
+  showAiMenuAtom,
+  showLinkMenuAtom,
+} from "@/features/editor/atoms/editor-atoms";
+import {
+  userAtom,
+  workspaceAtom,
+} from "@/features/user/atoms/current-user-atom";

 export interface BubbleMenuItem {
  name: string;
@@ -217,7 +227,12 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {

            <ActionIcon.Group>
              {items.map((item, index) => (
-                <Tooltip key={index} label={t(item.name)} withArrow>
+                <Tooltip
+                  key={index}
+                  label={t(item.name)}
+                  withArrow
+                  withinPortal={false}
+                >
                  <ActionIcon
                    key={index}
                    variant="default"
@@ -226,7 +241,9 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
                    aria-label={t(item.name)}
                    className={clsx({ [classes.active]: item.isActive() })}
                    style={{ border: "none" }}
-                    onClick={() => isEditorReady(props.editor) && item.command()}
+                    onClick={() =>
+                      isEditorReady(props.editor) && item.command()
+                    }
                  >
                    <item.icon style={{ width: rem(16) }} stroke={2} />
                  </ActionIcon>
@@ -256,7 +273,9 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
              radius="6px"
              aria-label={t(commentItem.name)}
              style={{ border: "none" }}
-              onClick={() => isEditorReady(props.editor) && commentItem.command()}
+              onClick={() =>
+                isEditorReady(props.editor) && commentItem.command()
+              }
            >
              <IconMessage size={16} stroke={2} />
            </ActionIcon>
@@ -129,8 +129,7 @@ function handleColorKeyNav(
  grid: "text" | "highlight",
 ) {
  const cols = COLOR_GRID_COLS;
-  const total =
-    grid === "text" ? TEXT_COLORS.length : HIGHLIGHT_COLORS.length;
+  const total = grid === "text" ? TEXT_COLORS.length : HIGHLIGHT_COLORS.length;
  const col = index % cols;

  if (e.key === "ArrowRight") {
@@ -163,8 +162,7 @@ function handleColorKeyNav(
    if (prev >= 0) {
      focusSwatch(grid, prev);
    } else if (grid === "highlight") {
-      const lastRowStart =
-        Math.floor((TEXT_COLORS.length - 1) / cols) * cols;
+      const lastRowStart = Math.floor((TEXT_COLORS.length - 1) / cols) * cols;
      focusSwatch("text", Math.min(lastRowStart + col, TEXT_COLORS.length - 1));
    }
    return;
@@ -222,7 +220,7 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
      withArrow
    >
      <Popover.Target>
-        <Tooltip label={t("Text color")} withArrow>
+        <Tooltip label={t("Text color")} withArrow withinPortal={false}>
          <Button
            variant="default"
            radius="0"
@@ -247,26 +245,26 @@ export const ColorSelector: FC<ColorSelectorProps> = ({

      <Popover.Dropdown onMouseDown={(e) => e.preventDefault()}>
        <Stack gap="md" p="2px">
-            <Box>
-              <Text size="sm" fw={600} mb="xs">
-                {t("Text color")}
-              </Text>
-              <SimpleGrid cols={5} spacing="xs">
-                {TEXT_COLORS.map(({ name, color }, index) => {
-                  const applyTextColor = () => {
-                    if (!isEditorReady(editor)) return;
-                    if (name === "Default") {
-                      editor.commands.unsetColor();
-                    } else {
-                      editor
-                        .chain()
-                        .focus()
-                        .setColor(color || "")
-                        .run();
-                    }
-                    setIsOpen(false);
-                  };
-                  return (
+          <Box>
+            <Text size="sm" fw={600} mb="xs">
+              {t("Text color")}
+            </Text>
+            <SimpleGrid cols={5} spacing="xs">
+              {TEXT_COLORS.map(({ name, color }, index) => {
+                const applyTextColor = () => {
+                  if (!isEditorReady(editor)) return;
+                  if (name === "Default") {
+                    editor.commands.unsetColor();
+                  } else {
+                    editor
+                      .chain()
+                      .focus()
+                      .setColor(color || "")
+                      .run();
+                  }
+                  setIsOpen(false);
+                };
+                return (
                  <Tooltip key={index} label={t(name)} withArrow>
                    <Box
                      role="button"
@@ -306,34 +304,34 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                      A
                    </Box>
                  </Tooltip>
-                  );
-                })}
-              </SimpleGrid>
-            </Box>
+                );
+              })}
+            </SimpleGrid>
+          </Box>

-            <Box>
-              <Text size="sm" fw={600} mb="xs">
-                {t("Highlight color")}
-              </Text>
-              <SimpleGrid cols={5} spacing="xs">
-                {HIGHLIGHT_COLORS.map(({ name, color }, index) => {
-                  const applyHighlight = () => {
-                    if (!isEditorReady(editor)) return;
-                    if (name === "Default") {
-                      editor.commands.unsetHighlight();
-                    } else {
-                      editor
-                        .chain()
-                        .focus()
-                        .toggleMark("highlight", {
-                          color: color || "",
-                          colorName: name.toLowerCase() || "",
-                        })
-                        .run();
-                    }
-                    setIsOpen(false);
-                  };
-                  return (
+          <Box>
+            <Text size="sm" fw={600} mb="xs">
+              {t("Highlight color")}
+            </Text>
+            <SimpleGrid cols={5} spacing="xs">
+              {HIGHLIGHT_COLORS.map(({ name, color }, index) => {
+                const applyHighlight = () => {
+                  if (!isEditorReady(editor)) return;
+                  if (name === "Default") {
+                    editor.commands.unsetHighlight();
+                  } else {
+                    editor
+                      .chain()
+                      .focus()
+                      .toggleMark("highlight", {
+                        color: color || "",
+                        colorName: name.toLowerCase() || "",
+                      })
+                      .run();
+                  }
+                  setIsOpen(false);
+                };
+                return (
                  <Tooltip key={index} label={t(name)} withArrow>
                    <Box
                      role="button"
@@ -378,37 +376,36 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                      )}
                    </Box>
                  </Tooltip>
-                  );
-                })}
-              </SimpleGrid>
-            </Box>
+                );
+              })}
+            </SimpleGrid>
+          </Box>

-            <Button
-              variant="default"
-              fullWidth
-              data-color-grid="remove"
-              className={classes.removeColor}
-              onClick={() => {
-                if (isEditorReady(editor)) {
-                  editor.commands.unsetColor();
-                  editor.commands.unsetHighlight();
-                }
-                setIsOpen(false);
-              }}
-              onKeyDown={(e) => {
-                if (e.key === "ArrowUp") {
-                  e.preventDefault();
-                  const lastRowStart =
-                    Math.floor(
-                      (HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS,
-                    ) * COLOR_GRID_COLS;
-                  focusSwatch("highlight", lastRowStart);
-                }
-              }}
-            >
-              {t("Remove color")}
-            </Button>
-          </Stack>
+          <Button
+            variant="default"
+            fullWidth
+            data-color-grid="remove"
+            className={classes.removeColor}
+            onClick={() => {
+              if (isEditorReady(editor)) {
+                editor.commands.unsetColor();
+                editor.commands.unsetHighlight();
+              }
+              setIsOpen(false);
+            }}
+            onKeyDown={(e) => {
+              if (e.key === "ArrowUp") {
+                e.preventDefault();
+                const lastRowStart =
+                  Math.floor((HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS) *
+                  COLOR_GRID_COLS;
+                focusSwatch("highlight", lastRowStart);
+              }
+            }}
+          >
+            {t("Remove color")}
+          </Button>
+        </Stack>
      </Popover.Dropdown>
    </Popover>
  );
@@ -10,7 +10,7 @@ export const LinkSelector: FC = () => {
  const setShowLinkMenu = useSetAtom(showLinkMenuAtom);

  return (
-    <Tooltip label={t("Add link")} withArrow>
+    <Tooltip label={t("Add link")} withArrow withinPortal={false}>
      <ActionIcon
        variant="default"
        size="lg"
@@ -91,7 +91,12 @@ export const TextAlignmentSelector: FC<TextAlignmentProps> = ({
      onChange={setIsOpen}
    >
      <Menu.Target>
-        <Tooltip label={t("Text align")} withArrow disabled={isOpen}>
+        <Tooltip
+          label={t("Text align")}
+          withArrow
+          disabled={isOpen}
+          withinPortal={false}
+        >
          <Button
            variant="default"
            style={{ border: "none", height: "34px" }}
@@ -0,0 +1,188 @@
+import type { Editor } from "@tiptap/react";
+import type { Node as PMNode } from "@tiptap/pm/model";
+import Lightbox, { type Slide } from "yet-another-react-lightbox";
+import type { LightboxRequest } from "@/features/editor/atoms/editor-atoms";
+import { getFileUrl } from "@/lib/config.ts";
+import "yet-another-react-lightbox/styles.css";
+import Download from "yet-another-react-lightbox/plugins/download";
+import Fullscreen from "yet-another-react-lightbox/plugins/fullscreen";
+import Video from "yet-another-react-lightbox/plugins/video";
+import Zoom from "yet-another-react-lightbox/plugins/zoom";
+import { useEffect, useMemo, useState } from "react";
+import i18n from "@/i18n.ts";
+import { useTranslation } from "react-i18next";
+
+type LightboxViewProps = {
+  editor: Editor;
+  open: boolean;
+  src: string;
+  type: "image" | "video";
+  onClose: () => void;
+};
+
+function getVideoMimeType(src: string) {
+  const extension = src.split(/[?#]/, 1)[0].split(".").pop()?.toLowerCase();
+
+  switch (extension) {
+    case "webm":
+      return "video/webm";
+    case "ogv":
+      return "video/ogg";
+    case "mov":
+      return "video/quicktime";
+    case "m4v":
+      return "video/x-m4v";
+    default:
+      return "video/mp4";
+  }
+}
+
+function getFilename(src: string) {
+  const filename = src.split(/[?#]/, 1)[0].split("/").pop();
+  if (!filename) return i18n.t("Media");
+
+  try {
+    return decodeURIComponent(filename);
+  } catch {
+    return filename;
+  }
+}
+
+function getMedia(rawSrc: string, type?: string, alt?: string): Slide {
+  const src = getFileUrl(rawSrc);
+  const filename = getFilename(rawSrc);
+
+  if (type === "video") {
+    return {
+      type: "video",
+      sources: [{ src, type: getVideoMimeType(rawSrc) }],
+      download: { url: src, filename },
+    };
+  } else {
+    return {
+      type: "image",
+      src,
+      alt: alt || undefined,
+      download: { url: src, filename },
+    };
+  }
+}
+
+const LIGHTBOX_NODE_TYPES: Record<string, "image" | "video"> = {
+  image: "image",
+  video: "video",
+  drawio: "image",
+  excalidraw: "image",
+};
+
+// video is excluded: clicks there operate the native controls
+const CLICK_TO_EXPAND_NODE_TYPES = new Set(["image", "drawio", "excalidraw"]);
+
+export function getLightboxClickRequest(node: PMNode): LightboxRequest {
+  if (!CLICK_TO_EXPAND_NODE_TYPES.has(node.type.name)) return null;
+
+  const src = typeof node.attrs.src === "string" ? node.attrs.src : "";
+  if (!src) return null;
+
+  return { src: getFileUrl(src), type: "image" };
+}
+
+function getPageMedia(editor: Editor): Slide[] {
+  const media: Slide[] = [];
+
+  editor.state.doc.descendants((node) => {
+    const type = LIGHTBOX_NODE_TYPES[node.type.name];
+    if (!type) return;
+
+    const rawSrc = typeof node.attrs.src === "string" ? node.attrs.src : "";
+    if (!rawSrc) return;
+
+    media.push(getMedia(rawSrc, type, node.attrs.alt));
+  });
+
+  return media;
+}
+
+export default function LightboxView({
+  editor,
+  open,
+  src,
+  type,
+  onClose,
+}: LightboxViewProps) {
+  const { i18n: i18nInstance } = useTranslation();
+
+  const selectedSlide = useMemo(
+    () => getMedia(src, type),
+    [src, type, i18nInstance.language]
+  );
+
+  const [pageSlides, setPageSlides] = useState<Slide[]>([]);
+  const [loadedMediaKey, setLoadedMediaKey] = useState<string | null>(null);
+  const [isFullscreen, setIsFullscreen] = useState(false);
+
+  useEffect(() => {
+    if (!open) setIsFullscreen(false);
+  }, [open]);
+
+  useEffect(() => {
+    if (!open) return;
+
+    setLoadedMediaKey(null);
+
+    const frame = requestAnimationFrame(() => {
+      const slides = getPageMedia(editor);
+
+      setPageSlides(slides);
+      setLoadedMediaKey(`${type}:${src}`);
+    });
+
+    return () => cancelAnimationFrame(frame);
+  }, [editor, open, type, src]);
+
+  const slides = loadedMediaKey === `${type}:${src}` ? pageSlides : [selectedSlide];
+
+  const index = useMemo(() => {
+    if (!(pageSlides.length > 0)) {
+      return 0;
+    }
+
+    const idx = slides.findIndex((slide) =>
+      type === "video"
+        ? "sources" in slide && slide.sources.some((s) => s.src === src)
+        : "src" in slide && slide.src === src
+    );
+    return idx >= 0 ? idx : 0;
+  }, [slides, src, type]);
+
+  return (
+    <Lightbox
+      open={open}
+      close={onClose}
+      index={index}
+      slides={slides}
+      plugins={[Download, Fullscreen, Video, Zoom]}
+      styles={{
+        container: { backgroundColor: "rgba(0, 0, 0, 0.8)" },
+        icon: { width: 24, height: 24 },
+        toolbar: {
+          margin: 8,
+          borderRadius: 8,
+          backgroundColor: "rgba(0, 0, 0, 0.5)",
+        },
+      }}
+      controller={{ closeOnBackdropClick: !isFullscreen }}
+      on={{
+        enterFullscreen: () => setIsFullscreen(true),
+        exitFullscreen: () => setIsFullscreen(false),
+      }}
+      video={{ controls: true, playsInline: true }}
+      zoom={{
+        scrollToZoom: true,
+        maxZoomPixelRatio: 4,
+        maxZoom: 4,
+        supports: ["video"],
+      }}
+    />
+  );
+}
@@ -1,6 +1,7 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback, useEffect, useRef, useState } from "react";
+import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -24,6 +25,7 @@ import {
  IconDownload,
  IconEdit,
  IconTrash,
+  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getDrawioUrl, getFileUrl } from "@/lib/config.ts";
@@ -39,10 +41,12 @@ import { decodeBase64ToSvgString, svgStringToFile } from "@/lib/utils";
 import { IAttachment } from "@/features/attachments/types/attachment.types";
 import { modals } from "@mantine/modals";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
+import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";

 export function DrawioMenu({ editor }: EditorMenuProps) {
  const { t } = useTranslation();
+  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
  const [opened, { open, close }] = useDisclosure(false);
  const [initialXML, setInitialXML] = useState<string>("");
  const drawioRef = useRef<DrawIoEmbedRef>(null);
@@ -328,6 +332,23 @@ export function DrawioMenu({ editor }: EditorMenuProps) {

          <div className={classes.divider} />

+          <Tooltip position="top" label={t("Expand")} withinPortal={false}>
+            <ActionIcon
+              onClick={() =>
+                editorState?.src &&
+                setLightboxRequest({
+                  src: getFileUrl(editorState.src),
+                  type: "image",
+                })
+              }
+              size="lg"
+              aria-label={t("Expand")}
+              variant="subtle"
+            >
+              <IconZoomIn size={18} />
+            </ActionIcon>
+          </Tooltip>
+
          <Tooltip position="top" label={t("Edit")} withinPortal={false}>
            <ActionIcon
              onClick={handleOpen}
@@ -1,6 +1,7 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { lazy, Suspense, useCallback, useEffect, useRef, useState } from "react";
+import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -25,6 +26,7 @@ import {
  IconDownload,
  IconEdit,
  IconTrash,
+  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
@@ -37,6 +39,7 @@ import ReactClearModal from "react-clear-modal";
 import { useHandleLibrary } from "@excalidraw/excalidraw";
 import { localStorageLibraryAdapter } from "@/features/editor/components/excalidraw/excalidraw-utils.ts";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
+import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";

 const ExcalidrawComponent = lazy(() =>
@@ -47,6 +50,7 @@ const ExcalidrawComponent = lazy(() =>

 export function ExcalidrawMenu({ editor }: EditorMenuProps) {
  const { t } = useTranslation();
+  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
  const [opened, { open, close }] = useDisclosure(false);
  const [excalidrawAPI, setExcalidrawAPI] =
    useState<ExcalidrawImperativeAPI>(null);
@@ -359,6 +363,23 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) {

          <div className={classes.divider} />

+          <Tooltip position="top" label={t("Expand")} withinPortal={false}>
+            <ActionIcon
+              onClick={() =>
+                editorState?.src &&
+                setLightboxRequest({
+                  src: getFileUrl(editorState.src),
+                  type: "image",
+                })
+              }
+              size="lg"
+              aria-label={t("Expand")}
+              variant="subtle"
+            >
+              <IconZoomIn size={18} />
+            </ActionIcon>
+          </Tooltip>
+
          <Tooltip position="top" label={t("Edit")} withinPortal={false}>
            <ActionIcon
              onClick={handleOpen}
@@ -1,6 +1,7 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import React, { useCallback, useRef } from "react";
+import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -16,16 +17,19 @@ import {
  IconDownload,
  IconRefresh,
  IconTrash,
+  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
 import { uploadImageAction } from "@/features/editor/components/image/upload-image-action.tsx";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
+import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";

 export function ImageMenu({ editor }: EditorMenuProps) {
  const { t } = useTranslation();
  const fileInputRef = useRef<HTMLInputElement>(null);
+  const setLightboxRequest = useSetAtom(lightboxRequestAtom);

  const editorState = useEditorState({
    editor,
@@ -207,6 +211,23 @@ export function ImageMenu({ editor }: EditorMenuProps) {

        <div className={classes.divider} />

+        <Tooltip position="top" label={t("Expand")} withinPortal={false}>
+          <ActionIcon
+            onClick={() =>
+              editorState?.src &&
+              setLightboxRequest({
+                src: getFileUrl(editorState.src),
+                type: "image",
+              })
+            }
+            size="lg"
+            aria-label={t("Expand")}
+            variant="subtle"
+          >
+            <IconZoomIn size={18} />
+          </ActionIcon>
+        </Tooltip>
+
        <Tooltip position="top" label={t("Download")} withinPortal={false}>
          <ActionIcon
            onClick={handleDownload}
@@ -13,14 +13,21 @@ import {
 import { useTranslation } from "react-i18next";
 import { sortPositionKeys } from "@/features/page/tree/utils/utils";
 import { useSharedPageSubpages } from "@/features/share/hooks/use-shared-page-subpages";
+import { extractPageSlugId } from "@/lib";

 export default function SubpagesView(props: NodeViewProps) {
  const { editor } = props;
-  const { spaceSlug, shareId } = useParams();
+  const { spaceSlug, shareId, pageSlug } = useParams();
  const { t } = useTranslation();

-  //@ts-ignore
-  const currentPageId = editor.storage.pageId;
+  // @ts-ignore
+  const storagePageId = editor.storage.pageId;
+  const routePageId = extractPageSlugId(pageSlug);
+  let currentPageId = storagePageId;
+
+  if (shareId){
+    currentPageId = routePageId;
+  }

  // Get subpages from shared tree if we're in a shared context
  const sharedSubpages = useSharedPageSubpages(currentPageId);
@@ -1,6 +1,7 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback } from "react";
+import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -15,14 +16,17 @@ import {
  IconLayoutAlignRight,
  IconDownload,
  IconTrash,
+  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
+import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";

 export function VideoMenu({ editor }: EditorMenuProps) {
  const { t } = useTranslation();
+  const setLightboxRequest = useSetAtom(lightboxRequestAtom);

  const editorState = useEditorState({
    editor,
@@ -183,6 +187,23 @@ export function VideoMenu({ editor }: EditorMenuProps) {

        <div className={classes.divider} />

+        <Tooltip position="top" label={t("Expand")} withinPortal={false}>
+          <ActionIcon
+            onClick={() =>
+              editorState?.src &&
+              setLightboxRequest({
+                src: getFileUrl(editorState.src),
+                type: "video",
+              })
+            }
+            size="lg"
+            aria-label={t("Expand")}
+            variant="subtle"
+          >
+            <IconZoomIn size={18} />
+          </ActionIcon>
+        </Tooltip>
+
        <Tooltip position="top" label={t("Download")} withinPortal={false}>
          <ActionIcon
            onClick={handleDownload}
@@ -33,6 +33,7 @@ import { useAtom, useAtomValue } from "jotai";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import {
  currentPageEditModeAtom,
+  lightboxRequestAtom,
  pageEditorAtom,
  yjsConnectionStatusAtom,
  yjsSyncedAtom,
@@ -53,6 +54,9 @@ import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
 import VideoMenu from "@/features/editor/components/video/video-menu.tsx";
 import PdfMenu from "@/features/editor/components/pdf/pdf-menu.tsx";
 import SubpagesMenu from "@/features/editor/components/subpages/subpages-menu.tsx";
+import LightboxView, {
+  getLightboxClickRequest,
+} from "@/features/editor/components/common/lightbox-view";
 import {
  handleFileDrop,
  handlePaste,
@@ -184,6 +188,7 @@ function CollabPageEditor({
  const [, setActiveCommentId] = useAtom(activeCommentIdAtom);
  const [showCommentPopup, setShowCommentPopup] = useAtom(showCommentPopupAtom);
  const [showReadOnlyCommentPopup] = useAtom(showReadOnlyCommentPopupAtom);
+  const [lightboxRequest, setLightboxRequest] = useAtom(lightboxRequestAtom);
  const [isLocalSynced, setIsLocalSynced] = useState(false);
  const [isRemoteSynced, setIsRemoteSynced] = useState(false);
  const [yjsConnectionStatus, setYjsConnectionStatus] = useAtom(
@@ -245,6 +250,17 @@ function CollabPageEditor({
    return [...mainExtensions, ...collabExtensions(provider, currentUser.user)];
  }, [provider, currentUser?.user]);

+  const debouncedUpdateContent = useDebouncedCallback((newContent: any) => {
+    const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
+
+    if (pageData) {
+      queryClient.setQueryData(["pages", slugId], {
+        ...pageData,
+        content: newContent,
+      });
+    }
+  }, 3000);
+
  const editor = useEditor(
    {
      extensions,
@@ -305,6 +321,22 @@ function CollabPageEditor({

          return handleFileDrop(editorRef.current, event, moved, pageId);
        },
+        handleClickOn: (view, _pos, node) => {
+          if (view.editable) return false;
+
+          const request = getLightboxClickRequest(node);
+          if (!request) return false;
+
+          setLightboxRequest(request);
+          return true;
+        },
+        handleDoubleClickOn: (_view, _pos, node) => {
+          const request = getLightboxClickRequest(node);
+          if (!request) return false;
+
+          setLightboxRequest(request);
+          return true;
+        },
      },
      onCreate({ editor }) {
        if (editor) {
@@ -343,17 +375,6 @@ function CollabPageEditor({
    },
  });

-  const debouncedUpdateContent = useDebouncedCallback((newContent: any) => {
-    const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
-
-    if (pageData) {
-      queryClient.setQueryData(["pages", slugId], {
-        ...pageData,
-        content: newContent,
-      });
-    }
-  }, 3000);
-
  const handleActiveCommentEvent = (event) => {
    const { commentId, resolved } = event.detail;

@@ -386,6 +407,7 @@ function CollabPageEditor({
    setActiveCommentId(null);
    setShowCommentPopup(false);
    setAsideState({ tab: "", isAsideOpen: false });
+    setLightboxRequest(null);
  }, [pageId]);

  const isSynced = isLocalSynced && isRemoteSynced;
@@ -459,6 +481,15 @@ function CollabPageEditor({
        {editor && !editorIsEditable && (editable || canComment) && (
          <ReadonlyBubbleMenu editor={editor} />
        )}
+        {editor && (
+          <LightboxView
+            editor={editor}
+            open={!!lightboxRequest}
+            src={lightboxRequest?.src ?? ""}
+            type={lightboxRequest?.type ?? "image"}
+            onClose={() => setLightboxRequest(null)}
+          />
+        )}
        {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
        {showReadOnlyCommentPopup && (
          <CommentDialog editor={editor} pageId={pageId} readOnly />
@@ -1,15 +1,27 @@
 import "@/features/editor/styles/index.css";
-import React, { useCallback, useEffect, useMemo, useRef } from "react";
-import { EditorProvider } from "@tiptap/react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { Editor, EditorProvider } from "@tiptap/react";
 import { mainExtensions } from "@/features/editor/extensions/extensions";
 import { Document } from "@tiptap/extension-document";
 import { Heading, UniqueID } from "@docmost/editor-ext";
 import { Text } from "@tiptap/extension-text";
 import { Placeholder } from "@tiptap/extension-placeholder";
 import { useAtom } from "jotai";
-import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
+import {
+  lightboxRequestAtom,
+  readOnlyEditorAtom,
+} from "@/features/editor/atoms/editor-atoms.ts";
 import { useEditorScroll } from "./hooks/use-editor-scroll";
 import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
+import LightboxView, {
+  getLightboxClickRequest,
+} from "@/features/editor/components/common/lightbox-view";

 interface PageEditorProps {
  title: string;
@@ -33,6 +45,8 @@ export default function ReadonlyPageEditor({
  shareId,
 }: PageEditorProps) {
  const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
+  const [lightboxRequest, setLightboxRequest] = useAtom(lightboxRequestAtom);
+  const [contentEditor, setContentEditor] = useState<Editor | null>(null);
  const isComponentMounted = useRef(false);
  const editorCreated = useRef(false);

@@ -49,6 +63,11 @@ export default function ReadonlyPageEditor({
    isComponentMounted.current = true;
  }, []);

+  useEffect(() => {
+    if (!shareId) return;
+    setLightboxRequest(null);
+  }, [pageId, shareId]);
+
  const extensions = useMemo(() => {
    const excludedExtensions = new Set([
      "uniqueID",
@@ -97,6 +116,19 @@ export default function ReadonlyPageEditor({
        textDirection="auto"
        extensions={extensions}
        content={content}
+        editorProps={
+          shareId
+            ? {
+                handleClickOn: (_view, _pos, node) => {
+                  const request = getLightboxClickRequest(node);
+                  if (!request) return false;
+
+                  setLightboxRequest(request);
+                  return true;
+                },
+              }
+            : undefined
+        }
        onCreate={({ editor }) => {
          if (editor) {
            if (pageId) {
@@ -105,12 +137,22 @@ export default function ReadonlyPageEditor({
            }
            // @ts-ignore
            setReadOnlyEditor(editor);
+            setContentEditor(editor);

            handleScrollTo(editor);
            editorCreated.current = true;
          }
        }}
      ></EditorProvider>
+      {shareId && contentEditor && (
+        <LightboxView
+          editor={contentEditor}
+          open={!!lightboxRequest}
+          src={lightboxRequest?.src ?? ""}
+          type={lightboxRequest?.type ?? "image"}
+          onClose={() => setLightboxRequest(null)}
+        />
+      )}
      <div style={{ paddingBottom: "20vh" }}></div>
    </TransclusionLookupProvider>
  );
@@ -38,6 +38,60 @@
    line-height: var(--mantine-line-height-md);
  }

+  .media-alt-badge {
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
+    z-index: 1;
+    padding: 2px 8px;
+    border-radius: 6px;
+    font-size: 11px;
+    font-weight: 600;
+    letter-spacing: 0.03em;
+    cursor: default;
+    user-select: none;
+    background-color: var(--mantine-color-body);
+
+    @mixin light {
+      border: 1px solid var(--mantine-color-gray-3);
+      color: var(--mantine-color-gray-7);
+    }
+
+    @mixin dark {
+      border: 1px solid var(--mantine-color-dark-4);
+      color: var(--mantine-color-dark-1);
+    }
+
+    @media print {
+      display: none;
+    }
+
+    &::after {
+      content: attr(data-alt);
+      display: none;
+      position: absolute;
+      right: 0;
+      bottom: calc(100% + 6px);
+      width: max-content;
+      max-width: 320px;
+      padding: 6px 10px;
+      border-radius: var(--mantine-radius-default);
+      font-size: var(--mantine-font-size-sm);
+      font-weight: 400;
+      letter-spacing: normal;
+      line-height: var(--mantine-line-height-sm);
+      white-space: pre-wrap;
+      overflow-wrap: break-word;
+      text-align: start;
+      background-color: var(--mantine-color-gray-9);
+      color: var(--mantine-color-white);
+    }
+
+    &:hover::after {
+      display: block;
+    }
+  }
+
  .media-pulse {
    animation: media-pulse 1.2s ease-in-out infinite;

@@ -39,6 +39,7 @@ export function useWorkspaceLabelsQuery(query: string, enabled: boolean) {
    queryFn: () => getWorkspaceLabels({ type: "page", query, limit: 50 }),
    enabled,
    staleTime: 30 * 1000,
+    placeholderData: keepPreviousData
  });
 }

@@ -0,0 +1,152 @@
+import { ReactNode, useMemo, useState } from "react";
+import { Divider, Group, Menu, ScrollArea, Text, TextInput } from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
+import { IconCheck, IconSearch } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { useSearchSuggestionsQuery } from "@/features/search/queries/search-query";
+import { RadioMenuItem } from "@/components/ui/radio-menu-item";
+import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
+import { IUser } from "@/features/user/types/user.types.ts";
+import { useAtomValue } from "jotai";
+import { userAtom } from "@/features/user/atoms/current-user-atom.ts";
+
+type CreatorFilterMenuProps = {
+  value: string | null;
+  onChange: (user: IUser | null) => void;
+  children: ReactNode;
+  width?: number;
+  position?:
+    | "bottom-start"
+    | "bottom-end"
+    | "bottom"
+    | "top-start"
+    | "top-end"
+    | "top";
+  zIndex?: number;
+  opened?: boolean;
+  onOpenChange?: (opened: boolean) => void;
+};
+
+export function CreatorFilterMenu({
+  value,
+  onChange,
+  children,
+  width = 280,
+  position = "bottom-end",
+  zIndex,
+  opened,
+  onOpenChange,
+}: CreatorFilterMenuProps) {
+  const { t } = useTranslation();
+  const [searchQuery, setSearchQuery] = useState("");
+  const [debouncedQuery] = useDebouncedValue(searchQuery, 300);
+
+  const { data: suggestion, isLoading } = useSearchSuggestionsQuery({
+    query: debouncedQuery,
+    includeUsers: true,
+    includeGroups: false,
+    includePages: false,
+    preload: true,
+  });
+
+  const users: IUser[] = (suggestion?.users as IUser[]) ?? [];
+  const currentUser = useAtomValue(userAtom);
+
+  // pin the signed-in user on top so they never have to search themselves
+  const displayUsers = useMemo(() => {
+    if (!currentUser) return users;
+    const others = users.filter((user) => user.id !== currentUser.id);
+    const q = debouncedQuery.trim().toLowerCase();
+    const matchesQuery =
+      !q ||
+      currentUser.name?.toLowerCase().includes(q) ||
+      currentUser.email?.toLowerCase().includes(q);
+    return matchesQuery ? [currentUser as IUser, ...others] : users;
+  }, [users, currentUser, debouncedQuery]);
+
+  return (
+    <Menu
+      shadow="md"
+      width={width}
+      position={position}
+      zIndex={zIndex}
+      opened={opened}
+      onChange={onOpenChange}
+    >
+      <Menu.Target>{children}</Menu.Target>
+      <Menu.Dropdown>
+        <TextInput
+          placeholder={t("Find a user")}
+          data-autofocus
+          autoFocus
+          leftSection={<IconSearch size={16} />}
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          size="sm"
+          variant="filled"
+          radius="sm"
+          styles={{ input: { marginBottom: 8 } }}
+        />
+
+        <ScrollArea.Autosize mah={280}>
+          <Menu.Item
+            component={RadioMenuItem}
+            aria-checked={!value}
+            onClick={() => onChange(null)}
+          >
+            <Group flex="1" gap="xs">
+              <div style={{ flex: 1 }}>
+                <Text size="sm" fw={500}>
+                  {t("Anyone")}
+                </Text>
+              </div>
+              {!value && <IconCheck size={20} aria-hidden />}
+            </Group>
+          </Menu.Item>
+
+          <Divider my="xs" />
+
+          {displayUsers.length === 0 && (
+            <Text size="xs" c="dimmed" px="xs" py="sm">
+              {isLoading ? t("Loading...") : t("No users found")}
+            </Text>
+          )}
+
+          {displayUsers.map((user) => (
+            <Menu.Item
+              key={user.id}
+              component={RadioMenuItem}
+              aria-checked={value === user.id}
+              onClick={() => onChange(user)}
+            >
+              <Group flex="1" gap="xs">
+                <CustomAvatar
+                  avatarUrl={user.avatarUrl}
+                  size={20}
+                  name={user.name}
+                />
+                <div style={{ flex: 1, minWidth: 0 }}>
+                  <Text size="sm" fw={500} truncate>
+                    {user.name}
+                    {user.id === currentUser?.id && (
+                      <Text span size="sm" c="dimmed" fw={400}>
+                        {" "}
+                        ({t("you")})
+                      </Text>
+                    )}
+                  </Text>
+                  {user.email && (
+                    <Text size="xs" c="dimmed" truncate>
+                      {user.email}
+                    </Text>
+                  )}
+                </div>
+                {value === user.id && <IconCheck size={20} aria-hidden />}
+              </Group>
+            </Menu.Item>
+          ))}
+        </ScrollArea.Autosize>
+      </Menu.Dropdown>
+    </Menu>
+  );
+}
@@ -0,0 +1,127 @@
+import { ReactNode, useMemo, useState } from "react";
+import {
+  Group,
+  Menu,
+  ScrollArea,
+  Text,
+  TextInput,
+  useComputedColorScheme,
+} from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
+import { IconCheck, IconSearch } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { useWorkspaceLabelsQuery } from "@/features/label/queries/label-query.ts";
+import { getLabelColor } from "@/features/label/utils/label-colors.ts";
+import { CheckboxMenuItem } from "@/components/ui/checkbox-menu-item";
+
+type LabelFilterMenuProps = {
+  value: string[];
+  onChange: (labelIds: string[]) => void;
+  children: ReactNode;
+  width?: number;
+  position?:
+    | "bottom-start"
+    | "bottom-end"
+    | "bottom"
+    | "top-start"
+    | "top-end"
+    | "top";
+  zIndex?: number;
+  opened?: boolean;
+  onOpenChange?: (opened: boolean) => void;
+};
+
+export function LabelFilterMenu({
+  value,
+  onChange,
+  children,
+  width = 280,
+  position = "bottom-end",
+  zIndex,
+  opened,
+  onOpenChange,
+}: LabelFilterMenuProps) {
+  const { t } = useTranslation();
+  const scheme = useComputedColorScheme("light");
+  const [searchQuery, setSearchQuery] = useState("");
+  const [debouncedQuery] = useDebouncedValue(searchQuery, 300);
+
+  const { data, isLoading } = useWorkspaceLabelsQuery(debouncedQuery, true);
+  const labels = data?.items ?? [];
+
+  const selectedSet = useMemo(() => new Set(value), [value]);
+
+  const toggleLabel = (labelId: string) => {
+    if (selectedSet.has(labelId)) {
+      onChange(value.filter((id) => id !== labelId));
+    } else {
+      onChange([...value, labelId]);
+    }
+  };
+
+  return (
+    <Menu
+      shadow="md"
+      width={width}
+      position={position}
+      zIndex={zIndex}
+      opened={opened}
+      onChange={onOpenChange}
+      closeOnItemClick={false}
+    >
+      <Menu.Target>{children}</Menu.Target>
+      <Menu.Dropdown>
+        <TextInput
+          placeholder={t("Find a label")}
+          data-autofocus
+          autoFocus
+          leftSection={<IconSearch size={16} />}
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          size="sm"
+          variant="filled"
+          radius="sm"
+          styles={{ input: { marginBottom: 8 } }}
+        />
+
+        <ScrollArea.Autosize mah={280}>
+          {labels.length === 0 && (
+            <Text size="xs" c="dimmed" px="xs" py="sm">
+              {isLoading ? t("Loading...") : t("No labels found")}
+            </Text>
+          )}
+
+          {labels.map((label) => {
+            const isChecked = selectedSet.has(label.id);
+            const color = getLabelColor(label.name, scheme);
+            return (
+              <Menu.Item
+                key={label.id}
+                type="button"
+                component={CheckboxMenuItem}
+                aria-checked={isChecked}
+                onClick={() => toggleLabel(label.id)}
+              >
+                <Group flex="1" gap="xs">
+                  <span
+                    style={{
+                      width: 8,
+                      height: 8,
+                      borderRadius: "50%",
+                      background: color.dot,
+                      flexShrink: 0,
+                    }}
+                  />
+                  <Text size="sm" fw={500} style={{ flex: 1 }} truncate>
+                    {label.name}
+                  </Text>
+                  {isChecked && <IconCheck size={20} aria-hidden />}
+                </Group>
+              </Menu.Item>
+            );
+          })}
+        </ScrollArea.Autosize>
+      </Menu.Dropdown>
+    </Menu>
+  );
+}
@@ -19,6 +19,7 @@ import {
 } from "@/features/search/types/search.types";
 import DOMPurify from "dompurify";
 import { useTranslation } from "react-i18next";
+import { timeAgo } from "@/lib/time.ts";

 interface SearchResultItemProps {
  result: IPageSearch | IAttachmentSearch;
@@ -26,6 +27,14 @@ interface SearchResultItemProps {
  showSpace?: boolean;
 }

+// Spotlight hardcodes tabIndex={-1} after spreading props; a ref wins and
+// React never writes -1 back because the prop value never changes
+const makeActionTabbable = (el: HTMLElement | null) => {
+  if (el) {
+    el.tabIndex = 0;
+  }
+};
+
 export function SearchResultItem({
  result,
  isAttachmentResult,
@@ -46,6 +55,7 @@ export function SearchResultItem({
    return (
      <Spotlight.Action
        component={Link}
+        ref={makeActionTabbable}
        //@ts-ignore
        to={buildPageUrl(
          attachmentResult.space.slug,
@@ -59,8 +69,13 @@ export function SearchResultItem({
            <IconFile size={16} />
          </Center>

-          <div style={{ flex: 1 }}>
-            <Text>{attachmentResult.fileName}</Text>
+          <div style={{ flex: 1, minWidth: 0 }}>
+            <Group justify="space-between" wrap="nowrap" gap="xs">
+              <Text truncate>{attachmentResult.fileName}</Text>
+              <Text size="xs" c="dimmed" style={{ flexShrink: 0 }}>
+                {timeAgo(attachmentResult.updatedAt)}
+              </Text>
+            </Group>
            <Text size="xs" opacity={0.6}>
              {attachmentResult.space.name} • {attachmentResult.page.title}
            </Text>
@@ -96,6 +111,7 @@ export function SearchResultItem({
    return (
      <Spotlight.Action
        component={Link}
+        ref={makeActionTabbable}
        //@ts-ignore
        to={buildPageUrl(
          pageResult.space.slug,
@@ -107,8 +123,13 @@ export function SearchResultItem({
        <Group wrap="nowrap" w="100%">
          <Center>{getPageIcon(pageResult?.icon)}</Center>

-          <div style={{ flex: 1 }}>
-            <Text>{pageResult.title}</Text>
+          <div style={{ flex: 1, minWidth: 0 }}>
+            <Group justify="space-between" wrap="nowrap" gap="xs">
+              <Text truncate>{pageResult.title || t("Untitled")}</Text>
+              <Text size="xs" c="dimmed" style={{ flexShrink: 0 }}>
+                {timeAgo(pageResult.updatedAt)}
+              </Text>
+            </Group>

            {showSpace && pageResult.space && (
              <Badge variant="light" size="xs" color="gray">
@@ -17,3 +17,10 @@
    color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-gray-6));
  }
 }
+
+.filterButtonActive {
+  color: var(--mantine-color-blue-light-color);
+  &:hover {
+    color: var(--mantine-color-blue-light-color);
+  }
+}
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import cx from "clsx";
 import {
  Button,
  Menu,
@@ -11,18 +12,24 @@ import {
 import {
  IconChevronDown,
  IconBuilding,
+  IconPlus,
  IconFileDescription,
  IconCheck,
+  IconUser,
+  IconTag,
+  IconLetterCase,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu";
+import { CreatorFilterMenu } from "@/features/search/components/creator-filter-menu";
 import { RadioMenuItem } from "@/components/ui/radio-menu-item";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
 import classes from "./search-spotlight-filters.module.css";
 import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { LabelFilterMenu } from "./label-filter-menu";

 interface SearchSpotlightFiltersProps {
  onFiltersChange?: (filters: any) => void;
@@ -40,9 +47,17 @@ export function SearchSpotlightFilters({
  const { t } = useTranslation();
  const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
  const [selectedSpaceId, setSelectedSpaceId] = useState<string | null>(
-    spaceId || null,
+    spaceId || null
  );
  const [contentType, setContentType] = useState<string | null>("page");
+  const [selectedCreatorId, setSelectedCreatorId] = useState<string | null>(null);
+  const [selectedCreatorName, setSelectedCreatorName] = useState<string | null>(
+    null
+  );
+  const [selectedLabelIds, setSelectedLabelIds] = useState<string[]>([]);
+  const [titleOnly, setTitleOnly] = useState(false);
+  const [openedFilter, setOpenedFilter] = useState<string | null>(null);
+  const [visibleFilters, setVisibleFilters] = useState<string[]>([]);
  const [workspace] = useAtom(workspaceAtom);

  const { data: spacesData } = useGetSpacesQuery({ limit: 100 });
@@ -50,15 +65,6 @@ export function SearchSpotlightFilters({
    ? spacesData?.items.find((space) => space.id === selectedSpaceId)
    : null;

-  useEffect(() => {
-    if (onFiltersChange) {
-      onFiltersChange({
-        spaceId: selectedSpaceId,
-        contentType,
-      });
-    }
-  }, []);
-
  const contentTypeOptions = [
    { value: "page", label: t("Pages") },
    {
@@ -68,38 +74,70 @@ export function SearchSpotlightFilters({
    },
  ];

+  useEffect(() => {
+    onFiltersChange?.({
+      spaceId: selectedSpaceId,
+      contentType,
+      creatorId: selectedCreatorId,
+      labelIds: selectedLabelIds,
+      titleOnly,
+    });
+  }, [
+    selectedSpaceId,
+    contentType,
+    selectedCreatorId,
+    selectedLabelIds,
+    titleOnly,
+    onFiltersChange,
+  ]);
+
  const handleSpaceSelect = (spaceId: string | null) => {
    setSelectedSpaceId(spaceId);
+  };

-    if (onFiltersChange) {
-      onFiltersChange({
-        spaceId: spaceId,
-        contentType,
-      });
+  const handleCreatorSelect = (user: { id: string; name: string } | null) => {
+    setSelectedCreatorId(user?.id ?? null);
+    setSelectedCreatorName(user?.name ?? null);
+  };
+
+  const handleLabelsSelect = (labelIds: string[]) => {
+    setSelectedLabelIds(labelIds);
+  };
+
+  const handleChangeContentType = (value: string) => {
+    setContentType(value);
+
+    if (value === "attachment") {
+      setSelectedLabelIds([]);
    }
  };

-  const handleFilterChange = (filterType: string, value: any) => {
-    let newSelectedSpaceId = selectedSpaceId;
-    let newContentType = contentType;
+  const onDemandFilters = [
+    { key: "creator", label: t("Created by"), icon: IconUser, available: true },
+    {
+      key: "labels",
+      label: t("Labels"),
+      icon: IconTag,
+      available: contentType !== "attachment",
+    },
+  ];

-    switch (filterType) {
-      case "spaceId":
-        newSelectedSpaceId = value;
-        setSelectedSpaceId(value);
-        break;
-      case "contentType":
-        newContentType = value;
-        setContentType(value);
-        break;
-    }
+  const isFilterVisible = (key: string) => {
+    if (openedFilter === key) return true;
+    if (key === "creator") return !!selectedCreatorId;
+    if (key === "labels")
+      return contentType !== "attachment" && selectedLabelIds.length > 0;
+    return false;
+  };

-    if (onFiltersChange) {
-      onFiltersChange({
-        spaceId: newSelectedSpaceId,
-        contentType: newContentType,
-      });
-    }
+  const orderedVisibleFilters = visibleFilters.filter(isFilterVisible);
+  const addableFilters = onDemandFilters.filter(
+    (filter) => filter.available && !isFilterVisible(filter.key),
+  );
+
+  const revealFilter = (key: string) => {
+    setVisibleFilters((prev) => [...prev.filter((k) => k !== key), key]);
+    setOpenedFilter(key);
  };

  return (
@@ -122,8 +160,17 @@ export function SearchSpotlightFilters({
            color="blue"
            labelPosition="left"
            styles={{
-              root: { display: "flex", alignItems: "center" },
-              label: { paddingRight: "8px", fontSize: "13px", fontWeight: 500 },
+              root: {
+                display: "flex",
+                alignItems: "center",
+                flexShrink: 0,
+              },
+              label: {
+                whiteSpace: "nowrap",
+                paddingRight: "8px",
+                fontSize: "13px",
+                fontWeight: 500,
+              },
            }}
          />
        </div>
@@ -181,7 +228,7 @@ export function SearchSpotlightFilters({
              onClick={() =>
                !option.disabled &&
                contentType !== option.value &&
-                handleFilterChange("contentType", option.value)
+                handleChangeContentType(option.value)
              }
              disabled={
                option.disabled || (isAiMode && option.value === "attachment")
@@ -195,13 +242,11 @@ export function SearchSpotlightFilters({
                      {t("Enterprise")}
                    </Badge>
                  )}
-                  {!option.disabled &&
-                    isAiMode &&
-                    option.value === "attachment" && (
-                      <Text size="xs" mt={4}>
-                        {t("AI Answers not available for attachments")}
-                      </Text>
-                    )}
+                  {!option.disabled && isAiMode && option.value === "attachment" && (
+                    <Text size="xs" mt={4}>
+                      {t("AI Answers not available for attachments")}
+                    </Text>
+                  )}
                </div>
                {contentType === option.value && <IconCheck size={20} aria-hidden />}
              </Group>
@@ -209,6 +254,126 @@ export function SearchSpotlightFilters({
          ))}
        </Menu.Dropdown>
      </Menu>
+
+      {!isAiMode && (
+        <Button
+          variant={titleOnly ? "light" : "subtle"}
+          color={titleOnly ? "blue" : "gray"}
+          size="sm"
+          radius="xl"
+          leftSection={<IconLetterCase size={16} />}
+          className={cx(
+            classes.filterButton,
+            titleOnly && classes.filterButtonActive,
+          )}
+          fw={500}
+          aria-pressed={titleOnly}
+          onClick={() => setTitleOnly(!titleOnly)}
+        >
+          {t("Title only")}
+        </Button>
+      )}
+
+      {!isAiMode &&
+        orderedVisibleFilters.map((filterKey) => {
+        if (filterKey === "creator") {
+          return (
+            <CreatorFilterMenu
+              key="creator"
+              value={selectedCreatorId}
+              onChange={handleCreatorSelect}
+              position="bottom-start"
+              width={250}
+              zIndex={getDefaultZIndex("max")}
+              opened={openedFilter === "creator"}
+              onOpenChange={(opened) =>
+                setOpenedFilter(opened ? "creator" : null)
+              }
+            >
+              <Button
+                variant="subtle"
+                color="gray"
+                size="sm"
+                rightSection={<IconChevronDown size={14} />}
+                leftSection={<IconUser size={16} />}
+                className={classes.filterButton}
+                fw={500}
+              >
+                {selectedCreatorId
+                  ? `${t("Created by")}: ${selectedCreatorName || t("Unknown")}`
+                  : `${t("Created by")}: ${t("Anyone")}`}
+              </Button>
+            </CreatorFilterMenu>
+          );
+        }
+
+        if (filterKey === "labels") {
+          return (
+            <LabelFilterMenu
+              key="labels"
+              value={selectedLabelIds}
+              onChange={handleLabelsSelect}
+              position="bottom-start"
+              width={250}
+              zIndex={getDefaultZIndex("max")}
+              opened={openedFilter === "labels"}
+              onOpenChange={(opened) =>
+                setOpenedFilter(opened ? "labels" : null)
+              }
+            >
+              <Button
+                variant="subtle"
+                color="gray"
+                size="sm"
+                rightSection={<IconChevronDown size={14} />}
+                leftSection={<IconTag size={16} />}
+                className={classes.filterButton}
+                fw={500}
+              >
+                {selectedLabelIds.length > 0
+                  ? `${t("Labels")} (${selectedLabelIds.length})`
+                  : t("Labels")}
+              </Button>
+            </LabelFilterMenu>
+          );
+        }
+
+        return null;
+      })}
+
+      {!isAiMode && addableFilters.length > 0 && (
+        <Menu
+          shadow="md"
+          width={200}
+          position="bottom-end"
+          zIndex={getDefaultZIndex("max")}
+        >
+          <Menu.Target>
+            <Button
+              variant="subtle"
+              color="gray"
+              size="sm"
+              leftSection={<IconPlus size={16} />}
+              className={classes.filterButton}
+              style={{ marginLeft: "auto" }}
+              fw={500}
+            >
+              {t("Filter")}
+            </Button>
+          </Menu.Target>
+          <Menu.Dropdown>
+            {addableFilters.map((filter) => (
+              <Menu.Item
+                key={filter.key}
+                leftSection={<filter.icon size={16} />}
+                onClick={() => revealFilter(filter.key)}
+              >
+                {filter.label}
+              </Menu.Item>
+            ))}
+          </Menu.Dropdown>
+        </Menu>
+      )}
    </div>
  );
 }
@@ -1,7 +1,7 @@
 import { Spotlight } from "@mantine/spotlight";
 import { IconSearch, IconSparkles } from "@tabler/icons-react";
-import { Group, Button, VisuallyHidden } from "@mantine/core";
-import React, { useState, useMemo, useEffect } from "react";
+import { Group, Button, VisuallyHidden, Text } from "@mantine/core";
+import React, { useState, useMemo, useEffect, useCallback } from "react";
 import { useDebouncedValue } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
 import { notifications } from "@mantine/notifications";
@@ -13,11 +13,16 @@ import { SearchResultItem } from "./search-result-item.tsx";
 import { AiSearchResult } from "../../../ee/ai/components/ai-search-result.tsx";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
+import { useAtomValue } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { hintVectorCache } from "@/ee/ai/services/ai-search-service.ts";
+import { getAiVectorDriver } from "@/lib/config.ts";

 interface SearchSpotlightProps {
  spaceId?: string;
 }
 export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
+  const workspace = useAtomValue(workspaceAtom);
  const { t } = useTranslation();
  const hasAiFeature = useHasFeature(Feature.AI);
  const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
@@ -26,6 +31,9 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
  const [filters, setFilters] = useState<{
    spaceId?: string | null;
    contentType?: string;
+    creatorId?: string | null;
+    labelIds?: string[];
+    titleOnly?: boolean;
  }>({
    contentType: "page",
  });
@@ -43,10 +51,25 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
      params.spaceId = filters.spaceId;
    }

+    if (filters.creatorId) {
+      params.creatorId = filters.creatorId;
+    }
+
+    if (filters.labelIds?.length) {
+      params.labelIds = filters.labelIds;
+    }
+
+    if (filters.titleOnly) {
+      params.titleOnly = true;
+    }
+
    return params;
  }, [debouncedSearchQuery, filters]);

-  const { data: searchResults, isLoading } = useUnifiedSearch(
+  const {
+    data: searchResults,
+    isFetching,
+  } = useUnifiedSearch(
    searchParams,
    !isAiMode // Disable regular search when in AI mode
  );
@@ -83,6 +106,11 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
    }
  }, [aiSearchError, t]);

+  const isFilterBrowse =
+    (filters.labelIds?.length ?? 0) > 0 || !!filters.creatorId;
+  // while the debounce is pending the empty list is not a settled "no results"
+  const isQuerySettled = query === debouncedSearchQuery;
+
  // Determine result type for rendering
  const isAttachmentSearch =
    filters.contentType === "attachment" && hasAttachmentIndexing;
@@ -96,10 +124,19 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
    />
  ));

-  const handleFiltersChange = (newFilters: any) => {
-    setFilters(newFilters);
+  const handleSpotlightOpen = () => {
+    if (
+      workspace?.settings?.ai?.search === true &&
+      getAiVectorDriver() === "turbopuffer"
+    ) {
+      hintVectorCache();
+    }
  };

+  const handleFiltersChange = useCallback((newFilters: any) => {
+    setFilters(newFilters);
+  }, [setFilters]);
+
  const handleAskClick = () => {
    setIsAiMode(!isAiMode);
  };
@@ -115,6 +152,7 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
      <Spotlight.Root
        size="xl"
        maxHeight={600}
+        onSpotlightOpen={handleSpotlightOpen}
        store={searchSpotlightStore}
        query={query}
        onQueryChange={setQuery}
@@ -167,7 +205,7 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
            ? query.length > 0 && !isAiLoading && !aiSearchResult
              ? t("No answer available")
              : ""
-            : query.length > 0 && !isLoading
+            : (query.length > 0 || isFilterBrowse) && !isFetching
              ? resultItems.length === 0
                ? t("No results found")
                : t("{{count}} results found", { count: resultItems.length })
@@ -194,15 +232,28 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
            </>
          ) : (
            <>
-              {query.length === 0 && resultItems.length === 0 && (
+              {query.length === 0 && !isFilterBrowse && resultItems.length === 0 && (
                <Spotlight.Empty>{t("Start typing to search...")}</Spotlight.Empty>
              )}

-              {query.length > 0 && !isLoading && resultItems.length === 0 && (
-                <Spotlight.Empty>{t("No results found...")}</Spotlight.Empty>
-              )}
+              {(query.length > 0 || isFilterBrowse) &&
+                !isFetching &&
+                isQuerySettled &&
+                resultItems.length === 0 && (
+                  <Spotlight.Empty>{t("No results found...")}</Spotlight.Empty>
+                )}

              {resultItems.length > 0 && <>{resultItems}</>}
+
+              {(query.length > 0 || isFilterBrowse) &&
+                isFetching &&
+                resultItems.length === 0 && (
+                <Spotlight.Empty>
+                  <Text size="sm" style={{ marginTop: 10 }}>
+                    {t("Searching...")}
+                  </Text>
+                </Spotlight.Empty>
+              )}
            </>
          )}
        </Spotlight.ActionsList>
@@ -39,6 +39,20 @@ export function useUnifiedSearch(
        return await searchPage(backendParams);
      }
    },
-    enabled: !!params.query && enabled,
+    enabled:
+      (!!params.query ||
+        (params.labelIds?.length ?? 0) > 0 ||
+        !!params.creatorId) &&
+      enabled,
+    // keep previous results only within the same search type; page results
+    // rendered as attachments (or vice versa) crash on missing fields
+    placeholderData: (previousData, previousQuery) => {
+      if (!params.query && !params.labelIds?.length && !params.creatorId)
+        return undefined;
+      if (previousQuery && previousQuery.queryKey[1] !== searchType) {
+        return undefined;
+      }
+      return previousData;
+    },
  });
 }
@@ -36,6 +36,9 @@ export interface IPageSearchParams {
  query: string;
  spaceId?: string;
  shareId?: string;
+  creatorId?: string;
+  labelIds?: string[];
+  titleOnly?: boolean;
 }

 export interface IAttachmentSearch {
@@ -54,7 +54,9 @@ import {
 import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
 import { searchSpotlight } from "@/features/search/constants";
-import TemplatePickerModal from "@/ee/template/components/template-picker-modal";
+const TemplatePickerModal = React.lazy(
+  () => import("@/ee/template/components/template-picker-modal"),
+);
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 import { Feature } from "@/ee/features";
@@ -406,11 +408,13 @@ function SpaceMenu({

      {hasTemplates && templatePickerOpened && (
        <ErrorBoundary fallbackRender={() => null}>
-          <TemplatePickerModal
-            opened={templatePickerOpened}
-            onClose={closeTemplatePicker}
-            initialSpaceId={spaceId}
-          />
+          <React.Suspense fallback={null}>
+            <TemplatePickerModal
+              opened={templatePickerOpened}
+              onClose={closeTemplatePicker}
+              initialSpaceId={spaceId}
+            />
+          </React.Suspense>
        </ErrorBoundary>
      )}
    </>
@@ -1,118 +0,0 @@
-import { beforeAll, describe, expect, it, vi } from "vitest";
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
-import { MantineProvider } from "@mantine/core";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { MemoryRouter, useLocation } from "react-router-dom";
-import { SwitchSpace } from "./switch-space.tsx";
-
-vi.mock("@/main.tsx", async () => {
-  const { QueryClient } = await import("@tanstack/react-query");
-  return { queryClient: new QueryClient() };
-});
-
-const SPACES = [
-  { id: "1", name: "General", slug: "general", logo: null },
-  { id: "2", name: "Engineering", slug: "engineering", logo: null },
-  { id: "3", name: "Marketing", slug: "marketing", logo: null },
-];
-
-vi.mock("@/features/space/services/space-service.ts", () => ({
-  getSpaces: vi.fn(async () => ({ items: SPACES, meta: {} })),
-  getSpaceById: vi.fn(),
-  getSpaceMembers: vi.fn(),
-  addSpaceMember: vi.fn(),
-  changeMemberRole: vi.fn(),
-  removeSpaceMember: vi.fn(),
-  createSpace: vi.fn(),
-  updateSpace: vi.fn(),
-  deleteSpace: vi.fn(),
-}));
-
-beforeAll(() => {
-  window.matchMedia = ((query: string) => ({
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: () => {},
-    removeListener: () => {},
-    addEventListener: () => {},
-    removeEventListener: () => {},
-    dispatchEvent: () => false,
-  })) as unknown as typeof window.matchMedia;
-  window.ResizeObserver = class {
-    observe() {}
-    unobserve() {}
-    disconnect() {}
-  } as unknown as typeof window.ResizeObserver;
-  Element.prototype.scrollIntoView = () => {};
-});
-
-function LocationProbe() {
-  const location = useLocation();
-  return <div data-testid="location">{location.pathname}</div>;
-}
-
-function renderSwitcher() {
-  const client = new QueryClient({
-    defaultOptions: { queries: { retry: false } },
-  });
-  return render(
-    <MantineProvider>
-      <QueryClientProvider client={client}>
-        <MemoryRouter initialEntries={["/s/general"]}>
-          <SwitchSpace spaceName="General" spaceSlug="general" />
-          <LocationProbe />
-        </MemoryRouter>
-      </QueryClientProvider>
-    </MantineProvider>,
-  );
-}
-
-function getOption(name: string) {
-  const options = screen.getAllByRole("option", { hidden: true });
-  const match = options.find((option) => option.textContent?.includes(name));
-  if (!match) {
-    throw new Error(`option ${name} not found`);
-  }
-  return match;
-}
-
-async function openSwitcher() {
-  fireEvent.click(screen.getByRole("button", { name: /general/i }));
-  const dialog = await screen.findByRole("dialog", { hidden: true });
-  await screen.findAllByRole("option", { hidden: true });
-  return dialog;
-}
-
-describe("SwitchSpace", () => {
-  it("renders the space options inside the popover so option clicks are not outside clicks", async () => {
-    renderSwitcher();
-    const dialog = await openSwitcher();
-    const listbox = screen.getByRole("listbox", { hidden: true });
-    expect(dialog.contains(listbox)).toBe(true);
-  });
-
-  it("keeps the popover open when an option is pressed with the mouse", async () => {
-    renderSwitcher();
-    const dialog = await openSwitcher();
-    fireEvent.mouseDown(getOption("Marketing"));
-    await new Promise((resolve) => setTimeout(resolve, 400));
-    expect(document.body.contains(dialog)).toBe(true);
-  });
-
-  it("navigates to the space picked from search results", async () => {
-    renderSwitcher();
-    await openSwitcher();
-    fireEvent.change(screen.getByPlaceholderText("Search for spaces"), {
-      target: { value: "mark" },
-    });
-    await waitFor(() => getOption("Marketing"));
-    const option = getOption("Marketing");
-    fireEvent.mouseDown(option);
-    fireEvent.mouseUp(option);
-    fireEvent.click(option);
-    await waitFor(() =>
-      expect(screen.getByTestId("location").textContent).toBe("/s/marketing"),
-    );
-  });
-});
@@ -64,8 +64,6 @@ export function SwitchSpace({
        </Button>
      </Popover.Target>
      <Popover.Dropdown>
-        {/* keep the options dropdown inside the popover; a portaled dropdown
-            registers as an outside click and closes the popover mid-selection */}
        <SpaceSelect
          label={spaceName}
          value={spaceSlug}
@@ -25,6 +25,9 @@ export interface IWorkspace {
  generativeAi?: boolean;
  disablePublicSharing?: boolean;
  mcpEnabled?: boolean;
+  aiChatReadOnly?: boolean;
+  aiChatWorkspaceKnowledgeOnly?: boolean;
+  enforceMcpOauth?: boolean;
  trashRetentionDays?: number;
  restrictApiToAdmins?: boolean;
  allowMemberTemplates?: boolean;
@@ -50,7 +53,10 @@ export interface IWorkspaceAiSettings {
  search?: boolean;
  generative?: boolean;
  mcp?: boolean;
+  enforceMcpOauth?: boolean;
  chat?: boolean;
+  chatReadOnly?: boolean;
+  chatWorkspaceKnowledgeOnly?: boolean;
 }

 export interface IWorkspaceSharingSettings {
@@ -76,6 +76,8 @@ function redirectToLogin() {
    APP_ROUTE.AUTH.MFA_CHALLENGE,
    APP_ROUTE.AUTH.MFA_SETUP_REQUIRED,
    "/invites",
+    // the oauth consent page redirects to login itself, preserving its query string
+    "/oauth/consent",
  ];
  if (!exemptPaths.some((path) => window.location.pathname.startsWith(path))) {
    const redirectTo = window.location.pathname;
@@ -43,6 +43,10 @@ export function isCloud(): boolean {
  return castToBoolean(getConfigValue("CLOUD"));
 }

+export function getAiVectorDriver(): string {
+  return getConfigValue("AI_VECTOR_DRIVER");
+}
+
 export function getAvatarUrl(
  avatarUrl: string,
  type: AvatarIconType = AvatarIconType.AVATAR,
@@ -33,3 +33,31 @@
  color: var(--mantine-color-dimmed);
  -webkit-text-fill-color: var(--mantine-color-dimmed);
 }
+
+/* Spotlight's selected action ships as primary-filled blue with white text,
+ * but our custom action children (gray badge, dimmed snippet, gray icons)
+ * keep their light-surface colors on it and drop below WCAG AA 4.5:1
+ * (WCAG 1.4.3). Use a gray selection one step above the gray-0/dark-6
+ * hover instead - it matches the app's selection styling (we use no blue
+ * fills) and keeps every child at its already-passing resting contrast.
+ */
+.mantine-Spotlight-action[data-selected] {
+  background-color: light-dark(
+    var(--mantine-color-gray-1),
+    var(--mantine-color-dark-5)
+  );
+  color: var(--mantine-color-text);
+  --action-description-color: var(--mantine-color-dimmed);
+  --action-description-opacity: 1;
+}
+
+/* Result actions are tab stops (tabIndex restored via ref); give keyboard
+ * focus the same gray treatment as arrow-key selection so both navigation
+ * modes read identically (WCAG 2.4.7 focus visible).
+ */
+.mantine-Spotlight-action:focus-visible {
+  background-color: light-dark(
+    var(--mantine-color-gray-1),
+    var(--mantine-color-dark-5)
+  );
+}
@@ -16,6 +16,7 @@ export default defineConfig(({ mode }) => {
    BILLING_TRIAL_DAYS,
    POSTHOG_HOST,
    POSTHOG_KEY,
+    AI_VECTOR_DRIVER,
  } = loadEnv(mode, envPath, "");

  return {
@@ -31,6 +32,7 @@ export default defineConfig(({ mode }) => {
        BILLING_TRIAL_DAYS,
        POSTHOG_HOST,
        POSTHOG_KEY,
+        AI_VECTOR_DRIVER,
      },
      APP_VERSION: JSON.stringify(process.env.npm_package_version),
    },
@@ -40,32 +40,34 @@
    "@clickhouse/client": "1.18.2",
    "@docmost/base-formula": "workspace:*",
    "@docmost/pdf-inspector": "1.9.6",
-    "@fastify/cookie": "11.0.2",
-    "@fastify/multipart": "10.0.0",
-    "@fastify/static": "10.1.2",
+    "@fastify/cookie": "11.1.2",
+    "@fastify/multipart": "10.1.1",
+    "@fastify/static": "10.1.3",
+    "@jmondi/oauth2-server": "^4.3.7",
    "@keyv/redis": "5.1.6",
    "@langchain/core": "1.1.46",
    "@langchain/textsplitters": "1.0.1",
    "@modelcontextprotocol/sdk": "1.30.0",
    "@nest-lab/throttler-storage-redis": "1.2.0",
    "@nestjs-labs/nestjs-ioredis": "11.0.4",
-    "@nestjs/bullmq": "11.0.4",
+    "@nestjs/bullmq": "11.0.5",
    "@nestjs/cache-manager": "3.1.3",
-    "@nestjs/common": "11.1.28",
+    "@nestjs/common": "11.2.1",
    "@nestjs/config": "4.0.4",
-    "@nestjs/core": "11.1.27",
+    "@nestjs/core": "11.2.1",
    "@nestjs/event-emitter": "3.1.0",
    "@nestjs/jwt": "11.0.2",
    "@nestjs/mapped-types": "2.1.1",
    "@nestjs/passport": "11.0.5",
-    "@nestjs/platform-fastify": "11.1.28",
-    "@nestjs/platform-socket.io": "11.1.28",
+    "@nestjs/platform-fastify": "11.2.1",
+    "@nestjs/platform-socket.io": "11.2.1",
    "@nestjs/schedule": "6.1.3",
    "@nestjs/terminus": "11.1.1",
    "@nestjs/throttler": "6.5.0",
-    "@nestjs/websockets": "11.1.28",
+    "@nestjs/websockets": "11.2.1",
    "@node-saml/passport-saml": "5.1.0",
    "@socket.io/redis-adapter": "8.3.0",
+    "@turbopuffer/turbopuffer": "^2.8.0",
    "ai": "6.0.134",
    "ai-sdk-ollama": "3.8.1",
    "bcrypt": "6.0.0",
@@ -119,7 +121,7 @@
    "tmp-promise": "3.0.3",
    "typesense": "3.0.5",
    "undici": "7.29.0",
-    "ws": "8.21.0",
+    "ws": "8.21.3",
    "yauzl": "3.4.0",
    "zod": "4.3.6"
  },
@@ -22,11 +22,13 @@ import { TelemetryModule } from './integrations/telemetry/telemetry.module';
 import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
 import { RedisConfigService } from './integrations/redis/redis-config.service';
 import { CacheModule } from '@nestjs/cache-manager';
-import KeyvRedis from '@keyv/redis';
+import KeyvRedis, { defaultReconnectStrategy } from '@keyv/redis';
+import { parseRedisUrl } from './common/helpers';
 import { LoggerModule } from './common/logger/logger.module';
 import { ClsModule } from 'nestjs-cls';
 import { NoopAuditModule } from './integrations/audit/audit.module';
 import { ThrottleModule } from './integrations/throttle/throttle.module';
+import { EncryptionModule } from './integrations/encryption/encryption.module';

 const enterpriseModules = [];
 try {
@@ -53,6 +55,7 @@ try {
    CoreModule,
    DatabaseModule,
    EnvironmentModule,
+    EncryptionModule,
    RedisModule.forRootAsync({
      useClass: RedisConfigService,
    }),
@@ -60,10 +63,20 @@ try {
      isGlobal: true,
      useFactory: async (environmentService: EnvironmentService) => {
        const redisUrl = environmentService.getRedisUrl();
+        const { family, tls } = parseRedisUrl(redisUrl);

        return {
          ttl: 5 * 1000,
-          stores: [new KeyvRedis(redisUrl)],
+          stores: [
+            new KeyvRedis({
+              url: redisUrl,
+              socket: {
+                family,
+                reconnectStrategy: defaultReconnectStrategy,
+                ...tls,
+              },
+            }),
+          ],
        };
      },
      inject: [EnvironmentService],
@@ -63,9 +63,11 @@ export class CollaborationGateway {
        redis: new RedisClient({
          host: this.redisConfig.host,
          port: this.redisConfig.port,
+          username: this.redisConfig.username,
          password: this.redisConfig.password,
          db: this.redisConfig.db,
          family: this.redisConfig.family,
+          tls: this.redisConfig.tls,
          retryStrategy: createRetryStrategy(),
        }),
        serverId: `collab-${os?.hostname()}-${nanoid(10)}`,
@@ -57,6 +57,7 @@ import {
  JSONContent,
 } from '@tiptap/core';
 import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
+import { collapseBlankLines } from '../common/helpers';
 // @tiptap/html library works best for generating prosemirror json state but not HTML
 // see: https://github.com/ueberdosis/tiptap/issues/5352
 // see:https://github.com/ueberdosis/tiptap/issues/4089
@@ -146,7 +147,7 @@ export function htmlToJson(html: string) {
 }

 export function jsonToText(tiptapJson: JSONContent) {
-  return generateText(tiptapJson, tiptapExtensions);
+  return collapseBlankLines(generateText(tiptapJson, tiptapExtensions));
 }

 export function jsonToNode(tiptapJson: JSONContent) {
@@ -14,7 +14,8 @@ import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
 import { RedisConfigService } from '../../integrations/redis/redis-config.service';
 import { CaslModule } from '../../core/casl/casl.module';
 import { CacheModule } from '@nestjs/cache-manager';
-import KeyvRedis from '@keyv/redis';
+import KeyvRedis, { defaultReconnectStrategy } from '@keyv/redis';
+import { parseRedisUrl } from '../../common/helpers';

@Module({
  imports: [
@@ -33,10 +34,20 @@ import KeyvRedis from '@keyv/redis';
      isGlobal: true,
      useFactory: async (environmentService: EnvironmentService) => {
        const redisUrl = environmentService.getRedisUrl();
+        const { family, tls } = parseRedisUrl(redisUrl);

        return {
          ttl: 5 * 1000,
-          stores: [new KeyvRedis(redisUrl)],
+          stores: [
+            new KeyvRedis({
+              url: redisUrl,
+              socket: {
+                family,
+                reconnectStrategy: defaultReconnectStrategy,
+                ...tls,
+              },
+            }),
+          ],
        };
      },
      inject: [EnvironmentService],
@@ -0,0 +1,8 @@
+import { SetMetadata } from '@nestjs/common';
+
+export const OAUTH_SCOPE_KEY = 'oauthScope';
+
+export type OAuthRouteScope = 'read' | 'write';
+
+export const OAuthScope = (scope: OAuthRouteScope) =>
+  SetMetadata(OAUTH_SCOPE_KEY, scope);
@@ -0,0 +1,6 @@
+import { SetMetadata } from '@nestjs/common';
+
+export const REQUIRE_SESSION_AUTH_KEY = 'requireSessionAuth';
+
+export const RequireSessionAuth = () =>
+  SetMetadata(REQUIRE_SESSION_AUTH_KEY, true);
@@ -23,6 +23,11 @@ export const AuditEvent = {
  API_KEY_UPDATED: 'api_key.updated',
  API_KEY_DELETED: 'api_key.deleted',

+  // OAuth
+  OAUTH_CLIENT_REGISTERED: 'oauth_client.registered',
+  OAUTH_GRANT_CREATED: 'oauth_grant.created',
+  OAUTH_GRANT_REVOKED: 'oauth_grant.revoked',
+
  // SCIM Tokens
  SCIM_TOKEN_CREATED: 'scim_token.created',
  SCIM_TOKEN_UPDATED: 'scim_token.updated',
@@ -124,6 +129,8 @@ export const AuditResource = {
  COMMENT: 'comment',
  SHARE: 'share',
  API_KEY: 'api_key',
+  OAUTH_CLIENT: 'oauth_client',
+  OAUTH_GRANT: 'oauth_grant',
  SCIM_TOKEN: 'scim_token',
  SSO_PROVIDER: 'sso_provider',
  WORKSPACE_INVITATION: 'workspace_invitation',
@@ -12,6 +12,8 @@ export enum EventName {
  SPACE_UPDATED = 'space.updated',
  SPACE_DELETED = 'space.deleted',

+  USER_PASSWORD_RESET = 'user.password.reset',
+
  WORKSPACE_CREATED = 'workspace.created',
  WORKSPACE_UPDATED = 'workspace.updated',
  WORKSPACE_DELETED = 'workspace.deleted',
@@ -23,6 +23,9 @@ export const Feature = {
  PERSONAL_SPACES: 'spaces:personal',
  DOCX_EXPORT: 'export:docx',
  BASES: 'bases',
+  OAUTH: 'oauth',
+  AI_CONTROLS: 'ai:controls',
+  MCP_CONTROLS: 'mcp:controls',
 } as const;

 export type FeatureKey = (typeof Feature)[keyof typeof Feature];
@@ -0,0 +1,186 @@
+import {
+  ExecutionContext,
+  ForbiddenException,
+  UnauthorizedException,
+} from '@nestjs/common';
+import { JwtAuthGuard } from './jwt-auth.guard';
+import { OAUTH_SCOPE_KEY } from '../decorators/oauth-scope.decorator';
+import { REQUIRE_SESSION_AUTH_KEY } from '../decorators/require-session-auth.decorator';
+import { JwtType } from '../../core/auth/dto/jwt-payload';
+
+const handlerSentinel = () => 'handler';
+const classSentinel = class Controller {};
+
+function createCtx(): ExecutionContext {
+  return {
+    getHandler: () => handlerSentinel,
+    getClass: () => classSentinel,
+  } as any;
+}
+
+function createGuard(scopeMetadata?: unknown, requireSession?: boolean) {
+  const reflector = {
+    getAllAndOverride: jest.fn((key: string) =>
+      key === REQUIRE_SESSION_AUTH_KEY ? requireSession : scopeMetadata,
+    ),
+  } as any;
+  const environmentService = {
+    isCloud: jest.fn().mockReturnValue(false),
+  } as any;
+  const guard = new JwtAuthGuard(reflector, environmentService);
+  return { guard, reflector };
+}
+
+function oauthUser(scopes: string[]) {
+  return {
+    user: { id: 'user_1' },
+    workspace: { id: 'ws_1' },
+    oauth: { grantId: 'grant_1', scopes },
+  };
+}
+
+describe('JwtAuthGuard.handleRequest', () => {
+  it('rethrows the strategy error', () => {
+    const { guard } = createGuard();
+    const err = new UnauthorizedException('bad token');
+
+    expect(() => guard.handleRequest(err, null, null, createCtx())).toThrow(err);
+  });
+
+  it('throws UnauthorizedException when there is no user', () => {
+    const { guard } = createGuard();
+
+    expect(() => guard.handleRequest(null, null, null, createCtx())).toThrow(
+      UnauthorizedException,
+    );
+  });
+
+  it('returns a non-oauth user untouched without consulting scope metadata', () => {
+    const { guard, reflector } = createGuard();
+    const user = { user: { id: 'user_1' }, workspace: { id: 'ws_1' } };
+
+    expect(guard.handleRequest(null, user, null, createCtx())).toBe(user);
+    expect(reflector.getAllAndOverride).not.toHaveBeenCalledWith(
+      OAUTH_SCOPE_KEY,
+      expect.anything(),
+    );
+  });
+
+  it('forbids an oauth user on a route without scope metadata', () => {
+    const { guard, reflector } = createGuard(undefined);
+
+    expect(() =>
+      guard.handleRequest(null, oauthUser(['read', 'write']), null, createCtx()),
+    ).toThrow(ForbiddenException);
+    expect(reflector.getAllAndOverride).toHaveBeenCalledWith(OAUTH_SCOPE_KEY, [
+      handlerSentinel,
+      classSentinel,
+    ]);
+  });
+
+  it('passes read scope on a read route', () => {
+    const { guard } = createGuard('read');
+    const user = oauthUser(['read']);
+
+    expect(guard.handleRequest(null, user, null, createCtx())).toBe(user);
+  });
+
+  it('forbids read scope on a write route with insufficient_scope', () => {
+    const { guard } = createGuard('write');
+
+    expect(() =>
+      guard.handleRequest(null, oauthUser(['read']), null, createCtx()),
+    ).toThrow('insufficient_scope');
+  });
+
+  it('passes write scope on a read route', () => {
+    const { guard } = createGuard('read');
+    const user = oauthUser(['write']);
+
+    expect(guard.handleRequest(null, user, null, createCtx())).toBe(user);
+  });
+
+  it('passes write scope on a write route', () => {
+    const { guard } = createGuard('write');
+    const user = oauthUser(['write']);
+
+    expect(guard.handleRequest(null, user, null, createCtx())).toBe(user);
+  });
+
+  describe('session-only routes', () => {
+    const sessionUser = {
+      user: { id: 'user_1' },
+      workspace: { id: 'ws_1' },
+      authType: JwtType.ACCESS,
+    };
+
+    it('allows a signed-in session', () => {
+      const { guard } = createGuard(undefined, true);
+
+      expect(guard.handleRequest(null, sessionUser, null, createCtx())).toBe(
+        sessionUser,
+      );
+    });
+
+    it('forbids an api key', () => {
+      const { guard } = createGuard(undefined, true);
+      const apiKeyUser = {
+        user: { id: 'user_1' },
+        workspace: { id: 'ws_1' },
+        authType: JwtType.API_KEY,
+      };
+
+      expect(() =>
+        guard.handleRequest(null, apiKeyUser, null, createCtx()),
+      ).toThrow('This action requires an interactive user session');
+    });
+
+    it('forbids an oauth token even when it carries write scope', () => {
+      const { guard } = createGuard('write', true);
+      const user = { ...oauthUser(['write']), authType: JwtType.OAUTH_ACCESS };
+
+      expect(() => guard.handleRequest(null, user, null, createCtx())).toThrow(
+        'This action requires an interactive user session',
+      );
+    });
+
+    it('leaves api keys working on routes without the marker', () => {
+      const { guard } = createGuard(undefined, undefined);
+      const apiKeyUser = {
+        user: { id: 'user_1' },
+        workspace: { id: 'ws_1' },
+        authType: JwtType.API_KEY,
+      };
+
+      expect(guard.handleRequest(null, apiKeyUser, null, createCtx())).toBe(
+        apiKeyUser,
+      );
+    });
+  });
+
+  it('lets handler metadata override class metadata', () => {
+    const metadataByTarget = new Map<unknown, string>([
+      [handlerSentinel, 'write'],
+      [classSentinel, 'read'],
+    ]);
+    const reflector = {
+      getAllAndOverride: jest.fn((key: string, targets: unknown[]) => {
+        if (key === REQUIRE_SESSION_AUTH_KEY) {
+          return undefined;
+        }
+        for (const target of targets) {
+          if (metadataByTarget.has(target)) {
+            return metadataByTarget.get(target);
+          }
+        }
+        return undefined;
+      }),
+    } as any;
+    const environmentService = { isCloud: jest.fn().mockReturnValue(false) } as any;
+    const guard = new JwtAuthGuard(reflector, environmentService);
+
+    expect(() =>
+      guard.handleRequest(null, oauthUser(['read']), null, createCtx()),
+    ).toThrow('insufficient_scope');
+  });
+});
@@ -1,16 +1,26 @@
 import {
  ExecutionContext,
+  ForbiddenException,
  Injectable,
+  Logger,
  UnauthorizedException,
 } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { IS_PUBLIC_KEY } from '../decorators/public.decorator';
+import {
+  OAUTH_SCOPE_KEY,
+  OAuthRouteScope,
+} from '../decorators/oauth-scope.decorator';
+import { REQUIRE_SESSION_AUTH_KEY } from '../decorators/require-session-auth.decorator';
+import { JwtType } from '../../core/auth/dto/jwt-payload';
 import { Reflector } from '@nestjs/core';
 import { EnvironmentService } from '../../integrations/environment/environment.service';
 import { addDays } from 'date-fns';

@Injectable()
 export class JwtAuthGuard extends AuthGuard('jwt') {
+  private logger = new Logger('JwtAuthGuard');
+
  constructor(
    private reflector: Reflector,
    private environmentService: EnvironmentService,
@@ -36,6 +46,39 @@ export class JwtAuthGuard extends AuthGuard('jwt') {
      throw err || new UnauthorizedException();
    }

+    const requiresSession = this.reflector.getAllAndOverride<boolean>(
+      REQUIRE_SESSION_AUTH_KEY,
+      [ctx.getHandler(), ctx.getClass()],
+    );
+    if (requiresSession && user.authType !== JwtType.ACCESS) {
+      this.logger.debug(
+        `session-only endpoint ${ctx.getClass()?.name}.${ctx.getHandler()?.name} refused authType ${user.authType}`,
+      );
+      throw new ForbiddenException(
+        'This action requires an interactive user session',
+      );
+    }
+
+    if (user.oauth) {
+      const required = this.reflector.getAllAndOverride<
+        OAuthRouteScope | undefined
+      >(OAUTH_SCOPE_KEY, [ctx.getHandler(), ctx.getClass()]);
+      if (!required) {
+        this.logger.warn(
+          `oauth scope check: no @OAuthScope metadata on ${ctx.getClass()?.name}.${ctx.getHandler()?.name}`,
+        );
+        throw new ForbiddenException('OAuth tokens cannot access this endpoint');
+      }
+      const scopes: string[] = user.oauth.scopes ?? [];
+      const satisfied =
+        required === 'read'
+          ? scopes.includes('read') || scopes.includes('write')
+          : scopes.includes('write');
+      if (!satisfied) {
+        throw new ForbiddenException('insufficient_scope');
+      }
+    }
+
    this.setJoinedWorkspacesCookie(user, ctx);
    return user;
  }
@@ -1,4 +1,5 @@
 export * from './utils';
+export * from './text.utils';
 export * from './nanoid.utils';
 export * from './file.helper';
 export * from './constants';
@@ -0,0 +1,66 @@
+import {
+  resolveFrameHeader,
+  resolveFrameHeadersForPath,
+  SecurityHeader,
+} from './security-headers';
+
+describe('resolveFrameHeader', () => {
+  it('denies framing with X-Frame-Options when embedding is off', () => {
+    expect(resolveFrameHeader(false, [])).toEqual({
+      name: 'X-Frame-Options',
+      value: 'SAMEORIGIN',
+    });
+  });
+
+  it('returns null when embedding is on but no origins are configured', () => {
+    expect(resolveFrameHeader(true, [])).toBeNull();
+  });
+
+  it('emits a frame-ancestors CSP for the allowed origins', () => {
+    expect(resolveFrameHeader(true, ['https://a.example', 'https://b.example']))
+      .toEqual({
+        name: 'Content-Security-Policy',
+        value: "frame-ancestors 'self' https://a.example https://b.example",
+      });
+  });
+});
+
+describe('resolveFrameHeadersForPath', () => {
+  const configured: SecurityHeader = {
+    name: 'Content-Security-Policy',
+    value: "frame-ancestors 'self' https://a.example",
+  };
+
+  it.each(['/oauth/consent', '/oauth/consent/nested'])(
+    'force-denies %s regardless of configured header',
+    (path) => {
+      expect(resolveFrameHeadersForPath(path, configured)).toEqual([
+        { name: 'X-Frame-Options', value: 'DENY' },
+        { name: 'Content-Security-Policy', value: "frame-ancestors 'none'" },
+      ]);
+    },
+  );
+
+  it('force-denies consent even when the global header is absent', () => {
+    expect(resolveFrameHeadersForPath('/oauth/consent', null)).toEqual([
+      { name: 'X-Frame-Options', value: 'DENY' },
+      { name: 'Content-Security-Policy', value: "frame-ancestors 'none'" },
+    ]);
+  });
+
+  it('does not match an unrelated path that merely contains the prefix', () => {
+    expect(
+      resolveFrameHeadersForPath('/oauth/consenting-adults', configured),
+    ).toEqual([configured]);
+  });
+
+  it('passes the configured header through for other paths', () => {
+    expect(resolveFrameHeadersForPath('/home', configured)).toEqual([
+      configured,
+    ]);
+  });
+
+  it('returns nothing for other paths when no header is configured', () => {
+    expect(resolveFrameHeadersForPath('/home', null)).toEqual([]);
+  });
+});
@@ -17,3 +17,19 @@ export function resolveFrameHeader(
    value: `frame-ancestors 'self' ${allowedOrigins.join(' ')}`,
  };
 }
+
+// Deny OAuth consent in iframe
+export const OAUTH_CONSENT_PATH = '/oauth/consent';
+
+export function resolveFrameHeadersForPath(
+  path: string,
+  configuredHeader: SecurityHeader | null,
+): SecurityHeader[] {
+  if (path === OAUTH_CONSENT_PATH || path.startsWith(`${OAUTH_CONSENT_PATH}/`)) {
+    return [
+      { name: 'X-Frame-Options', value: 'DENY' },
+      { name: 'Content-Security-Policy', value: "frame-ancestors 'none'" },
+    ];
+  }
+  return configuredHeader ? [configuredHeader] : [];
+}
@@ -0,0 +1,14 @@
+import { collapseBlankLines } from './text.utils';
+
+describe('collapseBlankLines', () => {
+  it.each([
+    ['a\n\n\n\nb', 'a\n\nb'],
+    ['a\n\nb', 'a\n\nb'],
+    ['a\nb', 'a\nb'],
+    ['\n\n\n\na\n\n\n', '\n\na\n\n'],
+    ['no newlines', 'no newlines'],
+    ['', ''],
+  ])('collapses %j to %j', (input, expected) => {
+    expect(collapseBlankLines(input)).toBe(expected);
+  });
+});
@@ -0,0 +1,3 @@
+export function collapseBlankLines(text: string): string {
+  return text.replace(/\n{2,}/g, '\n\n');
+}
@@ -28,15 +28,25 @@ export type RedisConfig = {
  host: string;
  port: number;
  db: number;
+  username?: string;
  password?: string;
  family?: number;
+  tls?: { rejectUnauthorized?: boolean };
 };

 export function parseRedisUrl(redisUrl: string): RedisConfig {
-  // format - redis[s]://[[username][:password]@][host][:port][/db-number][?family=4|6]
+  // format - redis[s]://[[username][:password]@][host][:port][/db-number][?family=4|6][&rejectUnauthorized=false]
  const url = new URL(redisUrl);
-  const { hostname, port, password, pathname, searchParams } = url;
-  const portInt = parseInt(port, 10);
+  const {
+    hostname,
+    port,
+    username,
+    password,
+    pathname,
+    protocol,
+    searchParams,
+  } = url;
+  const portInt = port ? parseInt(port, 10) : 6379;

  let db: number = 0;
  // extract db value if present
@@ -54,7 +64,22 @@ export function parseRedisUrl(redisUrl: string): RedisConfig {
    family = parseInt(familyParam, 10);
  }

-  return { host: hostname, port: portInt, password, db, family };
+  const tls =
+    protocol === 'rediss:'
+      ? searchParams.get('rejectUnauthorized') === 'false'
+        ? { rejectUnauthorized: false }
+        : {}
+      : undefined;
+
+  return {
+    host: hostname,
+    port: portInt,
+    username: username ? decodeURIComponent(username) : undefined,
+    password: password ? decodeURIComponent(password) : undefined,
+    db,
+    family,
+    tls,
+  };
 }

 export function createRetryStrategy() {
@@ -24,6 +24,7 @@ import * as bytes from 'bytes';
 import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { OAuthScope } from '../../common/decorators/oauth-scope.decorator';
 import { Attachment, User, Workspace } from '@docmost/db/types/entity.types';
 import { StorageService } from '../../integrations/storage/storage.service';
 import {
@@ -175,6 +176,7 @@ export class AttachmentController {

  @UseGuards(JwtAuthGuard)
  @Get('/files/:fileId/:fileName')
+  @OAuthScope('read')
  async getFile(
    @Req() req: FastifyRequest,
    @Res() res: FastifyReply,
@@ -427,6 +429,7 @@ export class AttachmentController {
  @UseGuards(JwtAuthGuard)
  @HttpCode(HttpStatus.OK)
  @Post('pages/attachments')
+  @OAuthScope('read')
  async getPageAttachments(
    @Body() dto: PageIdDto,
    @Body() pagination: PaginationOptions,
@@ -116,8 +116,8 @@ export class AttachmentService {
        });
      }

-      // Only index PDFs and DOCX files
-      if (['.pdf', '.docx'].includes(attachment.fileExt.toLowerCase())) {
+      // Only index PDF, DOCX and TXT files
+      if (['.pdf', '.docx', '.txt'].includes(attachment.fileExt.toLowerCase())) {
        await this.attachmentQueue.add(
          QueueJob.ATTACHMENT_INDEX_CONTENT,
          {
@@ -12,7 +12,7 @@ import {
 } from '@nestjs/common';
 import { SkipThrottle, ThrottlerGuard } from '@nestjs/throttler';
 import {
-  AI_CHAT_THROTTLER,
+  ALL_NAMED_THROTTLERS_SKIPPED,
  AUTH_THROTTLER,
 } from '../../integrations/throttle/throttler-names';
 import { LoginDto } from './dto/login.dto';
@@ -38,7 +38,7 @@ import {
  IAuditService,
 } from '../../integrations/audit/audit.service';

-@SkipThrottle({ [AI_CHAT_THROTTLER]: true })
+@SkipThrottle({ ...ALL_NAMED_THROTTLERS_SKIPPED, [AUTH_THROTTLER]: false })
@UseGuards(ThrottlerGuard)
@Controller('auth')
 export class AuthController {
@@ -7,6 +7,7 @@ export enum JwtType {
  API_KEY = 'api_key',
  PDF_RENDER = 'pdf_render',
  PDF_EXPORT_DOWNLOAD = 'pdf_export_download',
+  OAUTH_ACCESS = 'oauth_access',
 }
 export type JwtPayload = {
  sub: string;
@@ -59,3 +60,14 @@ export type JwtPdfExportDownloadPayload = {
  workspaceId: string;
  type: 'pdf_export_download';
 };
+
+export type JwtOAuthPayload = {
+  sub: string;
+  workspaceId: string;
+  grantId: string;
+  scope: string;
+  aud: string;
+  iss: string;
+  jti: string;
+  type: JwtType.OAUTH_ACCESS;
+};
@@ -2,6 +2,7 @@ import {
  BadRequestException,
  Inject,
  Injectable,
+  Logger,
  NotFoundException,
  UnauthorizedException,
 } from '@nestjs/common';
@@ -40,9 +41,13 @@ import {
  IAuditService,
 } from '../../../integrations/audit/audit.service';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { EventName } from '../../../common/events/event.contants';

@Injectable()
 export class AuthService {
+  private readonly logger = new Logger(AuthService.name);
+
  constructor(
    private signupService: SignupService,
    private tokenService: TokenService,
@@ -53,6 +58,7 @@ export class AuthService {
    private mailService: MailService,
    private domainService: DomainService,
    private environmentService: EnvironmentService,
+    private eventEmitter: EventEmitter2,
    @InjectKysely() private readonly db: KyselyDB,
    @Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
  ) {}
@@ -261,6 +267,19 @@ export class AuthService {

    await this.userSessionRepo.deleteByUserId(user.id, workspace.id);

+    // A failed revocation must not block the reset itself; log loudly instead.
+    try {
+      await this.eventEmitter.emitAsync(EventName.USER_PASSWORD_RESET, {
+        userId: user.id,
+        workspaceId: workspace.id,
+      });
+    } catch (err) {
+      this.logger.error(
+        `failed to revoke oauth grants for user ${user.id} after password reset`,
+        err,
+      );
+    }
+
    this.auditService.setActorId(user.id);
    this.auditService.log({
      event: AuditEvent.USER_PASSWORD_RESET,
@@ -2,7 +2,12 @@ import { Injectable, Logger, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { Strategy } from 'passport-jwt';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
-import { JwtApiKeyPayload, JwtPayload, JwtType } from '../dto/jwt-payload';
+import {
+  JwtApiKeyPayload,
+  JwtOAuthPayload,
+  JwtPayload,
+  JwtType,
+} from '../dto/jwt-payload';
 import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
 import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo';
@@ -33,7 +38,10 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
    });
  }

-  async validate(req: any, payload: JwtPayload | JwtApiKeyPayload) {
+  async validate(
+    req: any,
+    payload: JwtPayload | JwtApiKeyPayload | JwtOAuthPayload,
+  ) {
    if (!payload.workspaceId) {
      throw new UnauthorizedException();
    }
@@ -42,8 +50,21 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
      throw new UnauthorizedException('Workspace does not match');
    }

+    // authType lets guards tell an interactive session from a programmatic credential.
    if (payload.type === JwtType.API_KEY) {
-      return this.validateApiKey(req, payload as JwtApiKeyPayload);
+      const authResult = await this.validateApiKey(
+        req,
+        payload as JwtApiKeyPayload,
+      );
+      return { ...authResult, authType: JwtType.API_KEY };
+    }
+
+    if (payload.type === JwtType.OAUTH_ACCESS) {
+      const authResult = await this.validateOAuthToken(
+        req,
+        payload as JwtOAuthPayload,
+      );
+      return { ...authResult, authType: JwtType.OAUTH_ACCESS };
    }

    if (payload.type !== JwtType.ACCESS) {
@@ -71,7 +92,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
      this.sessionActivityService.trackActivity(sessionId, payload.sub, payload.workspaceId);
    }

-    return { user, workspace };
+    return { user, workspace, authType: JwtType.ACCESS };
  }

  private async validateApiKey(req: any, payload: JwtApiKeyPayload) {
@@ -99,4 +120,36 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {

    throw new UnauthorizedException('Enterprise API Key module missing');
  }
+
+  private async validateOAuthToken(req: any, payload: JwtOAuthPayload) {
+    let OAuthStrategyModule: any;
+    let isOAuthModuleReady = false;
+
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      OAuthStrategyModule = require('./../../../ee/oauth/services/oauth-strategy.service');
+      isOAuthModuleReady = true;
+    } catch (err) {
+      this.logger.debug(
+        'OAuth module requested but enterprise module not bundled in this build',
+      );
+      isOAuthModuleReady = false;
+    }
+
+    if (isOAuthModuleReady) {
+      const OAuthStrategyService = this.moduleRef.get(
+        OAuthStrategyModule.OAuthStrategyService,
+        {
+          strict: false,
+        },
+      );
+
+      return OAuthStrategyService.validateOAuthToken(payload, {
+        workspaceId: req.raw.workspaceId,
+        host: req.raw.headers?.host ?? req.headers?.host,
+      });
+    }
+
+    throw new UnauthorizedException('Enterprise OAuth module missing');
+  }
 }
@@ -16,6 +16,7 @@ import { PageIdDto, CommentIdDto } from './dto/comments.input';
 import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { OAuthScope } from '../../common/decorators/oauth-scope.decorator';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
@@ -48,13 +49,14 @@ export class CommentController {

  @HttpCode(HttpStatus.OK)
  @Post('create')
+  @OAuthScope('write')
  async create(
    @Body() createCommentDto: CreateCommentDto,
    @AuthUser() user: User,
    @AuthWorkspace() workspace: Workspace,
  ) {
    const page = await this.pageRepo.findById(createCommentDto.pageId);
-    if (!page || page.deletedAt) {
+    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
      throw new NotFoundException('Page not found');
    }

@@ -84,14 +86,16 @@ export class CommentController {

  @HttpCode(HttpStatus.OK)
  @Post('/')
+  @OAuthScope('read')
  async findPageComments(
    @Body() input: PageIdDto,
    @Body()
    pagination: PaginationOptions,
    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
  ) {
    const page = await this.pageRepo.findById(input.pageId);
-    if (!page) {
+    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
      throw new NotFoundException('Page not found');
    }

@@ -102,14 +106,18 @@ export class CommentController {

  @HttpCode(HttpStatus.OK)
  @Post('info')
-  async findOne(@Body() input: CommentIdDto, @AuthUser() user: User) {
+  async findOne(
+    @Body() input: CommentIdDto,
+    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
    const comment = await this.commentRepo.findById(input.commentId);
    if (!comment) {
      throw new NotFoundException('Comment not found');
    }

    const page = await this.pageRepo.findById(comment.pageId);
-    if (!page) {
+    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
      throw new NotFoundException('Page not found');
    }

@@ -120,6 +128,7 @@ export class CommentController {

  @HttpCode(HttpStatus.OK)
  @Post('update')
+  @OAuthScope('write')
  async update(@Body() dto: UpdateCommentDto, @AuthUser() user: User, @AuthWorkspace() workspace: Workspace) {
    const comment = await this.commentRepo.findById(dto.commentId, {
      includeCreator: true,
@@ -130,7 +139,7 @@ export class CommentController {
    }

    const page = await this.pageRepo.findById(comment.pageId);
-    if (!page) {
+    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
      throw new NotFoundException('Page not found');
    }

@@ -148,7 +157,7 @@ export class CommentController {
    }

    const page = await this.pageRepo.findById(comment.pageId);
-    if (!page) {
+    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
      throw new NotFoundException('Page not found');
    }

@@ -7,12 +7,15 @@ import { executeTx } from '@docmost/db/utils';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
 import { normalizeLabelName } from './utils';
+import { EventEmitter2 } from "@nestjs/event-emitter";
+import { EventName } from "src/common/events/event.contants";

@Injectable()
 export class LabelService {
  constructor(
    private readonly labelRepo: LabelRepo,
    private readonly pagePermissionRepo: PagePermissionRepo,
+    private readonly eventEmitter: EventEmitter2,
    @InjectKysely() private readonly db: KyselyDB,
  ) {}

@@ -34,6 +37,12 @@ export class LabelService {
        attached.push(label);
      }
    });
+
+    this.eventEmitter.emit(EventName.PAGE_UPDATED, {
+      pageIds: [pageId],
+      workspaceId: workspaceId,
+    });
+    
    return attached;
  }

@@ -64,6 +73,11 @@ export class LabelService {
        await this.labelRepo.deleteLabel(labelId, workspaceId, trx);
      }
    });
+
+    this.eventEmitter.emit(EventName.PAGE_UPDATED, {
+      pageIds: [pageId],
+      workspaceId: workspaceId,
+    });
  }

  async getPageLabels(pageId: string, pagination: PaginationOptions) {
@@ -26,6 +26,7 @@ import { PageHistoryService } from './services/page-history.service';
 import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { OAuthScope } from '../../common/decorators/oauth-scope.decorator';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { Page, User, Workspace } from '@docmost/db/types/entity.types';
 import { SidebarPageDto } from './dto/sidebar-page.dto';
@@ -69,6 +70,7 @@ export class PageController {

  @HttpCode(HttpStatus.OK)
  @Post('/info')
+  @OAuthScope('read')
  async getPage(@Body() dto: PageInfoDto, @AuthUser() user: User) {
    const page = await this.pageRepo.findById(dto.pageId, {
      includeSpace: true,
@@ -199,6 +201,7 @@ export class PageController {

  @HttpCode(HttpStatus.OK)
  @Post('create')
+  @OAuthScope('write')
  async create(
    @Body() createPageDto: CreatePageDto,
    @AuthUser() user: User,
@@ -269,6 +272,7 @@ export class PageController {

  @HttpCode(HttpStatus.OK)
  @Post('update')
+  @OAuthScope('write')
  async update(@Body() updatePageDto: UpdatePageDto, @AuthUser() user: User) {
    const page = await this.pageRepo.findById(updatePageDto.pageId);

@@ -413,6 +417,7 @@ export class PageController {

  @HttpCode(HttpStatus.OK)
  @Post('recent')
+  @OAuthScope('read')
  async getRecentPages(
    @Body() recentPageDto: RecentPageDto,
    @Body() pagination: PaginationOptions,
@@ -527,6 +532,7 @@ export class PageController {

  @HttpCode(HttpStatus.OK)
  @Post('/sidebar-pages')
+  @OAuthScope('read')
  async getSidebarPages(
    @Body() dto: SidebarPageDto,
    @Body() pagination: PaginationOptions,
@@ -569,6 +575,7 @@ export class PageController {

  @HttpCode(HttpStatus.OK)
  @Post('move-to-space')
+  @OAuthScope('write')
  async movePageToSpace(
    @Body() dto: MovePageToSpaceDto,
    @AuthUser() user: User,
@@ -622,6 +629,7 @@ export class PageController {

  @HttpCode(HttpStatus.OK)
  @Post('duplicate')
+  @OAuthScope('write')
  async duplicatePage(@Body() dto: DuplicatePageDto, @AuthUser() user: User) {
    const copiedPage = await this.pageRepo.findById(dto.pageId);
    if (!copiedPage) {
@@ -706,6 +714,7 @@ export class PageController {

  @HttpCode(HttpStatus.OK)
  @Post('move')
+  @OAuthScope('write')
  async movePage(@Body() dto: MovePageDto, @AuthUser() user: User) {
    const movedPage = await this.pageRepo.findById(dto.pageId);
    if (!movedPage) {
@@ -496,10 +496,21 @@ export class PageService {
          },
        );

-        await this.aiQueue.add(QueueJob.PAGE_MOVED_TO_SPACE, {
-          pageIds: pageIdsToMove,
-          workspaceId: rootPage.workspaceId,
-        });
+        await this.aiQueue.add(
+          QueueJob.PAGE_MOVED_TO_SPACE,
+          {
+            pageIds: pageIdsToMove,
+            spaceId,
+            workspaceId: rootPage.workspaceId,
+          },
+          {
+            attempts: 2,
+            backoff: {
+              type: 'fixed',
+              delay: 2 * 60 * 1000,
+            },
+          },
+        );
      }
    });

@@ -1,4 +1,5 @@
 import {
+  IsArray,
  IsBoolean,
  IsNotEmpty,
  IsNumber,
@@ -8,9 +9,9 @@ import {
 } from 'class-validator';

 export class SearchDTO {
-  @IsNotEmpty()
+  @IsOptional()
  @IsString()
-  query: string;
+  query?: string;

  @IsOptional()
  @IsUUID()
@@ -24,6 +25,15 @@ export class SearchDTO {
  @IsUUID()
  creatorId?: string;

+  @IsOptional()
+  @IsArray()
+  @IsUUID('all', { each: true })
+  labelIds?: string[];
+
+  @IsOptional()
+  @IsBoolean()
+  titleOnly?: boolean;
+
  @IsOptional()
  @IsNumber()
  limit?: number;
@@ -17,6 +17,7 @@ import {
 } from './dto/search.dto';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { OAuthScope } from '../../common/decorators/oauth-scope.decorator';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
 import {
@@ -42,6 +43,7 @@ export class SearchController {

  @HttpCode(HttpStatus.OK)
  @Post()
+  @OAuthScope('read')
  async pageSearch(
    @Body() searchDto: SearchDTO,
    @AuthUser() user: User,
@@ -75,6 +77,7 @@ export class SearchController {

  @HttpCode(HttpStatus.OK)
  @Post('suggest')
+  @OAuthScope('read')
  async searchSuggestions(
    @Body() dto: SearchSuggestionDTO,
    @AuthUser() user: User,
@@ -29,12 +29,36 @@ export class SearchService {
      workspaceId: string;
    },
  ): Promise<{ items: SearchResponseDto[] }> {
-    const { query } = searchParams;
+    const query = searchParams.query?.trim() ?? '';
+    const labelIds = [...new Set(searchParams.labelIds ?? [])];
+    // selected filters (labels, creator) are browsable without a query
+    const browseByFilters =
+      query.length < 1 &&
+      (labelIds.length > 0 || Boolean(searchParams.creatorId));

-    if (query.length < 1) {
+    if (query.length < 1 && !browseByFilters) {
      return { items: [] };
    }
-    const searchQuery = tsquery(query.trim() + '*');
+    const searchQuery = tsquery(query + '*');
+    const titleOnly = searchParams.titleOnly === true;
+    const titleQuery = query;
+    // escape LIKE wildcards; ranking keeps the raw query
+    const titleLikeQuery = query.replace(/[\\%_]/g, '\\$&');
+
+    const rankColumn = browseByFilters
+      ? sql<number>`0`.as('rank')
+      : titleOnly
+        ? sql<number>`word_similarity(lower(${titleQuery}), lower(pages.title))`.as(
+            'rank',
+          )
+        : sql<number>`ts_rank(tsv, to_tsquery('english', f_unaccent(${searchQuery})))`.as(
+            'rank',
+          );
+    const highlightColumn = browseByFilters || titleOnly
+      ? sql<string>`''`.as('highlight')
+      : sql<string>`ts_headline('english', text_content, to_tsquery('english', f_unaccent(${searchQuery})),'MinWords=9, MaxWords=10, MaxFragments=3')`.as(
+          'highlight',
+        );

    let queryResults = this.db
      .selectFrom('pages')
@@ -47,23 +71,41 @@ export class SearchService {
        'creatorId',
        'createdAt',
        'updatedAt',
-        sql<number>`ts_rank(tsv, to_tsquery('english', f_unaccent(${searchQuery})))`.as(
-          'rank',
-        ),
-        sql<string>`ts_headline('english', text_content, to_tsquery('english', f_unaccent(${searchQuery})),'MinWords=9, MaxWords=10, MaxFragments=3')`.as(
-          'highlight',
-        ),
+        rankColumn,
+        highlightColumn,
      ])
-      .where(
-        'tsv',
-        '@@',
-        sql<string>`to_tsquery('english', f_unaccent(${searchQuery}))`,
+      .$if(!browseByFilters && !titleOnly, (qb) =>
+        qb.where(
+          'tsv',
+          '@@',
+          sql<string>`to_tsquery('english', f_unaccent(${searchQuery}))`,
+        ),
+      )
+      .$if(!browseByFilters && titleOnly, (qb) =>
+        qb.where((eb) =>
+          eb(
+            sql`lower(pages.title)`,
+            'like',
+            sql`lower(${`%${titleLikeQuery}%`})`,
+          ),
+        ),
      )
      .$if(Boolean(searchParams.creatorId), (qb) =>
        qb.where('creatorId', '=', searchParams.creatorId),
      )
+      .$if(labelIds?.length > 0, (qb) =>
+        qb.where(
+          'id',
+          'in',
+          this.db
+            .selectFrom('pageLabels')
+            .select('pageId')
+            .where('labelId', 'in', labelIds),
+        ),
+      )
      .where('deletedAt', 'is', null)
-      .orderBy('rank', 'desc')
+      .$if(browseByFilters, (qb) => qb.orderBy('updatedAt', 'desc'))
+      .$if(!browseByFilters, (qb) => qb.orderBy('rank', 'desc'))
      .limit(searchParams.limit || 25)
      .offset(searchParams.offset || 0);

@@ -71,8 +113,7 @@ export class SearchService {
      queryResults = queryResults.select((eb) => this.pageRepo.withSpace(eb));
    }

-    if (searchParams.spaceId) {
-      // search by spaceId
+    if (searchParams.spaceId && opts.userId) {
      queryResults = queryResults.where('spaceId', '=', searchParams.spaceId);
    } else if (opts.userId && !searchParams.spaceId) {
      // only search spaces the user is a member of
@@ -46,8 +46,9 @@ export class ShareService {
      throw new NotFoundException('Share not found');
    }

-    const isRestricted =
-      await this.pagePermissionRepo.hasRestrictedAncestor(share.pageId);
+    const isRestricted = await this.pagePermissionRepo.hasRestrictedAncestor(
+      share.pageId,
+    );
    if (isRestricted) {
      throw new NotFoundException('Share not found');
    }
@@ -110,6 +111,9 @@ export class ShareService {
  }

  async getSharedPage(dto: ShareInfoDto, workspaceId: string) {
+    //TODO: we should resolve the page from the share id
+    if (!dto.pageId) throw new NotFoundException('Shared page not found');
+
    const share = await this.getShareForPage(dto.pageId, workspaceId);

    if (!share) {
@@ -126,8 +130,9 @@ export class ShareService {
    }

    // Block access to restricted pages
-    const isRestricted =
-      await this.pagePermissionRepo.hasRestrictedAncestor(page.id);
+    const isRestricted = await this.pagePermissionRepo.hasRestrictedAncestor(
+      page.id,
+    );
    if (isRestricted) {
      throw new NotFoundException('Shared page not found');
    }
@@ -339,15 +339,25 @@ export class SpaceMemberService {
      return;
    }

-    if (spaceMember.role === SpaceRole.ADMIN) {
-      await this.validateLastAdmin(dto.spaceId);
-    }
+    await executeTx(this.db, async (trx) => {
+      await trx
+        .selectFrom('spaces')
+        .select('id')
+        .where('id', '=', dto.spaceId)
+        .forUpdate()
+        .executeTakeFirst();

-    await this.spaceMemberRepo.updateSpaceMember(
-      { role: dto.role },
-      spaceMember.id,
-      dto.spaceId,
-    );
+      if (spaceMember.role === SpaceRole.ADMIN) {
+        await this.validateLastAdmin(dto.spaceId, trx);
+      }
+
+      await this.spaceMemberRepo.updateSpaceMember(
+        { role: dto.role },
+        spaceMember.id,
+        dto.spaceId,
+        trx,
+      );
+    });

    this.auditService.log({
      event: AuditEvent.SPACE_MEMBER_ROLE_CHANGED,
@@ -368,10 +378,14 @@ export class SpaceMemberService {
    });
  }

-  async validateLastAdmin(spaceId: string): Promise<void> {
+  async validateLastAdmin(
+    spaceId: string,
+    trx?: KyselyTransaction,
+  ): Promise<void> {
    const spaceOwnerCount = await this.spaceMemberRepo.roleCountBySpaceId(
      SpaceRole.ADMIN,
      spaceId,
+      trx,
    );
    if (spaceOwnerCount === 1) {
      throw new BadRequestException(
@@ -13,6 +13,7 @@ import { SpaceService } from './services/space.service';
 import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { OAuthScope } from '../../common/decorators/oauth-scope.decorator';
 import { SpaceIdDto } from './dto/space-id.dto';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { SpaceMemberService } from './services/space-member.service';
@@ -48,6 +49,7 @@ export class SpaceController {

  @HttpCode(HttpStatus.OK)
  @Post('/')
+  @OAuthScope('read')
  async getWorkspaceSpaces(
    @Body()
    pagination: PaginationOptions,
@@ -92,6 +94,7 @@ export class SpaceController {

  @HttpCode(HttpStatus.OK)
  @Post('info')
+  @OAuthScope('read')
  async getSpaceInfo(
    @Body() spaceIdDto: SpaceIdDto,
    @AuthUser() user: User,
@@ -129,6 +132,7 @@ export class SpaceController {

  @HttpCode(HttpStatus.OK)
  @Post('create')
+  @OAuthScope('write')
  createSpace(
    @Body() createSpaceDto: CreateSpaceDto,
    @AuthUser() user: User,
@@ -145,6 +149,7 @@ export class SpaceController {

  @HttpCode(HttpStatus.OK)
  @Post('update')
+  @OAuthScope('write')
  async updateSpace(
    @Body() updateSpaceDto: UpdateSpaceDto,
    @AuthUser() user: User,
@@ -10,6 +10,7 @@ import { UserService } from './user.service';
 import { UpdateUserDto } from './dto/update-user.dto';
 import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { OAuthScope } from '../../common/decorators/oauth-scope.decorator';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
@@ -24,6 +25,7 @@ export class UserController {

  @HttpCode(HttpStatus.OK)
  @Post('me')
+  @OAuthScope('read')
  async getUserInfo(
    @AuthUser() authUser: User,
    @AuthWorkspace() workspace: Workspace,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Philip Okugbe	579e22a45e	fix: use ACL username and decode credentials in Redis URL parsing (#2434 ) * fix: use ACL username and decode credentials in Redis URL parsing * fix: pass family and TLS options to the collab app module	2026-08-26 14:16:18 +01:00
Philip Okugbe	c3d9a19545	New Crowdin updates (#2332 )	2026-08-26 14:08:10 +01:00
Philipinho	214a73b6a0	refactor: rename MCP oauth-only setting to enforceMcpOauth	2026-08-26 13:45:28 +01:00
Philipinho	278d318771	sync	2026-08-26 12:56:15 +01:00
Philip Okugbe	e56de8eb6c	feat(ee): MCP OAuth (#2432 ) * feat: mcp oauth * fix: small refactor * fix: cleanup consent	2026-08-26 12:55:30 +01:00
Salihu	bda802e5df	convert only bare links to embeds (#2424 )	2026-08-26 12:53:36 +01:00
Philip Okugbe	b29e130f26	fix: enhance lightbox (#2429 ) * fix: close on click outside; smaller icon size * fix: make ALT more visible	2026-08-26 02:24:02 +01:00
Philip Okugbe	56474e5b70	fix: remove client compression script (#2428 )	2026-08-25 17:31:49 +01:00
Philipinho	83d7ee4460	chore: pnpm minor version	2026-08-25 04:34:11 +01:00
Philipinho	fc90fbd8c0	chore: update pnpm	2026-08-25 04:31:23 +01:00
Philip Okugbe	a0ec93506c	chore: compress and lazy load client code (#2425 )	2026-08-25 03:29:56 +01:00
Philipinho	a415b86193	fix: clean up unaccent usage in index	2026-08-25 03:28:59 +01:00
Philipinho	702f8b7a41	fix: local editor cache	2026-08-25 02:54:38 +01:00
Salihu	95cef61927	fix: rework filtering behaviour (#2413 ) * rework filtering behaviour * fix classification bug	2026-08-25 02:52:24 +01:00
SalihuandPhilipinho	7bd73f77a4	feat: lightbox media display (#2420 ) * lightbox media display init * revert uninteded changes * load page media more accurately * restrict lock file changes to installed packages * revert changes in lock file * update lockfile * - support diagrams - support readonly mode - use softer backdrop - other enhancments --------- Co-authored-by: Philipinho <16838612+Philipinho@users.noreply.github.com>	2026-08-25 02:43:19 +01:00
Salihu	3a25336d3d	fix: display subpages correctly on first load (#2423 )	2026-08-25 01:39:55 +01:00
SalihuandPhilipinho	917195b2f2	feat: enhanced search filters (#2398 ) * advanced search filters * improve labelId filtering in query * index label ids on typesense * index label ids on typesense * filters on AI search * refactor: detect typesense schema drift from the declared collection schema * feat: show secondary search filters only when applied Created by and Labels now stay hidden until they hold a value; a Filter button at the right end of the bar lists the hidden ones and opens the picked filter's dropdown immediately. * fix: keep applied search filters in the order they were added * feat: add title-only search mode Adds a titleOnly flag to page search: the Postgres driver matches titles via trigram-indexed unaccented LIKE ranked by word_similarity, and a Match filter in the search spotlight switches between everything and title-only matching. * refactor: make title-only search a toggle chip * fix: drop stale results when the search content type changes * feat: add trigram index on attachment file names * feat: extend title-only search to attachments The titleOnly flag now matches attachment file names via the separator-normalized trigram expression, and the toggle chip stays available in attachment mode as File name only. * refactor: keep the title-only label uniform across search modes * feat: index txt attachments for content search * feat: pin the current user at the top of the creator filter * refactor: dim the you suffix in the creator filter * feat: browse label-filtered pages without a query Selecting labels now lists their pages newest-first before any text is typed, on both the Postgres and Typesense drivers. * fix: match any selected label instead of requiring all * fix: use a gray spotlight selection instead of primary blue * feat: include search results in the spotlight tab order * feat: show last updated time on search results * fix: stop empty-state flicker while the search query debounces * feat: browse creator-filtered results without a query Selecting a creator with an empty query now lists their pages (or attachments in attachment mode) newest-first, with the same space and page permission filtering as typed search. * fix: show Untitled for pages without a title in search results * quick page sharing fix * minor search filter fixes --------- Co-authored-by: Philipinho <16838612+Philipinho@users.noreply.github.com>	2026-08-25 01:39:33 +01:00
Philip Okugbe	cd597f0161	chore: remove unused npm modules in Docke build (#2422 )	2026-08-24 20:32:50 +01:00
Philip Okugbe	b7f0b063dc	feat(ee): add enterprise ai chat controls (#2421 ) * feat(ee): add enterprise ai chat controls * feat: add comment listing tool to ai chat * fix: scope comment endpoints to workspace and skip trashed pages	2026-08-24 20:29:21 +01:00
Salihu	cd9c166927	Merge pull request #2417 from docmost/fix/checkbox-filtering fix(ee): checkbox filtering	2026-08-23 21:21:02 +01:00
Philip Okugbe	549cf7c005	fix: skip pgvector table check when enabling AI search on turbopuffer (#2416 )	2026-08-22 13:20:35 +01:00
Philip Okugbe	e14f499f3d	fix: pass tls to redis in throttle module (#2415 )	2026-08-22 03:46:00 +01:00
Salihu	b814bd0f12	fix: checkbox filtering	2026-08-21 19:29:10 +01:00
Salihu	b86abd3d40	Revert "fix: checkbox filtering" This reverts commit `3b858746e3`.	2026-08-21 19:23:48 +01:00
Salihu	3b858746e3	fix: checkbox filtering	2026-08-21 19:21:14 +01:00
Philipinho	66b424a3b8	fix: preserve hash in vimeo embed url	2026-08-20 22:25:45 +01:00
Philipinho	ab43031375	fix race issue	2026-08-19 21:46:01 +01:00
Michael LohrandPhilipinho	8c2c49ea6d	fix: handle empty password, missing port, and TLS in Redis URL parsing (#2021 ) * fix: handle empty password, missing port, and TLS in Redis URL parsing --------- Co-authored-by: Philipinho <16838612+Philipinho@users.noreply.github.com>	2026-08-19 21:05:44 +01:00
Philip Okugbe	8913d20aa0	chore: package updates (#2412 )	2026-08-19 19:59:00 +01:00
Philip Okugbe	232beda471	feat(ee): turbopuffer ai vector search driver (#2402 ) * feat(ai): add AI_VECTOR_DRIVER and turbopuffer configuration * feat(ai): carry workspace and target space ids on vector lifecycle events * feat(ai): add vector driver interface and turbopuffer request helpers * feat(ai): add pgvector driver behind the vector driver interface * refactor(ai): route vector reads and writes through the vector driver * feat(ai): add turbopuffer vector driver * feat(ai): rebuild turbopuffer namespaces when the embedding model changes * feat(ai): warm the vector namespace cache on session start * fix(ai): harden turbopuffer misconfiguration and reset failure paths * fix(ai): collapse blank-line runs in extracted page text * fix(ai): skip full re-embed when ai search is re-enabled within the delete grace window * sync * fix(ai): store real embedding dimensions instead of serialized vector length * fix(ai): filter search hits by the page's current space at query time * fix(ai): retry the page moved-to-space vector patch job * sync * feat(ai): pre-warm the vector namespace * fix(ai): pass AI_VECTOR_DRIVER through the client build config	2026-08-17 21:18:16 +01:00
Philip Okugbe	911c1057d6	feat(server): add global encryption module (AES-256-GCM) (#2400 ) Provides an injectable EncryptionService that encrypts/decrypts strings with AES-256-GCM using a key derived from APP_SECRET with domain separation.	2026-08-16 12:35:37 +01:00
Philipinho	d136864ef1	sync	2026-08-16 11:46:50 +01:00
Philip Okugbe	c093c18bf3	fix(client): keep space switcher dropdown inside its popover (#2392 )	2026-08-14 02:08:28 +01:00