@agent-native/core 0.152.0 → 0.153.0

package/corpus/templates/content/actions/attach-content-database-source.ts

@@ -52,6 +52,41 @@ const sourceTypeSchema = z
 const BUILDER_CMS_ATTACH_INITIAL_PAGES = 1;
 const BUILDER_CMS_ATTACH_METADATA_LIMIT = 10_000;
 
+export function shouldBootstrapLocalDetailsSource(args: {
+  relationshipMode: "items" | "details" | undefined;
+  hasExistingSource: boolean;
+}) {
+  return args.relationshipMode === "details" && !args.hasExistingSource;
+}
+
+export function assertDetailsSourceJoin(args: {
+  relationshipMode: "items" | "details" | undefined;
+  hasJoin: boolean;
+}) {
+  if (args.relationshipMode === "details" && !args.hasJoin) {
+    throw new Error("Choose a match key before adding source details.");
+  }
+}
+
+export async function readBeforeLocalDetailsBootstrap<
+  T extends {
+    readState: BuilderCmsReadResult["state"];
+    readMessage: string | null;
+  },
+>(args: {
+  readCandidate: () => Promise<T>;
+  bootstrapLocalSource: () => Promise<void>;
+}) {
+  const candidate = await args.readCandidate();
+  if (candidate.readState !== "live") {
+    throw new Error(
+      candidate.readMessage ?? "Source read failed before connection.",
+    );
+  }
+  await args.bootstrapLocalSource();
+  return candidate;
+}
+
 export async function readInitialBuilderCmsAttachEntries(
   sourceTable: string,
   readEntries: typeof readBuilderCmsContentEntries = readBuilderCmsContentEntries,
@@ -244,6 +279,65 @@ function identityFederation(
   };
 }
 
