@agent-native/core 0.152.1 → 0.153.0

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

@@ -71,6 +71,7 @@ import {
   IconPaperclip,
   IconPhone,
   IconPlus,
+  IconPlugConnected,
   IconSearch,
   IconSquareCheck,
   IconTrash,
@@ -3135,6 +3136,9 @@ export function AddProperty({
   popoversPortalled = true,
   source,
   sources,
+  onConnectSource,
+  openRequestId = 0,
+  onOpenRequestHandled,
 }: {
   documentId: string;
   databaseId: string;
@@ -3143,18 +3147,26 @@ export function AddProperty({
   popoversPortalled?: boolean;
   source?: ContentDatabaseSource | null;
   sources?: ContentDatabaseSource[];
+  onConnectSource?: () => void;
+  openRequestId?: number;
+  onOpenRequestHandled?: (requestId: number) => void;
 }) {
   const t = useT();
   const configure = useConfigureDocumentProperty(documentId, databaseId);
   const addSourceFieldProperty =
     useAddContentDatabaseSourceFieldProperty(documentId);
   const [open, setOpen] = useState(false);
+  const [sourceHandoffClosing, setSourceHandoffClosing] = useState(false);
+  const handledOpenRequestId = useRef(0);
   const [typeQuery, setTypeQuery] = useState("");
   const filteredPropertyTypes = filterDocumentPropertyTypes(typeQuery);
   const firstFilteredPropertyType = filteredPropertyTypes[0] ?? null;
   const allSources =
     sources && sources.length > 0 ? sources : source ? [source] : [];
   const query = typeQuery.trim().toLowerCase();
+  const connectSourceLabel = t("editor.properties.connectASource");
+  const connectSourceMatches =
+    !!onConnectSource && matchesConnectSourceQuery(connectSourceLabel, query);
   const sourceFieldGroups = allSources
     .map((src) => ({
       source: src,
@@ -3199,6 +3211,17 @@ export function AddProperty({
     return () => cancelAnimationFrame(frame);
   }, [open]);
 
+  useEffect(() => {
+    if (openRequestId === 0 || openRequestId === handledOpenRequestId.current)
+      return;
+    handledOpenRequestId.current = openRequestId;
+    setTypeQuery("");
+    setAddPropertyError(null);
+    setSourceHandoffClosing(false);
+    setOpen(true);
+    onOpenRequestHandled?.(openRequestId);
+  }, [onOpenRequestHandled, openRequestId]);
+
   function closeAddPropertyPicker() {
     if (isAddingProperty) return;
     setTypeQuery("");
@@ -3206,6 +3229,17 @@ export function AddProperty({
     setOpen(false);
   }
 
+  function connectSource() {
+    if (!onConnectSource || isAddingProperty) return;
+    setTypeQuery("");
+    setAddPropertyError(null);
+    // Radix keeps closing popovers mounted for their exit animation. Remove
+    // this one immediately so opening Sources cannot stack over it.
+    setSourceHandoffClosing(true);
+    setOpen(false);
+    onConnectSource();
+  }
+
   async function add(type: DocumentPropertyType) {
     const label = t(`editor.propertyTypes.${type}`);
     setPendingPropertyType(type);
@@ -3283,6 +3317,7 @@ export function AddProperty({
       open={open}
       onOpenChange={(nextOpen) => {
         if (nextOpen) {
+          setSourceHandoffClosing(false);
           setOpen(true);
         } else if (!isAddingProperty) {
           closeAddPropertyPicker();
@@ -3310,7 +3345,11 @@ export function AddProperty({
         align={variant === "default" ? "start" : "end"}
         collisionPadding={12}
         portalled={popoversPortalled}
-        className="relative z-[300] w-80 p-2"
+        className={cn(
+          "relative z-[300] w-80 p-2",
+          sourceHandoffClosing &&
+            "data-[state=closed]:hidden data-[state=closed]:animate-none",
+        )}
       >
         <div className="grid gap-2">
           <div className="flex h-8 items-center gap-1 rounded border border-border bg-background px-2">
@@ -3326,6 +3365,9 @@ export function AddProperty({
                 if (event.key === "Enter" && firstFilteredPropertyType) {
                   event.preventDefault();
                   void add(firstFilteredPropertyType);
+                } else if (event.key === "Enter" && connectSourceMatches) {
+                  event.preventDefault();
+                  connectSource();
                 }
                 if (event.key === "Escape") {
                   event.preventDefault();
@@ -3336,6 +3378,16 @@ export function AddProperty({
             />
           </div>
           <div className="max-h-80 overflow-auto rounded border p-1">
+            {connectSourceMatches ? (
+              <button
+                type="button"
+                className="mb-1 flex w-full items-center gap-2 rounded px-2 py-1.5 text-start text-sm hover:bg-accent focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                onClick={connectSource}
+              >
+                <IconPlugConnected className="size-4 shrink-0 text-muted-foreground" />
+                <span className="flex-1">{connectSourceLabel}</span>
+              </button>
+            ) : null}
             {sourceFieldGroups.map((group) => (
               <div
                 key={group.source.id}
@@ -3407,7 +3459,7 @@ export function AddProperty({
                 })}
               </div>
             ))}
-            {filteredPropertyTypes.length === 0 ? (
+            {filteredPropertyTypes.length === 0 && !connectSourceMatches ? (
               <div className="px-2 py-3 text-sm text-muted-foreground">
                 {t("editor.properties.noMatchingPropertyTypes")}
               </div>
@@ -3494,3 +3546,11 @@ export function filterDocumentPropertyTypes(
     );
   });
 }
+
+export function matchesConnectSourceQuery(label: string, query: string) {
+  const normalizedQuery = query.trim().toLocaleLowerCase();
+  return (
+    normalizedQuery.length === 0 ||
+    label.toLocaleLowerCase().includes(normalizedQuery)
+  );
+}

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

@@ -888,6 +888,9 @@ function DatabaseTable({
   >(null);
   const [searchOpen, setSearchOpen] = useState(false);
   const [settingsOpen, setSettingsOpen] = useState(false);
+  const sourceHandoffActiveRef = useRef(false);
+  const addPropertyOpenRequestSequenceRef = useRef(0);
+  const [addPropertyOpenRequestId, setAddPropertyOpenRequestId] = useState(0);
   const [inlineFilterControlsOpen, setInlineFilterControlsOpen] =
     useState(false);
   const [inlineAddFilterOpen, setInlineAddFilterOpen] = useState(false);
@@ -921,6 +924,41 @@ function DatabaseTable({
     useState<Record<string, string> | null>(null);
   const [settingsPanel, setSettingsPanel] =
     useState<DatabaseSettingsPanel>("main");
+  const openSourcesFromAddProperty = () => {
+    sourceHandoffActiveRef.current = true;
+    setSettingsPanel("source");
+    setSettingsOpen(true);
+  };
+  const completeSourceHandoff = () => {
+    if (!sourceHandoffActiveRef.current) return;
+    sourceHandoffActiveRef.current = false;
+    setSettingsOpen(false);
+    addPropertyOpenRequestSequenceRef.current += 1;
+    setAddPropertyOpenRequestId(addPropertyOpenRequestSequenceRef.current);
+  };
+  async function runSourceHandoffMutation<T>(
+    mutation: () => Promise<T>,
+  ): Promise<T | null> {
+    try {
+      const result = await mutation();
+      completeSourceHandoff();
+      return result;
+    } catch (error) {
+      toast.error(dbText("failedToAttachSource"), {
+        description:
+          error instanceof Error ? error.message : dbText("somethingWentWrong"),
+      });
+      return null;
+    }
+  }
+  const closeDatabaseSettings = () => {
+    sourceHandoffActiveRef.current = false;
+    setSettingsOpen(false);
+  };
+  const changeDatabaseSettingsPanel = (panel: DatabaseSettingsPanel) => {
+    if (panel !== "source") sourceHandoffActiveRef.current = false;
+    setSettingsPanel(panel);
+  };
   const [savedViewConfig, setSavedViewConfig] =
     useState<ContentDatabaseViewConfig>(defaultDatabaseViewConfig());
   const [personalQueryDirty, setPersonalQueryDirty] = useState(false);
@@ -2559,6 +2597,7 @@ function DatabaseTable({
               "relative",
             )}
             onClick={() => {
+              sourceHandoffActiveRef.current = false;
               setSettingsPanel("main");
               setSettingsOpen((open) => !open);
             }}
@@ -2729,6 +2768,15 @@ function DatabaseTable({
           isCreating={isCreatingDatabaseItem || setProperty.isPending}
           hasActiveConstraints={!!searchQuery || activeFilters.length > 0}
           isMoving={setProperty.isPending}
+          source={source}
+          sources={sources}
+          addPropertyOpenRequestId={addPropertyOpenRequestId}
+          onAddPropertyOpenRequestHandled={(requestId) =>
+            setAddPropertyOpenRequestId((current) =>
+              current === requestId ? 0 : current,
+            )
+          }
+          onConnectSource={openSourcesFromAddProperty}
           collapsedGroupIds={activeView.collapsedGroupIds ?? []}
           hideEmptyGroups={activeView.hideEmptyGroups === true}
           onClearResultConstraints={clearSearchAndFilters}
@@ -2809,6 +2857,15 @@ function DatabaseTable({
           hasSearch={!!searchQuery}
           dateProperty={dateViewProperty}
           month={dateViewMonth}
+          source={source}
+          sources={sources}
+          addPropertyOpenRequestId={addPropertyOpenRequestId}
+          onAddPropertyOpenRequestHandled={(requestId) =>
+            setAddPropertyOpenRequestId((current) =>
+              current === requestId ? 0 : current,
+            )
+          }
+          onConnectSource={openSourcesFromAddProperty}
           onClearResultConstraints={clearSearchAndFilters}
           onMonthChange={setDateViewMonth}
           onDatePropertyChange={(propertyId) =>
@@ -2837,6 +2894,15 @@ function DatabaseTable({
           hasSearch={!!searchQuery}
           dateProperty={dateViewProperty}
           month={dateViewMonth}
+          source={source}
+          sources={sources}
+          addPropertyOpenRequestId={addPropertyOpenRequestId}
+          onAddPropertyOpenRequestHandled={(requestId) =>
+            setAddPropertyOpenRequestId((current) =>
+              current === requestId ? 0 : current,
+            )
+          }
+          onConnectSource={openSourcesFromAddProperty}
           onClearResultConstraints={clearSearchAndFilters}
           onMonthChange={setDateViewMonth}
           onDatePropertyChange={(propertyId) =>
@@ -2887,6 +2953,13 @@ function DatabaseTable({
           collapsedGroupIds={activeView.collapsedGroupIds ?? []}
           hideEmptyGroups={activeView.hideEmptyGroups === true}
           focusedTitleDocumentId={inlineTitleFocusDocumentId}
+          addPropertyOpenRequestId={addPropertyOpenRequestId}
+          onAddPropertyOpenRequestHandled={(requestId) =>
+            setAddPropertyOpenRequestId((current) =>
+              current === requestId ? 0 : current,
+            )
+          }
+          onConnectSource={openSourcesFromAddProperty}
           onClearResultConstraints={clearSearchAndFilters}
           onSortsChange={setActiveSorts}
           onFiltersChange={setActiveFilters}
@@ -2987,41 +3060,47 @@ function DatabaseTable({
         sources={sources}
         hiddenCount={hiddenProperties.length}
         groupIds={toolbarGroups.map((group) => group.id)}
-        onClose={() => setSettingsOpen(false)}
-        onPanelChange={setSettingsPanel}
+        onClose={closeDatabaseSettings}
+        onPanelChange={changeDatabaseSettingsPanel}
         onAttachBuilderSource={(model, relationshipMode) =>
-          attachSource.mutateAsync({
-            documentId: document.id,
-            sourceType: "builder-cms",
-            sourceName: model.displayName,
-            sourceTable: model.name,
-            builderFieldPaths: model.fields.map((field) => field.name),
-            relationshipMode,
-            mode:
-              relationshipMode === "items"
-                ? "add"
-                : sources.length > 0 || source
-                  ? undefined
-                  : "replace",
-          })
+          runSourceHandoffMutation(() =>
+            attachSource.mutateAsync({
+              documentId: document.id,
+              sourceType: "builder-cms",
+              sourceName: model.displayName,
+              sourceTable: model.name,
+              builderFieldPaths: model.fields.map((field) => field.name),
+              relationshipMode,
+              mode:
+                relationshipMode === "items"
+                  ? "add"
+                  : sources.length > 0 || source
+                    ? undefined
+                    : "replace",
+            }),
+          )
         }
         onFederateSource={(candidate, join) =>
-          attachSource.mutateAsync({
-            documentId: document.id,
-            sourceType: candidate.sourceType,
-            sourceName: candidate.sourceName,
-            sourceTable: candidate.sourceTable,
-            relationshipMode: "details",
-            join,
-          })
+          runSourceHandoffMutation(() =>
+            attachSource.mutateAsync({
+              documentId: document.id,
+              sourceType: candidate.sourceType,
+              sourceName: candidate.sourceName,
+              sourceTable: candidate.sourceTable,
+              relationshipMode: "details",
+              join,
+            }),
+          )
         }
         onChangeSourceRole={(sourceId, relationshipMode, join) =>
-          changeSourceRole.mutateAsync({
-            documentId: document.id,
-            sourceId,
-            relationshipMode,
-            join,
-          })
+          runSourceHandoffMutation(() =>
+            changeSourceRole.mutateAsync({
+              documentId: document.id,
+              sourceId,
+              relationshipMode,
+              join,
+            }),
+          )
         }
         onDisconnectSecondary={(sourceId) =>
           disconnectSource.mutate({ documentId: document.id, sourceId })
@@ -5286,6 +5365,9 @@ function DatabaseTableView({
   collapsedGroupIds,
   hideEmptyGroups,
   focusedTitleDocumentId,
+  addPropertyOpenRequestId,
+  onAddPropertyOpenRequestHandled,
+  onConnectSource,
   onSortsChange,
   onFiltersChange,
   onResizeColumn,
@@ -5336,6 +5418,9 @@ function DatabaseTableView({
   collapsedGroupIds: string[];
   hideEmptyGroups: boolean;
   focusedTitleDocumentId: string | null;
+  addPropertyOpenRequestId: number;
+  onAddPropertyOpenRequestHandled: (requestId: number) => void;
+  onConnectSource: () => void;
   onSortsChange: (sorts: DatabaseSort[]) => void;
   onFiltersChange: (filters: DatabaseFilter[]) => void;
   onResizeColumn: (
@@ -5876,6 +5961,9 @@ function DatabaseTableView({
                   label={dbText("addProperty")}
                   source={source}
                   sources={sources}
+                  onConnectSource={onConnectSource}
+                  openRequestId={addPropertyOpenRequestId}
+                  onOpenRequestHandled={onAddPropertyOpenRequestHandled}
                 />
               </div>
             ) : null}
@@ -7521,16 +7609,16 @@ function DatabaseSettingsPanelSheet({
   onAttachBuilderSource: (
     model: BuilderCmsModelSummary,
     relationshipMode?: "items" | "details",
-  ) => Promise<ContentDatabaseSourceAttachmentResult>;
+  ) => Promise<ContentDatabaseSourceAttachmentResult | null>;
   onFederateSource: (
     candidate: PendingSourceCandidate,
     join: ContentDatabaseSourceJoinRequest,
-  ) => Promise<ContentDatabaseSourceAttachmentResult>;
+  ) => Promise<ContentDatabaseSourceAttachmentResult | null>;
   onChangeSourceRole: (
     sourceId: string,
     relationshipMode: "items" | "details",
     join?: ContentDatabaseSourceJoinRequest,
-  ) => Promise<ContentDatabaseResponse>;
+  ) => Promise<ContentDatabaseResponse | null>;
   onDisconnectSecondary: (sourceId: string) => void;
   onRefreshSource: (sourceId?: string) => void;
   onHydrateBuilderBodies: (sourceId: string) => void;
@@ -8094,16 +8182,16 @@ function DatabaseSettingsSourcePanel({
   onAttachBuilderSource: (
     model: BuilderCmsModelSummary,
     relationshipMode?: "items" | "details",
-  ) => Promise<ContentDatabaseSourceAttachmentResult>;
+  ) => Promise<ContentDatabaseSourceAttachmentResult | null>;
   onFederateSource: (
     candidate: PendingSourceCandidate,
     join: ContentDatabaseSourceJoinRequest,
-  ) => Promise<ContentDatabaseSourceAttachmentResult>;
+  ) => Promise<ContentDatabaseSourceAttachmentResult | null>;
   onChangeSourceRole: (
     sourceId: string,
     relationshipMode: "items" | "details",
     join?: ContentDatabaseSourceJoinRequest,
-  ) => Promise<ContentDatabaseResponse>;
+  ) => Promise<ContentDatabaseResponse | null>;
   onDisconnectSecondary: (sourceId: string) => void;
   onRefreshSource: (sourceId?: string) => void;
   onHydrateBuilderBodies: (sourceId: string) => void;
@@ -8249,8 +8337,8 @@ function DatabaseSettingsSourcePanel({
         }}
         onAddItems={async () => {
           if (!secondary) return;
-          await onChangeSourceRole(secondary.id, "items");
-          onNavReplace([]);
+          const result = await onChangeSourceRole(secondary.id, "items");
+          if (result) onNavReplace([]);
         }}
         onChooseFields={() =>
           secondary
@@ -8282,6 +8370,7 @@ function DatabaseSettingsSourcePanel({
                 join,
               )
             : await onFederateSource(top.candidate, join);
+          if (!result) return;
           if ("responseProjection" in result) {
             throw new Error(
               "Detail-source attachment returned an item-source acknowledgement.",
@@ -8442,8 +8531,8 @@ function DatabaseSettingsSourcePanel({
               })
             }
             onAddItems={async () => {
-              await onAttachBuilderSource(model, "items");
-              onNavReplace([]);
+              const result = await onAttachBuilderSource(model, "items");
+              if (result) onNavReplace([]);
             }}
           />
         ) : (
@@ -8453,17 +8542,8 @@ function DatabaseSettingsSourcePanel({
               size="sm"
               disabled={!canEdit || builderAttachPending}
               onClick={async () => {
-                try {
-                  await onAttachBuilderSource(model);
-                  onNavReplace([]);
-                } catch (err) {
-                  toast.error(dbText("failedToAttachSource"), {
-                    description:
-                      err instanceof Error
-                        ? err.message
-                        : dbText("somethingWentWrong"),
-                  });
-                }
+                const result = await onAttachBuilderSource(model);
+                if (result) onNavReplace([]);
               }}
             >
               {builderAttachPending ? (
@@ -8792,8 +8872,8 @@ function DatabaseSettingsSourcePanel({
             });
           }}
           onAddItems={async () => {
-            await onChangeSourceRole(selectedSource.id, "items");
-            onNavReplace([]);
+            const result = await onChangeSourceRole(selectedSource.id, "items");
+            if (result) onNavReplace([]);
           }}
           onChooseFields={() =>
             onNavPush({
@@ -12014,6 +12094,11 @@ function DatabaseCalendarView({
   hasSearch,
   dateProperty,
   month,
+  source,
+  sources,
+  addPropertyOpenRequestId,
+  onAddPropertyOpenRequestHandled,
+  onConnectSource,
   onClearResultConstraints,
   onMonthChange,
   onDatePropertyChange,
@@ -12035,6 +12120,11 @@ function DatabaseCalendarView({
   hasSearch: boolean;
   dateProperty: DocumentProperty | null;
   month: Date;
+  source: ContentDatabaseSource | null;
+  sources: ContentDatabaseSource[];
+  addPropertyOpenRequestId: number;
+  onAddPropertyOpenRequestHandled: (requestId: number) => void;
+  onConnectSource: () => void;
   onClearResultConstraints: () => void;
   onMonthChange: (month: Date) => void;
   onDatePropertyChange: (propertyId: string | null) => void;
@@ -12178,6 +12268,11 @@ function DatabaseCalendarView({
             <AddProperty
               documentId={databaseDocumentId}
               databaseId={databaseId}
+              source={source}
+              sources={sources}
+              onConnectSource={onConnectSource}
+              openRequestId={addPropertyOpenRequestId}
+              onOpenRequestHandled={onAddPropertyOpenRequestHandled}
             />
           ) : null}
         </div>
@@ -12470,6 +12565,11 @@ function DatabaseBoardView({
   isLoading,
   isCreating,
   isMoving,
+  source,
+  sources,
+  addPropertyOpenRequestId,
+  onAddPropertyOpenRequestHandled,
+  onConnectSource,
   hasActiveConstraints,
   collapsedGroupIds,
   hideEmptyGroups,
@@ -12495,6 +12595,11 @@ function DatabaseBoardView({
   isLoading: boolean;
   isCreating: boolean;
   isMoving: boolean;
+  source: ContentDatabaseSource | null;
+  sources: ContentDatabaseSource[];
+  addPropertyOpenRequestId: number;
+  onAddPropertyOpenRequestHandled: (requestId: number) => void;
+  onConnectSource: () => void;
   hasActiveConstraints: boolean;
   collapsedGroupIds: string[];
   hideEmptyGroups: boolean;
@@ -12722,6 +12827,11 @@ function DatabaseBoardView({
             <AddProperty
               documentId={databaseDocumentId}
               databaseId={databaseId}
+              source={source}
+              sources={sources}
+              onConnectSource={onConnectSource}
+              openRequestId={addPropertyOpenRequestId}
+              onOpenRequestHandled={onAddPropertyOpenRequestHandled}
             />
           ) : null}
         </div>

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

@@ -1,5 +1,6 @@
 import type {
   ContentDatabaseItem,
+  ContentDatabaseSource,
   ContentDatabaseView,
   DocumentProperty,
 } from "@shared/api";
@@ -59,6 +60,11 @@ export function DatabaseTimelineView({
   hasSearch,
   dateProperty,
   month,
+  source,
+  sources,
+  addPropertyOpenRequestId,
+  onAddPropertyOpenRequestHandled,
+  onConnectSource,
   onClearResultConstraints,
   onMonthChange,
   onDatePropertyChange,
@@ -81,6 +87,11 @@ export function DatabaseTimelineView({
   hasSearch: boolean;
   dateProperty: DocumentProperty | null;
   month: Date;
+  source: ContentDatabaseSource | null;
+  sources: ContentDatabaseSource[];
+  addPropertyOpenRequestId: number;
+  onAddPropertyOpenRequestHandled: (requestId: number) => void;
+  onConnectSource: () => void;
   onClearResultConstraints: () => void;
   onMonthChange: (month: Date) => void;
   onDatePropertyChange: (propertyId: string | null) => void;
@@ -293,6 +304,11 @@ export function DatabaseTimelineView({
             <AddProperty
               documentId={databaseDocumentId}
               databaseId={databaseId}
+              source={source}
+              sources={sources}
+              onConnectSource={onConnectSource}
+              openRequestId={addPropertyOpenRequestId}
+              onOpenRequestHandled={onAddPropertyOpenRequestHandled}
             />
           ) : null}
         </div>

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

@@ -1476,19 +1476,28 @@ function CanonicalKeyConfirmView({
         type="button"
         size="sm"
         disabled={!canEdit || pending || matchedCount === 0}
-        onClick={() =>
-          onCommit({
-            canonicalKey: suggestion.canonicalKey,
-            primary: {
-              keyField: primaryKeyField,
-              normalizationFormula: primaryFormula,
-            },
-            secondary: {
-              keyField: secondaryKeyField,
-              normalizationFormula: secondaryFormula,
-            },
-          })
-        }
+        onClick={async () => {
+          try {
+            await onCommit({
+              canonicalKey: suggestion.canonicalKey,
+              primary: {
+                keyField: primaryKeyField,
+                normalizationFormula: primaryFormula,
+              },
+              secondary: {
+                keyField: secondaryKeyField,
+                normalizationFormula: secondaryFormula,
+              },
+            });
+          } catch (error) {
+            toast.error(dbText("failedToAttachSource"), {
+              description:
+                error instanceof Error
+                  ? error.message
+                  : dbText("somethingWentWrong"),
+            });
+          }
+        }}
       >
         {pending ? (
           <Spinner className="mr-1.5 size-3.5" />

package/corpus/templates/content/app/components/sidebar/DocumentSidebar.tsx

@@ -2254,6 +2254,13 @@ export function DocumentSidebar({
       <div className="agent-layout-left-drawer flex h-full w-12 flex-col items-center gap-1 border-e border-border bg-sidebar py-3 transition-[width] duration-200 ease-out">
         {brandButton(true)}
         {renderCollapsedNewButton()}
+        <SidebarFooterActions
+          collapsed
+          feedback={feedbackButton}
+          search={searchButton}
+          collapse={collapseButton}
+          className="mt-auto"
+        />
         <Tooltip>
           <TooltipTrigger asChild>
             <Link
@@ -2270,13 +2277,6 @@ export function DocumentSidebar({
           </TooltipTrigger>
           <TooltipContent>{t("navigation.settings")}</TooltipContent>
         </Tooltip>
-        <SidebarFooterActions
-          collapsed
-          feedback={feedbackButton}
-          search={searchButton}
-          collapse={collapseButton}
-          className="mt-auto"
-        />
       </div>
     );
   }

package/corpus/templates/content/app/hooks/use-documents.ts

@@ -52,6 +52,7 @@ export type PageOwnedDocumentCachePatch = Pick<
   | "hideFromSearch"
   | "visibility"
   | "accessRole"
+  | "canComment"
   | "canEdit"
   | "canManage"
   | "source"
@@ -183,6 +184,7 @@ export function mergeDocumentIntoDocumentCache(
     hideFromSearch: document.hideFromSearch,
     visibility: document.visibility,
     accessRole: document.accessRole,
+    canComment: document.canComment,
     canEdit: document.canEdit,
     canManage: document.canManage,
     source: document.source,