@agent-native/core 0.134.1 → 0.135.1

package/corpus/templates/content/app/i18n-data.ts

@@ -3055,6 +3055,10 @@ const enUS = {
     metaTitle: "Settings - Content",
     title: "Settings",
     description: "Language and workspace preferences for Content.",
+    emailNotifications: "Email notifications",
+    emailNotificationsDescription:
+      "Get an email when someone comments on, replies in, or mentions you on your document.",
+    saveFailed: "Failed to save",
     languageTitle: "Language",
     languageDescription:
       "Choose the interface language. This preference is saved for your account.",
@@ -3116,9 +3120,12 @@ const enUS = {
     liveDocumentSaveBeforeSyncFailed:
       "The live document could not be saved before syncing.",
     documentTitle: "Document title",
-    builderBodySyncing: "Content is still syncing from Builder",
+    builderBodySyncing: "This page's content is still syncing from Builder",
     builderBodySyncingDescription:
       "Editing is paused until the Builder body finishes syncing, so the existing article content is not overwritten.",
+    pageBodySyncing: "This page's content is still syncing",
+    pageBodySyncingDescription:
+      "Editing is paused until the page body finishes syncing, so existing content is not overwritten.",
     localFileSavedHistoryNotUpdated:
       "Local file saved, but history was not updated",
     reorderField: "Reorder {{name}}",
@@ -5611,6 +5618,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "内容仍在从 Builder 同步",
     builderBodySyncingDescription:
       "同步 Builder 正文完成前会暂停编辑，避免覆盖现有文章内容。",
+    pageBodySyncing: "此页面的内容仍在同步",
+    pageBodySyncingDescription:
+      "在页面正文完成同步之前，编辑会暂停，以免覆盖现有内容。",
     creatingDatabase: "正在创建内联数据库...",
     databaseCreated: "内联数据库已创建",
     emptyBlockPlaceholder: "按“/”使用命令",
@@ -5956,6 +5966,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "El contenido aún se está sincronizando desde Builder",
     builderBodySyncingDescription:
       "La edición está en pausa hasta que el cuerpo de Builder termine de sincronizarse, para no sobrescribir el contenido existente del artículo.",
+    pageBodySyncing: "El contenido de esta página aún se está sincronizando",
+    pageBodySyncingDescription:
+      "La edición está en pausa hasta que el contenido de la página termine de sincronizarse, para no sobrescribir el contenido existente.",
     creatingDatabase: "Creando base de datos integrada...",
     databaseCreated: "Base de datos integrada creada",
     emptyBlockPlaceholder: "Pulsa «/» para ver los comandos",
@@ -6313,6 +6326,10 @@ const editorMessagesByLocale = {
       "Le contenu est encore en cours de synchronisation depuis Builder",
     builderBodySyncingDescription:
       "La modification est suspendue jusqu'à la fin de la synchronisation du corps Builder, afin de ne pas écraser le contenu existant de l'article.",
+    pageBodySyncing:
+      "Le contenu de cette page est encore en cours de synchronisation",
+    pageBodySyncingDescription:
+      "La modification est suspendue jusqu'à la fin de la synchronisation du contenu de la page, afin de ne pas écraser le contenu existant.",
     creatingDatabase: "Création d'une base de données intégrée...",
     databaseCreated: "Base de données intégrée créée",
     emptyBlockPlaceholder: "Appuyez sur « / » pour afficher les commandes",
@@ -6672,6 +6689,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "Inhalte werden noch von Builder synchronisiert",
     builderBodySyncingDescription:
       "Die Bearbeitung ist pausiert, bis der Builder-Textkörper fertig synchronisiert ist, damit der bestehende Artikelinhalt nicht überschrieben wird.",
+    pageBodySyncing: "Der Inhalt dieser Seite wird noch synchronisiert",
+    pageBodySyncingDescription:
+      "Die Bearbeitung ist pausiert, bis der Seiteninhalt fertig synchronisiert ist, damit bestehende Inhalte nicht überschrieben werden.",
     creatingDatabase: "Inline-Datenbank wird erstellt...",
     databaseCreated: "Inline-Datenbank erstellt",
     emptyBlockPlaceholder: "Drücke „/“ für Befehle",
@@ -7036,6 +7056,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "コンテンツはまだ Builder から同期中です",
     builderBodySyncingDescription:
       "既存の記事内容を上書きしないよう、Builder 本文の同期が完了するまで編集は一時停止されます。",
+    pageBodySyncing: "このページのコンテンツはまだ同期中です",
+    pageBodySyncingDescription:
+      "既存のコンテンツを上書きしないよう、ページ本文の同期が完了するまで編集は一時停止されます。",
     creatingDatabase: "インラインデータベースを作成しています...",
     databaseCreated: "インラインデータベースが作成されました",
     emptyBlockPlaceholder: "「/」でコマンドを表示",
@@ -7389,6 +7412,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "콘텐츠가 아직 Builder에서 동기화되는 중입니다",
     builderBodySyncingDescription:
       "기존 문서 내용을 덮어쓰지 않도록 Builder 본문 동기화가 완료될 때까지 편집이 일시 중지됩니다.",
+    pageBodySyncing: "이 페이지의 콘텐츠가 아직 동기화 중입니다",
+    pageBodySyncingDescription:
+      "기존 콘텐츠를 덮어쓰지 않도록 페이지 본문 동기화가 완료될 때까지 편집이 일시 중지됩니다.",
     creatingDatabase: "인라인 데이터베이스 생성 중...",
     databaseCreated: "인라인 데이터베이스가 생성되었습니다.",
     emptyBlockPlaceholder: "‘/’를 눌러 명령 사용",
@@ -7741,6 +7767,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "O conteúdo ainda está sincronizando do Builder",
     builderBodySyncingDescription:
       "A edição fica pausada até o corpo do Builder terminar de sincronizar, para não sobrescrever o conteúdo existente do artigo.",
+    pageBodySyncing: "O conteúdo desta página ainda está sincronizando",
+    pageBodySyncingDescription:
+      "A edição fica pausada até o conteúdo da página terminar de sincronizar, para não sobrescrever o conteúdo existente.",
     creatingDatabase: "Criando banco de dados embutido...",
     databaseCreated: "Banco de dados embutido criado",
     emptyBlockPlaceholder: "Pressione “/” para comandos",
@@ -8099,6 +8128,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "सामग्री अभी भी Builder से सिंक हो रही है",
     builderBodySyncingDescription:
       "Builder का मुख्य भाग सिंक पूरा होने तक संपादन रोका गया है, ताकि मौजूदा लेख सामग्री अधिलेखित न हो।",
+    pageBodySyncing: "इस पेज की सामग्री अभी भी सिंक हो रही है",
+    pageBodySyncingDescription:
+      "पेज का मुख्य भाग सिंक पूरा होने तक संपादन रोका गया है, ताकि मौजूदा सामग्री अधिलेखित न हो।",
     creatingDatabase: "इनलाइन डेटाबेस बनाया जा रहा है...",
     databaseCreated: "इनलाइन डेटाबेस बनाया गया",
     emptyBlockPlaceholder: "कमांड के लिए '/' दबाएं",
@@ -8446,6 +8478,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "لا يزال المحتوى قيد المزامنة من Builder",
     builderBodySyncingDescription:
       "يتم إيقاف التحرير مؤقتًا حتى تكتمل مزامنة نص Builder، حتى لا يتم استبدال محتوى المقالة الحالي.",
+    pageBodySyncing: "لا يزال محتوى هذه الصفحة قيد المزامنة",
+    pageBodySyncingDescription:
+      "يتم إيقاف التحرير مؤقتًا حتى تكتمل مزامنة محتوى الصفحة، حتى لا تتم الكتابة فوق المحتوى الحالي.",
     creatingDatabase: "جارٍ إنشاء قاعدة بيانات مضمنة...",
     databaseCreated: "تم إنشاء قاعدة البيانات المضمنة",
     emptyBlockPlaceholder: 'اضغط على "/" للأوامر',
@@ -9133,6 +9168,10 @@ export const messagesByLocale = {
     settings: {
       title: "设置",
       description: "Content 的语言和工作区偏好设置。",
+      emailNotifications: "邮件通知",
+      emailNotificationsDescription:
+        "当有人评论你的文档、在讨论串中回复或提到你时，收到邮件通知。",
+      saveFailed: "保存失败",
       languageTitle: "语言",
       languageDescription: "选择界面语言。此偏好会保存到你的账户。",
       languageLabel: "界面语言",
@@ -9325,6 +9364,10 @@ export const messagesByLocale = {
     settings: {
       title: "Ajustes",
       description: "Preferencias de idioma y espacio de trabajo para Content.",
+      emailNotifications: "Notificaciones por correo",
+      emailNotificationsDescription:
+        "Recibe un correo cuando alguien comente, responda o te mencione en tu documento.",
+      saveFailed: "No se pudo guardar",
       languageTitle: "Idioma",
       languageDescription:
         "Elige el idioma de la interfaz. Esta preferencia se guarda en tu cuenta.",
@@ -9524,6 +9567,10 @@ export const messagesByLocale = {
     settings: {
       title: "Paramètres",
       description: "Préférences de langue et d’espace de travail pour Content.",
+      emailNotifications: "Notifications par e-mail",
+      emailNotificationsDescription:
+        "Recevez un e-mail lorsqu’une personne commente, répond ou vous mentionne dans votre document.",
+      saveFailed: "Échec de l’enregistrement",
       languageTitle: "Langue",
       languageDescription:
         "Choisissez la langue de l’interface. Cette préférence est enregistrée dans votre compte.",
@@ -9721,6 +9768,10 @@ export const messagesByLocale = {
     settings: {
       title: "Einstellungen",
       description: "Sprach- und Arbeitsbereichseinstellungen für Content.",
+      emailNotifications: "E-Mail-Benachrichtigungen",
+      emailNotificationsDescription:
+        "Erhalte eine E-Mail, wenn jemand dein Dokument kommentiert, antwortet oder dich erwähnt.",
+      saveFailed: "Speichern fehlgeschlagen",
       languageTitle: "Sprache",
       languageDescription:
         "Wähle die Sprache der Oberfläche. Diese Einstellung wird in deinem Konto gespeichert.",
@@ -9917,6 +9968,10 @@ export const messagesByLocale = {
     settings: {
       title: "設定",
       description: "Content の言語とワークスペース設定。",
+      emailNotifications: "メール通知",
+      emailNotificationsDescription:
+        "誰かがあなたのドキュメントにコメント、返信、またはあなたにメンションしたときにメールを受け取ります。",
+      saveFailed: "保存に失敗しました",
       languageTitle: "言語",
       languageDescription:
         "インターフェース言語を選択します。この設定はアカウントに保存されます。",
@@ -10105,6 +10160,10 @@ export const messagesByLocale = {
     settings: {
       title: "설정",
       description: "Content의 언어 및 워크스페이스 환경설정입니다.",
+      emailNotifications: "이메일 알림",
+      emailNotificationsDescription:
+        "누군가 내 문서에 댓글을 달거나 답글을 남기거나 나를 멘션하면 이메일을 받습니다.",
+      saveFailed: "저장 실패",
       languageTitle: "언어",
       languageDescription:
         "인터페이스 언어를 선택하세요. 이 기본 설정은 계정에 저장됩니다.",
@@ -10299,6 +10358,10 @@ export const messagesByLocale = {
     settings: {
       title: "Configurações",
       description: "Preferências de idioma e espaço de trabalho do Content.",
+      emailNotifications: "Notificações por e-mail",
+      emailNotificationsDescription:
+        "Receba um e-mail quando alguém comentar, responder ou mencionar você no seu documento.",
+      saveFailed: "Falha ao salvar",
       languageTitle: "Idioma",
       languageDescription:
         "Escolha o idioma da interface. Essa preferência é salva na sua conta.",
@@ -10486,6 +10549,10 @@ export const messagesByLocale = {
     settings: {
       title: "सेटिंग्स",
       description: "Content के लिए भाषा और कार्यस्थान प्राथमिकताएं।",
+      emailNotifications: "ईमेल सूचनाएँ",
+      emailNotificationsDescription:
+        "जब कोई आपके दस्तावेज़ पर टिप्पणी करे, जवाब दे या आपका उल्लेख करे तो ईमेल पाएँ।",
+      saveFailed: "सहेजने में विफल",
       languageTitle: "भाषा",
       languageDescription: "इंटरफ़ेस भाषा चुनें। यह पसंद आपके खाते में सहेजी जाती है।",
       languageLabel: "इंटरफ़ेस भाषा",
@@ -10672,6 +10739,10 @@ export const messagesByLocale = {
     settings: {
       title: "الإعدادات",
       description: "تفضيلات اللغة ومساحة العمل في Content.",
+      emailNotifications: "إشعارات البريد الإلكتروني",
+      emailNotificationsDescription:
+        "احصل على بريد إلكتروني عندما يعلّق شخص على مستندك أو يرد أو يذكرك.",
+      saveFailed: "فشل الحفظ",
       languageTitle: "اللغة",
       languageDescription: "اختر لغة الواجهة. يتم حفظ هذا التفضيل في حسابك.",
       languageLabel: "لغة الواجهة",

package/corpus/templates/content/app/lib/document-query.ts

@@ -0,0 +1,36 @@
+export interface DocumentQueryContext {
+  databaseId?: string | null;
+  databaseDocumentId?: string | null;
+}
+
+export function documentQueryKey(
+  documentId: string,
+  context: DocumentQueryContext = {},
+) {
+  return [
+    "action",
+    "get-document",
+    {
+      id: documentId,
+      ...(context.databaseId ? { databaseId: context.databaseId } : {}),
+      ...(context.databaseDocumentId
+        ? { databaseDocumentId: context.databaseDocumentId }
+        : {}),
+    },
+  ] as const;
+}
+
+export function documentQueryFilter(documentId: string) {
+  return {
+    queryKey: ["action", "get-document"] as const,
+    predicate: (query: { queryKey: readonly unknown[] }) => {
+      const args = query.queryKey[2];
+      return (
+        !!args &&
+        typeof args === "object" &&
+        "id" in args &&
+        args.id === documentId
+      );
+    },
+  };
+}

package/corpus/templates/content/app/routes/_app.settings.tsx

@@ -3,6 +3,8 @@ import { LanguagePicker, useT } from "@agent-native/core/client/i18n";
 import { TeamPage } from "@agent-native/core/client/org";
 import {
   AccountSettingsCard,
+  SettingsGroup,
+  SettingsRow,
   SettingsTabsPage,
   useAgentSettingsTabs,
   type SettingsSearchEntry,
@@ -10,8 +12,10 @@ import {
 import { CreativeContextSettingsLink } from "@agent-native/creative-context/client";
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 import { useMemo } from "react";
+import { toast } from "sonner";
 
-import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+import { useContentPrefs } from "@/hooks/use-content-prefs";
 import { messagesByLocale } from "@/i18n-data";
 
 import changelog from "../../CHANGELOG.md?raw";
@@ -24,6 +28,7 @@ export default function SettingsRoute() {
   const t = useT();
   const agentSettingsTabs = useAgentSettingsTabs();
   useSetPageTitle(t("settings.title"));
+  const { prefs, loading: prefsLoading, save: savePrefs } = useContentPrefs();
 
   const generalSearchEntries = useMemo<SettingsSearchEntry[]>(
     () => [
@@ -33,6 +38,12 @@ export default function SettingsRoute() {
         keywords: "language locale translation i18n",
         hash: "language",
       },
+      {
+        id: "content-notifications",
+        label: t("settings.emailNotifications"),
+        keywords: "email notifications comments replies mentions alerts",
+        hash: "notifications",
+      },
     ],
     [t],
   );
@@ -52,23 +63,41 @@ export default function SettingsRoute() {
 
             <CreativeContextSettingsLink />
 
-            <section
-              id="language"
-              className="scroll-mt-16 rounded-lg border border-border bg-card p-5"
-            >
-              <div className="space-y-1">
-                <h2 className="text-base font-semibold">
-                  {t("settings.languageTitle")}
-                </h2>
-                <p className="text-sm leading-6 text-muted-foreground">
-                  {t("settings.languageDescription")}
-                </p>
-              </div>
-              <div className="mt-4 max-w-xs space-y-1.5">
-                <Label>{t("settings.languageLabel")}</Label>
-                <LanguagePicker label={t("settings.languageLabel")} />
-              </div>
-            </section>
+            <SettingsGroup>
+              <SettingsRow
+                id="language"
+                label={t("settings.languageTitle")}
+                description={t("settings.languageDescription")}
+                control={
+                  <div className="w-56">
+                    <LanguagePicker label={t("settings.languageLabel")} />
+                  </div>
+                }
+              />
+              <SettingsRow
+                id="notifications"
+                label={t("settings.emailNotifications")}
+                description={t("settings.emailNotificationsDescription")}
+                control={
+                  <Switch
+                    aria-label={t("settings.emailNotifications")}
+                    checked={prefs.emailNotifications !== false}
+                    disabled={prefsLoading}
+                    onCheckedChange={(checked) => {
+                      savePrefs({ emailNotifications: checked }).catch(
+                        (err) => {
+                          toast.error(
+                            err instanceof Error
+                              ? err.message
+                              : t("settings.saveFailed"),
+                          );
+                        },
+                      );
+                    }}
+                  />
+                }
+              />
+            </SettingsGroup>
           </main>
         }
         team={

package/corpus/templates/content/changelog/2026-07-30-breadcrumb-menus-now-hide-internal-system-pages.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-30
+---
+
+Breadcrumb menus now show only relevant page peers instead of internal system pages, with reliable keyboard selection between pages.

package/corpus/templates/content/changelog/2026-08-01-get-an-email-when-someone-comments-on-replies-in-or-mentions.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-08-01
+---
+
+Get an email when someone comments on, replies in, or mentions you on your document, with a new toggle in Settings

package/corpus/templates/content/changelog/2026-08-02-pages-opened-from-a-database-now-keep-that-database-s-fields.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-02
+---
+
+Pages opened from a database now keep that database’s fields and loading state, even when the page also belongs to a Builder-connected database.

package/corpus/templates/content/server/lib/comment-notifications.ts

@@ -0,0 +1,146 @@
+/**
+ * Email notifications for document comments, replies, and mentions.
+ *
+ * Recipient resolution, preference filtering, and delivery reporting come from
+ * `@agent-native/core/server`; this module owns only the Documents rows and the
+ * email copy. Share invites are not routed through the `emailNotifications`
+ * preference — they have their own delivery path.
+ */
+
+import {
+  emailStrong,
+  getAppProductionUrl,
+  notifyActivity,
+  renderEmail,
+  runActivityNotification,
+  sendEmail,
+  type ActivityNotificationResult,
+} from "@agent-native/core/server";
+import { filterRecipientsByResourceAccess } from "@agent-native/core/sharing";
+import { and, eq } from "drizzle-orm";
+
+import { CONTENT_USER_PREFS_KEY } from "../../shared/content-user-prefs.js";
+import { getDb, schema } from "../db/index.js";
+
+export type DocumentCommentNotificationResult = ActivityNotificationResult;
+
+const LOG_LABEL = "[content] comment notification";
+const EXCERPT_LIMIT = 240;
+
+function excerpt(content: string): string {
+  const collapsed = content.replace(/\s+/g, " ").trim();
+  return collapsed.length > EXCERPT_LIMIT
+    ? `${collapsed.slice(0, EXCERPT_LIMIT - 1)}…`
+    : collapsed;
+}
+
+function documentUrl(documentId: string): string {
+  const base = getAppProductionUrl().replace(/\/+$/, "");
+  return `${base}/page/${encodeURIComponent(documentId)}`;
+}
+
+async function threadParticipants(
+  documentId: string,
+  threadId: string,
+): Promise<string[]> {
+  const rows = await getDb()
+    .select({ authorEmail: schema.documentComments.authorEmail })
+    .from(schema.documentComments)
+    .where(
+      and(
+        eq(schema.documentComments.documentId, documentId),
+        eq(schema.documentComments.threadId, threadId),
+      ),
+    );
+  return rows.map((row) => row.authorEmail);
+}
+
+export interface DocumentCommentNotificationInput {
+  documentId: string;
+  /** Read from the access-checked resource by the caller, never re-queried. */
+  documentTitle: string;
+  /** The document's org, so `org` visibility resolves for its members. */
+  orgId?: string | null;
+  threadId: string;
+  ownerEmail: string;
+  authorEmail: string;
+  authorName?: string | null;
+  content: string;
+  mentions: { email: string; name: string }[];
+  isReply: boolean;
+}
+
+export async function notifyDocumentComment(
+  input: DocumentCommentNotificationInput,
+): Promise<DocumentCommentNotificationResult> {
+  return runActivityNotification(LOG_LABEL, () =>
+    deliverDocumentCommentEmails(input),
+  );
+}
+
+async function deliverDocumentCommentEmails(
+  input: DocumentCommentNotificationInput,
+): Promise<DocumentCommentNotificationResult> {
+  const title = input.documentTitle.trim() || "Untitled";
+  const mentioned = new Set(
+    input.mentions.map((mention) => mention.email.trim().toLowerCase()),
+  );
+
+  const candidates = [input.ownerEmail, ...mentioned];
+  if (input.isReply) {
+    candidates.push(
+      ...(await threadParticipants(input.documentId, input.threadId)),
+    );
+  }
+
+  // Mentions are caller-supplied and thread rows are historical; re-check both
+  // against the document's live ACL before mailing anyone its contents.
+  const allowed = await filterRecipientsByResourceAccess({
+    resourceType: "document",
+    resourceId: input.documentId,
+    emails: candidates,
+    orgId: input.orgId,
+  });
+
+  const actor = input.authorName?.trim() || input.authorEmail;
+  const url = documentUrl(input.documentId);
+
+  return notifyActivity({
+    candidates: allowed,
+    actorEmail: input.authorEmail,
+    preferenceKey: CONTENT_USER_PREFS_KEY,
+    logLabel: LOG_LABEL,
+    send: async (to) => {
+      const wasMentioned = mentioned.has(to);
+      const lead = wasMentioned
+        ? `${emailStrong(actor)} mentioned you in a comment on ${emailStrong(title)}.`
+        : input.isReply
+          ? `${emailStrong(actor)} replied in a comment thread on ${emailStrong(title)}.`
+          : `${emailStrong(actor)} commented on ${emailStrong(title)}.`;
+
+      const { html, text } = renderEmail({
+        preheader: `${actor} commented on ${title}.`,
+        heading: wasMentioned
+          ? "You were mentioned"
+          : input.isReply
+            ? "New reply on your document"
+            : "New comment",
+        paragraphs: [lead, `"${excerpt(input.content)}"`],
+        cta: { label: "Open document", url },
+        footer:
+          "You received this because you own, were mentioned in, or participated in this thread. Turn these off in Documents settings.",
+      });
+
+      await sendEmail({
+        to,
+        subject: wasMentioned
+          ? `${actor} mentioned you on "${title}"`
+          : input.isReply
+            ? `${actor} replied to a comment on "${title}"`
+            : `${actor} commented on "${title}"`,
+        html,
+        text,
+      });
+    },
+  });
+}

package/corpus/templates/content/server/lib/document-context.ts

@@ -14,6 +14,7 @@ export type DocumentContextPathEntry = {
  * assembles the live path without copying ancestor prose into descendants. */
 export async function getDocumentContextPath(
   document: Pick<typeof schema.documents.$inferSelect, "id" | "parentId">,
+  options: { databaseId?: string } = {},
 ): Promise<DocumentContextPathEntry[]> {
   const db = getDb();
   const path: DocumentContextPathEntry[] = [];
@@ -43,6 +44,15 @@ export async function getDocumentContextPath(
     parentId = parent.parentId;
   }
 
+  const membershipClauses = [
+    eq(schema.contentDatabaseItems.documentId, document.id),
+    isNull(schema.contentDatabases.deletedAt),
+  ];
+  if (options.databaseId) {
+    membershipClauses.push(
+      eq(schema.contentDatabaseItems.databaseId, options.databaseId),
+    );
+  }
   const [membership] = await db
     .select({ database: schema.contentDatabases })
     .from(schema.contentDatabaseItems)
@@ -50,12 +60,7 @@ export async function getDocumentContextPath(
       schema.contentDatabases,
       eq(schema.contentDatabases.id, schema.contentDatabaseItems.databaseId),
     )
-    .where(
-      and(
-        eq(schema.contentDatabaseItems.documentId, document.id),
-        isNull(schema.contentDatabases.deletedAt),
-      ),
-    )
+    .where(and(...membershipClauses))
     .orderBy(
       sql`CASE WHEN ${schema.contentDatabases.systemRole} IS NULL THEN 0 ELSE 1 END`,
       asc(schema.contentDatabases.id),

package/corpus/templates/content/server/routes/_agent-native/content/user-prefs.get.ts

@@ -0,0 +1,17 @@
+import { getSession } from "@agent-native/core/server";
+import { getUserSetting } from "@agent-native/core/settings";
+import { defineEventHandler, setResponseStatus } from "h3";
+
+import { CONTENT_USER_PREFS_KEY } from "../../../../shared/content-user-prefs.js";
+
+export default defineEventHandler(async (event) => {
+  const session = await getSession(event);
+  if (!session?.email) {
+    setResponseStatus(event, 401);
+    return { error: "unauthorized" };
+  }
+
+  const stored = await getUserSetting(session.email, CONTENT_USER_PREFS_KEY);
+  // coercion-ok: a null read means this user has no preferences yet, which is a real state.
+  return stored ?? {};
+});

package/corpus/templates/content/server/routes/_agent-native/content/user-prefs.put.ts

@@ -0,0 +1,36 @@
+import { getSession } from "@agent-native/core/server";
+import { getUserSetting, putUserSetting } from "@agent-native/core/settings";
+import { defineEventHandler, getHeader, readBody, setResponseStatus } from "h3";
+
+import { CONTENT_USER_PREFS_KEY } from "../../../../shared/content-user-prefs.js";
+
+export default defineEventHandler(async (event) => {
+  const session = await getSession(event);
+  if (!session?.email) {
+    setResponseStatus(event, 401);
+    return { error: "unauthorized" };
+  }
+
+  // coercion-ok: an unparsable body is rejected with 400 immediately below.
+  const body = await readBody(event).catch(() => null);
+  if (!body || typeof body !== "object" || Array.isArray(body)) {
+    setResponseStatus(event, 400);
+    return { error: "Invalid settings payload" };
+  }
+
+  // Merge so a partial save never wipes preferences written elsewhere.
+  const stored = await getUserSetting(session.email, CONTENT_USER_PREFS_KEY);
+  // coercion-ok: a null read means this user has no preferences yet, which is a real state.
+  const existing = stored ?? {};
+  const next = {
+    ...(typeof existing === "object" && !Array.isArray(existing)
+      ? existing
+      : {}),
+    ...(body as Record<string, unknown>),
+  };
+
+  await putUserSetting(session.email, CONTENT_USER_PREFS_KEY, next, {
+    requestSource: getHeader(event, "x-request-source") || undefined,
+  });
+  return next;
+});

package/corpus/templates/content/shared/api.ts

@@ -36,6 +36,7 @@ export interface Document {
   properties?: DocumentProperty[];
   database?: ContentDatabase;
   databaseMembership?: ContentDatabaseMembership;
+  bodyHydration?: ContentDocumentBodyHydration;
   contextPath?: ContentContextPathEntry[];
   createdAt: string;
   updatedAt: string;
@@ -407,6 +408,13 @@ export interface ContentDatabaseMembership {
   bodyHydration?: ContentDatabaseBodyHydration;
 }
 
+export interface ContentDocumentBodyHydration {
+  provider?: "builder";
+  hydration?: ContentDatabaseBodyHydration;
+  sourceId?: string;
+  databaseDocumentId?: string;
+}
+
 export type ContentDatabaseBodyHydrationState =
   | "pending"
   | "hydrating"

package/corpus/templates/content/shared/content-user-prefs.ts

@@ -0,0 +1,11 @@
+/**
+ * Per-user Documents preferences, stored under one user-setting key so
+ * Settings and the notification senders read and write the same object.
+ */
+
+export const CONTENT_USER_PREFS_KEY = "content-user-prefs";
+
+export type ContentUserPrefs = {
+  /** Comment, reply, and mention emails only — never share invites. */
+  emailNotifications?: boolean;
+};