@agent-native/core 0.134.0 → 0.135.0

package/corpus/templates/content/actions/set-document-property.ts

@@ -13,13 +13,12 @@ import {
   type DocumentPropertyType,
 } from "../shared/properties.js";
 import { resolveContentDocumentAccess } from "./_content-document-access.js";
+import { lockDatabaseMemberships } from "./_database-membership-lock.js";
 import {
   getDatabaseById,
   listPropertiesForDatabaseDocuments,
   nanoid,
   normalizedValueJson,
-  writeBlockFieldContent,
-  writePrimaryBlocksContent,
 } from "./_property-utils.js";
 
 export default defineAction({
@@ -84,17 +83,34 @@ export default defineAction({
       const target = blocksStorageTarget(
         parsePropertyOptions(definition.optionsJson),
       );
-      if (target === "document_body") {
-        await writePrimaryBlocksContent({ documentId, content, now });
-      } else {
-        await writeBlockFieldContent({
-          documentId,
-          propertyId,
-          ownerEmail: database.ownerEmail,
-          content,
-          now,
-        });
-      }
+      await db.transaction(async (tx) => {
+        await lockDatabaseMemberships(tx, [membership.id]);
+        if (target === "document_body") {
+          await tx
+            .update(schema.documents)
+            .set({ content, updatedAt: now })
+            .where(eq(schema.documents.id, documentId));
+        } else {
+          await tx
+            .insert(schema.documentBlockFieldContents)
+            .values({
+              id: nanoid(),
+              ownerEmail: database.ownerEmail,
+              documentId,
+              propertyId,
+              content,
+              createdAt: now,
+              updatedAt: now,
+            })
+            .onConflictDoUpdate({
+              target: [
+                schema.documentBlockFieldContents.documentId,
+                schema.documentBlockFieldContents.propertyId,
+              ],
+              set: { content, updatedAt: now },
+            });
+        }
+      });
       return {
         documentId,
         databaseId: database.id,
@@ -113,32 +129,34 @@ export default defineAction({
     }
 
     const valueJson = normalizedValueJson(type, value);
-    const [existing] = await db
-      .select({ id: schema.documentPropertyValues.id })
-      .from(schema.documentPropertyValues)
-      .where(
-        and(
-          eq(schema.documentPropertyValues.documentId, documentId),
-          eq(schema.documentPropertyValues.propertyId, propertyId),
-        ),
-      );
-
-    if (existing) {
-      await db
-        .update(schema.documentPropertyValues)
-        .set({ valueJson, updatedAt: now })
-        .where(eq(schema.documentPropertyValues.id, existing.id));
-    } else {
-      await db.insert(schema.documentPropertyValues).values({
-        id: nanoid(),
-        ownerEmail: database.ownerEmail,
-        documentId,
-        propertyId,
-        valueJson,
-        createdAt: now,
-        updatedAt: now,
-      });
-    }
+    await db.transaction(async (tx) => {
+      await lockDatabaseMemberships(tx, [membership.id]);
+      const [existing] = await tx
+        .select({ id: schema.documentPropertyValues.id })
+        .from(schema.documentPropertyValues)
+        .where(
+          and(
+            eq(schema.documentPropertyValues.documentId, documentId),
+            eq(schema.documentPropertyValues.propertyId, propertyId),
+          ),
+        );
+      if (existing) {
+        await tx
+          .update(schema.documentPropertyValues)
+          .set({ valueJson, updatedAt: now })
+          .where(eq(schema.documentPropertyValues.id, existing.id));
+      } else {
+        await tx.insert(schema.documentPropertyValues).values({
+          id: nanoid(),
+          ownerEmail: database.ownerEmail,
+          documentId,
+          propertyId,
+          valueJson,
+          createdAt: now,
+          updatedAt: now,
+        });
+      }
+    });
 
     return {
       documentId,

package/corpus/templates/content/actions/sync-local-folder-source.ts

@@ -18,6 +18,7 @@ import { setFavoriteMembership } from "./_content-favorites.js";
 import { ensureDocumentsFilesMembership } from "./_content-files.js";
 import { resolveContentSpaceAccess } from "./_content-space-access.js";
 import { provisionContentSpaces } from "./_content-spaces.js";
+import { lockDatabaseMemberships } from "./_database-membership-lock.js";
 import { LOCAL_FOLDER_SOURCE_TYPE } from "./_local-folder-source.js";
 
 const MAX_SOURCE_FILES = 500;
@@ -616,6 +617,12 @@ export default defineAction({
               [item.documentId, item] as const,
           ),
         );
+        await lockDatabaseMemberships(
+          tx,
+          filesItems.map(
+            (item: typeof schema.contentDatabaseItems.$inferSelect) => item.id,
+          ),
+        );
         for (const plan of plans.filter((candidate) => !candidate.conflict)) {
           if (plan.keepContent) continue;
           const item = itemByDocumentId.get(plan.id);

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

@@ -445,6 +445,7 @@ export function documentEditorBreadcrumbNavigationItems(
     | "title"
     | "icon"
     | "position"
+    | "database"
     | "databaseMembership"
     | "source"
   >[], // i18n-ignore type expression
@@ -457,6 +458,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 +484,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 (

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

@@ -318,6 +318,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 +346,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 +364,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 +396,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 +413,7 @@ function ToolbarBreadcrumbMenu({
       <DropdownMenuContent
         align="start"
         className="w-64"
+        onKeyDown={cancelClose}
         onPointerEnter={cancelClose}
         onPointerLeave={scheduleClose}
       >
@@ -379,7 +422,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">