@agent-native/core 0.135.0 → 0.135.2

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.135.0",
+  "version": "0.135.2",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {

package/corpus/core/src/sharing/access.ts

@@ -15,6 +15,7 @@
 
 import { and, eq, or, sql, type SQL } from "drizzle-orm";
 
+import { orgMembers } from "../org/schema.js";
 import {
   getRequestAuthCapability,
   getRequestUserEmail,
@@ -87,6 +88,35 @@ function emailColumnMatches(column: any, email: string): SQL {
   return sql`lower(${column}) = ${email}`;
 }
 
+/**
+ * Real `org_members` membership, independent of the caller's currently
+ * active org (`ctx.orgId`). `org`-visibility access must key off actual
+ * membership — a user's active-org selection is a UI convenience, not a
+ * statement of which orgs they belong to.
+ *
+ * Queries through the resource's own `reg.getDb()` — the same connection
+ * every other lookup in this file uses — not the ambient `getDbExec()`,
+ * since `org_members` lives in that same app database.
+ */
+async function isOrgMember(
+  reg: ShareableResourceRegistration,
+  memberOrgId: string,
+  email: string,
+): Promise<boolean> {
+  const db = reg.getDb() as any;
+  const rows = await db
+    .select({ id: orgMembers.id })
+    .from(orgMembers)
+    .where(
+      and(
+        eq(orgMembers.orgId, memberOrgId),
+        emailColumnMatches(orgMembers.email, email),
+      ),
+    )
+    .limit(1);
+  return rows.length > 0;
+}
+
 /**
  * Build a Drizzle `WHERE` clause that admits rows the current user can see.
  * Pass the ownable resource table and its shares table; optional min role
@@ -470,7 +500,7 @@ async function resolveAccessImpl(
   const resource = await loadResourceForAccess(reg, resourceId, options);
   if (!resource) return null;
 
-  const { userEmail, orgId } = ctx;
+  const { userEmail } = ctx;
   const normalizedUserEmail = normalizeEmailForAccess(userEmail);
 
   if (
@@ -491,7 +521,19 @@ async function resolveAccessImpl(
   // `visibility === "public"` on an `allowPublic: false` resource is treated
   // as private: only owner + explicit shares grant access. Falls through to
   // the explicit-share lookup below.
-  if (resource.visibility === "org" && orgId && resource.orgId === orgId) {
+  //
+  // Membership in the resource's own org, not equality with the caller's
+  // currently active org: a caller can be a genuine member of the
+  // resource's org while a *different* org is their active selection, and
+  // `org` visibility should still admit them. Still requires some active
+  // org to be set at all (`orgId`), matching the pre-existing behavior for
+  // a caller with no active org.
+  if (
+    resource.visibility === "org" &&
+    resource.orgId &&
+    normalizedUserEmail &&
+    (await isOrgMember(reg, resource.orgId, normalizedUserEmail))
+  ) {
     const role = await highestShareRole(reg, resourceId, ctx, resource);
     return { role: role ?? "viewer", resource };
   }

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

@@ -67,6 +67,10 @@ export default defineAction({
 
     if (!rec) throw new Error(`Recording not found: ${args.recordingId}`);
 
+    // Floor to the nearest second so nearby comments land on the same
+    // timestamp bucket for scrubber grouping and the playback overlay.
+    const videoTimestampMs = Math.floor(args.videoTimestampMs / 1000) * 1000;
+
     await db.insert(schema.recordingComments).values({
       id,
       recordingId: args.recordingId,
@@ -76,7 +80,7 @@ export default defineAction({
       authorEmail,
       authorName: args.authorName ?? null,
       content: args.content,
-      videoTimestampMs: args.videoTimestampMs,
+      videoTimestampMs,
       createdAt: now,
       updatedAt: now,
     });
@@ -94,7 +98,7 @@ export default defineAction({
     await writeAppState("refresh-signal", { ts: Date.now() });
 
     console.log(
-      `Added comment to recording ${args.recordingId} @ ${args.videoTimestampMs}ms (thread: ${threadId})`,
+      `Added comment to recording ${args.recordingId} @ ${videoTimestampMs}ms (thread: ${threadId})`,
     );
 
     return { id, threadId, notified };

package/corpus/templates/clips/app/components/player/comments-panel.tsx

@@ -1,4 +1,7 @@
-import { useActionMutation } from "@agent-native/core/client/hooks";
+import {
+  useActionMutation,
+  useAvatarUrl,
+} from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
 import {
   IconSend,
@@ -12,7 +15,7 @@ import {
 import { useQueryClient } from "@tanstack/react-query";
 import { type Ref, useEffect, useMemo, useRef, useState } from "react";
 
-import { Avatar, AvatarFallback } from "@/components/ui/avatar";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
@@ -860,10 +863,14 @@ function CommentCard({
   }
 
   const commentContent = linkifyCommentContent(comment.content);
+  const avatarUrl = useAvatarUrl(comment.authorEmail);
 
   return (
     <div className={cn("flex gap-2", comment.resolved && "opacity-60")}>
       <Avatar className="h-7 w-7 shrink-0">
+        {avatarUrl ? (
+          <AvatarImage src={avatarUrl} alt={displayName(comment)} />
+        ) : null}
         <AvatarFallback className="text-[10px] bg-primary text-primary-foreground">
           {initials(displayName(comment))}
         </AvatarFallback>

package/corpus/templates/clips/app/components/player/playback-comment-overlay.tsx

@@ -1,4 +1,9 @@
-export const PLAYBACK_COMMENT_VISIBLE_MS = 4_000;
+import { useAvatarUrl } from "@agent-native/core/client/hooks";
+
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { cn } from "@/lib/utils";
+
+export const PLAYBACK_COMMENT_VISIBLE_MS = 1_000;
 
 export function getPlaybackCommentVisibleMs(playbackRate = 1): number {
   const safePlaybackRate =
@@ -50,50 +55,62 @@ export function PlaybackCommentOverlay({
   comments,
   currentMs,
   playbackRate = 1,
+  onClick,
 }: {
   comments: PlaybackComment[] | undefined;
   currentMs: number;
   playbackRate?: number;
+  onClick?: () => void;
 }) {
   const activeComments = getActivePlaybackComments(
     comments,
     currentMs,
     playbackRate,
   );
+  const avatarUrl = useAvatarUrl(activeComments[0]?.authorEmail);
   if (activeComments.length === 0) return null;
 
+  const [comment, ...rest] = activeComments;
+  const author = displayAuthor(comment);
+  const Card = (onClick ? "button" : "div") as "button" | "div";
+
   return (
     <div
       data-player-ui
       className="pointer-events-none absolute inset-x-3 bottom-[5.25rem] z-20 flex justify-center sm:inset-x-6"
       aria-live="polite"
     >
-      <div className="flex w-full max-w-xl flex-col items-center gap-2">
-        {activeComments.map((comment) => {
-          const author = displayAuthor(comment);
-          return (
-            <div
-              key={comment.id}
-              className="animate-in fade-in slide-in-from-bottom-2 flex max-w-full items-start gap-2.5 rounded-xl bg-black/85 px-3 py-2.5 text-white shadow-2xl ring-1 ring-white/15 backdrop-blur-md duration-200"
-            >
-              <span
-                aria-hidden="true"
-                className="flex size-7 shrink-0 items-center justify-center rounded-full bg-white/15 text-[10px] font-semibold text-white"
-              >
-                {initials(author)}
-              </span>
-              <div className="min-w-0">
-                <p className="truncate text-xs font-semibold text-white/80">
-                  {author}
-                </p>
-                <p className="line-clamp-3 break-words text-sm leading-5 text-white">
-                  {comment.content}
-                </p>
-              </div>
-            </div>
-          );
-        })}
-      </div>
+      <Card
+        key={comment.id}
+        type={onClick ? "button" : undefined}
+        onClick={onClick}
+        className={cn(
+          "animate-in fade-in slide-in-from-bottom-2 flex w-full max-w-xl flex-col gap-1.5 rounded-xl bg-black/85 px-3 py-2.5 text-left text-white shadow-2xl ring-1 ring-white/15 backdrop-blur-md duration-200",
+          onClick && "pointer-events-auto cursor-pointer hover:bg-black/95",
+        )}
+      >
+        <div className="flex max-w-full items-start gap-2.5">
+          <Avatar aria-hidden="true" className="size-7 shrink-0">
+            {avatarUrl ? <AvatarImage src={avatarUrl} alt={author} /> : null}
+            <AvatarFallback className="bg-white/15 text-[10px] font-semibold text-white">
+              {initials(author)}
+            </AvatarFallback>
+          </Avatar>
+          <div className="min-w-0">
+            <p className="truncate text-xs font-semibold text-white/80">
+              {author}
+            </p>
+            <p className="line-clamp-3 break-words text-sm leading-5 text-white">
+              {comment.content}
+            </p>
+          </div>
+        </div>
+        {rest.length > 0 && (
+          <p className="pl-[2.375rem] text-xs text-white/60">
+            +{rest.length} other comment{rest.length > 1 ? "s" : ""}
+          </p>
+        )}
+      </Card>
     </div>
   );
 }

package/corpus/templates/clips/app/components/player/scrubber.tsx

@@ -1,3 +1,4 @@
+import { IconMessage2Filled } from "@tabler/icons-react";
 import { useMemo, useRef, useState } from "react";
 
 import { cn } from "@/lib/utils";
@@ -225,10 +226,17 @@ export function Scrubber(props: ScrubberProps) {
               e.stopPropagation();
               onSeek(ms);
             }}
-            className="absolute -top-1 -translate-x-1/2 h-3.5 w-3.5 rounded-full bg-yellow-400 border-2 border-black/50 hover:scale-125 transition-transform"
+            className="absolute top-1/2 -translate-x-1/2 -translate-y-1/2 flex h-4 w-4 items-center justify-center rounded-full bg-primary text-primary-foreground shadow-md ring-2 ring-background transition-transform hover:scale-125"
             style={{ left: (ms / Math.max(1, durationMs)) * 100 + "%" }}
             aria-label={`${list.length} comment${list.length > 1 ? "s" : ""}`}
-          />
+          >
+            <IconMessage2Filled className="h-2.5 w-2.5" />
+            {list.length > 1 && (
+              <span className="absolute -top-1.5 -right-1.5 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-primary px-0.5 text-[8px] font-bold leading-none text-primary-foreground ring-2 ring-background">
+                {list.length}
+              </span>
+            )}
+          </button>
         ))}
 
         {/* Reaction dots */}

package/corpus/templates/clips/app/components/player/video-player.tsx

@@ -218,6 +218,8 @@ export interface VideoPlayerProps {
    * lifecycle instead of polling an imperative-handle getter.
    */
   onVideoElementChange?: (video: HTMLVideoElement | null) => void;
+  /** Called when the viewer clicks the timestamped-comment overlay. */
+  onCommentClick?: () => void;
 }
 
 export const VideoPlayer = forwardRef<VideoPlayerHandle, VideoPlayerProps>(
@@ -255,6 +257,7 @@ export const VideoPlayer = forwardRef<VideoPlayerHandle, VideoPlayerProps>(
       recordingId,
       role,
       onVideoElementChange,
+      onCommentClick,
     } = props;
 
     const resolvedVideoSrc = useMemo(
@@ -1651,6 +1654,7 @@ export const VideoPlayer = forwardRef<VideoPlayerHandle, VideoPlayerProps>(
             comments={comments}
             currentMs={currentMs}
             playbackRate={speed}
+            onClick={onCommentClick}
           />
         ) : null}
 

package/corpus/templates/clips/app/routes/r.$recordingId.tsx

@@ -261,15 +261,26 @@ export default function RecordingPage() {
   // The compact layout stacks the panel below the video, so switching tabs
   // alone leaves the user looking at the player. Desktop always renders the
   // side aside, so nothing to scroll there.
-  const openInsightsPanel = useCallback(() => {
-    setPanel("insights");
-    if (!isCompactLayout) return;
-    requestAnimationFrame(() => {
-      document
-        .getElementById("clip-activity-panel")
-        ?.scrollIntoView({ block: "start" });
-    });
-  }, [isCompactLayout]);
+  const openSidePanel = useCallback(
+    (next: SidePanel) => {
+      setPanel(next);
+      if (!isCompactLayout) return;
+      requestAnimationFrame(() => {
+        document
+          .getElementById("clip-activity-panel")
+          ?.scrollIntoView({ block: "start" });
+      });
+    },
+    [isCompactLayout],
+  );
+  const openInsightsPanel = useCallback(
+    () => openSidePanel("insights"),
+    [openSidePanel],
+  );
+  const openCommentsPanel = useCallback(
+    () => openSidePanel("comments"),
+    [openSidePanel],
+  );
   const transcriptKickedRef = useRef<string | null>(null);
   // When the recording lands in the processing state but never flips to
   // 'ready', stop spinning forever and surface an error banner so the user
@@ -1608,6 +1619,7 @@ export default function RecordingPage() {
                   cta={firstCta}
                   onCtaClick={() => tracking.reportCtaClick()}
                   onTimeUpdate={(ms) => setCurrentMs(ms)}
+                  onCommentClick={openCommentsPanel}
                   className="h-full w-full rounded-none sm:rounded-xl"
                 />
                 {commentOpen ? (
@@ -1667,12 +1679,7 @@ export default function RecordingPage() {
                       className="shrink-0"
                       onOpen={() => {
                         if (isCompactLayout) {
-                          setPanel("comments");
-                          requestAnimationFrame(() => {
-                            document
-                              .getElementById("clip-activity-panel")
-                              ?.scrollIntoView({ block: "start" });
-                          });
+                          openCommentsPanel();
                           return;
                         }
                         setCommentAtMs(resolvePlaybackMs());

package/corpus/templates/clips/app/routes/share.$shareId.tsx

@@ -997,6 +997,7 @@ export default function ShareRoute() {
               cta={firstCta}
               onCtaClick={() => tracking.reportCtaClick()}
               onTimeUpdate={(ms) => setCurrentMs(ms)}
+              onCommentClick={() => setPanel("comments")}
               className="h-full w-full rounded-none sm:rounded-xl"
             />
           </div>

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/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/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">