@agent-native/core 0.134.1 → 0.135.1

package/corpus/templates/clips/vitest.config.ts

@@ -1,23 +1,27 @@
 import path from "node:path";
 
-import { defineConfig } from "vitest/config";
+import baseConfig from "@agent-native/core/vitest-config";
+import { defineConfig, mergeConfig } from "vitest/config";
 
-export default defineConfig({
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./app"),
-      "@shared": path.resolve(__dirname, "./shared"),
+export default mergeConfig(
+  baseConfig,
+  defineConfig({
+    resolve: {
+      alias: {
+        "@": path.resolve(__dirname, "./app"),
+        "@shared": path.resolve(__dirname, "./shared"),
+      },
     },
-  },
-  test: {
-    include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
-    exclude: [
-      "**/node_modules/**",
-      "**/.git/**",
-      "**/dist/**",
-      "**/.output/**",
-      "**/.react-router/**",
-      "**/e2e/**",
-    ],
-  },
-});
+    test: {
+      include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
+      exclude: [
+        "**/node_modules/**",
+        "**/.git/**",
+        "**/dist/**",
+        "**/.output/**",
+        "**/.react-router/**",
+        "**/e2e/**",
+      ],
+    },
+  }),
+);

package/corpus/templates/content/actions/_database-utils.ts

