@agent-native/core 0.128.0 → 0.128.2

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

@@ -132,6 +132,7 @@ import {
 } from "@/components/ui/tooltip";
 import { applySourceFieldPropertyToDatabaseResponse } from "@/hooks/use-content-database";
 import {
+  documentPropertiesResponseMatchesScope,
   useConfigureDocumentProperty,
   useDeleteDocumentProperty,
   useDocumentProperties,
@@ -165,6 +166,7 @@ function tWithFallback(
 
 interface DocumentPropertiesProps {
   documentId: string;
+  databaseId: string;
   databaseDocumentId: string;
   canEdit: boolean;
   popoversPortalled?: boolean;
@@ -797,18 +799,23 @@ function scalarPlaceholder(type: DocumentPropertyType, t: TFunction) {
 
 export function DocumentProperties({
   documentId,
+  databaseId,
   databaseDocumentId,
   canEdit,
   popoversPortalled = true,
 }: DocumentPropertiesProps) {
   const t = useT();
-  const { data, isLoading } = useDocumentProperties(documentId);
+  const { data, isLoading } = useDocumentProperties(documentId, databaseId);
+  const loaded = documentPropertiesResponseMatchesScope(
+    documentId,
+    databaseId,
+    data,
+  );
   // Blocks fields are rendered as body content (below the database/title), not
   // as scalar property rows in this panel — exclude them here.
-  const properties = (data?.properties ?? []).filter(
+  const properties = (loaded ? data.properties : []).filter(
     (property) => property.definition.type !== "blocks",
   );
-  const databaseId = data?.databaseId ?? null;
   const visibleProperties = properties.filter(isPropertyVisible);
   const hiddenProperties = properties.filter(
     (property) => !isPropertyVisible(property),
@@ -816,7 +823,7 @@ export function DocumentProperties({
 
   return (
     <div className="mt-5 border-y border-transparent py-1">
-      {isLoading ? (
+      {isLoading || !loaded ? (
         <div className="flex h-8 items-center gap-2 text-sm text-muted-foreground">
           <Spinner className="size-3.5" />
           {t("editor.properties.loadingProperties")}
@@ -837,17 +844,19 @@ export function DocumentProperties({
         </div>
       ) : null}
 
-      {canEdit && hiddenProperties.length > 0 ? (
+      {loaded && canEdit && hiddenProperties.length > 0 ? (
         <HiddenPropertiesMenu
           documentId={documentId}
+          databaseId={databaseId}
           properties={hiddenProperties}
           t={t}
         />
       ) : null}
 
-      {canEdit && databaseId ? (
+      {loaded && canEdit && databaseId ? (
         <AddProperty
           documentId={documentId}
+          databaseId={databaseId}
           popoversPortalled={popoversPortalled}
         />
       ) : null}
@@ -866,14 +875,16 @@ function isPropertyVisible(property: DocumentProperty) {
 
 function HiddenPropertiesMenu({
   documentId,
+  databaseId,
   properties,
   t,
 }: {
   documentId: string;
+  databaseId: string;
   properties: DocumentProperty[];
   t: TFunction;
 }) {
-  const configure = useConfigureDocumentProperty(documentId);
+  const configure = useConfigureDocumentProperty(documentId, databaseId);
 
   async function showProperty(property: DocumentProperty) {
     await configure.mutateAsync({
@@ -955,6 +966,7 @@ function PropertyRow({
         <PropertyManagementPopover
           property={property}
           documentId={documentId}
+          databaseId={property.definition.databaseId!}
           icon={Icon}
         />
       ) : (
@@ -1018,6 +1030,7 @@ export function propertyTypeForSourceFieldType(
 export function PropertyManagementPopover({
   property,
   documentId,
+  databaseId,
   icon: Icon,
   triggerClassName,
   onTriggerPointerDown,
@@ -1034,6 +1047,7 @@ export function PropertyManagementPopover({
 }: {
   property: DocumentProperty;
   documentId: string;
+  databaseId: string;
   icon: Icon;
   triggerClassName?: string;
   onTriggerPointerDown?: (event: ReactPointerEvent<HTMLButtonElement>) => void;
@@ -1064,10 +1078,13 @@ export function PropertyManagementPopover({
   const quickFilters = databaseQuickFilterOptionsForColumn(
     property.definition.type,
   );
-  const configure = useConfigureDocumentProperty(documentId);
-  const duplicate = useDuplicateDocumentProperty(documentId);
-  const remove = useDeleteDocumentProperty(documentId);
-  const { data: propertiesData } = useDocumentProperties(documentId);
+  const configure = useConfigureDocumentProperty(documentId, databaseId);
+  const duplicate = useDuplicateDocumentProperty(documentId, databaseId);
+  const remove = useDeleteDocumentProperty(documentId, databaseId);
+  const { data: propertiesData } = useDocumentProperties(
+    documentId,
+    databaseId,
+  );
   const bindQueryClient = useQueryClient();
   const bindSourceField = useActionMutation<
     ContentDatabaseResponse,
@@ -1078,7 +1095,11 @@ export function PropertyManagementPopover({
         queryKey: ["action", "get-content-database"],
       });
       bindQueryClient.invalidateQueries({
-        queryKey: ["action", "list-document-properties", { documentId }],
+        queryKey: [
+          "action",
+          "list-document-properties",
+          { documentId, databaseId },
+        ],
       });
     },
   });
@@ -2132,7 +2153,11 @@ function PersonValueEditor({
   onDone: () => void;
 }) {
   const t = useT();
-  const mutation = useSetDocumentProperty(documentId, databaseDocumentId);
+  const mutation = useSetDocumentProperty(
+    documentId,
+    property.definition.databaseId!,
+    databaseDocumentId,
+  );
   const { session } = useSession();
   const [people, setPeople] = useState(() => personItems(property.value));
   const [query, setQuery] = useState("");
@@ -2333,7 +2358,11 @@ function FilesMediaValueEditor({
   onDone: () => void;
 }) {
   const t = useT();
-  const mutation = useSetDocumentProperty(documentId, databaseDocumentId);
+  const mutation = useSetDocumentProperty(
+    documentId,
+    property.definition.databaseId!,
+    databaseDocumentId,
+  );
   const [items, setItems] = useState(() => filesMediaItems(property.value));
   const [linkValue, setLinkValue] = useState("");
   const [uploading, setUploading] = useState(false);
@@ -2536,7 +2565,11 @@ function DateValueEditor({
   onDone: () => void;
 }) {
   const t = useT();
-  const mutation = useSetDocumentProperty(documentId, databaseDocumentId);
+  const mutation = useSetDocumentProperty(
+    documentId,
+    property.definition.databaseId!,
+    databaseDocumentId,
+  );
   const [includeTime, setIncludeTime] = useState(
     documentPropertyDateIncludesTime(property.value),
   );
@@ -2765,7 +2798,11 @@ function ScalarValueEditor({
   onDone: () => void;
 }) {
   const t = useT();
-  const mutation = useSetDocumentProperty(documentId, databaseDocumentId);
+  const mutation = useSetDocumentProperty(
+    documentId,
+    property.definition.databaseId!,
+    databaseDocumentId,
+  );
   const type = property.definition.type;
   const inputType =
     type === "number"
@@ -2875,7 +2912,11 @@ function CheckboxValueEditor({
   onDone: () => void;
 }) {
   const t = useT();
-  const mutation = useSetDocumentProperty(documentId, databaseDocumentId);
+  const mutation = useSetDocumentProperty(
+    documentId,
+    property.definition.databaseId!,
+    databaseDocumentId,
+  );
   const checked = Boolean(property.value);
 
   return (
@@ -2916,9 +2957,14 @@ function OptionValueEditor({
   onDone: () => void;
 }) {
   const t = useT();
-  const setValue = useSetDocumentProperty(documentId, databaseDocumentId);
+  const setValue = useSetDocumentProperty(
+    documentId,
+    property.definition.databaseId!,
+    databaseDocumentId,
+  );
   const configure = useConfigureDocumentProperty(
     documentId,
+    property.definition.databaseId!,
     databaseDocumentId,
   );
   const options = property.definition.options.options ?? [];
@@ -3085,6 +3131,7 @@ function OptionValueEditor({
 
 export function AddProperty({
   documentId,
+  databaseId,
   variant = "default",
   label,
   popoversPortalled = true,
@@ -3092,6 +3139,7 @@ export function AddProperty({
   sources,
 }: {
   documentId: string;
+  databaseId: string;
   variant?: "default" | "header" | "icon";
   label?: string;
   popoversPortalled?: boolean;
@@ -3099,7 +3147,7 @@ export function AddProperty({
   sources?: ContentDatabaseSource[];
 }) {
   const t = useT();
-  const configure = useConfigureDocumentProperty(documentId);
+  const configure = useConfigureDocumentProperty(documentId, databaseId);
   const queryClient = useQueryClient();
   const addSourceFieldProperty = useActionMutation<
     ContentDatabaseSourceFieldPropertyResponse,
@@ -3111,7 +3159,11 @@ export function AddProperty({
         (current) => applySourceFieldPropertyToDatabaseResponse(current, data),
       );
       queryClient.invalidateQueries({
-        queryKey: ["action", "list-document-properties", { documentId }],
+        queryKey: [
+          "action",
+          "list-document-properties",
+          { documentId, databaseId },
+        ],
       });
     },
   });

package/corpus/templates/content/app/components/editor/database/DatabaseView.tsx

@@ -392,7 +392,12 @@ export function previewDraftMissingCasRecovery(args: {
 }
 
 type DatabaseMessageKey = keyof (typeof messagesByLocale)["en-US"]["database"];
-type SidebarMessageKey = keyof (typeof messagesByLocale)["en-US"]["sidebar"];
+type SidebarMessages = (typeof messagesByLocale)["en-US"]["sidebar"];
+type SidebarMessageKey = {
+  [Key in keyof SidebarMessages]: SidebarMessages[Key] extends string
+    ? Key
+    : never;
+}[keyof SidebarMessages];
 
 export function dbText(
   key: DatabaseMessageKey,
@@ -783,7 +788,11 @@ function DatabaseTable({
     document.id,
   );
   const setSourceWriteMode = useSetContentDatabaseSourceWriteMode(document.id);
-  const setProperty = useSetDocumentProperty(document.id, document.id);
+  const setProperty = useSetDocumentProperty(
+    document.id,
+    expectedDatabaseId,
+    document.id,
+  );
   const updateView = useUpdateContentDatabaseView(document.id);
   // A deleted/missing database resolves to the unavailable union (no
   // `database` field) — treat it as no data; the inline-block wrapper owns
@@ -1437,7 +1446,7 @@ function DatabaseTable({
     if (openWorkspaceFiles(item)) return;
     seedDatabaseItemDocumentCaches(queryClient, item);
     prioritizeBuilderBodyHydrationForItem(item);
-    navigate(`/page/${item.document.id}`);
+    navigate(databaseItemPagePath(item.document.id, databaseId, document.id));
   }
 
   function openWorkspaceFiles(item: ContentDatabaseItem) {
@@ -2428,7 +2437,13 @@ function DatabaseTable({
                   aria-label={dbText("openAsFullPage")}
                   className={databaseToolbarIconButtonClass()}
                 >
-                  <Link to={`/page/${databaseDocumentId}`}>
+                  <Link
+                    to={databaseItemPagePath(
+                      databaseDocumentId,
+                      databaseId,
+                      databaseDocumentId,
+                    )}
+                  >
                     <IconArrowsDiagonal className="size-3.5" />
                   </Link>
                 </Button>
@@ -2606,6 +2621,7 @@ function DatabaseTable({
         />
       ) : activeView.type === "board" ? (
         <DatabaseBoardView
+          databaseId={databaseId}
           activeView={activeView}
           properties={orderedProperties}
           items={visibleItems}
@@ -2684,6 +2700,7 @@ function DatabaseTable({
         />
       ) : activeView.type === "calendar" ? (
         <DatabaseCalendarView
+          databaseId={databaseId}
           activeView={activeView}
           properties={orderedProperties}
           items={visibleItems}
@@ -2711,6 +2728,7 @@ function DatabaseTable({
         />
       ) : activeView.type === "timeline" ? (
         <DatabaseTimelineView
+          databaseId={databaseId}
           activeView={activeView}
           properties={orderedProperties}
           items={visibleItems}
@@ -2744,6 +2762,7 @@ function DatabaseTable({
         />
       ) : (
         <DatabaseTableView
+          databaseId={databaseId}
           newRowLabel={newDatabaseRowLabel}
           properties={tableProperties}
           groupableProperties={orderedProperties}
@@ -3063,6 +3082,15 @@ export function databaseItemPreviewTitle(
   return item?.document.title?.trim() || "Untitled";
 }
 
+export function databaseItemPagePath(
+  documentId: string,
+  databaseId: string,
+  databaseDocumentId: string,
+) {
+  const search = new URLSearchParams({ databaseId, databaseDocumentId });
+  return `/page/${documentId}?${search.toString()}`;
+}
+
 export function databaseNavigationState({
   document,
   databaseId,
@@ -4943,6 +4971,7 @@ function DatabaseItemPreview({
             {previewDocument.databaseMembership ? (
               <DocumentProperties
                 documentId={previewDocument.id}
+                databaseId={item.databaseId}
                 databaseDocumentId={databaseDocumentId}
                 canEdit={previewCanEdit}
                 popoversPortalled={false}
@@ -4981,6 +5010,7 @@ function DatabaseItemPreview({
                 const editor = previewDocument.databaseMembership ? (
                   <DocumentBlockFields
                     documentId={previewDocument.id}
+                    databaseId={item.databaseId}
                     databaseDocumentId={databaseDocumentId}
                     canEdit={previewCanEdit}
                     primaryEditor={primaryEditor}
@@ -5084,6 +5114,7 @@ function DatabaseItemPreview({
 }
 
 function DatabaseTableView({
+  databaseId,
   newRowLabel,
   properties,
   groupableProperties,
@@ -5130,6 +5161,7 @@ function DatabaseTableView({
   onDeletedPreviewItems,
   onOpenPage,
 }: {
+  databaseId: string;
   newRowLabel: string;
   properties: DocumentProperty[];
   groupableProperties: DocumentProperty[];
@@ -5194,7 +5226,11 @@ function DatabaseTableView({
   const contentSpaces = useContentSpaces();
   const moveItem = useMoveDatabaseItem(databaseDocumentId);
   const duplicateItems = useDuplicateDatabaseItems(databaseDocumentId);
-  const setProperty = useSetDocumentProperty(databaseDocumentId);
+  const setProperty = useSetDocumentProperty(
+    databaseDocumentId,
+    databaseId,
+    databaseDocumentId,
+  );
   const deleteItems = useDeleteDatabaseItems(databaseDocumentId);
   const [draggedItemId, setDraggedItemId] = useState<string | null>(null);
   const [dropTargetItemId, setDropTargetItemId] = useState<string | null>(null);
@@ -5648,6 +5684,7 @@ function DatabaseTableView({
             >
               <AddProperty
                 documentId={databaseDocumentId}
+                databaseId={databaseId}
                 variant={cleanDefaultTable ? "header" : "icon"}
                 label={dbText("addProperty")}
                 source={source}
@@ -7399,6 +7436,7 @@ function DatabaseSettingsPanelSheet({
         ) : panel === "property_visibility" ? (
           <DatabaseSettingsPropertyVisibilityPanel
             documentId={documentId}
+            databaseId={databaseId}
             properties={properties}
             activeView={activeView}
             items={items}
@@ -10652,6 +10690,7 @@ function DatabaseOpenPagesInSetting({
 
 function DatabaseSettingsPropertyVisibilityPanel({
   documentId,
+  databaseId,
   properties,
   activeView,
   items,
@@ -10662,6 +10701,7 @@ function DatabaseSettingsPropertyVisibilityPanel({
   onPropertiesHiddenChange,
 }: {
   documentId: string;
+  databaseId: string;
   properties: DocumentProperty[];
   activeView: ContentDatabaseView;
   items: ContentDatabaseItem[];
@@ -10761,6 +10801,7 @@ function DatabaseSettingsPropertyVisibilityPanel({
       <div className="border-t border-border/70 pt-3">
         <AddProperty
           documentId={documentId}
+          databaseId={databaseId}
           label={dbText("newProperty")}
           source={source}
           sources={sources}
@@ -11667,6 +11708,7 @@ export function DatabaseGroupHeader({
 }
 
 function DatabaseCalendarView({
+  databaseId,
   activeView,
   properties,
   items,
@@ -11687,6 +11729,7 @@ function DatabaseCalendarView({
   onDeletedPreviewItem,
   onOpenPage,
 }: {
+  databaseId: string;
   activeView: ContentDatabaseView;
   properties: DocumentProperty[];
   items: ContentDatabaseItem[];
@@ -11838,7 +11881,12 @@ function DatabaseCalendarView({
       ) : dateProperties.length === 0 ? (
         <div className="flex min-h-24 items-center justify-between gap-3 px-2 py-4 text-sm text-muted-foreground">
           <span>{dbText("addADatePropertyToUseCalendarView")}</span>
-          {canEdit ? <AddProperty documentId={databaseDocumentId} /> : null}
+          {canEdit ? (
+            <AddProperty
+              documentId={databaseDocumentId}
+              databaseId={databaseId}
+            />
+          ) : null}
         </div>
       ) : databaseViewHasNoMatchingPages(
           items.length,
@@ -12118,6 +12166,7 @@ export interface DatabaseBoardGroup {
 }
 
 function DatabaseBoardView({
+  databaseId,
   activeView,
   properties,
   items,
@@ -12142,6 +12191,7 @@ function DatabaseBoardView({
   onDeletedPreviewItem,
   onOpenPage,
 }: {
+  databaseId: string;
   activeView: ContentDatabaseView;
   properties: DocumentProperty[];
   items: ContentDatabaseItem[];
@@ -12187,7 +12237,10 @@ function DatabaseBoardView({
     null,
   );
   const [dropGroupId, setDropGroupId] = useState<string | null>(null);
-  const configureProperty = useConfigureDocumentProperty(databaseDocumentId);
+  const configureProperty = useConfigureDocumentProperty(
+    databaseDocumentId,
+    databaseId,
+  );
   const canCreateGroup =
     canEdit && !!groupProperty && databaseBoardCanCreateGroup(groupProperty);
 
@@ -12372,7 +12425,12 @@ function DatabaseBoardView({
       ) : groupableProperties.length === 0 ? (
         <div className="flex min-h-24 items-center justify-between gap-3 px-2 py-4 text-sm text-muted-foreground">
           <span>{dbText("addAStatusSelectMultiSelectOrCheckbox2")}</span>
-          {canEdit ? <AddProperty documentId={databaseDocumentId} /> : null}
+          {canEdit ? (
+            <AddProperty
+              documentId={databaseDocumentId}
+              databaseId={databaseId}
+            />
+          ) : null}
         </div>
       ) : (
         <>
@@ -15900,6 +15958,7 @@ function DatabasePropertyHeader({
         <PropertyManagementPopover
           property={property}
           documentId={documentId}
+          databaseId={property.definition.databaseId!}
           icon={Icon}
           triggerClassName="h-full min-w-0 flex-1 rounded-none text-xs text-muted-foreground"
           onTriggerPointerDown={(event) => {
@@ -16137,6 +16196,7 @@ function ColumnHeaderMenuContent({
 
 function DatabasePropertiesMenu({
   documentId,
+  databaseId,
   properties,
   hiddenCount,
   activeView,
@@ -16145,6 +16205,7 @@ function DatabasePropertiesMenu({
   onPropertiesHiddenChange,
 }: {
   documentId: string;
+  databaseId: string;
   properties: DocumentProperty[];
   hiddenCount: number;
   activeView: ContentDatabaseView;
@@ -16279,7 +16340,11 @@ function DatabasePropertiesMenu({
           className="border-t border-border p-2"
           onKeyDown={(event) => event.stopPropagation()}
         >
-          <AddProperty documentId={documentId} label={dbText("newProperty")} />
+          <AddProperty
+            documentId={documentId}
+            databaseId={databaseId}
+            label={dbText("newProperty")}
+          />
         </div>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -17259,7 +17324,11 @@ function DatabaseFilterValueControl({
   hideOptionsUntilQuery?: boolean;
   onValueChange: (value: string) => void;
 }) {
-  const configureProperty = useConfigureDocumentProperty(documentId);
+  const configureProperty = useConfigureDocumentProperty(
+    documentId,
+    properties.find((property) => property.definition.id === filter.key)
+      ?.definition.databaseId ?? "",
+  );
   const { session } = useSession();
   const currentUserEmail = session?.email?.trim() ?? "";
   const options = databaseFilterOptionChoices(

package/corpus/templates/content/app/components/editor/database/TimelineView.tsx

@@ -46,6 +46,7 @@ import {
 } from "./DatabaseView";
 
 export function DatabaseTimelineView({
+  databaseId,
   activeView,
   properties,
   items,
@@ -67,6 +68,7 @@ export function DatabaseTimelineView({
   onDeletedPreviewItem,
   onOpenPage,
 }: {
+  databaseId: string;
   activeView: ContentDatabaseView;
   properties: DocumentProperty[];
   items: ContentDatabaseItem[];
@@ -287,7 +289,12 @@ export function DatabaseTimelineView({
       ) : dateProperties.length === 0 ? (
         <div className="flex min-h-24 items-center justify-between gap-3 px-2 py-4 text-sm text-muted-foreground">
           <span>{dbText("addADatePropertyToUseTimelineView")}</span>
-          {canEdit ? <AddProperty documentId={databaseDocumentId} /> : null}
+          {canEdit ? (
+            <AddProperty
+              documentId={databaseDocumentId}
+              databaseId={databaseId}
+            />
+          ) : null}
         </div>
       ) : (
         <>

package/corpus/templates/content/app/components/editor/database/settings.tsx

@@ -176,6 +176,7 @@ function NotionLogoMark({ className }: { className?: string }) {
 export function DatabaseSettingsPanelSheet({
   open,
   panel,
+  databaseId,
   documentId,
   canEdit,
   activeView,
@@ -208,6 +209,7 @@ export function DatabaseSettingsPanelSheet({
 }: {
   open: boolean;
   panel: DatabaseSettingsPanel;
+  databaseId: string;
   documentId: string;
   canEdit: boolean;
   activeView: ContentDatabaseView;
@@ -348,6 +350,7 @@ export function DatabaseSettingsPanelSheet({
         ) : panel === "property_visibility" ? (
           <DatabaseSettingsPropertyVisibilityPanel
             documentId={documentId}
+            databaseId={databaseId}
             properties={properties}
             activeView={activeView}
             items={items}
@@ -2796,6 +2799,7 @@ function DatabaseOpenPagesInSetting({
 
 function DatabaseSettingsPropertyVisibilityPanel({
   documentId,
+  databaseId,
   properties,
   activeView,
   items,
@@ -2806,6 +2810,7 @@ function DatabaseSettingsPropertyVisibilityPanel({
   onPropertiesHiddenChange,
 }: {
   documentId: string;
+  databaseId: string;
   properties: DocumentProperty[];
   activeView: ContentDatabaseView;
   items: ContentDatabaseItem[];
@@ -2905,6 +2910,7 @@ function DatabaseSettingsPropertyVisibilityPanel({
       <div className="border-t border-border/70 pt-3">
         <AddProperty
           documentId={documentId}
+          databaseId={databaseId}
           label={dbText("newProperty")}
           source={source}
           sources={sources}