@agent-native/core 0.135.0 → 0.135.1

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

@@ -57,6 +57,8 @@ import type {
 import type { Query, QueryClient } from "@tanstack/react-query";
 import { useQueryClient } from "@tanstack/react-query";
 
+import { documentQueryFilter } from "../lib/document-query";
+
 export function contentDatabaseQueryKey(documentId: string) {
   return ["action", "get-content-database", { documentId }] as const;
 }
@@ -421,9 +423,7 @@ export function clearDeletedContentDatabaseFromCache(
   documentId: string,
 ) {
   queryClient.removeQueries(contentDatabaseQueryFilter(documentId));
-  queryClient.removeQueries({
-    queryKey: ["action", "get-document", { id: documentId }],
-  });
+  queryClient.removeQueries(documentQueryFilter(documentId));
   queryClient.invalidateQueries({
     queryKey: ["action", "get-content-database"],
   });
@@ -713,20 +713,14 @@ export function useCreateContentDatabase(documentId: string | null) {
     {
       onSuccess: (data) => {
         if (documentId) {
-          queryClient.invalidateQueries({
-            queryKey: ["action", "get-document", { id: documentId }],
-          });
+          queryClient.invalidateQueries(documentQueryFilter(documentId));
           queryClient.invalidateQueries({
             queryKey: contentDatabaseQueryKey(documentId),
           });
         }
-        queryClient.invalidateQueries({
-          queryKey: [
-            "action",
-            "get-document",
-            { id: data.database.documentId },
-          ],
-        });
+        queryClient.invalidateQueries(
+          documentQueryFilter(data.database.documentId),
+        );
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
@@ -743,17 +737,11 @@ export function useCreateInlineContentDatabase(hostDocumentId: string | null) {
   >("create-inline-content-database", {
     onSuccess: (data) => {
       if (hostDocumentId) {
-        queryClient.invalidateQueries({
-          queryKey: ["action", "get-document", { id: hostDocumentId }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(hostDocumentId));
       }
-      queryClient.invalidateQueries({
-        queryKey: [
-          "action",
-          "get-document",
-          { id: data.block.databaseDocumentId },
-        ],
-      });
+      queryClient.invalidateQueries(
+        documentQueryFilter(data.block.databaseDocumentId),
+      );
       queryClient.invalidateQueries({
         queryKey: contentDatabaseQueryKey(data.block.databaseDocumentId),
       });
@@ -1488,7 +1476,10 @@ export function useProcessBuilderBodyHydration(documentId: string) {
 
 export function invalidateBuilderBodyHydrationQueries(
   queryClient: {
-    invalidateQueries: (filters: { queryKey: readonly unknown[] }) => unknown;
+    invalidateQueries: (filters: {
+      queryKey?: readonly unknown[];
+      predicate?: (query: { queryKey: readonly unknown[] }) => boolean;
+    }) => unknown;
   },
   documentId: string,
   variables?: Pick<ProcessBuilderBodyHydrationRequest, "documentId"> | null,
@@ -1501,9 +1492,7 @@ export function invalidateBuilderBodyHydrationQueries(
     queryKey: ["action", "get-content-database-source", { documentId }],
   });
   if (variables?.documentId) {
-    queryClient.invalidateQueries({
-      queryKey: ["action", "get-document", { id: variables.documentId }],
-    });
+    queryClient.invalidateQueries(documentQueryFilter(variables.documentId));
   }
 }
 

package/corpus/templates/content/app/hooks/use-create-page.ts

@@ -12,6 +12,7 @@ import {
 import { useContentSpaces } from "@/hooks/use-content-spaces";
 import { useCreateDocument } from "@/hooks/use-documents";
 import { useLocalStorage } from "@/hooks/use-local-storage";
+import { documentQueryFilter } from "@/lib/document-query";
 import { markDocumentCreationPending } from "@/lib/optimistic-document";
 
 const LIST_DOCUMENTS_QUERY_KEY = [
@@ -103,9 +104,7 @@ export function useCreatePage(opts?: {
         );
         // Replace optimistic doc with real server doc + clear any 404 error
         // state from the in-flight fetch that ran before create completed.
-        queryClient.invalidateQueries({
-          queryKey: ["action", "get-document", { id }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(id));
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
@@ -115,9 +114,7 @@ export function useCreatePage(opts?: {
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
-        queryClient.removeQueries({
-          queryKey: ["action", "get-document", { id }],
-        });
+        queryClient.removeQueries(documentQueryFilter(id));
         if (shouldNavigate) navigate("/");
         toast.error("Failed to create page", {
           description:

package/corpus/templates/content/app/hooks/use-document-properties.ts

@@ -22,7 +22,10 @@ import {
   contentDatabaseQueryKey,
   removeDocumentPropertyFromDatabaseResponse,
 } from "./use-content-database";
-import { documentPropertiesQueryKey } from "./use-documents";
+import {
+  documentPropertiesQueryKey,
+  documentQueryFilter,
+} from "./use-documents";
 
 type DatabaseScopedRequest = { databaseId: string };
 
@@ -91,9 +94,7 @@ export function useConfigureDocumentProperty(
       queryClient.invalidateQueries({
         queryKey: documentPropertiesQueryKey(documentId, databaseId),
       });
-      queryClient.invalidateQueries({
-        queryKey: ["action", "get-document", { id: documentId }],
-      });
+      queryClient.invalidateQueries(documentQueryFilter(documentId));
       queryClient.invalidateQueries(
         contentDatabaseConstrainedQueryFilter(databaseDocumentId),
       );
@@ -158,9 +159,7 @@ export function useSetDocumentProperty(
       queryClient.invalidateQueries({
         queryKey: documentPropertiesQueryKey(variables.documentId, databaseId),
       });
-      queryClient.invalidateQueries({
-        queryKey: ["action", "get-document", { id: variables.documentId }],
-      });
+      queryClient.invalidateQueries(documentQueryFilter(variables.documentId));
       queryClient.invalidateQueries(
         contentDatabaseConstrainedQueryFilter(databaseDocumentId),
       );
@@ -195,9 +194,7 @@ export function useDuplicateDocumentProperty(
       queryClient.invalidateQueries({
         queryKey: documentPropertiesQueryKey(documentId, databaseId),
       });
-      queryClient.invalidateQueries({
-        queryKey: ["action", "get-document", { id: documentId }],
-      });
+      queryClient.invalidateQueries(documentQueryFilter(documentId));
       queryClient.invalidateQueries({
         ...contentDatabaseQueryFilter(databaseDocumentId),
       });
@@ -220,9 +217,7 @@ export function useReorderDocumentProperty(
       queryClient.invalidateQueries({
         queryKey: documentPropertiesQueryKey(documentId, databaseId),
       });
-      queryClient.invalidateQueries({
-        queryKey: ["action", "get-document", { id: documentId }],
-      });
+      queryClient.invalidateQueries(documentQueryFilter(documentId));
       queryClient.invalidateQueries({
         queryKey: contentDatabaseQueryKey(databaseDocumentId),
       });
@@ -277,9 +272,7 @@ export function useDeleteDocumentProperty(
       queryClient.invalidateQueries({
         queryKey: documentPropertiesQueryKey(documentId, databaseId),
       });
-      queryClient.invalidateQueries({
-        queryKey: ["action", "get-document", { id: documentId }],
-      });
+      queryClient.invalidateQueries(documentQueryFilter(documentId));
       queryClient.invalidateQueries({
         ...contentDatabaseQueryFilter(databaseDocumentId),
       });

package/corpus/templates/content/app/hooks/use-document-versions.ts

@@ -5,6 +5,8 @@ import {
 import type { Document, DocumentVersion } from "@shared/api";
 import { useQueryClient } from "@tanstack/react-query";
 
+import { documentQueryFilter } from "./use-documents";
+
 export function useDocumentVersions(documentId: string | null) {
   return useActionQuery<DocumentVersion[]>(
     "list-document-versions",
@@ -29,9 +31,7 @@ export function useRestoreDocumentVersion(documentId: string) {
         queryClient.invalidateQueries({
           queryKey: ["action", "list-document-versions", { documentId }],
         });
-        queryClient.invalidateQueries({
-          queryKey: ["action", "get-document", { id: documentId }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(documentId));
       },
     },
   );

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

@@ -19,23 +19,50 @@ import { useQueryClient } from "@tanstack/react-query";
 import { toast } from "sonner";
 
 import type { DocumentUpdateConflictResponse } from "../../actions/update-document";
+import {
+  documentQueryFilter,
+  documentQueryKey,
+  type DocumentQueryContext,
+} from "../lib/document-query";
 import {
   removeOptimisticItemFromContentDatabase,
   useRestoreContentDatabase,
 } from "./use-content-database";
 
+export {
+  documentQueryFilter,
+  documentQueryKey,
+  type DocumentQueryContext,
+} from "../lib/document-query";
+
 export type { DocumentUpdateConflictResponse };
 
+export type PageOwnedDocumentCachePatch = Pick<
+  Partial<Document>,
+  | "id"
+  | "parentId"
+  | "title"
+  | "content"
+  | "description"
+  | "icon"
+  | "position"
+  | "isFavorite"
+  | "hideFromSearch"
+  | "visibility"
+  | "accessRole"
+  | "canEdit"
+  | "canManage"
+  | "source"
+  | "createdAt"
+  | "updatedAt"
+>;
+
 export const LIST_DOCUMENTS_QUERY_KEY = [
   "action",
   "list-documents",
   undefined,
 ] as const;
 
-export function documentQueryKey(documentId: string) {
-  return ["action", "get-document", { id: documentId }] as const;
-}
-
 export function documentPropertiesQueryKey(
   documentId: string,
   databaseId: string,
@@ -74,7 +101,27 @@ export function mergeDocumentIntoDocumentCache(
   old: unknown,
   document: Document,
 ) {
-  return old && typeof old === "object" ? { ...old, ...document } : document;
+  const pageOwnedPatch: PageOwnedDocumentCachePatch = {
+    id: document.id,
+    parentId: document.parentId,
+    title: document.title,
+    content: document.content,
+    description: document.description,
+    icon: document.icon,
+    position: document.position,
+    isFavorite: document.isFavorite,
+    hideFromSearch: document.hideFromSearch,
+    visibility: document.visibility,
+    accessRole: document.accessRole,
+    canEdit: document.canEdit,
+    canManage: document.canManage,
+    source: document.source,
+    createdAt: document.createdAt,
+    updatedAt: document.updatedAt,
+  };
+  return old && typeof old === "object"
+    ? { ...old, ...pageOwnedPatch }
+    : pageOwnedPatch;
 }
 
 export function mergeDocumentIntoListDocumentsCache(
@@ -157,9 +204,9 @@ function patchDocumentWithFavoriteMembershipInDatabaseCache(
 export function patchDocumentCaches(
   queryClient: Pick<QueryClient, "setQueryData" | "setQueriesData">,
   documentId: string,
-  patch: Partial<Document>,
+  patch: PageOwnedDocumentCachePatch,
 ) {
-  queryClient.setQueryData(documentQueryKey(documentId), (old: unknown) =>
+  queryClient.setQueriesData(documentQueryFilter(documentId), (old: unknown) =>
     old && typeof old === "object" ? { ...old, ...patch } : old,
   );
   queryClient.setQueryData(LIST_DOCUMENTS_QUERY_KEY, (old: unknown) =>
@@ -219,7 +266,7 @@ export function patchContentSpaceNameCaches(
 export function documentUpdateSuccessPatch(
   data: DocumentUpdateResponse,
   variables: DocumentUpdateRequestWithCas,
-): Partial<Document> {
+): PageOwnedDocumentCachePatch {
   return {
     updatedAt: data.updatedAt,
     ...(variables.title !== undefined ? { title: data.title } : {}),
@@ -289,13 +336,28 @@ export const DOCUMENT_QUERY_FRESHNESS_OPTIONS = {
   retry: false,
 };
 
-export function useDocument(id: string | null) {
-  return useActionQuery<Document>("get-document", id ? { id } : undefined, {
-    enabled: !!id,
-    // Doc-not-found / no-access errors are deterministic — retrying just keeps
-    // the spinner up for ~7s before the UI can render "Not found".
-    ...DOCUMENT_QUERY_FRESHNESS_OPTIONS,
-  });
+export function useDocument(
+  id: string | null,
+  context: DocumentQueryContext = {},
+) {
+  return useActionQuery<Document>(
+    "get-document",
+    id
+      ? {
+          id,
+          ...(context.databaseId ? { databaseId: context.databaseId } : {}),
+          ...(context.databaseDocumentId
+            ? { databaseDocumentId: context.databaseDocumentId }
+            : {}),
+        }
+      : undefined,
+    {
+      enabled: !!id,
+      // Doc-not-found / no-access errors are deterministic — retrying just keeps
+      // the spinner up for ~7s before the UI can render "Not found".
+      ...DOCUMENT_QUERY_FRESHNESS_OPTIONS,
+    },
+  );
 }
 
 export interface PreviewDocumentDraftRecord {
@@ -368,7 +430,7 @@ export function useUpdateDocument() {
         };
         if (Object.keys(optimisticPatch).length === 0) return undefined;
 
-        const documentKey = documentQueryKey(variables.id);
+        const documentFilter = documentQueryFilter(variables.id);
         const databaseFilter = {
           queryKey: ["action", "get-content-database"],
         } as const;
@@ -376,14 +438,14 @@ export function useUpdateDocument() {
           queryKey: ["action", "list-content-spaces"],
         } as const;
         await Promise.all([
-          queryClient.cancelQueries({ queryKey: documentKey }),
+          queryClient.cancelQueries(documentFilter),
           queryClient.cancelQueries({ queryKey: LIST_DOCUMENTS_QUERY_KEY }),
           queryClient.cancelQueries(databaseFilter),
           queryClient.cancelQueries(contentSpacesFilter),
         ]);
 
         const previous: Array<[readonly unknown[], unknown]> = [
-          [documentKey, queryClient.getQueryData(documentKey)],
+          ...queryClient.getQueriesData(documentFilter),
           [
             LIST_DOCUMENTS_QUERY_KEY,
             queryClient.getQueryData(LIST_DOCUMENTS_QUERY_KEY),
@@ -423,8 +485,8 @@ export function useUpdateDocument() {
         // just-applied write.
         if (isDocumentUpdateConflict(data)) {
           const serverDocument = data.document;
-          queryClient.setQueryData(
-            ["action", "get-document", { id: variables.id }],
+          queryClient.setQueriesData(
+            documentQueryFilter(variables.id),
             (old: unknown) =>
               mergeDocumentIntoDocumentCache(old, serverDocument),
           );
@@ -453,9 +515,7 @@ export function useUpdateDocument() {
               queryKey: ["action", "get-content-database"],
             });
           }
-          queryClient.invalidateQueries({
-            queryKey: ["action", "get-document", { id: variables.id }],
-          });
+          queryClient.invalidateQueries(documentQueryFilter(variables.id));
           queryClient.invalidateQueries({
             queryKey: ["action", "list-documents"],
           });
@@ -525,9 +585,7 @@ export function useDeleteDocument() {
       queryClient.invalidateQueries({
         queryKey: ["action", "list-documents"],
       });
-      queryClient.invalidateQueries({
-        queryKey: ["action", "get-document", { id: variables.id }],
-      });
+      queryClient.invalidateQueries(documentQueryFilter(variables.id));
       queryClient.invalidateQueries({
         queryKey: ["action", "get-content-database"],
       });
@@ -606,9 +664,7 @@ export function useMoveDocument() {
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
-        queryClient.invalidateQueries({
-          queryKey: ["action", "get-document", { id: variables.id }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(variables.id));
       },
     },
   );

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

@@ -16,6 +16,8 @@ import type {
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useEffect, useRef } from "react";
 
+import { documentQueryFilter } from "./use-documents";
+
 // The server signs a `redirect` query param into the OAuth `state` and the
 // callback route sends the user back there once the connection completes. If
 // we never send it, `state.redirectPath` defaults to "/" server-side and
@@ -55,9 +57,7 @@ export function invalidateDocumentQueries(
   // path after every debounced editor save). Invalidating the bare ["action"]
   // key would refetch every mounted query app-wide (sidebar tree, comments,
   // database views, search, connection status, ...) on each cycle.
-  queryClient.invalidateQueries({
-    queryKey: ["action", "get-document", { id: documentId }],
-  });
+  queryClient.invalidateQueries(documentQueryFilter(documentId));
   queryClient.invalidateQueries({
     queryKey: ["action", "list-documents"],
   });
@@ -155,21 +155,23 @@ export function useDocumentSyncStatus(
 
     lastObservedSyncedAtRef.current = query.data.lastSyncedAt;
 
-    const cachedDocument = queryClient.getQueryData<Document>([
-      "action",
-      "get-document",
-      { id: normalizedDocumentId },
-    ]);
+    const cachedDocuments = queryClient
+      .getQueriesData<Document>(documentQueryFilter(normalizedDocumentId))
+      .map(([, document]) => document)
+      .filter((document): document is Document => !!document);
     const syncedLocalUpdatedAt = query.data.lastPushedLocalUpdatedAt;
 
     if (
-      cachedDocument?.updatedAt &&
+      cachedDocuments.some(
+        (cachedDocument) =>
+          !!cachedDocument.updatedAt &&
+          !!syncedLocalUpdatedAt &&
+          syncedLocalUpdatedAt > cachedDocument.updatedAt,
+      ) &&
       syncedLocalUpdatedAt &&
-      syncedLocalUpdatedAt > cachedDocument.updatedAt
+      cachedDocuments.length > 0
     ) {
-      queryClient.invalidateQueries({
-        queryKey: ["action", "get-document", { id: normalizedDocumentId }],
-      });
+      queryClient.invalidateQueries(documentQueryFilter(normalizedDocumentId));
       queryClient.invalidateQueries({ queryKey: ["action", "list-documents"] });
     }
   }, [

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

@@ -3120,9 +3120,12 @@ const enUS = {
     liveDocumentSaveBeforeSyncFailed:
       "The live document could not be saved before syncing.",
     documentTitle: "Document title",
-    builderBodySyncing: "Content is still syncing from Builder",
+    builderBodySyncing: "This page's content is still syncing from Builder",
     builderBodySyncingDescription:
       "Editing is paused until the Builder body finishes syncing, so the existing article content is not overwritten.",
+    pageBodySyncing: "This page's content is still syncing",
+    pageBodySyncingDescription:
+      "Editing is paused until the page body finishes syncing, so existing content is not overwritten.",
     localFileSavedHistoryNotUpdated:
       "Local file saved, but history was not updated",
     reorderField: "Reorder {{name}}",
@@ -5615,6 +5618,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "内容仍在从 Builder 同步",
     builderBodySyncingDescription:
       "同步 Builder 正文完成前会暂停编辑，避免覆盖现有文章内容。",
+    pageBodySyncing: "此页面的内容仍在同步",
+    pageBodySyncingDescription:
+      "在页面正文完成同步之前，编辑会暂停，以免覆盖现有内容。",
     creatingDatabase: "正在创建内联数据库...",
     databaseCreated: "内联数据库已创建",
     emptyBlockPlaceholder: "按“/”使用命令",
@@ -5960,6 +5966,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "El contenido aún se está sincronizando desde Builder",
     builderBodySyncingDescription:
       "La edición está en pausa hasta que el cuerpo de Builder termine de sincronizarse, para no sobrescribir el contenido existente del artículo.",
+    pageBodySyncing: "El contenido de esta página aún se está sincronizando",
+    pageBodySyncingDescription:
+      "La edición está en pausa hasta que el contenido de la página termine de sincronizarse, para no sobrescribir el contenido existente.",
     creatingDatabase: "Creando base de datos integrada...",
     databaseCreated: "Base de datos integrada creada",
     emptyBlockPlaceholder: "Pulsa «/» para ver los comandos",
@@ -6317,6 +6326,10 @@ const editorMessagesByLocale = {
       "Le contenu est encore en cours de synchronisation depuis Builder",
     builderBodySyncingDescription:
       "La modification est suspendue jusqu'à la fin de la synchronisation du corps Builder, afin de ne pas écraser le contenu existant de l'article.",
+    pageBodySyncing:
+      "Le contenu de cette page est encore en cours de synchronisation",
+    pageBodySyncingDescription:
+      "La modification est suspendue jusqu'à la fin de la synchronisation du contenu de la page, afin de ne pas écraser le contenu existant.",
     creatingDatabase: "Création d'une base de données intégrée...",
     databaseCreated: "Base de données intégrée créée",
     emptyBlockPlaceholder: "Appuyez sur « / » pour afficher les commandes",
@@ -6676,6 +6689,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "Inhalte werden noch von Builder synchronisiert",
     builderBodySyncingDescription:
       "Die Bearbeitung ist pausiert, bis der Builder-Textkörper fertig synchronisiert ist, damit der bestehende Artikelinhalt nicht überschrieben wird.",
+    pageBodySyncing: "Der Inhalt dieser Seite wird noch synchronisiert",
+    pageBodySyncingDescription:
+      "Die Bearbeitung ist pausiert, bis der Seiteninhalt fertig synchronisiert ist, damit bestehende Inhalte nicht überschrieben werden.",
     creatingDatabase: "Inline-Datenbank wird erstellt...",
     databaseCreated: "Inline-Datenbank erstellt",
     emptyBlockPlaceholder: "Drücke „/“ für Befehle",
@@ -7040,6 +7056,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "コンテンツはまだ Builder から同期中です",
     builderBodySyncingDescription:
       "既存の記事内容を上書きしないよう、Builder 本文の同期が完了するまで編集は一時停止されます。",
+    pageBodySyncing: "このページのコンテンツはまだ同期中です",
+    pageBodySyncingDescription:
+      "既存のコンテンツを上書きしないよう、ページ本文の同期が完了するまで編集は一時停止されます。",
     creatingDatabase: "インラインデータベースを作成しています...",
     databaseCreated: "インラインデータベースが作成されました",
     emptyBlockPlaceholder: "「/」でコマンドを表示",
@@ -7393,6 +7412,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "콘텐츠가 아직 Builder에서 동기화되는 중입니다",
     builderBodySyncingDescription:
       "기존 문서 내용을 덮어쓰지 않도록 Builder 본문 동기화가 완료될 때까지 편집이 일시 중지됩니다.",
+    pageBodySyncing: "이 페이지의 콘텐츠가 아직 동기화 중입니다",
+    pageBodySyncingDescription:
+      "기존 콘텐츠를 덮어쓰지 않도록 페이지 본문 동기화가 완료될 때까지 편집이 일시 중지됩니다.",
     creatingDatabase: "인라인 데이터베이스 생성 중...",
     databaseCreated: "인라인 데이터베이스가 생성되었습니다.",
     emptyBlockPlaceholder: "‘/’를 눌러 명령 사용",
@@ -7745,6 +7767,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "O conteúdo ainda está sincronizando do Builder",
     builderBodySyncingDescription:
       "A edição fica pausada até o corpo do Builder terminar de sincronizar, para não sobrescrever o conteúdo existente do artigo.",
+    pageBodySyncing: "O conteúdo desta página ainda está sincronizando",
+    pageBodySyncingDescription:
+      "A edição fica pausada até o conteúdo da página terminar de sincronizar, para não sobrescrever o conteúdo existente.",
     creatingDatabase: "Criando banco de dados embutido...",
     databaseCreated: "Banco de dados embutido criado",
     emptyBlockPlaceholder: "Pressione “/” para comandos",
@@ -8103,6 +8128,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "सामग्री अभी भी Builder से सिंक हो रही है",
     builderBodySyncingDescription:
       "Builder का मुख्य भाग सिंक पूरा होने तक संपादन रोका गया है, ताकि मौजूदा लेख सामग्री अधिलेखित न हो।",
+    pageBodySyncing: "इस पेज की सामग्री अभी भी सिंक हो रही है",
+    pageBodySyncingDescription:
+      "पेज का मुख्य भाग सिंक पूरा होने तक संपादन रोका गया है, ताकि मौजूदा सामग्री अधिलेखित न हो।",
     creatingDatabase: "इनलाइन डेटाबेस बनाया जा रहा है...",
     databaseCreated: "इनलाइन डेटाबेस बनाया गया",
     emptyBlockPlaceholder: "कमांड के लिए '/' दबाएं",
@@ -8450,6 +8478,9 @@ const editorMessagesByLocale = {
     builderBodySyncing: "لا يزال المحتوى قيد المزامنة من Builder",
     builderBodySyncingDescription:
       "يتم إيقاف التحرير مؤقتًا حتى تكتمل مزامنة نص Builder، حتى لا يتم استبدال محتوى المقالة الحالي.",
+    pageBodySyncing: "لا يزال محتوى هذه الصفحة قيد المزامنة",
+    pageBodySyncingDescription:
+      "يتم إيقاف التحرير مؤقتًا حتى تكتمل مزامنة محتوى الصفحة، حتى لا تتم الكتابة فوق المحتوى الحالي.",
     creatingDatabase: "جارٍ إنشاء قاعدة بيانات مضمنة...",
     databaseCreated: "تم إنشاء قاعدة البيانات المضمنة",
     emptyBlockPlaceholder: 'اضغط على "/" للأوامر',

package/corpus/templates/content/app/lib/document-query.ts

@@ -0,0 +1,36 @@
+export interface DocumentQueryContext {
+  databaseId?: string | null;
+  databaseDocumentId?: string | null;
+}
+
+export function documentQueryKey(
+  documentId: string,
+  context: DocumentQueryContext = {},
+) {
+  return [
+    "action",
+    "get-document",
+    {
+      id: documentId,
+      ...(context.databaseId ? { databaseId: context.databaseId } : {}),
+      ...(context.databaseDocumentId
+        ? { databaseDocumentId: context.databaseDocumentId }
+        : {}),
+    },
+  ] as const;
+}
+
+export function documentQueryFilter(documentId: string) {
+  return {
+    queryKey: ["action", "get-document"] as const,
+    predicate: (query: { queryKey: readonly unknown[] }) => {
+      const args = query.queryKey[2];
+      return (
+        !!args &&
+        typeof args === "object" &&
+        "id" in args &&
+        args.id === documentId
+      );
+    },
+  };
+}

package/corpus/templates/content/changelog/2026-08-02-pages-opened-from-a-database-now-keep-that-database-s-fields.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-02
+---
+
+Pages opened from a database now keep that database’s fields and loading state, even when the page also belongs to a Builder-connected database.

package/corpus/templates/content/server/lib/document-context.ts

@@ -14,6 +14,7 @@ export type DocumentContextPathEntry = {
  * assembles the live path without copying ancestor prose into descendants. */
 export async function getDocumentContextPath(
   document: Pick<typeof schema.documents.$inferSelect, "id" | "parentId">,
+  options: { databaseId?: string } = {},
 ): Promise<DocumentContextPathEntry[]> {
   const db = getDb();
   const path: DocumentContextPathEntry[] = [];
@@ -43,6 +44,15 @@ export async function getDocumentContextPath(
     parentId = parent.parentId;
   }
 
+  const membershipClauses = [
+    eq(schema.contentDatabaseItems.documentId, document.id),
+    isNull(schema.contentDatabases.deletedAt),
+  ];
+  if (options.databaseId) {
+    membershipClauses.push(
+      eq(schema.contentDatabaseItems.databaseId, options.databaseId),
+    );
+  }
   const [membership] = await db
     .select({ database: schema.contentDatabases })
     .from(schema.contentDatabaseItems)
@@ -50,12 +60,7 @@ export async function getDocumentContextPath(
       schema.contentDatabases,
       eq(schema.contentDatabases.id, schema.contentDatabaseItems.databaseId),
     )
-    .where(
-      and(
-        eq(schema.contentDatabaseItems.documentId, document.id),
-        isNull(schema.contentDatabases.deletedAt),
-      ),
-    )
+    .where(and(...membershipClauses))
     .orderBy(
       sql`CASE WHEN ${schema.contentDatabases.systemRole} IS NULL THEN 0 ELSE 1 END`,
       asc(schema.contentDatabases.id),