@agent-native/core 0.135.0 → 0.135.2

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

@@ -62,8 +62,10 @@ import {
   type ContentSpaceSummary,
 } from "@/hooks/use-content-spaces";
 import {
+  mergeDocumentIntoDocumentCache,
   isDocumentUpdateConflict,
   patchDocumentCaches,
+  documentQueryFilter,
   useDocument,
   useDeleteDocument,
   useDocuments,
@@ -247,7 +249,10 @@ export function DocumentEditor({
   databaseId,
   databaseDocumentId,
 }: DocumentEditorProps) {
-  const documentQuery = useDocument(documentId);
+  const documentQuery = useDocument(documentId, {
+    databaseId,
+    databaseDocumentId,
+  });
   const {
     data: queriedDocument,
     isError,
@@ -539,7 +544,7 @@ function DocumentEditorBody({
   const deleteDocument = useDeleteDocument();
   const queryClient = useQueryClient();
   const processBuilderBodies = useProcessBuilderBodyHydration(
-    document.databaseMembership?.databaseDocumentId ?? documentId,
+    document.bodyHydration?.databaseDocumentId ?? documentId,
   );
   const canEdit = document.canEdit ?? true;
   const canEditRef = useRef(canEdit);
@@ -664,24 +669,30 @@ function DocumentEditorBody({
   );
 
   useEffect(() => {
-    const membership = document.databaseMembership;
-    const hydration = membership?.bodyHydration;
+    const hydrationContext = document.bodyHydration;
+    const hydration = hydrationContext?.hydration;
     if (
-      !membership?.sourceId ||
+      !canEdit ||
+      !hydrationContext?.sourceId ||
       !hydration ||
       (hydration.status !== "pending" && hydration.status !== "error")
     ) {
       return;
     }
-    const promotionKey = `${membership.sourceId}:${documentId}:${hydration.status}:${hydration.version ?? ""}`;
+    const promotionKey = `${hydrationContext.sourceId}:${documentId}:${hydration.status}:${hydration.version ?? ""}`;
     if (promotedBuilderBodyRef.current === promotionKey) return;
     promotedBuilderBodyRef.current = promotionKey;
     processBuilderBodies.mutate({
-      sourceId: membership.sourceId,
+      sourceId: hydrationContext.sourceId,
       documentId,
       limit: 1,
     });
-  }, [document.databaseMembership, documentId, processBuilderBodies.mutate]);
+  }, [
+    canEdit,
+    document.bodyHydration,
+    documentId,
+    processBuilderBodies.mutate,
+  ]);
   const titleFocusedRef = useRef(false);
   const scrollContainerRef = useRef<HTMLDivElement>(null);
   const titleInputRef = useRef<HTMLTextAreaElement>(null);
@@ -976,9 +987,8 @@ function DocumentEditorBody({
           description:
             error instanceof Error ? error.message : t("empty.genericError"),
         });
-        queryClient.setQueryData(
-          ["action", "get-document", { id: documentId }],
-          fileFirstDocument,
+        queryClient.setQueriesData(documentQueryFilter(documentId), (old) =>
+          mergeDocumentIntoDocumentCache(old, fileFirstDocument),
         );
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
@@ -1890,9 +1900,15 @@ function DocumentEditorBody({
                       if (bodyHydrationPending) {
                         return (
                           <BuilderBodySyncingNotice
-                            title={t("editor.builderBodySyncing")}
+                            title={t(
+                              document.bodyHydration?.provider === "builder"
+                                ? "editor.builderBodySyncing"
+                                : "editor.pageBodySyncing",
+                            )}
                             description={t(
-                              "editor.builderBodySyncingDescription",
+                              document.bodyHydration?.provider === "builder"
+                                ? "editor.builderBodySyncingDescription"
+                                : "editor.pageBodySyncingDescription",
                             )}
                           />
                         );

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

@@ -90,6 +90,7 @@ import {
   useSearchNotionPages,
   useCreateAndLinkNotionPage,
 } from "@/hooks/use-notion";
+import { documentQueryFilter } from "@/lib/document-query";
 import {
   localSourceAbsolutePath,
   revealLinkedLocalSourceFile,
@@ -572,12 +573,8 @@ export function DocumentToolbar({
       const previous = hideFromSearch;
       setPendingHideFromSearch(next);
 
-      queryClient.setQueryData(
-        ["action", "get-document", { id: documentId }],
-        (old: any) =>
-          old && typeof old === "object"
-            ? { ...old, hideFromSearch: next }
-            : old,
+      queryClient.setQueriesData(documentQueryFilter(documentId), (old: any) =>
+        old && typeof old === "object" ? { ...old, hideFromSearch: next } : old,
       );
       queryClient.setQueryData(
         ["action", "list-documents", undefined],
@@ -601,9 +598,7 @@ export function DocumentToolbar({
         });
       } catch (err) {
         setPendingHideFromSearch(previous);
-        queryClient.invalidateQueries({
-          queryKey: ["action", "get-document", { id: documentId }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(documentId));
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
@@ -614,9 +609,7 @@ export function DocumentToolbar({
         throw err;
       } finally {
         setPendingHideFromSearch(null);
-        queryClient.invalidateQueries({
-          queryKey: ["action", "get-document", { id: documentId }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(documentId));
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });

package/corpus/templates/content/app/components/editor/body-hydration.ts

@@ -54,12 +54,12 @@ export function databaseItemBodyHydrationIsPending(
 }
 
 export function documentBodyHydrationIsPending(
-  document: Pick<Document, "content" | "databaseMembership">,
+  document: Pick<Document, "content" | "bodyHydration">,
 ) {
-  const hydration = document.databaseMembership?.bodyHydration;
+  const hydration = document.bodyHydration?.hydration;
   if (
     sourceBackedEmptyBodyNeedsHydration({
-      sourceId: document.databaseMembership?.sourceId,
+      sourceId: document.bodyHydration ? "source-backed" : undefined,
       content: document.content,
       hydration,
     })
@@ -81,7 +81,10 @@ export function newDocumentPageChoiceIsDisabled(args: {
 
 export function previewBodyHydrationIsPending(args: {
   item: Pick<ContentDatabaseItem, "bodyHydration" | "document">;
-  document: Pick<Document, "content" | "databaseMembership"> | null | undefined;
+  document:
+    | Pick<Document, "content" | "databaseMembership" | "bodyHydration">
+    | null
+    | undefined;
 }) {
   const membership =
     args.document?.databaseMembership ?? args.item.document.databaseMembership;
@@ -128,11 +131,14 @@ export function previewDraftConflictsWithHydratedBody(args: {
 
 export function previewBodyHydrationIsTerminalError(args: {
   item: Pick<ContentDatabaseItem, "bodyHydration" | "document">;
-  document: Pick<Document, "databaseMembership"> | null | undefined;
+  document:
+    | Pick<Document, "databaseMembership" | "bodyHydration">
+    | null
+    | undefined;
 }) {
   return (
     builderBodyHydrationIsTerminalError(
-      args.document?.databaseMembership?.bodyHydration,
+      args.document?.bodyHydration?.hydration,
     ) ||
     builderBodyHydrationIsTerminalError(
       args.item.bodyHydration ??

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

@@ -204,6 +204,7 @@ import {
 } from "@/hooks/use-document-properties";
 import {
   isDocumentUpdateConflict,
+  documentQueryFilter,
   type DocumentUpdateResult,
   useDeleteDocument,
   useDocument,
@@ -4853,9 +4854,7 @@ function DatabaseItemPreview({
           void queryClient.invalidateQueries({
             queryKey: contentDatabaseQueryKey(databaseDocumentId),
           });
-          void queryClient.invalidateQueries({
-            queryKey: ["action", "get-document", { id: document.id }],
-          });
+          void queryClient.invalidateQueries(documentQueryFilter(document.id));
           void queryClient.invalidateQueries({
             queryKey: ["action", "list-documents"],
           });

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

@@ -126,6 +126,7 @@ import {
   useUpdateDocument,
   buildDocumentTree,
   filterDocumentTreeDocuments,
+  documentQueryFilter,
 } from "@/hooks/use-documents";
 import { useLocalStorage } from "@/hooks/use-local-storage";
 import {
@@ -1191,16 +1192,12 @@ export function DocumentSidebar({
           created,
         );
         if (nextId !== id) {
-          queryClient.removeQueries({
-            queryKey: ["action", "get-document", { id }],
-          });
+          queryClient.removeQueries(documentQueryFilter(id));
           navigateToDocument(nextId);
         }
         // 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: nextId }],
-        });
+        queryClient.invalidateQueries(documentQueryFilter(nextId));
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
@@ -1214,9 +1211,7 @@ export function DocumentSidebar({
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
-        queryClient.removeQueries({
-          queryKey: ["action", "get-document", { id }],
-        });
+        queryClient.removeQueries(documentQueryFilter(id));
         if (rootFilesDatabaseId) {
           queryClient.setQueryData<ContentDatabaseResponse>(
             contentDatabaseByIdQueryKey(rootFilesDatabaseId),
@@ -1300,9 +1295,7 @@ export function DocumentSidebar({
         );
       });
       for (const deletedId of deletedIds) {
-        queryClient.removeQueries({
-          queryKey: ["action", "get-document", { id: deletedId }],
-        });
+        queryClient.removeQueries(documentQueryFilter(deletedId));
       }
 
       if (activeDeleted) {

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));
       },
     },
   );