+async function readDetailsSourceCandidate(args: {
+  sourceType: ContentDatabaseSourceType;
+  sourceTable: string;
+  limit: number;
+  offset: number;
+  now: string;
+}) {
+  const adapter = getContentDatabaseSourceAdapter(args.sourceType);
+  if (adapter) {
+    const read = await adapter.read({
+      sourceTable: args.sourceTable,
+      limit: args.limit,
+      offset: args.offset,
+    });
+    return {
+      readState: read.state,
+      readMessage: read.message,
+      entries: read.state === "live" ? read.entries : [],
+      modelFields: read.fields,
+      builderRead:
+        args.sourceType === "builder-cms"
+          ? ({
+              state: read.state,
+              entries: read.entries,
+              fetchedAt: read.fetchedAt,
+              message: read.message,
+              progress: read.progress!,
+            } satisfies BuilderCmsReadResult)
+          : null,
+      adapterMetadata: read.metadata,
+      adapterFetchedAt: read.fetchedAt,
+      adapterMessage: read.message,
+    };
+  }
+  if (args.sourceType === "builder-cms") {
+    const initial = await readInitialBuilderCmsAttachSource(args.sourceTable);
+    return {
+      readState: initial.read.state,
+      readMessage: initial.read.message,
+      entries: initial.read.state === "live" ? initial.read.entries : [],
+      modelFields: initial.modelFields,
+      builderRead: initial.read,
+      adapterMetadata: undefined,
+      adapterFetchedAt: args.now,
+      adapterMessage: null,
+    };
+  }
+  return {
+    readState: "live" as const,
+    readMessage: null,
+    entries: [] as BuilderCmsSourceEntry[],
+    modelFields: [] as BuilderCmsModelFieldSummary[],
+    builderRead: null,
+    adapterMetadata: undefined,
+    adapterFetchedAt: args.now,
+    adapterMessage: null,
+  };
+}
+
 export default defineAction({
   description:
     "Attach or replace a safe local source binding for a content database. Builder CMS bindings store source metadata, field mappings, row identity, provenance, freshness, capabilities, and local-only diff state without calling external APIs.",
@@ -317,37 +411,60 @@ export default defineAction({
     const relationshipMode =
       args.relationshipMode ?? (args.mode === "add" ? "items" : undefined);
 
+    // Validate before bootstrapping the local primary so an invalid details
+    // attach cannot leave a source record behind.
+    assertDetailsSourceJoin({
+      relationshipMode,
+      hasJoin: Boolean(args.join),
+    });
+
     // A normal local Content database has rows but no explicit source record.
-    // Bootstrap that local snapshot before attaching a read-only details source
-    // so Notion federation works without forcing users to attach Builder first.
+    // A details join needs that local snapshot to remain the primary side;
+    // otherwise the candidate source would fall through to replacement semantics.
+    let initialDetailsSource:
+      | Awaited<ReturnType<typeof readDetailsSourceCandidate>>
+      | undefined;
     if (
-      sourceType === "notion-database" &&
-      relationshipMode === "details" &&
-      !existingSource
+      shouldBootstrapLocalDetailsSource({
+        relationshipMode,
+        hasExistingSource: Boolean(existingSource),
+      })
     ) {
-      const setup = await sourceSetupPayload(database.id);
-      const localSourceId = await replaceSourceMetadata({
-        database,
-        source: null,
-        sourceType: "mock-local",
-        sourceName: "Local Content database",
-        sourceTable: database.id,
-        now,
-      });
-      await seedMockSourceFields({
-        sourceId: localSourceId,
-        ownerEmail: database.ownerEmail,
-        sourceType: "mock-local",
-        properties: setup.properties,
-        now,
-      });
-      await seedMockSourceRows({
-        sourceId: localSourceId,
-        ownerEmail: database.ownerEmail,
-        sourceType: "mock-local",
-        sourceTable: database.id,
-        items: setup.response.items,
-        now,
+      initialDetailsSource = await readBeforeLocalDetailsBootstrap({
+        readCandidate: () =>
+          readDetailsSourceCandidate({
+            sourceType,
+            sourceTable,
+            limit: args.limit,
+            offset: args.offset,
+            now,
+          }),
+        bootstrapLocalSource: async () => {
+          const setup = await sourceSetupPayload(database.id);
+          const localSourceId = await replaceSourceMetadata({
+            database,
+            source: null,
+            sourceType: "mock-local",
+            sourceName: "Local Content database",
+            sourceTable: database.id,
+            now,
+          });
+          await seedMockSourceFields({
+            sourceId: localSourceId,
+            ownerEmail: database.ownerEmail,
+            sourceType: "mock-local",
+            properties: setup.properties,
+            now,
+          });
+          await seedMockSourceRows({
+            sourceId: localSourceId,
+            ownerEmail: database.ownerEmail,
+            sourceType: "mock-local",
+            sourceTable: database.id,
+            items: setup.response.items,
+            now,
+          });
+        },
       });
       existingSource = await getExistingSource(database.id);
     }
@@ -359,42 +476,22 @@ export default defineAction({
       if (!args.join) {
         throw new Error("Choose a match key before adding source details.");
       }
-      let entries: BuilderCmsSourceEntry[];
-      let modelFields: BuilderCmsModelFieldSummary[];
-      let builderRead: BuilderCmsReadResult | null = null;
-      let adapterMetadata: Record<string, unknown> | undefined;
-      let adapterFetchedAt = now;
-      let adapterMessage: string | null = null;
-      const adapter = getContentDatabaseSourceAdapter(sourceType);
-      if (adapter) {
-        const read = await adapter.read({
+      const {
+        entries,
+        modelFields,
+        builderRead,
+        adapterMetadata,
+        adapterFetchedAt,
+        adapterMessage,
+      } =
+        initialDetailsSource ??
+        (await readDetailsSourceCandidate({
+          sourceType,
           sourceTable,
           limit: args.limit,
           offset: args.offset,
-        });
-        entries = read.state === "live" ? read.entries : [];
-        modelFields = read.fields;
-        adapterMetadata = read.metadata;
-        adapterFetchedAt = read.fetchedAt;
-        adapterMessage = read.message;
-        if (sourceType === "builder-cms") {
-          builderRead = {
-            state: read.state,
-            entries: read.entries,
-            fetchedAt: read.fetchedAt,
-            message: read.message,
-            progress: read.progress!,
-          };
-        }
-      } else if (sourceType === "builder-cms") {
-        const initial = await readInitialBuilderCmsAttachSource(sourceTable);
-        modelFields = initial.modelFields;
-        builderRead = initial.read;
-        entries = builderRead.state === "live" ? builderRead.entries : [];
-      } else {
-        entries = [];
-        modelFields = [];
-      }
+          now,
+        }));
 
       const secondaryId = await insertSecondarySource({
         database,

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

@@ -323,6 +323,7 @@ export default defineAction({
       hideFromSearch: parseDocumentHideFromSearch(doc.hideFromSearch),
       visibility: doc.visibility,
       accessRole: inheritedRole,
+      canComment: true,
       canEdit: true,
       canManage: inheritedRole === "owner" || inheritedRole === "admin",
       createdAt: doc.createdAt,

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

@@ -34,7 +34,7 @@ export default defineAction({
 
     const userEmail = getRequestUserEmail();
     if (comment.authorEmail === userEmail) {
-      await assertAccess("document", comment.documentId, "viewer");
+      await assertAccess("document", comment.documentId, "commenter");
     } else {
       await assertAccess("document", comment.documentId, "editor");
     }

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

@@ -1,7 +1,7 @@
 import { defineAction } from "@agent-native/core";
 import { buildDeepLink } from "@agent-native/core/server";
 import { getRequestUserEmail } from "@agent-native/core/server/request-context";
-import { resolveAccess } from "@agent-native/core/sharing";
+import { resolveAccess, roleSatisfies } from "@agent-native/core/sharing";
 import { eq } from "drizzle-orm";
 import { z } from "zod";
 
@@ -29,6 +29,13 @@ function canEditRole(role: string) {
   return role === "owner" || role === "admin" || role === "editor";
 }
 
+function canCommentRole(role: string) {
+  return roleSatisfies(
+    role as Parameters<typeof roleSatisfies>[0],
+    "commenter",
+  );
+}
+
 function canManageRole(role: string) {
   return role === "owner" || role === "admin";
 }
@@ -161,6 +168,7 @@ export default defineAction({
       visibility: doc.visibility,
       source: serializeDocumentSource(doc),
       accessRole: access.role,
+      canComment: canCommentRole(access.role),
       canEdit: canEditRole(access.role),
       canManage: canManageRole(access.role),
       database: database

package/corpus/templates/content/actions/import-content-source.ts

@@ -29,6 +29,7 @@ import {
 
 const MAX_SOURCE_FILES = 500;
 const MAX_SOURCE_FILE_BYTES = 2 * 1024 * 1024;
+const MAX_DOCUMENT_BODY_BYTES = 512 * 1024;
 const SNAPSHOT_INTERVAL_MS = 5 * 60 * 1000;
 
 function nanoid(size = 12): string {
@@ -284,6 +285,13 @@ export default defineAction({
         });
         continue;
       }
+      if (Buffer.byteLength(file.content, "utf8") > MAX_DOCUMENT_BODY_BYTES) {
+        errors.push({
+          path: file.path,
+          reason: `Document body exceeds the ${MAX_DOCUMENT_BODY_BYTES}-byte import limit.`,
+        });
+        continue;
+      }
 
       const sourceMatchedDocument = file.id
         ? null

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

@@ -3,7 +3,11 @@ import {
   getRequestOrgId,
   getRequestUserEmail,
 } from "@agent-native/core/server/request-context";
-import { ROLE_RANK, type ShareRole } from "@agent-native/core/sharing";
+import {
+  ROLE_RANK,
+  roleSatisfies,
+  type ShareRole,
+} from "@agent-native/core/sharing";
 import { and, asc, eq, inArray, isNull, or, sql } from "drizzle-orm";
 import { z } from "zod";
 
@@ -33,6 +37,10 @@ function canEditRole(role: EffectiveRole) {
   return role === "owner" || role === "admin" || role === "editor";
 }
 
+function canCommentRole(role: EffectiveRole) {
+  return roleSatisfies(role, "commenter");
+}
+
 function canManageRole(role: EffectiveRole) {
   return role === "owner" || role === "admin";
 }
@@ -331,6 +339,7 @@ export default defineAction({
           ? serializeDatabaseMembership(databaseMembership)
           : undefined,
         accessRole,
+        canComment: canCommentRole(accessRole),
         canEdit: canEditRole(accessRole),
         canManage: canManageRole(accessRole),
         createdAt: d.createdAt,

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

@@ -43,7 +43,7 @@ export default defineAction({
     ) {
       await assertAccess("document", comment.documentId, "editor");
     } else {
-      await assertAccess("document", comment.documentId, "viewer");
+      await assertAccess("document", comment.documentId, "commenter");
     }
 
     const updatedAt = new Date().toISOString();

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

@@ -175,6 +175,15 @@ function canEditRole(role: string) {
   return role === "owner" || role === "admin" || role === "editor";
 }
 
+function canCommentRole(role: string) {
+  return (
+    role === "owner" ||
+    role === "admin" ||
+    role === "editor" ||
+    role === "commenter"
+  );
+}
+
 function builderBodyWithoutImageSourceComponentMarkers(
   content: string | null | undefined,
 ) {
@@ -645,6 +654,7 @@ export default defineAction({
               ),
               visibility: current.visibility,
               accessRole: access.role,
+              canComment: canCommentRole(access.role),
               canEdit: canEditRole(access.role),
               canManage: canManageRole(access.role),
               createdAt: current.createdAt,
@@ -730,6 +740,7 @@ export default defineAction({
         hideFromSearch: parseDocumentHideFromSearch(doc.hideFromSearch),
         visibility: doc.visibility,
         accessRole: access.role,
+        canComment: canCommentRole(access.role),
         canEdit: canEditRole(access.role),
         canManage: canManageRole(access.role),
         createdAt: doc.createdAt,

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

@@ -1,15 +1,13 @@
 import { useT } from "@agent-native/core/client/i18n";
 import {
   IconBold,
+  IconCheck,
+  IconChevronDown,
   IconItalic,
   IconStrikethrough,
   IconCode,
   IconLink,
   IconMessageCircle,
-  IconH1,
-  IconH2,
-  IconH3,
-  IconH4,
 } from "@tabler/icons-react";
 import {
   NodeSelection,
@@ -20,8 +18,13 @@ import {
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
 import type { Editor } from "@tiptap/react";
 import { BubbleMenu } from "@tiptap/react/menus";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
 import {
   Tooltip,
   TooltipContent,
@@ -56,6 +59,15 @@ type SelectionFillRange = {
   to: number;
 };
 
+type TextStyle = "paragraph" | 1 | 2 | 3 | 4 | 5 | 6;
+
+function activeTextStyle(editor: Editor): TextStyle {
+  for (const level of [1, 2, 3, 4, 5, 6] as const) {
+    if (editor.isActive("heading", { level })) return level;
+  }
+  return "paragraph";
+}
+
 const selectionFillPluginKey = new PluginKey<SelectionFillRange | null>(
   "contentSelectionFill",
 );
@@ -106,6 +118,86 @@ export function BubbleToolbar({ editor, onComment }: BubbleToolbarProps) {
   const t = useT();
   const [showLinkInput, setShowLinkInput] = useState(false);
   const [linkUrl, setLinkUrl] = useState("");
+  const [textStyleOpen, setTextStyleOpen] = useState(false);
+  const textStyleSelection = useRef<{ from: number; to: number } | null>(null);
+  const textStyleApplied = useRef(false);
+  const restoreEditorFocusOnClose = useRef(false);
+  const [textStyle, setTextStyle] = useState<TextStyle>(() =>
+    activeTextStyle(editor),
+  );
+
+  useEffect(() => {
+    const syncTextStyle = () => {
+      setTextStyle(activeTextStyle(editor));
+      const { from, to } = editor.state.selection;
+      if (from !== to) textStyleSelection.current = { from, to };
+    };
+    editor.on("selectionUpdate", syncTextStyle);
+    editor.on("transaction", syncTextStyle);
+    syncTextStyle();
+    return () => {
+      editor.off("selectionUpdate", syncTextStyle);
+      editor.off("transaction", syncTextStyle);
+    };
+  }, [editor]);
+
+  const textStyles = [
+    {
+      value: "paragraph" as const,
+      shortLabel: t("editor.slash.text"),
+      menuLabel: "T",
+      label: t("editor.slash.text"),
+    },
+    {
+      value: 1 as const,
+      shortLabel: "H1",
+      menuLabel: "H1",
+      label: t("editor.heading1"),
+    },
+    {
+      value: 2 as const,
+      shortLabel: "H2",
+      menuLabel: "H2",
+      label: t("editor.heading2"),
+    },
+    {
+      value: 3 as const,
+      shortLabel: "H3",
+      menuLabel: "H3",
+      label: t("editor.heading3"),
+    },
+    {
+      value: 4 as const,
+      shortLabel: "H4",
+      menuLabel: "H4",
+      label: t("editor.heading4"),
+    },
+  ];
+  const selectedTextStyle =
+    textStyles.find((style) => style.value === textStyle) ??
+    (typeof textStyle === "number"
+      ? {
+          value: textStyle,
+          shortLabel: `H${textStyle}`,
+          menuLabel: `H${textStyle}`,
+          label: textStyle === 5 ? t("editor.heading5") : t("editor.heading6"),
+        }
+      : textStyles[0]);
+
+  const applyTextStyle = (style: TextStyle) => {
+    const chain = editor.chain();
+    if (textStyleSelection.current) {
+      chain.setTextSelection(textStyleSelection.current);
+    }
+    if (style === "paragraph") {
+      chain.setParagraph().focus().run();
+    } else {
+      chain.setHeading({ level: style }).focus().run();
+    }
+    textStyleApplied.current = true;
+    setTextStyle(style);
+    setTextStyleOpen(false);
+  };
 
   const openLinkInput = useCallback(() => {
     setLinkUrl(editor.getAttributes("link").href || "");
@@ -251,30 +343,7 @@ export function BubbleToolbar({ editor, onComment }: BubbleToolbarProps) {
       isActive: () => editor.isActive("code"),
     },
     { type: "divider" as const },
-    {
-      icon: IconH1,
-      title: t("editor.heading1"),
-      action: () => editor.chain().focus().toggleHeading({ level: 1 }).run(),
-      isActive: () => editor.isActive("heading", { level: 1 }),
-    },
-    {
-      icon: IconH2,
-      title: t("editor.heading2"),
-      action: () => editor.chain().focus().toggleHeading({ level: 2 }).run(),
-      isActive: () => editor.isActive("heading", { level: 2 }),
-    },
-    {
-      icon: IconH3,
-      title: t("editor.heading3"),
-      action: () => editor.chain().focus().toggleHeading({ level: 3 }).run(),
-      isActive: () => editor.isActive("heading", { level: 3 }),
-    },
-    {
-      icon: IconH4,
-      title: t("editor.heading4"),
-      action: () => editor.chain().focus().toggleHeading({ level: 4 }).run(),
-      isActive: () => editor.isActive("heading", { level: 4 }),
-    },
+    { type: "text-style" as const },
     { type: "divider" as const },
     {
       icon: IconLink,
@@ -354,7 +423,7 @@ export function BubbleToolbar({ editor, onComment }: BubbleToolbarProps) {
         </div>
       ) : (
         <div
-          className="flex items-center gap-0.5 overflow-x-auto"
+          className="flex max-w-[calc(100vw-1rem)] items-center gap-0.5"
           onMouseDown={(e) => e.preventDefault()}
         >
           {items.map((item, i) => {
@@ -363,6 +432,103 @@ export function BubbleToolbar({ editor, onComment }: BubbleToolbarProps) {
                 <div key={`d-${i}`} className="w-px h-5 bg-border mx-0.5" />
               );
             }
+            if ("type" in item && item.type === "text-style") {
+              return (
+                <Popover
+                  key="text-style"
+                  open={textStyleOpen}
+                  onOpenChange={(open) => {
+                    if (open) {
+                      textStyleApplied.current = false;
+                      restoreEditorFocusOnClose.current = false;
+                      const { from, to } = editor.state.selection;
+                      if (from !== to)
+                        textStyleSelection.current = { from, to };
+                    }
+                    setTextStyleOpen(open);
+                  }}
+                >
+                  <PopoverTrigger asChild>
+                    <button
+                      type="button"
+                      aria-label={`${t("editor.slash.turnInto")}: ${selectedTextStyle.label}`}
+                      className="flex h-8 min-w-14 items-center justify-between gap-1 rounded px-2 text-sm font-medium text-popover-foreground/85 hover:bg-accent hover:text-accent-foreground"
+                    >
+                      <span>{selectedTextStyle.shortLabel}</span>
+                      <IconChevronDown size={14} strokeWidth={2} />
+                    </button>
+                  </PopoverTrigger>
+                  <PopoverContent
+                    portalled={false}
+                    align="start"
+                    sideOffset={24}
+                    className="w-44 p-1"
+                    onEscapeKeyDown={() => {
+                      restoreEditorFocusOnClose.current = true;
+                      window.setTimeout(() => editor.commands.focus(), 0);
+                    }}
+                    onCloseAutoFocus={(event) => {
+                      if (
+                        textStyleApplied.current ||
+                        restoreEditorFocusOnClose.current
+                      ) {
+                        event.preventDefault();
+                      }
+                      if (restoreEditorFocusOnClose.current) {
+                        editor.commands.focus();
+                      }
+                      textStyleApplied.current = false;
+                      restoreEditorFocusOnClose.current = false;
+                    }}
+                  >
+                    <div className="px-2 py-1 text-xs font-medium text-muted-foreground">
+                      {t("editor.slash.turnInto")}
+                    </div>
+                    <div
+                      role="menu"
+                      aria-label={t("editor.slash.turnInto")}
+                      className="flex flex-col gap-0.5"
+                    >
+                      {textStyles.map((style) => {
+                        const isSelected = style.value === textStyle;
+                        return (
+                          <button
+                            key={style.value}
+                            type="button"
+                            role="menuitemradio"
+                            aria-checked={isSelected}
+                            onPointerDown={(event) => {
+                              event.preventDefault();
+                              event.stopPropagation();
+                              applyTextStyle(style.value);
+                            }}
+                            onClick={(event) => {
+                              if (event.detail === 0) {
+                                applyTextStyle(style.value);
+                              }
+                            }}
+                            className={cn(
+                              "flex h-8 w-full items-center gap-2 rounded px-2 text-left text-sm",
+                              isSelected
+                                ? "bg-accent text-accent-foreground"
+                                : "text-popover-foreground hover:bg-accent hover:text-accent-foreground",
+                            )}
+                          >
+                            <span className="w-6 shrink-0 text-xs font-semibold text-muted-foreground">
+                              {style.menuLabel}
+                            </span>
+                            <span className="flex-1">{style.label}</span>
+                            {isSelected ? (
+                              <IconCheck size={15} strokeWidth={2.25} />
+                            ) : null}
+                          </button>
+                        );
+                      })}
+                    </div>
+                  </PopoverContent>
+                </Popover>
+              );
+            }
             const {
               icon: Icon,
               title,