Fixing query block sync invalidation

Author: ericvicenti

frontend/apps/desktop/src/app-sync.ts

@@ -499,6 +499,18 @@ async function runDiscovery(
     // Invalidate so UI shows the found resource
     appInvalidateQueries([queryKeys.ENTITY, id.id])
     appInvalidateQueries([queryKeys.RESOLVED_ENTITY, id.id])
+
+    // For recursive subscriptions, also invalidate directory queries
+    // so query blocks refresh when discovery completes
+    if (recursive) {
+      appInvalidateQueries([queryKeys.DOC_LIST_DIRECTORY, id.id])
+      getParentPaths(id.path).forEach((parentPath) => {
+        const parentId = hmId(id.uid, {path: parentPath})
+        appInvalidateQueries([queryKeys.DOC_LIST_DIRECTORY, parentId.id])
+      })
+      const rootId = hmId(id.uid)
+      appInvalidateQueries([queryKeys.DOC_LIST_DIRECTORY, rootId.id])
+    }
   }
 
   // Also check for version changes (for resources already known but updated)

frontend/apps/desktop/src/editor/query-block.tsx

@@ -123,8 +123,7 @@ function Render(
     recursive: mode === 'AllDescendants',
   })
   const directoryItems = useDirectory(queryId, {
-    // @ts-ignore
-    mode: queryIncludes[0]?.mode,
+    mode,
   })
 
   const sortedItems = useMemo(() => {
@@ -248,7 +247,7 @@ function Render(
         banner={banner}
         accountsMetadata={accountsMetadata}
         getEntity={getEntity}
-        isDiscovering={entity.isDiscovering}
+        isDiscovering={entity.isDiscovering || directoryItems.isLoading}
       />
     </div>
   )

frontend/packages/ui/src/blocks-content.tsx

@@ -2968,14 +2968,10 @@ export function DocumentCardGrid({
           })}
         </div>
       ) : null}
-      {items.length == 0 ? (
-        <BlankQueryBlockMessage
-          message={
-            isDiscovering
-              ? 'Searching for documents...'
-              : 'No Documents found in this Query Block.'
-          }
-        />
+      {items.length == 0 && isDiscovering ? (
+        <BlankQueryBlockMessage message="Searching for documents..." />
+      ) : items.length == 0 ? (
+        <BlankQueryBlockMessage message="No Documents found in this Query Block." />
       ) : null}
     </div>
   )

frontend/packages/ui/src/query-block-content.tsx

@@ -90,15 +90,17 @@ function QueryBlockListView({
   accountsMetadata: HMAccountsMetadata
   isDiscovering?: boolean
 }) {
-  if (isDiscovering && items.length === 0) {
+  // Show loading state when discovering and no items yet
+  if (items.length === 0 && isDiscovering) {
     return (
       <div className="bg-muted flex items-center rounded-lg p-4">
-        <span className="text-muted-foreground">
+        <span className="text-muted-foreground italic">
           Searching for documents...
         </span>
       </div>
     )
   }
+
   return (
     <div className="my-4 flex w-full flex-col gap-1">
       {items.map((item) => {