@@ -1234,10 +1234,15 @@ export async function getDatabaseByDocumentId(
 
 export async function getDatabaseItemByDocumentId(
   documentId: string,
-  options: { includeDeleted?: boolean } = {},
+  options: { includeDeleted?: boolean; databaseId?: string } = {},
   db = getDb(),
 ) {
   const clauses = [eq(schema.contentDatabaseItems.documentId, documentId)];
+  if (options.databaseId) {
+    clauses.push(
+      eq(schema.contentDatabaseItems.databaseId, options.databaseId),
+    );
+  }
   if (!options.includeDeleted) {
     clauses.push(isNull(schema.contentDatabases.deletedAt));
   }
@@ -1262,13 +1267,33 @@ export async function getDatabaseItemByDocumentId(
     )
     .leftJoin(
       schema.contentDatabaseBodyHydrationQueue,
-      eq(
-        schema.contentDatabaseBodyHydrationQueue.databaseItemId,
-        schema.contentDatabaseItems.id,
+      and(
+        eq(
+          schema.contentDatabaseBodyHydrationQueue.databaseItemId,
+          schema.contentDatabaseItems.id,
+        ),
+        eq(
+          schema.contentDatabaseBodyHydrationQueue.sourceId,
+          schema.contentDatabaseSourceRows.sourceId,
+        ),
+        eq(
+          schema.contentDatabaseBodyHydrationQueue.sourceRowId,
+          schema.contentDatabaseSourceRows.sourceRowId,
+        ),
       ),
     )
     .where(and(...clauses))
     .orderBy(
+      sql`CASE
+        WHEN ${schema.contentDatabaseSourceRows.sourceId} IS NOT NULL
+          AND (
+            ${schema.contentDatabaseItems.bodyHydrationStatus} IN ('pending', 'hydrating')
+            OR ${schema.contentDatabaseBodyHydrationQueue.id} IS NOT NULL
+          ) THEN 0
+        WHEN ${schema.contentDatabaseSourceRows.sourceId} IS NOT NULL
+          AND ${schema.contentDatabaseItems.bodyHydrationStatus} = 'error' THEN 1
+        ELSE 2
+      END`,
       sql`CASE WHEN ${schema.contentDatabaseSourceRows.sourceId} IS NOT NULL THEN 0 ELSE 1 END`,
       sql`CASE WHEN ${schema.contentDatabases.systemRole} IS NULL THEN 0 ELSE 1 END`,
       sql`CASE WHEN ${schema.contentDatabases.systemRole} = 'files' THEN 0 ELSE 1 END`,
@@ -1277,6 +1302,90 @@ export async function getDatabaseItemByDocumentId(
   return row ?? null;
 }
 
+export async function getBuilderBodyHydrationMembershipByDocumentId(
+  documentId: string,
+  db = getDb(),
+) {
+  const rows = await db
+    .select({
+      item: schema.contentDatabaseItems,
+      database: schema.contentDatabases,
+      sourceId: schema.contentDatabaseSourceRows.sourceId,
+      sourceRowId: schema.contentDatabaseSourceRows.sourceRowId,
+      bodyHydrationQueueId: schema.contentDatabaseBodyHydrationQueue.id,
+      queueSourceId: schema.contentDatabaseBodyHydrationQueue.sourceId,
+      queueSourceRowId: schema.contentDatabaseBodyHydrationQueue.sourceRowId,
+    })
+    .from(schema.contentDatabaseSourceRows)
+    .innerJoin(
+      schema.contentDatabaseSources,
+      eq(
+        schema.contentDatabaseSources.id,
+        schema.contentDatabaseSourceRows.sourceId,
+      ),
+    )
+    .innerJoin(
+      schema.contentDatabaseItems,
+      eq(
+        schema.contentDatabaseItems.id,
+        schema.contentDatabaseSourceRows.databaseItemId,
+      ),
+    )
+    .innerJoin(
+      schema.contentDatabases,
+      eq(schema.contentDatabases.id, schema.contentDatabaseItems.databaseId),
+    )
+    .leftJoin(
+      schema.contentDatabaseBodyHydrationQueue,
+      eq(
+        schema.contentDatabaseBodyHydrationQueue.databaseItemId,
+        schema.contentDatabaseItems.id,
+      ),
+    )
+    .where(
+      and(
+        eq(schema.contentDatabaseSourceRows.documentId, documentId),
+        eq(schema.contentDatabaseItems.documentId, documentId),
+        eq(schema.contentDatabaseSources.sourceType, "builder-cms"),
+        isNull(schema.contentDatabases.deletedAt),
+      ),
+    );
+
+  const boundRows = rows.filter(
+    (row) =>
+      !row.bodyHydrationQueueId ||
+      (row.queueSourceId === row.sourceId &&
+        row.queueSourceRowId === row.sourceRowId),
+  );
+  if (boundRows.length === 0) return null;
+
+  const priority = (row: (typeof boundRows)[number]) => {
+    if (
+      row.bodyHydrationQueueId ||
+      row.item.bodyHydrationStatus === "pending" ||
+      row.item.bodyHydrationStatus === "hydrating"
+    ) {
+      return 0;
+    }
+    if (row.item.bodyHydrationStatus === "error") return 1;
+    return 2;
+  };
+  const topPriority = Math.min(...boundRows.map(priority));
+  const candidates = boundRows
+    .filter((row) => priority(row) === topPriority)
+    .sort((left, right) =>
+      `${left.database.id}:${left.sourceId}:${left.sourceRowId}`.localeCompare(
+        `${right.database.id}:${right.sourceId}:${right.sourceRowId}`,
+      ),
+    );
+  const sourceIds = new Set(candidates.map((row) => row.sourceId));
+
+  return {
+    membership: candidates[0]!,
+    hydrationSourceId: sourceIds.size === 1 ? candidates[0]!.sourceId : null,
+  };
+}
+
 export async function deleteDatabaseDataForDocument(
   documentId: string,
   ownerEmail: string,

package/corpus/templates/content/actions/add-comment.ts

@@ -4,6 +4,7 @@ import { assertAccess } from "@agent-native/core/sharing";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { notifyDocumentComment } from "../server/lib/comment-notifications.js";
 
 type Mention = { email: string; name: string };
 
@@ -115,6 +116,19 @@ export default defineAction({
       authorName: name,
     });
 
-    return { id, threadId };
+    const notified = await notifyDocumentComment({
+      documentId,
+      documentTitle: (access.resource.title as string | null) ?? "",
+      orgId: (access.resource.orgId as string | null) ?? null,
+      threadId,
+      ownerEmail,
+      authorEmail: email,
+      authorName: name,
+      content,
+      mentions,
+      isReply: Boolean(parentId ?? args.threadId),
+    });
+
+    return { id, threadId, notified };
   },
 });

package/corpus/templates/content/actions/get-document.ts

@@ -11,6 +11,7 @@ import { favoriteDocumentIds } from "./_content-favorites.js";
 import { resolveContentSpaceAccess } from "./_content-space-access.js";
 import {
   getDatabaseByDocumentId,
+  getBuilderBodyHydrationMembershipByDocumentId,
   getDocumentContextPath,
   getDatabaseItemByDocumentId,
   isSoftDeletedDatabaseDocument,
@@ -18,7 +19,9 @@ import {
 } from "./_database-utils.js";
 import { serializeDocumentSource } from "./_document-source.js";
 import {
+  getDatabaseById,
   listPropertiesForDocument,
+  resolvePropertyDatabaseForDocument,
   serializeDatabase,
 } from "./_property-utils.js";
 
@@ -54,6 +57,14 @@ export default defineAction({
   description: "Get a single document by ID with full content.",
   schema: z.object({
     id: z.string().optional().describe("Document ID (required)"),
+    databaseId: z
+      .string()
+      .optional()
+      .describe("Exact Database context for membership-local data"),
+    databaseDocumentId: z
+      .string()
+      .optional()
+      .describe("Backing document ID for the exact Database context"),
   }),
   http: { method: "GET" },
   readOnly: true,
@@ -79,8 +90,54 @@ export default defineAction({
       });
     }
     const doc = access.resource;
+    if (args.databaseDocumentId && !args.databaseId) {
+      throw Object.assign(new Error("databaseDocumentId requires databaseId"), {
+        statusCode: 404,
+      });
+    }
+
     const database = await getDatabaseByDocumentId(doc.id);
-    const databaseMembership = await getDatabaseItemByDocumentId(doc.id);
+    const databaseMembership = args.databaseId
+      ? await getDatabaseItemByDocumentId(doc.id, {
+          databaseId: args.databaseId,
+        })
+      : await getDatabaseItemByDocumentId(doc.id);
+    const propertyDatabase = args.databaseId
+      ? await getDatabaseById(args.databaseId)
+      : await resolvePropertyDatabaseForDocument(doc);
+    const propertyDatabaseAccess =
+      args.databaseId && propertyDatabase
+        ? await resolveDocumentAccess(propertyDatabase.documentId)
+        : null;
+    if (
+      args.databaseId &&
+      (!propertyDatabase ||
+        !propertyDatabaseAccess ||
+        (propertyDatabase.documentId !== doc.id && !databaseMembership))
+    ) {
+      throw Object.assign(new Error("Database context not found"), {
+        statusCode: 404,
+      });
+    }
+    if (
+      args.databaseDocumentId &&
+      propertyDatabase?.documentId !== args.databaseDocumentId
+    ) {
+      throw Object.assign(new Error("Database context not found"), {
+        statusCode: 404,
+      });
+    }
+    const bodyHydrationTarget =
+      await getBuilderBodyHydrationMembershipByDocumentId(doc.id);
+    const bodyHydrationMembership = bodyHydrationTarget?.membership;
+    const bodyHydrationAccess = bodyHydrationTarget?.hydrationSourceId
+      ? await resolveDocumentAccess(
+          bodyHydrationMembership!.database.documentId,
+        )
+      : null;
+    const bodyHydration = bodyHydrationMembership
+      ? serializeDatabaseMembership(bodyHydrationMembership).bodyHydration
+      : null;
     const userEmail = getRequestUserEmail();
     const favoriteIds = userEmail
       ? await favoriteDocumentIds(getDb(), userEmail, [doc.id])
@@ -112,10 +169,34 @@ export default defineAction({
       databaseMembership: databaseMembership
         ? serializeDatabaseMembership(databaseMembership)
         : undefined,
+      bodyHydration: bodyHydrationMembership
+        ? {
+            hydration: bodyHydrationAccess
+              ? bodyHydration!
+              : {
+                  status: bodyHydration!.status,
+                  attemptedAt: null,
+                  error: null,
+                  version: null,
+                },
+            ...(bodyHydrationAccess &&
+            canEditRole(bodyHydrationAccess.role) &&
+            bodyHydrationTarget?.hydrationSourceId
+              ? {
+                  provider: "builder" as const,
+                  sourceId: bodyHydrationTarget.hydrationSourceId,
+                  databaseDocumentId:
+                    bodyHydrationMembership.database.documentId,
+                }
+              : {}),
+          }
+        : undefined,
       createdAt: doc.createdAt,
       updatedAt: doc.updatedAt,
-      properties: await listPropertiesForDocument(doc),
-      contextPath: await getDocumentContextPath(doc),
+      properties: await listPropertiesForDocument(doc, args.databaseId),
+      contextPath: await getDocumentContextPath(doc, {
+        databaseId: args.databaseId,
+      }),
     };
   },
   link: ({ result }) => {

package/corpus/templates/content/actions/list-documents.ts

@@ -337,6 +337,7 @@ export default defineAction({
                 id: database.id,
                 documentId: database.documentId,
                 title: database.title,
+                systemRole: database.systemRole,
                 description: d.description,
                 viewConfig: parseDatabaseViewConfig(database.viewConfigJson),
                 createdAt: database.createdAt,

package/corpus/templates/content/app/components/editor/BuilderBodySyncingNotice.tsx

@@ -8,9 +8,16 @@ export function BuilderBodySyncingNotice({
   description: string;
 }) {
   return (
-    <div className="rounded-lg border border-dashed border-border bg-muted/35 px-4 py-5 text-sm">
+    <div
+      className="rounded-lg border border-dashed border-border bg-muted/35 px-4 py-5 text-sm"
+      role="status"
+      aria-live="polite"
+    >
       <div className="flex items-center gap-2 font-medium text-foreground">
-        <IconLoader2 className="size-4 animate-spin text-muted-foreground" />
+        <IconLoader2
+          className="size-4 animate-spin text-muted-foreground"
+          aria-hidden="true"
+        />
         {title}
       </div>
       <p className="mt-2 max-w-2xl leading-6 text-muted-foreground">

package/corpus/templates/content/app/components/editor/DocumentEditor.tsx

@@ -62,8 +62,10 @@ import {
   type ContentSpaceSummary,
 } from "@/hooks/use-content-spaces";
 import {
+  mergeDocumentIntoDocumentCache,
   isDocumentUpdateConflict,
   patchDocumentCaches,
+  documentQueryFilter,
   useDocument,
   useDeleteDocument,
   useDocuments,
@@ -247,7 +249,10 @@ export function DocumentEditor({
   databaseId,
   databaseDocumentId,
 }: DocumentEditorProps) {
-  const documentQuery = useDocument(documentId);
+  const documentQuery = useDocument(documentId, {
+    databaseId,
+    databaseDocumentId,
+  });
   const {
     data: queriedDocument,
     isError,
@@ -445,6 +450,7 @@ export function documentEditorBreadcrumbNavigationItems(
     | "title"
     | "icon"
     | "position"
+    | "database"
     | "databaseMembership"
     | "source"
   >[], // i18n-ignore type expression
@@ -457,6 +463,9 @@ export function documentEditorBreadcrumbNavigationItems(
     workspacesTitle: string;
   },
 ): ToolbarBreadcrumbItem[] {
+  const peerDocuments = documents.filter(
+    (item) => !item.database?.systemRole && item.source?.kind !== "folder",
+  );
   const documentById = new Map(documents.map((item) => [item.id, item]));
   const workspaceDocumentIds = new Set(
     spaces.map((space) => space.filesDocumentId),
@@ -480,9 +489,8 @@ export function documentEditorBreadcrumbNavigationItems(
     if (!current) return item;
     const membershipDocumentId =
       current.databaseMembership?.databaseDocumentId ?? null;
-    const siblings = documents
+    const siblings = peerDocuments
       .filter((candidate) => {
-        if (candidate.source?.kind === "folder") return false;
         if (candidate.parentId !== current.parentId) return false;
         if (current.parentId) return true;
         return (
@@ -536,7 +544,7 @@ function DocumentEditorBody({
   const deleteDocument = useDeleteDocument();
   const queryClient = useQueryClient();
   const processBuilderBodies = useProcessBuilderBodyHydration(
-    document.databaseMembership?.databaseDocumentId ?? documentId,
+    document.bodyHydration?.databaseDocumentId ?? documentId,
   );
   const canEdit = document.canEdit ?? true;
   const canEditRef = useRef(canEdit);
@@ -661,24 +669,30 @@ function DocumentEditorBody({
   );
 
   useEffect(() => {
-    const membership = document.databaseMembership;
-    const hydration = membership?.bodyHydration;
+    const hydrationContext = document.bodyHydration;
+    const hydration = hydrationContext?.hydration;
     if (
-      !membership?.sourceId ||
+      !canEdit ||
+      !hydrationContext?.sourceId ||
       !hydration ||
       (hydration.status !== "pending" && hydration.status !== "error")
     ) {
       return;
     }
-    const promotionKey = `${membership.sourceId}:${documentId}:${hydration.status}:${hydration.version ?? ""}`;
+    const promotionKey = `${hydrationContext.sourceId}:${documentId}:${hydration.status}:${hydration.version ?? ""}`;
     if (promotedBuilderBodyRef.current === promotionKey) return;
     promotedBuilderBodyRef.current = promotionKey;
     processBuilderBodies.mutate({
-      sourceId: membership.sourceId,
+      sourceId: hydrationContext.sourceId,
       documentId,
       limit: 1,
     });
-  }, [document.databaseMembership, documentId, processBuilderBodies.mutate]);
+  }, [
+    canEdit,
+    document.bodyHydration,
+    documentId,
+    processBuilderBodies.mutate,
+  ]);
   const titleFocusedRef = useRef(false);
   const scrollContainerRef = useRef<HTMLDivElement>(null);
   const titleInputRef = useRef<HTMLTextAreaElement>(null);
@@ -973,9 +987,8 @@ function DocumentEditorBody({
           description:
             error instanceof Error ? error.message : t("empty.genericError"),
         });
-        queryClient.setQueryData(
-          ["action", "get-document", { id: documentId }],
-          fileFirstDocument,
+        queryClient.setQueriesData(documentQueryFilter(documentId), (old) =>
+          mergeDocumentIntoDocumentCache(old, fileFirstDocument),
         );
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
@@ -1887,9 +1900,15 @@ function DocumentEditorBody({
                       if (bodyHydrationPending) {
                         return (
                           <BuilderBodySyncingNotice
-                            title={t("editor.builderBodySyncing")}
+                            title={t(
+                              document.bodyHydration?.provider === "builder"
+                                ? "editor.builderBodySyncing"
+                                : "editor.pageBodySyncing",
+                            )}
                             description={t(
-                              "editor.builderBodySyncingDescription",
+                              document.bodyHydration?.provider === "builder"
+                                ? "editor.builderBodySyncingDescription"
+                                : "editor.pageBodySyncingDescription",
                             )}
                           />
                         );

package/corpus/templates/content/app/components/editor/DocumentToolbar.tsx

@@ -90,6 +90,7 @@ import {
   useSearchNotionPages,
   useCreateAndLinkNotionPage,
 } from "@/hooks/use-notion";
+import { documentQueryFilter } from "@/lib/document-query";
 import {
   localSourceAbsolutePath,
   revealLinkedLocalSourceFile,
@@ -318,6 +319,15 @@ export function compactToolbarBreadcrumbItems(
   ];
 }
 
+export function firstSelectableBreadcrumbMenuItemId(
+  menuItems: ToolbarBreadcrumbItem["menuItems"],
+  currentDocumentId: string,
+): string | null {
+  return (
+    menuItems?.find((menuItem) => menuItem.id !== currentDocumentId)?.id ?? null
+  );
+}
+
 function ToolbarBreadcrumbMenu({
   item,
   label,
@@ -337,6 +347,12 @@ function ToolbarBreadcrumbMenu({
 }) {
   const [open, setOpen] = useState(false);
   const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const openedWithKeyboardRef = useRef(false);
+  const firstSelectableItemRef = useRef<HTMLDivElement | null>(null);
+  const firstSelectableItemId = firstSelectableBreadcrumbMenuItemId(
+    item.menuItems,
+    currentDocumentId,
+  );
 
   function cancelClose() {
     if (!closeTimerRef.current) return;
@@ -349,8 +365,25 @@ function ToolbarBreadcrumbMenu({
     closeTimerRef.current = setTimeout(() => setOpen(false), 140);
   }
 
+  useEffect(() => {
+    if (!open || !openedWithKeyboardRef.current) return;
+    openedWithKeyboardRef.current = false;
+    const frame = requestAnimationFrame(() => {
+      firstSelectableItemRef.current?.focus();
+    });
+    return () => cancelAnimationFrame(frame);
+  }, [open]);
+
   return (
-    <DropdownMenu modal={false} open={open} onOpenChange={setOpen}>
+    <DropdownMenu
+      modal={false}
+      open={open}
+      onOpenChange={(nextOpen) => {
+        if (nextOpen) cancelClose();
+        else openedWithKeyboardRef.current = false;
+        setOpen(nextOpen);
+      }}
+    >
       <DropdownMenuTrigger asChild>
         <button
           type="button"
@@ -364,6 +397,16 @@ function ToolbarBreadcrumbMenu({
             setOpen(true);
           }}
           onPointerLeave={scheduleClose}
+          onKeyDown={(event) => {
+            if (
+              event.key === "Enter" ||
+              event.key === " " ||
+              event.key === "ArrowDown"
+            ) {
+              openedWithKeyboardRef.current = true;
+              cancelClose();
+            }
+          }}
         >
           {children}
         </button>
@@ -371,6 +414,7 @@ function ToolbarBreadcrumbMenu({
       <DropdownMenuContent
         align="start"
         className="w-64"
+        onKeyDown={cancelClose}
         onPointerEnter={cancelClose}
         onPointerLeave={scheduleClose}
       >
@@ -379,7 +423,13 @@ function ToolbarBreadcrumbMenu({
           return (
             <DropdownMenuItem
               key={menuItem.id}
+              ref={
+                menuItem.id === firstSelectableItemId
+                  ? firstSelectableItemRef
+                  : undefined
+              }
               className="gap-2"
+              disabled={menuItem.id === currentDocumentId}
               onSelect={() => onOpen(menuItem.id)}
             >
               <span className="flex size-4 shrink-0 items-center justify-center">
@@ -523,12 +573,8 @@ export function DocumentToolbar({
       const previous = hideFromSearch;
       setPendingHideFromSearch(next);
 
-      queryClient.setQueryData(
-        ["action", "get-document", { id: documentId }],
-        (old: any) =>
-          old && typeof old === "object"
-            ? { ...old, hideFromSearch: next }
-            : old,
+      queryClient.setQueriesData(documentQueryFilter(documentId), (old: any) =>
+        old && typeof old === "object" ? { ...old, hideFromSearch: next } : old,
       );
       queryClient.setQueryData(
         ["action", "list-documents", undefined],
@@ -552,9 +598,7 @@ export function DocumentToolbar({
         });
       } catch (err) {
         setPendingHideFromSearch(previous);
-        queryClient.invalidateQueries({
-          queryKey: ["action", "get-document", { id: documentId }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(documentId));
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
@@ -565,9 +609,7 @@ export function DocumentToolbar({
         throw err;
       } finally {
         setPendingHideFromSearch(null);
-        queryClient.invalidateQueries({
-          queryKey: ["action", "get-document", { id: documentId }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(documentId));
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });

package/corpus/templates/content/app/components/editor/body-hydration.ts

@@ -54,12 +54,12 @@ export function databaseItemBodyHydrationIsPending(
 }
 
 export function documentBodyHydrationIsPending(
-  document: Pick<Document, "content" | "databaseMembership">,
+  document: Pick<Document, "content" | "bodyHydration">,
 ) {
-  const hydration = document.databaseMembership?.bodyHydration;
+  const hydration = document.bodyHydration?.hydration;
   if (
     sourceBackedEmptyBodyNeedsHydration({
-      sourceId: document.databaseMembership?.sourceId,
+      sourceId: document.bodyHydration ? "source-backed" : undefined,
       content: document.content,
       hydration,
     })
@@ -81,7 +81,10 @@ export function newDocumentPageChoiceIsDisabled(args: {
 
 export function previewBodyHydrationIsPending(args: {
   item: Pick<ContentDatabaseItem, "bodyHydration" | "document">;
-  document: Pick<Document, "content" | "databaseMembership"> | null | undefined;
+  document:
+    | Pick<Document, "content" | "databaseMembership" | "bodyHydration">
+    | null
+    | undefined;
 }) {
   const membership =
     args.document?.databaseMembership ?? args.item.document.databaseMembership;
@@ -128,11 +131,14 @@ export function previewDraftConflictsWithHydratedBody(args: {
 
 export function previewBodyHydrationIsTerminalError(args: {
   item: Pick<ContentDatabaseItem, "bodyHydration" | "document">;
-  document: Pick<Document, "databaseMembership"> | null | undefined;
+  document:
+    | Pick<Document, "databaseMembership" | "bodyHydration">
+    | null
+    | undefined;
 }) {
   return (
     builderBodyHydrationIsTerminalError(
-      args.document?.databaseMembership?.bodyHydration,
+      args.document?.bodyHydration?.hydration,
     ) ||
     builderBodyHydrationIsTerminalError(
       args.item.bodyHydration ??