@agent-native/core-corpus 0.201.0-nightly-20261005153421 → 0.201.0

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

@@ -130,7 +130,10 @@ import {
   getDesktopContentFiles,
   type DesktopContentFilesFolder,
 } from "@/lib/desktop-content-files";
-import { filesNavigationOrder } from "@/lib/files-navigation";
+import {
+  filesNavigationOrder,
+  openFilesFolderIds,
+} from "@/lib/files-navigation";
 import {
   filesRootHintScope,
   prefetchPagedFilesRoot,
@@ -150,6 +153,7 @@ import {
 import {
   readSidebarLayoutHint,
   rememberSidebarLayout,
+  withShownFilesBranch,
   type SidebarLayoutHint,
   type SidebarRowsHint,
 } from "@/lib/sidebar-layout-hint";
@@ -445,6 +449,8 @@ function WorkspaceSidebarItem({
   compact = false,
   filesPlaceholder,
   onFilesRootShown,
+  filesBranchPlaceholders,
+  onFilesBranchShown,
 }: {
   space: ContentSpaceSummary;
   selected: boolean;
@@ -476,6 +482,8 @@ function WorkspaceSidebarItem({
   compact?: boolean;
   filesPlaceholder?: SidebarRowsHint;
   onFilesRootShown?: (shown: SidebarRowsHint) => void;
+  filesBranchPlaceholders?: Readonly<Record<string, SidebarRowsHint>>;
+  onFilesBranchShown?: (documentId: string, shown: SidebarRowsHint) => void;
 }) {
   const t = useT();
   const [localWorkingCopies, setLocalWorkingCopies] = useState<
@@ -647,22 +655,13 @@ function WorkspaceSidebarItem({
   const queryClient = useQueryClient();
   const { session } = useSession();
   const filesRootScope = filesRootHintScope(session?.email, session?.orgId);
-  const filesRootConfirmed =
-    !localFileMode && expanded && filesPersonalView.isSuccess;
+  const filesRootConfirmed = !localFileMode && expanded;
   useEffect(() => {
     if (!filesRootScope || !filesRootConfirmed) return;
     rememberPagedFilesRoot(filesRootScope, {
       databaseId: space.filesDatabaseId,
-      sort: sidebarOrder.mode,
-      viewId: activeViewId,
     });
-  }, [
-    activeViewId,
-    filesRootConfirmed,
-    filesRootScope,
-    sidebarOrder.mode,
-    space.filesDatabaseId,
-  ]);
+  }, [filesRootConfirmed, filesRootScope, space.filesDatabaseId]);
   const reorderLabels: SidebarReorderLabels = {
     drag: (label) => t("sidebar.dragToReorder", { label }),
     moveUp: t("sidebar.moveUp"),
@@ -957,8 +956,6 @@ function WorkspaceSidebarItem({
           ) : (
             <PagedContentFilesSidebarView
               databaseId={space.filesDatabaseId}
-              sort={sidebarOrder.mode}
-              viewId={activeViewId}
               activeDocumentId={activeDocumentId}
               expandedDocumentIds={expandedDocumentIds}
               onDocumentExpandedChange={onDocumentExpandedChange}
@@ -986,6 +983,8 @@ function WorkspaceSidebarItem({
               untitledLabel={t("sidebar.untitled")}
               rootPlaceholder={filesPlaceholder}
               onRootPageShown={onFilesRootShown}
+              branchPlaceholders={filesBranchPlaceholders}
+              onBranchShown={onFilesBranchShown}
             />
           )}
         </div>
@@ -1033,7 +1032,9 @@ export function DocumentSidebar({
   useEffect(() => {
     if (!filesRootScope) return;
     const root = readPagedFilesRootHint(filesRootScope);
-    if (root) prefetchPagedFilesRoot(queryClient, root);
+    if (!root) return;
+    const { branches } = readSidebarLayoutHint(filesRootScope, null);
+    prefetchPagedFilesRoot(queryClient, root, Object.keys(branches ?? {}));
   }, [filesRootScope, queryClient]);
   const localFileMode = contentSpacesQuery.data?.sourceMode === "local-files";
   const documentsQuery = useDocuments({ enabled: localFileMode });
@@ -1617,9 +1618,47 @@ export function DocumentSidebar({
     return ids;
   }, [activeDocumentId, navigationContextQuery.data?.path]);
   const visibleExpandedDocumentIds = useMemo(
-    () => new Set([...expandedDocumentIds, ...activeAncestorIds]),
+    () => openFilesFolderIds(activeAncestorIds, expandedDocumentIds),
     [activeAncestorIds, expandedDocumentIds],
   );
+  // Open folders are kept by ID with the rows they drew, so the next load
+  // reads them with the tree and holds their rows. Until the stored open
+  // folders arrive, only the active page's ancestors are known to be open, so
+  // folders are dropped from the hint only after that.
+  const rememberFilesBranches = useCallback(
+    (shown?: { documentId: string; rows: SidebarRowsHint }) => {
+      const current = readSidebarLayoutHint(
+        filesRootScope,
+        selectedSpaceId,
+      ).branches;
+      const branches = shown
+        ? withShownFilesBranch(current, shown.documentId, shown.rows)
+        : { ...current };
+      rememberLayout({
+        branches: Object.fromEntries(
+          Object.entries(branches).filter(
+            ([documentId]) =>
+              !sidebarStateHydratedRef.current ||
+              visibleExpandedDocumentIds.has(documentId),
+          ),
+        ),
+      });
+    },
+    [
+      filesRootScope,
+      rememberLayout,
+      selectedSpaceId,
+      visibleExpandedDocumentIds,
+    ],
+  );
+  const rememberFilesBranch = useCallback(
+    (documentId: string, rows: SidebarRowsHint) =>
+      rememberFilesBranches({ documentId, rows }),
+    [rememberFilesBranches],
+  );
+  useEffect(() => {
+    if (sidebarStateHydratedRef.current) rememberFilesBranches();
+  }, [rememberFilesBranches]);
 
   const expandedIds = new Set(expandedIdsRef.current);
   for (const id of activeAncestorIds) expandedIds.add(id);
@@ -2556,6 +2595,8 @@ export function DocumentSidebar({
       }
       filesPlaceholder={compact ? sidebarLayoutHint.files : undefined}
       onFilesRootShown={compact ? rememberFilesRoot : undefined}
+      filesBranchPlaceholders={compact ? sidebarLayoutHint.branches : undefined}
+      onFilesBranchShown={compact ? rememberFilesBranch : undefined}
     />
   );
 

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

@@ -26,6 +26,7 @@ import {
   DropdownMenuRadioItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { filesNavigationPageParams } from "@/lib/files-navigation";
 
 import { SidebarRowIcon } from "./SidebarNavigationRow";
 
@@ -93,11 +94,10 @@ export function MovePageDialog({
 
   const roots = useActionQuery(
     "query-content-database-items",
-    {
+    filesNavigationPageParams({
       databaseId: space?.filesDatabaseId ?? "",
-      limit: 20,
-      navigation: { parentId: null, sort: "custom" },
-    },
+      parentId: null,
+    }),
     { enabled: open && query === "" },
   );
   const results = useActionQuery(

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

@@ -19,19 +19,40 @@ export function sidebarRowClassName(active = false) {
 export const sidebarShowMoreClassName =
   "grid h-7 w-full items-center gap-0 rounded p-0 pe-1.5 text-start text-xs font-medium text-muted-foreground hover:bg-transparent hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring";
 
-export function revealActiveSidebarRow(row: HTMLElement | null) {
+const SIDEBAR_ROW_PLACEHOLDER = "[data-sidebar-row-placeholder]";
+
+// The open page scrolls into view in Files unless another section already
+// shows it. Rows still loading may be that section, or may push the row once
+// they arrive, so the check waits until the sidebar has no placeholder rows.
+// Returns a cleanup that stops a check still waiting.
+export function revealActiveSidebarRow(
+  row: HTMLElement | null,
+): (() => void) | undefined {
   const viewport = row?.closest<HTMLElement>(
     "[data-radix-scroll-area-viewport]",
   );
-  if (!row || !viewport) return;
-  const bounds = viewport.getBoundingClientRect();
-  const alreadyVisible = Array.from(
-    viewport.querySelectorAll<HTMLElement>('[aria-current="page"]'),
-  ).some((element) => {
-    const rect = element.getBoundingClientRect();
-    return rect.bottom > bounds.top && rect.top < bounds.bottom;
+  if (!row || !viewport) return undefined;
+  const reveal = () => {
+    const bounds = viewport.getBoundingClientRect();
+    const alreadyVisible = Array.from(
+      viewport.querySelectorAll<HTMLElement>('[aria-current="page"]'),
+    ).some((element) => {
+      const rect = element.getBoundingClientRect();
+      return rect.bottom > bounds.top && rect.top < bounds.bottom;
+    });
+    if (!alreadyVisible) row.scrollIntoView({ block: "nearest" });
+  };
+  if (!viewport.querySelector(SIDEBAR_ROW_PLACEHOLDER)) {
+    reveal();
+    return undefined;
+  }
+  const observer = new MutationObserver(() => {
+    if (viewport.querySelector(SIDEBAR_ROW_PLACEHOLDER)) return;
+    observer.disconnect();
+    if (row.isConnected) reveal();
   });
-  if (!alreadyVisible) row.scrollIntoView({ block: "nearest" });
+  observer.observe(viewport, { childList: true, subtree: true });
+  return () => observer.disconnect();
 }
 
 export function SidebarRowIcon({ icon }: { icon: ReactNode }) {
@@ -109,6 +130,7 @@ export function SidebarRowsSkeleton({
     <div
       key={index}
       aria-hidden="true"
+      data-sidebar-row-placeholder=""
       {...(index === 0 ? firstRowProps : {})}
       className="flex h-7 items-center gap-1.5 px-1.5"
     >
@@ -121,7 +143,9 @@ export function SidebarRowsSkeleton({
       />
     </div>
   ));
-  const moreRow = more ? <div aria-hidden="true" className="h-7" /> : null;
+  const moreRow = more ? (
+    <div aria-hidden="true" data-sidebar-row-placeholder="" className="h-7" />
+  ) : null;
   if (!framed) {
     return (
       <>

package/corpus/templates/content/app/global.css

@@ -121,10 +121,14 @@
   }
 
   pre,
-  code {
+  pre code {
     overflow-x: auto;
     white-space: pre;
   }
+
+  code {
+    white-space: pre-wrap;
+  }
 }
 
 .notion-logo-icon {
@@ -476,7 +480,7 @@
 .notion-editor ul:not(.notion-task-list) > li,
 .notion-editor ol > li {
   display: grid;
-  grid-template-columns: minmax(1rem, auto) 1fr;
+  grid-template-columns: minmax(1rem, auto) minmax(0, 1fr);
   column-gap: 0.5em;
 }
 
@@ -567,7 +571,7 @@
 }
 .notion-editor .notion-task-list li {
   display: grid;
-  grid-template-columns: 1rem 1fr;
+  grid-template-columns: 1rem minmax(0, 1fr);
   column-gap: 0.5em;
 }
 .notion-editor .notion-task-list li label {
@@ -719,6 +723,7 @@
   margin: 0.6em 0;
 }
 .notion-editor pre code {
+  white-space: pre;
   font-family: inherit;
   background: none;
   padding: 0;
@@ -836,6 +841,7 @@
   border-spacing: 0;
   table-layout: fixed;
   width: 100% !important;
+  min-width: var(--content-table-min-width, 0px) !important;
   margin: 0;
   overflow: hidden;
   border-radius: var(--radius);
@@ -1063,7 +1069,7 @@
 
 div[data-notion-callout] {
   display: grid;
-  grid-template-columns: auto 1fr;
+  grid-template-columns: auto minmax(0, 1fr);
   gap: 0.8rem;
   align-items: start;
   margin: 0.9em 0;
@@ -1430,7 +1436,7 @@ div[data-notion-column] > :last-child {
   display: flex;
   align-items: center;
   width: min(100%, 42rem);
-  min-width: min(18rem, calc(100vw - 3rem));
+  min-width: min(18rem, 100%);
   min-height: 10rem;
   gap: 0.9rem;
   border: 1px dashed hsl(var(--border));
@@ -1478,7 +1484,7 @@ video.media-block__content {
 
 audio.media-block__content {
   width: min(40rem, calc(100vw - 2rem));
-  min-width: min(16.25rem, calc(100vw - 2rem));
+  min-width: min(16.25rem, 100%);
   min-height: 54px;
   background: hsl(var(--muted));
 }
@@ -1611,12 +1617,14 @@ audio.media-block__content {
   outline: none;
 }
 
+/* Even hidden, a handle box that reaches past the page's narrowest side
+   padding (16px) lets a full-width image scroll the page sideways. */
 .media-block__resize-handle--left {
-  left: -22px;
+  left: -16px;
 }
 
 .media-block__resize-handle--right {
-  right: -22px;
+  right: -16px;
 }
 
 .media-block__alt-badge {

package/corpus/templates/content/app/hooks/content-action-refresh.ts

@@ -253,12 +253,15 @@ function queryTargetsDatabase(query: ActionQuery, documentId: string): boolean {
   );
 }
 
+// The Files tree is ordered by the stored personal view but not keyed by it,
+// so it reads again with that view.
 function queryTargetsActiveDatabasePresentation(query: ActionQuery): boolean {
-  return (
-    query.queryKey[0] === "action" &&
-    query.queryKey[1] === "get-content-database-personal-view" &&
-    query.isActive?.() === true
-  );
+  if (query.queryKey[0] !== "action" || query.isActive?.() !== true)
+    return false;
+  if (query.queryKey[1] === "get-content-database-personal-view") return true;
+  if (query.queryKey[1] !== "query-content-database-items") return false;
+  const args = query.queryKey[2];
+  return !!args && typeof args === "object" && "navigation" in args;
 }
 
 function queryTargetsActiveNavigationOrRecent(query: ActionQuery): boolean {
@@ -411,6 +414,12 @@ export function contentActionInvalidatePredicate(
           eventRefreshesDocumentQuery(event.key, query.queryKey[1]),
       );
     }
+    if (
+      queryTargetsActiveDatabasePresentation(query) &&
+      eventsIncludeMutation(events, DATABASE_PRESENTATION_MUTATIONS)
+    ) {
+      return true;
+    }
     if (queryTargetsDatabase(query, documentId)) {
       return events.some(
         (event) =>
@@ -419,14 +428,6 @@ export function contentActionInvalidatePredicate(
           DATABASE_RESULT_MUTATIONS.has(event.key),
       );
     }
-    if (queryTargetsActiveDatabasePresentation(query)) {
-      return events.some(
-        (event) =>
-          event.source === "action" &&
-          typeof event.key === "string" &&
-          DATABASE_PRESENTATION_MUTATIONS.has(event.key),
-      );
-    }
     return false;
   };
 }

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

@@ -769,7 +769,16 @@ export function useContentDatabase(
       meta: { contentDatabaseSystemRole: options?.systemRole },
     },
   );
-  const page = tableQuery ? pageQuery.data : undefined;
+  const pageRead = tableQuery
+    ? contentDatabaseItemsPageReadState(
+        pageQuery.data,
+        pageQuery.isPlaceholderData,
+        pageQuery.isError,
+      )
+    : undefined;
+  const page = pageRead?.page;
+  const baseFailed = baseQuery.isError && baseQuery.data === undefined;
+  const pageFailed = Boolean(tableQuery) && pageRead?.failed === true;
   const data =
     page &&
     baseQuery.data &&
@@ -787,6 +796,24 @@ export function useContentDatabase(
   return {
     ...baseQuery,
     data,
+    // Whether `data` holds the requested rows or a read failed. A sorted or
+    // filtered view reads its own rows; until that read first answers, `data`
+    // holds the base read's rows in stored order.
+    itemsSettled:
+      baseQuery.isError ||
+      (tableQuery
+        ? pageRead?.settled === true || (page !== undefined && !!baseQuery.data)
+        : baseQuery.data !== undefined),
+    // No rows for the requested view could be read. After a failed sorted or
+    // filtered read, `data` still holds the base read's rows in stored order;
+    // they are not this view's rows and must not draw as them.
+    itemsFailed: baseFailed || pageFailed,
+    retryItems: () =>
+      Promise.all([
+        baseFailed ? baseQuery.refetch() : null,
+        pageFailed ? pageQuery.refetch() : null,
+      ]),
+    itemsRetrying: baseQuery.isFetching || pageQuery.isFetching,
     isLoading: tableQuery ? pageQuery.isLoading && !data : baseQuery.isLoading,
     isFetching: tableQuery ? pageQuery.isFetching : baseQuery.isFetching,
     isError: tableQuery ? pageQuery.isError : baseQuery.isError,
@@ -795,6 +822,19 @@ export function useContentDatabase(
   };
 }
 
+export function contentDatabaseItemsPageReadState<T>(
+  data: T | undefined,
+  isPlaceholderData: boolean,
+  isError: boolean,
+) {
+  const page = isPlaceholderData ? undefined : data;
+  return {
+    page,
+    failed: isError && page === undefined,
+    settled: isError || page !== undefined,
+  };
+}
+
 export function isContentDatabaseByIdQueryEnabled(
   databaseId: string | null,
   options?: { enabled?: boolean },
@@ -1298,6 +1338,35 @@ export function useContentDatabasePersonalView(
   );
 }
 
+// Every save of one database's personal view is keyed under this prefix, so a
+// save that settles can tell whether another one is still in flight.
+export function contentPersonalViewSaveKey(databaseId: string | null) {
+  return ["content-personal-view-save", databaseId] as const;
+}
+
+/**
+ * Once the last in-flight save of a database's personal view settles, reads
+ * that view and the Files tree it orders again. The tree is not keyed by the
+ * view, and a read during a save can still see the view from before it.
+ */
+export function refreshAfterPersonalViewSave(
+  queryClient: QueryClient,
+  databaseId: string,
+) {
+  // The save calling this is still counted while it settles.
+  if (
+    queryClient.isMutating({
+      mutationKey: contentPersonalViewSaveKey(databaseId),
+    }) > 1
+  ) {
+    return;
+  }
+  void queryClient.invalidateQueries({
+    queryKey: ["action", "get-content-database-personal-view", { databaseId }],
+  });
+  invalidateContentDatabaseNavigationQueries(queryClient, { databaseId });
+}
+
 export function useUpdateContentDatabasePersonalView(
   databaseId: string | null,
 ) {
@@ -1306,6 +1375,7 @@ export function useUpdateContentDatabasePersonalView(
     ContentDatabasePersonalViewResponse,
     UpdateContentDatabasePersonalViewRequest
   >("update-content-database-personal-view", {
+    mutationKey: [...contentPersonalViewSaveKey(databaseId), "overrides"],
     skipActionQueryInvalidation: true,
     onMutate: async (variables) => {
       if (!databaseId) return undefined;
@@ -1339,14 +1409,7 @@ export function useUpdateContentDatabasePersonalView(
       );
     },
     onSettled: () => {
-      if (!databaseId) return;
-      void queryClient.invalidateQueries({
-        queryKey: [
-          "action",
-          "get-content-database-personal-view",
-          { databaseId },
-        ],
-      });
+      if (databaseId) refreshAfterPersonalViewSave(queryClient, databaseId);
     },
   });
 }

package/corpus/templates/content/app/hooks/use-content-personal-navigation.ts

@@ -6,6 +6,11 @@ import type {
 import { applyContentPersonalNavigationPatch } from "@shared/content-personal-navigation-patch";
 import { useQueryClient } from "@tanstack/react-query";
 
+import {
+  contentPersonalViewSaveKey,
+  refreshAfterPersonalViewSave,
+} from "./use-content-database";
+
 export function useUpdateContentPersonalNavigation(
   databaseId: string | null,
   sharedViews?: ContentDatabaseView[],
@@ -16,7 +21,7 @@ export function useUpdateContentPersonalNavigation(
     "get-content-database-personal-view",
     { databaseId },
   ];
-  const mutationKey = ["content-personal-navigation", databaseId];
+  const mutationKey = [...contentPersonalViewSaveKey(databaseId), "navigation"];
   return useActionMutation("update-content-database-personal-view", {
     mutationKey,
     scope: { id: JSON.stringify(mutationKey) },
@@ -52,8 +57,7 @@ export function useUpdateContentPersonalNavigation(
       queryClient.setQueryData(queryKey, data);
     },
     onSettled: () => {
-      if (queryClient.isMutating({ mutationKey }) > 1) return;
-      void queryClient.invalidateQueries({ queryKey });
+      if (databaseId) refreshAfterPersonalViewSave(queryClient, databaseId);
     },
   });
 }

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

@@ -861,6 +861,33 @@ export function startPageOpenDocumentReads(
     retry: false,
   });
   startPreviewDocumentDraftRead(queryClient, documentId, cached);
+  if (cached?.source?.mode !== "local-files") {
+    startPageOpenReviewReads(queryClient, documentId);
+  }
+}
+
+// Open comments and suggestions hold the review margin open beside the page,
+// so their reads start with the page read rather than after it lands. A page
+// known to come from a local file has neither, so its open skips them.
+export function startPageOpenReviewReads(
+  queryClient: QueryClient,
+  documentId: string,
+) {
+  const reads = [
+    ["list-comments", { documentId }],
+    [
+      "list-resource-suggestions",
+      { resourceType: "document", resourceId: documentId },
+    ],
+  ] as const;
+  for (const [actionName, params] of reads) {
+    void queryClient.prefetchQuery({
+      queryKey: ["action", actionName, params],
+      queryFn: ({ signal }) =>
+        callAction(actionName, params, { method: "GET", signal }),
+      retry: false,
+    });
+  }
 }
 
 export interface PreviewDocumentDraftRecord {

package/corpus/templates/content/app/i18n-data.ts

@@ -1106,8 +1106,6 @@ const enUS = {
   landing: {
     previousPageUnavailable:
       "Your previous page is no longer available, so we opened Welcome.",
-    requestedPageUnavailable:
-      "That page is not available to your account, so we opened Welcome.",
     saveFailed: "Your place could not be saved",
     workspaceWelcomeUnavailableTitle: "Nothing is open here yet",
     workspaceWelcomeUnavailableDescription:
@@ -1176,6 +1174,9 @@ const enUS = {
     documentUnavailable: "Document unavailable",
     documentUnavailableDescription:
       "This page may have been deleted, or it has not been shared with your account.",
+    signedInAs: "Signed in as {{email}}",
+    goToMyPages: "Go to my pages",
+    switchAccount: "Switch account",
     documentNotFound: "Document not found",
     newPage: "New page",
     createFailed: "Failed to create page",

package/corpus/templates/content/app/lib/content-landing.ts

@@ -7,43 +7,15 @@ import {
 
 export const CONTENT_LANDING_PATH = "/home";
 
-export type ContentLandingRecoveryState = {
-  unavailableDocumentId: string;
-};
-
-export function contentLandingRecoveryTarget(input: {
-  host: string;
-  documentId: string;
-}): { pathname: string; state: ContentLandingRecoveryState } | null {
-  if (input.host !== "page" || !input.documentId) return null;
-  return {
-    pathname: CONTENT_LANDING_PATH,
-    state: { unavailableDocumentId: input.documentId },
-  };
-}
-
-export function readContentLandingRecovery(
-  state: unknown,
-): ContentLandingRecoveryState | null {
-  if (!state || typeof state !== "object") return null;
-  const documentId = (state as { unavailableDocumentId?: unknown })
-    .unavailableDocumentId;
-  return typeof documentId === "string" && documentId
-    ? { unavailableDocumentId: documentId }
-    : null;
-}
-
-// /home with no space and no unavailable page to explain returns to the last
-// page opened anywhere, which is the page a last-location hint names.
+// /home with no space returns to the last page opened anywhere, which is the
+// page a last-location hint names.
 export function isPersonalLanding(location: {
   pathname: string;
   search: string;
-  state: unknown;
 }) {
   return (
     location.pathname === CONTENT_LANDING_PATH &&
-    !new URLSearchParams(location.search).get("spaceId") &&
-    !readContentLandingRecovery(location.state)
+    !new URLSearchParams(location.search).get("spaceId")
   );
 }