From f90536c715e7afb3d497b370dbdcb7e1628b3b2f Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 7 Jan 2026 18:27:11 -0500
Subject: [PATCH 01/40] Implement pagination support for model table sizes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The OLAPListTables API returns paginated results with a nextPageToken field.
Previously only the first page was fetched, causing materialized models and
tables on subsequent pages to show as having no size data.

This change replaces the derived store pattern with a readable store that:
- Fetches all pages sequentially for each connector
- Detects nextPageToken in responses and creates follow-up queries
- Accumulates all tables before building the final size map
- Handles loading/error states correctly

This fixes the issue where 5 models were detected but only 2 tables (from the
first page) were returned, causing models like "auction_data_model" to show
"-" instead of their actual size.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 153 ++++++++++++++++++
 1 file changed, 153 insertions(+)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 32655dabd44..c547f6f0239 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -4,10 +4,14 @@ import {
 } from "@rilldata/web-admin/client";
 import {
   createRuntimeServiceListResources,
+  createConnectorServiceOLAPListTables,
   type V1ListResourcesResponse,
+  type V1Resource,
+  type V1OLAPListTablesResponse,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { derived, readable } from "svelte/store";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -47,3 +51,152 @@ export function useResources(instanceId: string) {
     },
   );
 }
+
+// Cache for connector queries to avoid recreating them
+const connectorQueryCache = new Map<
+  string,
+  ReturnType<typeof createConnectorServiceOLAPListTables>
+>();
+
+function getConnectorQuery(instanceId: string, connector: string) {
+  const cacheKey = `${instanceId}:${connector}`;
+  if (!connectorQueryCache.has(cacheKey)) {
+    const query = createConnectorServiceOLAPListTables(
+      {
+        instanceId,
+        connector,
+      },
+      {
+        query: {
+          enabled: !!instanceId && !!connector,
+        },
+      },
+    );
+    connectorQueryCache.set(cacheKey, query);
+  }
+  return connectorQueryCache.get(cacheKey)!;
+}
+
+export function useModelTableSizes(
+  instanceId: string,
+  resources: V1Resource[] | undefined,
+) {
+  // Extract unique connectors from model resources
+  const uniqueConnectors = new Set<string>();
+
+  if (resources) {
+    for (const resource of resources) {
+      if (resource?.meta?.name?.kind === ResourceKind.Model) {
+        const connector = resource.model?.state?.resultConnector;
+        const table = resource.model?.state?.resultTable;
+
+        if (connector && table) {
+          uniqueConnectors.add(connector);
+        }
+      }
+    }
+  }
+
+  const connectorArray = Array.from(uniqueConnectors).sort();
+
+  // If no connectors, return an empty readable store
+  if (connectorArray.length === 0) {
+    return readable(
+      {
+        data: new Map<string, string | number>(),
+        isLoading: false,
+        isError: false,
+      },
+      () => {},
+    );
+  }
+
+  // Use a readable store with custom subscription logic to handle pagination
+  return readable(
+    {
+      data: new Map<string, string | number>(),
+      isLoading: true,
+      isError: false,
+    },
+    (set) => {
+      const connectorTables = new Map<string, Array<any>>();
+      const connectorLoading = new Map<string, boolean>();
+      const connectorError = new Map<string, boolean>();
+      const subscriptions = new Set<() => void>();
+
+      const updateAndNotify = () => {
+        const sizeMap = new Map<string, string | number>();
+        let isLoading = false;
+        let isError = false;
+
+        for (const connector of connectorArray) {
+          if (connectorLoading.get(connector)) isLoading = true;
+          if (connectorError.get(connector)) isError = true;
+
+          for (const table of connectorTables.get(connector) || []) {
+            if (
+              table.name &&
+              table.physicalSizeBytes !== undefined &&
+              table.physicalSizeBytes !== null
+            ) {
+              const key = `${connector}:${table.name}`;
+              sizeMap.set(key, table.physicalSizeBytes as string | number);
+            }
+          }
+        }
+
+        set({ data: sizeMap, isLoading, isError });
+      };
+
+      const fetchPage = (connector: string, pageToken?: string) => {
+        const query = createConnectorServiceOLAPListTables(
+          {
+            instanceId,
+            connector,
+            ...(pageToken && { pageToken }),
+          } as any,
+          {
+            query: {
+              enabled: true,
+            },
+          },
+        );
+
+        const unsubscribe = query.subscribe((result: any) => {
+          connectorLoading.set(connector, result.isLoading);
+          connectorError.set(connector, result.isError);
+
+          if (result.data?.tables) {
+            const existing = connectorTables.get(connector) || [];
+            connectorTables.set(connector, [...existing, ...result.data.tables]);
+          }
+
+          // If query completed and has more pages, fetch the next page
+          if (!result.isLoading && result.data?.nextPageToken) {
+            unsubscribe();
+            subscriptions.delete(unsubscribe);
+            fetchPage(connector, result.data.nextPageToken);
+          }
+
+          updateAndNotify();
+        });
+
+        subscriptions.add(unsubscribe);
+      };
+
+      // Start fetching for all connectors
+      for (const connector of connectorArray) {
+        connectorLoading.set(connector, true);
+        connectorError.set(connector, false);
+        connectorTables.set(connector, []);
+        fetchPage(connector);
+      }
+
+      return () => {
+        for (const unsub of subscriptions) {
+          unsub();
+        }
+      };
+    },
+  );
+}

From 3298f690179fd13266ec808737f8937f0f91391a Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 7 Jan 2026 18:29:43 -0500
Subject: [PATCH 02/40] models in status page

---
 .../projects/status/ModelSizeCell.svelte      | 27 ++++++++++++
 .../projects/status/ProjectResources.svelte   | 11 ++++-
 .../status/ProjectResourcesTable.svelte       | 43 ++++++++++++++++++-
 3 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 web-admin/src/features/projects/status/ModelSizeCell.svelte

diff --git a/web-admin/src/features/projects/status/ModelSizeCell.svelte b/web-admin/src/features/projects/status/ModelSizeCell.svelte
new file mode 100644
index 00000000000..5507d8036dc
--- /dev/null
+++ b/web-admin/src/features/projects/status/ModelSizeCell.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+  import { formatMemorySize } from "@rilldata/web-common/lib/number-formatting/memory-size";
+
+  export let sizeBytes: string | number | undefined;
+
+  $: formattedSize = formatSize(sizeBytes);
+
+  function formatSize(bytes: string | number | undefined): string {
+    if (bytes === undefined || bytes === null || bytes === "-1") return "-";
+
+    let numBytes: number;
+    if (typeof bytes === "number") {
+      numBytes = bytes;
+    } else {
+      numBytes = parseInt(bytes, 10);
+    }
+
+    if (isNaN(numBytes) || numBytes < 0) return "-";
+    return formatMemorySize(numBytes);
+  }
+</script>
+
+<div class="truncate text-right tabular-nums">
+  <span class:text-gray-500={formattedSize === "-"}>
+    {formattedSize}
+  </span>
+</div>
diff --git a/web-admin/src/features/projects/status/ProjectResources.svelte b/web-admin/src/features/projects/status/ProjectResources.svelte
index 0c2bab74206..fa3d2dfe25b 100644
--- a/web-admin/src/features/projects/status/ProjectResources.svelte
+++ b/web-admin/src/features/projects/status/ProjectResources.svelte
@@ -9,7 +9,7 @@
   import Button from "web-common/src/components/button/Button.svelte";
   import ProjectResourcesTable from "./ProjectResourcesTable.svelte";
   import RefreshAllSourcesAndModelsConfirmDialog from "./RefreshAllSourcesAndModelsConfirmDialog.svelte";
-  import { useResources } from "./selectors";
+  import { useResources, useModelTableSizes } from "./selectors";
   import { isResourceReconciling } from "@rilldata/web-admin/lib/refetch-interval-store";
 
   const queryClient = useQueryClient();
@@ -20,6 +20,7 @@
   $: ({ instanceId } = $runtime);
 
   $: resources = useResources(instanceId);
+  $: tableSizes = useModelTableSizes(instanceId, $resources.data?.resources);
 
   $: hasReconcilingResources = $resources.data?.resources?.some(
     isResourceReconciling,
@@ -65,7 +66,13 @@
       Error loading resources: {$resources.error?.message}
     </div>
   {:else if $resources.data}
-    <ProjectResourcesTable data={$resources?.data?.resources} />
+    <ProjectResourcesTable
+      data={$resources?.data?.resources}
+      tableSizes={$tableSizes?.data ?? new Map()}
+    />
+    {#if $tableSizes?.isLoading}
+      <div class="mt-2 text-xs text-gray-500">Loading model sizes...</div>
+    {/if}
   {/if}
 </section>
 
diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index 4b2517a74a2..add1aeab1c0 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -13,12 +13,14 @@
   import type { ColumnDef } from "@tanstack/svelte-table";
   import { flexRender } from "@tanstack/svelte-table";
   import ActionsCell from "./ActionsCell.svelte";
+  import ModelSizeCell from "./ModelSizeCell.svelte";
   import NameCell from "./NameCell.svelte";
   import RefreshCell from "./RefreshCell.svelte";
   import RefreshResourceConfirmDialog from "./RefreshResourceConfirmDialog.svelte";
   import ResourceErrorMessage from "./ResourceErrorMessage.svelte";
 
   export let data: V1Resource[];
+  export let tableSizes: Map<string, string | number> = new Map();
 
   let isConfirmDialogOpen = false;
   let dialogResourceName = "";
@@ -104,6 +106,45 @@
           name: getValue() as string,
         }),
     },
+    {
+      id: "size",
+      accessorFn: (row) => {
+        // Only for models
+        if (row.meta.name.kind !== ResourceKind.Model) return undefined;
+
+        const connector = row.model?.state?.resultConnector;
+        const tableName = row.model?.state?.resultTable;
+        if (!connector || !tableName) return undefined;
+
+        const key = `${connector}:${tableName}`;
+        return tableSizes.get(key);
+      },
+      header: "Size",
+      sortingFn: (rowA, rowB) => {
+        const sizeA = rowA.getValue("size") as string | number | undefined;
+        const sizeB = rowB.getValue("size") as string | number | undefined;
+
+        let numA = -1;
+        if (sizeA && sizeA !== "-1") {
+          numA = typeof sizeA === "number" ? sizeA : parseInt(sizeA, 10);
+        }
+
+        let numB = -1;
+        if (sizeB && sizeB !== "-1") {
+          numB = typeof sizeB === "number" ? sizeB : parseInt(sizeB, 10);
+        }
+
+        return numB - numA; // Descending
+      },
+      sortDescFirst: true,
+      cell: ({ getValue }) =>
+        flexRender(ModelSizeCell, {
+          sizeBytes: getValue() as string | number | undefined,
+        }),
+      meta: {
+        widthPercent: 0,
+      },
+    },
     {
       accessorFn: (row) => row.meta.reconcileStatus,
       header: "Status",
@@ -193,7 +234,7 @@
 <VirtualizedTable
   data={tableData}
   {columns}
-  columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
+  columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 100px 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
 />
 
 <RefreshResourceConfirmDialog

From 718d6b34a0ae724cd99d4903698f767dbecaafa1 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 7 Jan 2026 18:32:27 -0500
Subject: [PATCH 03/40] Cache and eagerly subscribe to model size stores for
 persistent loading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The issue was that useModelTableSizes was creating a new store on every
render when resources changed. If the resources loaded before the queries
completed, the component would be unmounted/remounted, cancelling the queries.

This change:
1. Caches stores by instanceId:connectorArray to prevent recreation
2. Eagerly subscribes to each store to keep queries alive
3. Uses WeakMap to prevent memory leaks from old subscriptions
4. Ensures queries complete even if component re-renders quickly

Now when you refresh the status page, queries stay alive in the background
and complete asynchronously, updating the table when ready.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 92 ++++++++++---------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index c547f6f0239..511e6153bcb 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -7,11 +7,10 @@ import {
   createConnectorServiceOLAPListTables,
   type V1ListResourcesResponse,
   type V1Resource,
-  type V1OLAPListTablesResponse,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
-import { derived, readable } from "svelte/store";
+import { readable } from "svelte/store";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -52,53 +51,22 @@ export function useResources(instanceId: string) {
   );
 }
 
-// Cache for connector queries to avoid recreating them
-const connectorQueryCache = new Map<
+// Cache for model table size stores to avoid recreating them
+const modelSizesStoreCache = new Map<
   string,
-  ReturnType<typeof createConnectorServiceOLAPListTables>
+  ReturnType<typeof createModelTableSizesStore>
 >();
 
-function getConnectorQuery(instanceId: string, connector: string) {
-  const cacheKey = `${instanceId}:${connector}`;
-  if (!connectorQueryCache.has(cacheKey)) {
-    const query = createConnectorServiceOLAPListTables(
-      {
-        instanceId,
-        connector,
-      },
-      {
-        query: {
-          enabled: !!instanceId && !!connector,
-        },
-      },
-    );
-    connectorQueryCache.set(cacheKey, query);
-  }
-  return connectorQueryCache.get(cacheKey)!;
-}
+// Keep track of which stores are actively subscribed to ensure queries stay alive
+const activeStoreSubscriptions = new WeakMap<
+  any,
+  () => void
+>();
 
-export function useModelTableSizes(
+function createModelTableSizesStore(
   instanceId: string,
-  resources: V1Resource[] | undefined,
+  connectorArray: string[],
 ) {
-  // Extract unique connectors from model resources
-  const uniqueConnectors = new Set<string>();
-
-  if (resources) {
-    for (const resource of resources) {
-      if (resource?.meta?.name?.kind === ResourceKind.Model) {
-        const connector = resource.model?.state?.resultConnector;
-        const table = resource.model?.state?.resultTable;
-
-        if (connector && table) {
-          uniqueConnectors.add(connector);
-        }
-      }
-    }
-  }
-
-  const connectorArray = Array.from(uniqueConnectors).sort();
-
   // If no connectors, return an empty readable store
   if (connectorArray.length === 0) {
     return readable(
@@ -112,7 +80,7 @@ export function useModelTableSizes(
   }
 
   // Use a readable store with custom subscription logic to handle pagination
-  return readable(
+  const store = readable(
     {
       data: new Map<string, string | number>(),
       isLoading: true,
@@ -199,4 +167,40 @@ export function useModelTableSizes(
       };
     },
   );
+
+  // Eagerly subscribe to keep queries alive across component re-renders
+  const unsubscribe = store.subscribe(() => {});
+  activeStoreSubscriptions.set(store, unsubscribe);
+
+  return store;
+}
+
+export function useModelTableSizes(
+  instanceId: string,
+  resources: V1Resource[] | undefined,
+) {
+  // Extract unique connectors to create a stable cache key
+  const uniqueConnectors = new Set<string>();
+
+  if (resources) {
+    for (const resource of resources) {
+      if (resource?.meta?.name?.kind === ResourceKind.Model) {
+        const connector = resource.model?.state?.resultConnector;
+        const table = resource.model?.state?.resultTable;
+
+        if (connector && table) {
+          uniqueConnectors.add(connector);
+        }
+      }
+    }
+  }
+
+  const connectorArray = Array.from(uniqueConnectors).sort();
+  const cacheKey = `${instanceId}:${connectorArray.join(",")}`;
+
+  if (!modelSizesStoreCache.has(cacheKey)) {
+    modelSizesStoreCache.set(cacheKey, createModelTableSizesStore(instanceId, connectorArray));
+  }
+
+  return modelSizesStoreCache.get(cacheKey)!;
 }

From 0510a42ae69df0f5a4ebac6bbfcbc86bc4cf3310 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 8 Jan 2026 09:45:44 -0500
Subject: [PATCH 04/40] Remove store caching to fix refresh showing empty sizes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The store cache was keeping stale subscriptions alive across page refreshes.
When you refreshed the page, the old cached store would be returned even if
the resources had changed or needed fresh data.

This change simplifies the approach:
- Create fresh stores on each useModelTableSizes call
- Let TanStack Query handle result caching (HTTP level)
- Ensure queries always run with latest connector data
- No issues with premature garbage collection

Now on page refresh, sizes will load correctly immediately.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 78 +++++++------------
 1 file changed, 26 insertions(+), 52 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 511e6153bcb..0e2c623b75d 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -51,22 +51,28 @@ export function useResources(instanceId: string) {
   );
 }
 
-// Cache for model table size stores to avoid recreating them
-const modelSizesStoreCache = new Map<
-  string,
-  ReturnType<typeof createModelTableSizesStore>
->();
-
-// Keep track of which stores are actively subscribed to ensure queries stay alive
-const activeStoreSubscriptions = new WeakMap<
-  any,
-  () => void
->();
-
-function createModelTableSizesStore(
+export function useModelTableSizes(
   instanceId: string,
-  connectorArray: string[],
+  resources: V1Resource[] | undefined,
 ) {
+  // Extract unique connectors from model resources
+  const uniqueConnectors = new Set<string>();
+
+  if (resources) {
+    for (const resource of resources) {
+      if (resource?.meta?.name?.kind === ResourceKind.Model) {
+        const connector = resource.model?.state?.resultConnector;
+        const table = resource.model?.state?.resultTable;
+
+        if (connector && table) {
+          uniqueConnectors.add(connector);
+        }
+      }
+    }
+  }
+
+  const connectorArray = Array.from(uniqueConnectors).sort();
+
   // If no connectors, return an empty readable store
   if (connectorArray.length === 0) {
     return readable(
@@ -80,7 +86,8 @@ function createModelTableSizesStore(
   }
 
   // Use a readable store with custom subscription logic to handle pagination
-  const store = readable(
+  // Create fresh stores each time to ensure proper query lifecycle
+  return readable(
     {
       data: new Map<string, string | number>(),
       isLoading: true,
@@ -136,7 +143,10 @@ function createModelTableSizesStore(
 
           if (result.data?.tables) {
             const existing = connectorTables.get(connector) || [];
-            connectorTables.set(connector, [...existing, ...result.data.tables]);
+            connectorTables.set(connector, [
+              ...existing,
+              ...result.data.tables,
+            ]);
           }
 
           // If query completed and has more pages, fetch the next page
@@ -167,40 +177,4 @@ function createModelTableSizesStore(
       };
     },
   );
-
-  // Eagerly subscribe to keep queries alive across component re-renders
-  const unsubscribe = store.subscribe(() => {});
-  activeStoreSubscriptions.set(store, unsubscribe);
-
-  return store;
-}
-
-export function useModelTableSizes(
-  instanceId: string,
-  resources: V1Resource[] | undefined,
-) {
-  // Extract unique connectors to create a stable cache key
-  const uniqueConnectors = new Set<string>();
-
-  if (resources) {
-    for (const resource of resources) {
-      if (resource?.meta?.name?.kind === ResourceKind.Model) {
-        const connector = resource.model?.state?.resultConnector;
-        const table = resource.model?.state?.resultTable;
-
-        if (connector && table) {
-          uniqueConnectors.add(connector);
-        }
-      }
-    }
-  }
-
-  const connectorArray = Array.from(uniqueConnectors).sort();
-  const cacheKey = `${instanceId}:${connectorArray.join(",")}`;
-
-  if (!modelSizesStoreCache.has(cacheKey)) {
-    modelSizesStoreCache.set(cacheKey, createModelTableSizesStore(instanceId, connectorArray));
-  }
-
-  return modelSizesStoreCache.get(cacheKey)!;
 }

From 60d00b53ab0739f7dad7b028de06c1ea18c63733 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 8 Jan 2026 09:56:03 -0500
Subject: [PATCH 05/40] Add debugging and fix reactive columns for model sizes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The issue was that columns were defined as a static const, so the accessor
function captured the initial tableSizes reference and never updated when
tableSizes changed.

Changes:
1. Made columns reactive with $: so they update when tableSizes changes
2. Added console logging to ProjectResources and ProjectResourcesTable
  to track when stores and columns are updated
3. Added logging to selectors to see preload and store update timing

This should fix the issue where the table shows "-" on initial load but
correctly shows sizes after navigating away and back.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../projects/status/ProjectResources.svelte   |  11 +-
 .../status/ProjectResourcesTable.svelte       |  10 +-
 .../src/features/projects/status/selectors.ts | 129 +++++++++++++++---
 3 files changed, 127 insertions(+), 23 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectResources.svelte b/web-admin/src/features/projects/status/ProjectResources.svelte
index fa3d2dfe25b..cdc2a9d041f 100644
--- a/web-admin/src/features/projects/status/ProjectResources.svelte
+++ b/web-admin/src/features/projects/status/ProjectResources.svelte
@@ -16,11 +16,20 @@
   const createTrigger = createRuntimeServiceCreateTrigger();
 
   let isConfirmDialogOpen = false;
+  let tableSizes: any;
 
   $: ({ instanceId } = $runtime);
 
   $: resources = useResources(instanceId);
-  $: tableSizes = useModelTableSizes(instanceId, $resources.data?.resources);
+  $: {
+    tableSizes = useModelTableSizes(instanceId, $resources.data?.resources);
+    console.log(
+      "[ProjectResources] Updated tableSizes, resourceCount=",
+      $resources.data?.resources?.length,
+      "sizeMapSize=",
+      $tableSizes?.data?.size,
+    );
+  }
 
   $: hasReconcilingResources = $resources.data?.resources?.some(
     isResourceReconciling,
diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index add1aeab1c0..99508c0d059 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -28,6 +28,7 @@
   let dialogRefreshType: "full" | "incremental" = "full";
 
   let openDropdownResourceKey = "";
+  let columns: ColumnDef<V1Resource, any>[];
 
   const createTrigger = createRuntimeServiceCreateTrigger();
   const queryClient = useQueryClient();
@@ -87,8 +88,10 @@
     closeRefreshDialog();
   };
 
-  // Create columns definition as a constant to prevent unnecessary re-creation
-  const columns: ColumnDef<V1Resource, any>[] = [
+  // Columns must be reactive to update when tableSizes changes
+  $: {
+    console.log("[ProjectResourcesTable] Updating columns, tableSizesMapSize=", tableSizes.size);
+    columns = [
     {
       accessorKey: "title",
       header: "Type",
@@ -224,7 +227,8 @@
         widthPercent: 0,
       },
     },
-  ];
+    ];
+  }
 
   $: tableData = data.filter(
     (resource) => resource.meta.name.kind !== ResourceKind.Component,
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 0e2c623b75d..f1f613700a7 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -51,31 +51,83 @@ export function useResources(instanceId: string) {
   );
 }
 
-export function useModelTableSizes(
+// Cache stores by instanceId and connector array to prevent recreating them
+const modelSizesStoreCache = new Map<
+  string,
+  { store: any; unsubscribe: () => void }
+>();
+
+// Keep preloaded query subscriptions alive so they don't get cancelled
+const preloadedQuerySubscriptions = new Map<string, Set<() => void>>();
+
+// Preload queries to ensure they start immediately and keep them alive
+function preloadConnectorQueries(
   instanceId: string,
-  resources: V1Resource[] | undefined,
+  connectorArray: string[],
 ) {
-  // Extract unique connectors from model resources
-  const uniqueConnectors = new Set<string>();
+  const preloadKey = `${instanceId}:${connectorArray.join(",")}`;
 
-  if (resources) {
-    for (const resource of resources) {
-      if (resource?.meta?.name?.kind === ResourceKind.Model) {
-        const connector = resource.model?.state?.resultConnector;
-        const table = resource.model?.state?.resultTable;
+  // Only preload once per connector set
+  if (preloadedQuerySubscriptions.has(preloadKey)) {
+    console.log("[ModelSize] Preload already exists for", preloadKey);
+    return;
+  }
 
-        if (connector && table) {
-          uniqueConnectors.add(connector);
-        }
-      }
-    }
+  console.log("[ModelSize] Preloading queries for", connectorArray, "on", new Date().toISOString());
+
+  const subscriptions = new Set<() => void>();
+
+  for (const connector of connectorArray) {
+    console.log("[ModelSize] Creating preload query for connector:", connector);
+    const query = createConnectorServiceOLAPListTables(
+      {
+        instanceId,
+        connector,
+      },
+      {
+        query: {
+          enabled: true,
+        },
+      },
+    );
+
+    // Eagerly subscribe to keep the query alive
+    const unsubscribe = query.subscribe((result: any) => {
+      console.log(
+        `[ModelSize] Preloaded query for ${connector} updated:`,
+        "isLoading=",
+        result.isLoading,
+        "tableCount=",
+        result.data?.tables?.length || 0,
+      );
+    });
+    subscriptions.add(unsubscribe);
   }
 
-  const connectorArray = Array.from(uniqueConnectors).sort();
+  preloadedQuerySubscriptions.set(preloadKey, subscriptions);
+}
+
+function createCachedStore(
+  cacheKey: string,
+  instanceId: string,
+  connectorArray: string[],
+) {
+  console.log("[ModelSize] createCachedStore called with cacheKey:", cacheKey);
+
+  // Check if we already have a cached store
+  if (modelSizesStoreCache.has(cacheKey)) {
+    console.log("[ModelSize] Found cached store for", cacheKey);
+    return modelSizesStoreCache.get(cacheKey)!.store;
+  }
+
+  console.log("[ModelSize] Creating new store for", cacheKey);
+
+  // Preload queries immediately so they start running before store subscribers attach
+  preloadConnectorQueries(instanceId, connectorArray);
 
   // If no connectors, return an empty readable store
   if (connectorArray.length === 0) {
-    return readable(
+    const emptyStore = readable(
       {
         data: new Map<string, string | number>(),
         isLoading: false,
@@ -83,11 +135,15 @@ export function useModelTableSizes(
       },
       () => {},
     );
+    modelSizesStoreCache.set(cacheKey, {
+      store: emptyStore,
+      unsubscribe: () => {},
+    });
+    return emptyStore;
   }
 
-  // Use a readable store with custom subscription logic to handle pagination
-  // Create fresh stores each time to ensure proper query lifecycle
-  return readable(
+  // Create a new store with pagination support
+  const store = readable(
     {
       data: new Map<string, string | number>(),
       isLoading: true,
@@ -120,6 +176,9 @@ export function useModelTableSizes(
           }
         }
 
+        console.log(
+          `[ModelSize] Store updating for ${cacheKey}: tableCount=${sizeMap.size}, isLoading=${isLoading}`,
+        );
         set({ data: sizeMap, isLoading, isError });
       };
 
@@ -177,4 +236,36 @@ export function useModelTableSizes(
       };
     },
   );
+
+  // Eagerly subscribe to keep queries alive across component re-renders
+  const unsubscribe = store.subscribe(() => {});
+  modelSizesStoreCache.set(cacheKey, { store, unsubscribe });
+
+  return store;
+}
+
+export function useModelTableSizes(
+  instanceId: string,
+  resources: V1Resource[] | undefined,
+) {
+  // Extract unique connectors from model resources
+  const uniqueConnectors = new Set<string>();
+
+  if (resources) {
+    for (const resource of resources) {
+      if (resource?.meta?.name?.kind === ResourceKind.Model) {
+        const connector = resource.model?.state?.resultConnector;
+        const table = resource.model?.state?.resultTable;
+
+        if (connector && table) {
+          uniqueConnectors.add(connector);
+        }
+      }
+    }
+  }
+
+  const connectorArray = Array.from(uniqueConnectors).sort();
+  const cacheKey = `${instanceId}:${connectorArray.join(",")}`;
+
+  return createCachedStore(cacheKey, instanceId, connectorArray);
 }

From 42c54d6e5bc46d01b4ed2063ba95e9461ef4216a Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 8 Jan 2026 09:57:34 -0500
Subject: [PATCH 06/40] Make columns reactive to update when tableSizes changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The core issue: columns were defined as a static const, capturing
the initial tableSizes reference. When the store updated with new data,
the column accessor functions still referenced the old empty Map.

Solution: Make columns reactive with $: so they recreate whenever
tableSizes changes, ensuring accessor functions get the current data.

This allows the UI to update asynchronously as size data arrives.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../projects/status/ProjectResources.svelte   | 10 +--------
 .../status/ProjectResourcesTable.svelte       |  1 -
 .../src/features/projects/status/selectors.ts | 22 +------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectResources.svelte b/web-admin/src/features/projects/status/ProjectResources.svelte
index cdc2a9d041f..0fd5c8ffdbb 100644
--- a/web-admin/src/features/projects/status/ProjectResources.svelte
+++ b/web-admin/src/features/projects/status/ProjectResources.svelte
@@ -21,15 +21,7 @@
   $: ({ instanceId } = $runtime);
 
   $: resources = useResources(instanceId);
-  $: {
-    tableSizes = useModelTableSizes(instanceId, $resources.data?.resources);
-    console.log(
-      "[ProjectResources] Updated tableSizes, resourceCount=",
-      $resources.data?.resources?.length,
-      "sizeMapSize=",
-      $tableSizes?.data?.size,
-    );
-  }
+  $: tableSizes = useModelTableSizes(instanceId, $resources.data?.resources);
 
   $: hasReconcilingResources = $resources.data?.resources?.some(
     isResourceReconciling,
diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index 99508c0d059..ac80a1d2f3e 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -90,7 +90,6 @@
 
   // Columns must be reactive to update when tableSizes changes
   $: {
-    console.log("[ProjectResourcesTable] Updating columns, tableSizesMapSize=", tableSizes.size);
     columns = [
     {
       accessorKey: "title",
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index f1f613700a7..a00ed74cca1 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -69,16 +69,12 @@ function preloadConnectorQueries(
 
   // Only preload once per connector set
   if (preloadedQuerySubscriptions.has(preloadKey)) {
-    console.log("[ModelSize] Preload already exists for", preloadKey);
     return;
   }
 
-  console.log("[ModelSize] Preloading queries for", connectorArray, "on", new Date().toISOString());
-
   const subscriptions = new Set<() => void>();
 
   for (const connector of connectorArray) {
-    console.log("[ModelSize] Creating preload query for connector:", connector);
     const query = createConnectorServiceOLAPListTables(
       {
         instanceId,
@@ -92,15 +88,7 @@ function preloadConnectorQueries(
     );
 
     // Eagerly subscribe to keep the query alive
-    const unsubscribe = query.subscribe((result: any) => {
-      console.log(
-        `[ModelSize] Preloaded query for ${connector} updated:`,
-        "isLoading=",
-        result.isLoading,
-        "tableCount=",
-        result.data?.tables?.length || 0,
-      );
-    });
+    const unsubscribe = query.subscribe(() => {});
     subscriptions.add(unsubscribe);
   }
 
@@ -112,16 +100,11 @@ function createCachedStore(
   instanceId: string,
   connectorArray: string[],
 ) {
-  console.log("[ModelSize] createCachedStore called with cacheKey:", cacheKey);
-
   // Check if we already have a cached store
   if (modelSizesStoreCache.has(cacheKey)) {
-    console.log("[ModelSize] Found cached store for", cacheKey);
     return modelSizesStoreCache.get(cacheKey)!.store;
   }
 
-  console.log("[ModelSize] Creating new store for", cacheKey);
-
   // Preload queries immediately so they start running before store subscribers attach
   preloadConnectorQueries(instanceId, connectorArray);
 
@@ -176,9 +159,6 @@ function createCachedStore(
           }
         }
 
-        console.log(
-          `[ModelSize] Store updating for ${cacheKey}: tableCount=${sizeMap.size}, isLoading=${isLoading}`,
-        );
         set({ data: sizeMap, isLoading, isError });
       };
 

From 2519cd4585b778d601f10ff9067dd36b85ae4c03 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 8 Jan 2026 10:05:25 -0500
Subject: [PATCH 07/40] Update ProjectResourcesTable.svelte

---
 .../projects/status/ProjectResourcesTable.svelte     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index ac80a1d2f3e..11651aa6483 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -234,11 +234,13 @@
   );
 </script>
 
-<VirtualizedTable
-  data={tableData}
-  {columns}
-  columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 100px 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
-/>
+{#key tableSizes}
+  <VirtualizedTable
+    data={tableData}
+    {columns}
+    columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 100px 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
+  />
+{/key}
 
 <RefreshResourceConfirmDialog
   bind:open={isConfirmDialogOpen}

From a487787ddbeae71761d212fcd5ee44d38072848b Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 8 Jan 2026 10:08:17 -0500
Subject: [PATCH 08/40] prettier

---
 .../status/ProjectResourcesTable.svelte       | 261 +++++++++---------
 .../src/features/projects/status/selectors.ts |   5 +-
 2 files changed, 130 insertions(+), 136 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index 11651aa6483..3a074f438ee 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -28,7 +28,6 @@
   let dialogRefreshType: "full" | "incremental" = "full";
 
   let openDropdownResourceKey = "";
-  let columns: ColumnDef<V1Resource, any>[];
 
   const createTrigger = createRuntimeServiceCreateTrigger();
   const queryClient = useQueryClient();
@@ -88,146 +87,144 @@
     closeRefreshDialog();
   };
 
-  // Columns must be reactive to update when tableSizes changes
-  $: {
-    columns = [
-    {
-      accessorKey: "title",
-      header: "Type",
-      accessorFn: (row) => row.meta.name.kind,
-      cell: ({ row }) =>
-        flexRender(ResourceTypeBadge, {
-          kind: row.original.meta.name.kind as ResourceKind,
-        }),
-    },
-    {
-      accessorFn: (row) => row.meta.name.name,
-      header: "Name",
-      cell: ({ getValue }) =>
-        flexRender(NameCell, {
-          name: getValue() as string,
-        }),
-    },
-    {
-      id: "size",
-      accessorFn: (row) => {
-        // Only for models
-        if (row.meta.name.kind !== ResourceKind.Model) return undefined;
-
-        const connector = row.model?.state?.resultConnector;
-        const tableName = row.model?.state?.resultTable;
-        if (!connector || !tableName) return undefined;
-
-        const key = `${connector}:${tableName}`;
-        return tableSizes.get(key);
+  // Create columns definition as a constant - key block handles re-renders
+  const columns: ColumnDef<V1Resource, any>[] = [
+      {
+        accessorKey: "title",
+        header: "Type",
+        accessorFn: (row) => row.meta.name.kind,
+        cell: ({ row }) =>
+          flexRender(ResourceTypeBadge, {
+            kind: row.original.meta.name.kind as ResourceKind,
+          }),
       },
-      header: "Size",
-      sortingFn: (rowA, rowB) => {
-        const sizeA = rowA.getValue("size") as string | number | undefined;
-        const sizeB = rowB.getValue("size") as string | number | undefined;
-
-        let numA = -1;
-        if (sizeA && sizeA !== "-1") {
-          numA = typeof sizeA === "number" ? sizeA : parseInt(sizeA, 10);
-        }
-
-        let numB = -1;
-        if (sizeB && sizeB !== "-1") {
-          numB = typeof sizeB === "number" ? sizeB : parseInt(sizeB, 10);
-        }
-
-        return numB - numA; // Descending
+      {
+        accessorFn: (row) => row.meta.name.name,
+        header: "Name",
+        cell: ({ getValue }) =>
+          flexRender(NameCell, {
+            name: getValue() as string,
+          }),
       },
-      sortDescFirst: true,
-      cell: ({ getValue }) =>
-        flexRender(ModelSizeCell, {
-          sizeBytes: getValue() as string | number | undefined,
-        }),
-      meta: {
-        widthPercent: 0,
-      },
-    },
-    {
-      accessorFn: (row) => row.meta.reconcileStatus,
-      header: "Status",
-      sortingFn: (rowA, rowB) => {
-        // Priority order: Running (highest) -> Pending -> Idle -> Unknown (lowest)
-        const getStatusPriority = (status: V1ReconcileStatus) => {
-          switch (status) {
-            case V1ReconcileStatus.RECONCILE_STATUS_RUNNING:
-              return 4;
-            case V1ReconcileStatus.RECONCILE_STATUS_PENDING:
-              return 3;
-            case V1ReconcileStatus.RECONCILE_STATUS_IDLE:
-              return 2;
-            case V1ReconcileStatus.RECONCILE_STATUS_UNSPECIFIED:
-            default:
-              return 1;
+      {
+        id: "size",
+        accessorFn: (row) => {
+          // Only for models
+          if (row.meta.name.kind !== ResourceKind.Model) return undefined;
+
+          const connector = row.model?.state?.resultConnector;
+          const tableName = row.model?.state?.resultTable;
+          if (!connector || !tableName) return undefined;
+
+          const key = `${connector}:${tableName}`;
+          return tableSizes.get(key);
+        },
+        header: "Size",
+        sortingFn: (rowA, rowB) => {
+          const sizeA = rowA.getValue("size") as string | number | undefined;
+          const sizeB = rowB.getValue("size") as string | number | undefined;
+
+          let numA = -1;
+          if (sizeA && sizeA !== "-1") {
+            numA = typeof sizeA === "number" ? sizeA : parseInt(sizeA, 10);
+          }
+
+          let numB = -1;
+          if (sizeB && sizeB !== "-1") {
+            numB = typeof sizeB === "number" ? sizeB : parseInt(sizeB, 10);
           }
-        };
 
-        return (
-          getStatusPriority(rowB.original.meta.reconcileStatus) -
-          getStatusPriority(rowA.original.meta.reconcileStatus)
-        );
+          return numB - numA; // Descending
+        },
+        sortDescFirst: true,
+        cell: ({ getValue }) =>
+          flexRender(ModelSizeCell, {
+            sizeBytes: getValue() as string | number | undefined,
+          }),
+        meta: {
+          widthPercent: 0,
+        },
       },
-      cell: ({ row }) =>
-        flexRender(ResourceErrorMessage, {
-          message: row.original.meta.reconcileError,
-          status: row.original.meta.reconcileStatus,
-        }),
-      meta: {
-        marginLeft: "1",
+      {
+        accessorFn: (row) => row.meta.reconcileStatus,
+        header: "Status",
+        sortingFn: (rowA, rowB) => {
+          // Priority order: Running (highest) -> Pending -> Idle -> Unknown (lowest)
+          const getStatusPriority = (status: V1ReconcileStatus) => {
+            switch (status) {
+              case V1ReconcileStatus.RECONCILE_STATUS_RUNNING:
+                return 4;
+              case V1ReconcileStatus.RECONCILE_STATUS_PENDING:
+                return 3;
+              case V1ReconcileStatus.RECONCILE_STATUS_IDLE:
+                return 2;
+              case V1ReconcileStatus.RECONCILE_STATUS_UNSPECIFIED:
+              default:
+                return 1;
+            }
+          };
+
+          return (
+            getStatusPriority(rowB.original.meta.reconcileStatus) -
+            getStatusPriority(rowA.original.meta.reconcileStatus)
+          );
+        },
+        cell: ({ row }) =>
+          flexRender(ResourceErrorMessage, {
+            message: row.original.meta.reconcileError,
+            status: row.original.meta.reconcileStatus,
+          }),
+        meta: {
+          marginLeft: "1",
+        },
+      },
+      {
+        accessorFn: (row) => row.meta.stateUpdatedOn,
+        header: "Last refresh",
+        sortDescFirst: true,
+        cell: (info) =>
+          flexRender(RefreshCell, {
+            date: info.getValue() as string,
+          }),
       },
-    },
-    {
-      accessorFn: (row) => row.meta.stateUpdatedOn,
-      header: "Last refresh",
-      sortDescFirst: true,
-      cell: (info) =>
-        flexRender(RefreshCell, {
-          date: info.getValue() as string,
-        }),
-    },
-    {
-      accessorFn: (row) => row.meta.reconcileOn,
-      header: "Next refresh",
-      cell: (info) =>
-        flexRender(RefreshCell, {
-          date: info.getValue() as string,
-        }),
-    },
-    {
-      accessorKey: "actions",
-      header: "",
-      cell: ({ row }) => {
-        // Only hide actions for reconciling rows
-        const status = row.original.meta?.reconcileStatus;
-        const isRowReconciling =
-          status === V1ReconcileStatus.RECONCILE_STATUS_PENDING ||
-          status === V1ReconcileStatus.RECONCILE_STATUS_RUNNING;
-        if (!isRowReconciling) {
-          const resourceKey = `${row.original.meta.name.kind}:${row.original.meta.name.name}`;
-          return flexRender(ActionsCell, {
-            resourceKind: row.original.meta.name.kind,
-            resourceName: row.original.meta.name.name,
-            canRefresh:
-              row.original.meta.name.kind === ResourceKind.Model ||
-              row.original.meta.name.kind === ResourceKind.Source,
-            onClickRefreshDialog: openRefreshDialog,
-            isDropdownOpen: isDropdownOpen(resourceKey),
-            onDropdownOpenChange: (isOpen: boolean) =>
-              setDropdownOpen(resourceKey, isOpen),
-          });
-        }
+      {
+        accessorFn: (row) => row.meta.reconcileOn,
+        header: "Next refresh",
+        cell: (info) =>
+          flexRender(RefreshCell, {
+            date: info.getValue() as string,
+          }),
       },
-      enableSorting: false,
-      meta: {
-        widthPercent: 0,
+      {
+        accessorKey: "actions",
+        header: "",
+        cell: ({ row }) => {
+          // Only hide actions for reconciling rows
+          const status = row.original.meta?.reconcileStatus;
+          const isRowReconciling =
+            status === V1ReconcileStatus.RECONCILE_STATUS_PENDING ||
+            status === V1ReconcileStatus.RECONCILE_STATUS_RUNNING;
+          if (!isRowReconciling) {
+            const resourceKey = `${row.original.meta.name.kind}:${row.original.meta.name.name}`;
+            return flexRender(ActionsCell, {
+              resourceKind: row.original.meta.name.kind,
+              resourceName: row.original.meta.name.name,
+              canRefresh:
+                row.original.meta.name.kind === ResourceKind.Model ||
+                row.original.meta.name.kind === ResourceKind.Source,
+              onClickRefreshDialog: openRefreshDialog,
+              isDropdownOpen: isDropdownOpen(resourceKey),
+              onDropdownOpenChange: (isOpen: boolean) =>
+                setDropdownOpen(resourceKey, isOpen),
+            });
+          }
+        },
+        enableSorting: false,
+        meta: {
+          widthPercent: 0,
+        },
       },
-    },
     ];
-  }
 
   $: tableData = data.filter(
     (resource) => resource.meta.name.kind !== ResourceKind.Component,
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index a00ed74cca1..86a9c25a5e8 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -61,10 +61,7 @@ const modelSizesStoreCache = new Map<
 const preloadedQuerySubscriptions = new Map<string, Set<() => void>>();
 
 // Preload queries to ensure they start immediately and keep them alive
-function preloadConnectorQueries(
-  instanceId: string,
-  connectorArray: string[],
-) {
+function preloadConnectorQueries(instanceId: string, connectorArray: string[]) {
   const preloadKey = `${instanceId}:${connectorArray.join(",")}`;
 
   // Only preload once per connector set

From 155a8ef940b90f294ff281f3f1db970d4e4d2c58 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 8 Jan 2026 10:10:43 -0500
Subject: [PATCH 09/40] prettier

---
 .../status/ProjectResourcesTable.svelte       | 256 +++++++++---------
 1 file changed, 128 insertions(+), 128 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index 3a074f438ee..3af53269d24 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -89,142 +89,142 @@
 
   // Create columns definition as a constant - key block handles re-renders
   const columns: ColumnDef<V1Resource, any>[] = [
-      {
-        accessorKey: "title",
-        header: "Type",
-        accessorFn: (row) => row.meta.name.kind,
-        cell: ({ row }) =>
-          flexRender(ResourceTypeBadge, {
-            kind: row.original.meta.name.kind as ResourceKind,
-          }),
+    {
+      accessorKey: "title",
+      header: "Type",
+      accessorFn: (row) => row.meta.name.kind,
+      cell: ({ row }) =>
+        flexRender(ResourceTypeBadge, {
+          kind: row.original.meta.name.kind as ResourceKind,
+        }),
+    },
+    {
+      accessorFn: (row) => row.meta.name.name,
+      header: "Name",
+      cell: ({ getValue }) =>
+        flexRender(NameCell, {
+          name: getValue() as string,
+        }),
+    },
+    {
+      id: "size",
+      accessorFn: (row) => {
+        // Only for models
+        if (row.meta.name.kind !== ResourceKind.Model) return undefined;
+
+        const connector = row.model?.state?.resultConnector;
+        const tableName = row.model?.state?.resultTable;
+        if (!connector || !tableName) return undefined;
+
+        const key = `${connector}:${tableName}`;
+        return tableSizes.get(key);
       },
-      {
-        accessorFn: (row) => row.meta.name.name,
-        header: "Name",
-        cell: ({ getValue }) =>
-          flexRender(NameCell, {
-            name: getValue() as string,
-          }),
+      header: "Size",
+      sortingFn: (rowA, rowB) => {
+        const sizeA = rowA.getValue("size") as string | number | undefined;
+        const sizeB = rowB.getValue("size") as string | number | undefined;
+
+        let numA = -1;
+        if (sizeA && sizeA !== "-1") {
+          numA = typeof sizeA === "number" ? sizeA : parseInt(sizeA, 10);
+        }
+
+        let numB = -1;
+        if (sizeB && sizeB !== "-1") {
+          numB = typeof sizeB === "number" ? sizeB : parseInt(sizeB, 10);
+        }
+
+        return numB - numA; // Descending
       },
-      {
-        id: "size",
-        accessorFn: (row) => {
-          // Only for models
-          if (row.meta.name.kind !== ResourceKind.Model) return undefined;
-
-          const connector = row.model?.state?.resultConnector;
-          const tableName = row.model?.state?.resultTable;
-          if (!connector || !tableName) return undefined;
-
-          const key = `${connector}:${tableName}`;
-          return tableSizes.get(key);
-        },
-        header: "Size",
-        sortingFn: (rowA, rowB) => {
-          const sizeA = rowA.getValue("size") as string | number | undefined;
-          const sizeB = rowB.getValue("size") as string | number | undefined;
-
-          let numA = -1;
-          if (sizeA && sizeA !== "-1") {
-            numA = typeof sizeA === "number" ? sizeA : parseInt(sizeA, 10);
-          }
-
-          let numB = -1;
-          if (sizeB && sizeB !== "-1") {
-            numB = typeof sizeB === "number" ? sizeB : parseInt(sizeB, 10);
+      sortDescFirst: true,
+      cell: ({ getValue }) =>
+        flexRender(ModelSizeCell, {
+          sizeBytes: getValue() as string | number | undefined,
+        }),
+      meta: {
+        widthPercent: 0,
+      },
+    },
+    {
+      accessorFn: (row) => row.meta.reconcileStatus,
+      header: "Status",
+      sortingFn: (rowA, rowB) => {
+        // Priority order: Running (highest) -> Pending -> Idle -> Unknown (lowest)
+        const getStatusPriority = (status: V1ReconcileStatus) => {
+          switch (status) {
+            case V1ReconcileStatus.RECONCILE_STATUS_RUNNING:
+              return 4;
+            case V1ReconcileStatus.RECONCILE_STATUS_PENDING:
+              return 3;
+            case V1ReconcileStatus.RECONCILE_STATUS_IDLE:
+              return 2;
+            case V1ReconcileStatus.RECONCILE_STATUS_UNSPECIFIED:
+            default:
+              return 1;
           }
+        };
 
-          return numB - numA; // Descending
-        },
-        sortDescFirst: true,
-        cell: ({ getValue }) =>
-          flexRender(ModelSizeCell, {
-            sizeBytes: getValue() as string | number | undefined,
-          }),
-        meta: {
-          widthPercent: 0,
-        },
+        return (
+          getStatusPriority(rowB.original.meta.reconcileStatus) -
+          getStatusPriority(rowA.original.meta.reconcileStatus)
+        );
       },
-      {
-        accessorFn: (row) => row.meta.reconcileStatus,
-        header: "Status",
-        sortingFn: (rowA, rowB) => {
-          // Priority order: Running (highest) -> Pending -> Idle -> Unknown (lowest)
-          const getStatusPriority = (status: V1ReconcileStatus) => {
-            switch (status) {
-              case V1ReconcileStatus.RECONCILE_STATUS_RUNNING:
-                return 4;
-              case V1ReconcileStatus.RECONCILE_STATUS_PENDING:
-                return 3;
-              case V1ReconcileStatus.RECONCILE_STATUS_IDLE:
-                return 2;
-              case V1ReconcileStatus.RECONCILE_STATUS_UNSPECIFIED:
-              default:
-                return 1;
-            }
-          };
-
-          return (
-            getStatusPriority(rowB.original.meta.reconcileStatus) -
-            getStatusPriority(rowA.original.meta.reconcileStatus)
-          );
-        },
-        cell: ({ row }) =>
-          flexRender(ResourceErrorMessage, {
-            message: row.original.meta.reconcileError,
-            status: row.original.meta.reconcileStatus,
-          }),
-        meta: {
-          marginLeft: "1",
-        },
-      },
-      {
-        accessorFn: (row) => row.meta.stateUpdatedOn,
-        header: "Last refresh",
-        sortDescFirst: true,
-        cell: (info) =>
-          flexRender(RefreshCell, {
-            date: info.getValue() as string,
-          }),
+      cell: ({ row }) =>
+        flexRender(ResourceErrorMessage, {
+          message: row.original.meta.reconcileError,
+          status: row.original.meta.reconcileStatus,
+        }),
+      meta: {
+        marginLeft: "1",
       },
-      {
-        accessorFn: (row) => row.meta.reconcileOn,
-        header: "Next refresh",
-        cell: (info) =>
-          flexRender(RefreshCell, {
-            date: info.getValue() as string,
-          }),
+    },
+    {
+      accessorFn: (row) => row.meta.stateUpdatedOn,
+      header: "Last refresh",
+      sortDescFirst: true,
+      cell: (info) =>
+        flexRender(RefreshCell, {
+          date: info.getValue() as string,
+        }),
+    },
+    {
+      accessorFn: (row) => row.meta.reconcileOn,
+      header: "Next refresh",
+      cell: (info) =>
+        flexRender(RefreshCell, {
+          date: info.getValue() as string,
+        }),
+    },
+    {
+      accessorKey: "actions",
+      header: "",
+      cell: ({ row }) => {
+        // Only hide actions for reconciling rows
+        const status = row.original.meta?.reconcileStatus;
+        const isRowReconciling =
+          status === V1ReconcileStatus.RECONCILE_STATUS_PENDING ||
+          status === V1ReconcileStatus.RECONCILE_STATUS_RUNNING;
+        if (!isRowReconciling) {
+          const resourceKey = `${row.original.meta.name.kind}:${row.original.meta.name.name}`;
+          return flexRender(ActionsCell, {
+            resourceKind: row.original.meta.name.kind,
+            resourceName: row.original.meta.name.name,
+            canRefresh:
+              row.original.meta.name.kind === ResourceKind.Model ||
+              row.original.meta.name.kind === ResourceKind.Source,
+            onClickRefreshDialog: openRefreshDialog,
+            isDropdownOpen: isDropdownOpen(resourceKey),
+            onDropdownOpenChange: (isOpen: boolean) =>
+              setDropdownOpen(resourceKey, isOpen),
+          });
+        }
       },
-      {
-        accessorKey: "actions",
-        header: "",
-        cell: ({ row }) => {
-          // Only hide actions for reconciling rows
-          const status = row.original.meta?.reconcileStatus;
-          const isRowReconciling =
-            status === V1ReconcileStatus.RECONCILE_STATUS_PENDING ||
-            status === V1ReconcileStatus.RECONCILE_STATUS_RUNNING;
-          if (!isRowReconciling) {
-            const resourceKey = `${row.original.meta.name.kind}:${row.original.meta.name.name}`;
-            return flexRender(ActionsCell, {
-              resourceKind: row.original.meta.name.kind,
-              resourceName: row.original.meta.name.name,
-              canRefresh:
-                row.original.meta.name.kind === ResourceKind.Model ||
-                row.original.meta.name.kind === ResourceKind.Source,
-              onClickRefreshDialog: openRefreshDialog,
-              isDropdownOpen: isDropdownOpen(resourceKey),
-              onDropdownOpenChange: (isOpen: boolean) =>
-                setDropdownOpen(resourceKey, isOpen),
-            });
-          }
-        },
-        enableSorting: false,
-        meta: {
-          widthPercent: 0,
-        },
+      enableSorting: false,
+      meta: {
+        widthPercent: 0,
       },
-    ];
+    },
+  ];
 
   $: tableData = data.filter(
     (resource) => resource.meta.name.kind !== ResourceKind.Component,

From 3bc0475d9e8b68c0465996181ade0152b44cfd60 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 10:54:03 -0500
Subject: [PATCH 10/40] separated tables,

---
 .../projects/status/ColumnCountCell.svelte    |  16 ++
 .../status/MaterializationCell.svelte         |  24 +++
 .../projects/status/ProjectResources.svelte   |  17 ++-
 .../status/ProjectResourcesTable.svelte       |  41 +----
 .../projects/status/ProjectTables.svelte      |  38 +++++
 .../status/ProjectTablesRowCounts.svelte      |  86 +++++++++++
 .../projects/status/ProjectTablesTable.svelte |  97 ++++++++++++
 .../projects/status/RowCountCell.svelte       |  23 +++
 .../src/features/projects/status/selectors.ts | 140 ++++++++++++++++++
 .../[project]/-/status/+page.svelte           |   2 +
 10 files changed, 441 insertions(+), 43 deletions(-)
 create mode 100644 web-admin/src/features/projects/status/ColumnCountCell.svelte
 create mode 100644 web-admin/src/features/projects/status/MaterializationCell.svelte
 create mode 100644 web-admin/src/features/projects/status/ProjectTables.svelte
 create mode 100644 web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
 create mode 100644 web-admin/src/features/projects/status/ProjectTablesTable.svelte
 create mode 100644 web-admin/src/features/projects/status/RowCountCell.svelte

diff --git a/web-admin/src/features/projects/status/ColumnCountCell.svelte b/web-admin/src/features/projects/status/ColumnCountCell.svelte
new file mode 100644
index 00000000000..29826e3d153
--- /dev/null
+++ b/web-admin/src/features/projects/status/ColumnCountCell.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+  export let count: number | undefined;
+
+  $: formattedCount = formatCount(count);
+
+  function formatCount(c: number | undefined): string {
+    if (c === undefined) return "-";
+    return c.toLocaleString();
+  }
+</script>
+
+<div class="truncate text-right tabular-nums">
+  <span class:text-gray-500={formattedCount === "-"}>
+    {formattedCount}
+  </span>
+</div>
diff --git a/web-admin/src/features/projects/status/MaterializationCell.svelte b/web-admin/src/features/projects/status/MaterializationCell.svelte
new file mode 100644
index 00000000000..5f78627447b
--- /dev/null
+++ b/web-admin/src/features/projects/status/MaterializationCell.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+  import { Code2 } from "lucide-svelte";
+  import { Database } from "lucide-svelte";
+
+  export let isView: boolean | undefined;
+  export let physicalSizeBytes: string | number | undefined;
+
+  $: isLikelyView =
+    isView === true || physicalSizeBytes === "-1" || physicalSizeBytes === 0 || !physicalSizeBytes;
+
+  $: label = isLikelyView ? "View" : "Table";
+  $: icon = isLikelyView ? Code2 : Database;
+  $: color = isLikelyView ? "#0891B2" : "#059669"; // cyan for View, green for Table
+</script>
+
+<div class="shrink-0 flex items-center gap-x-1">
+  <span
+    class="shrink-0 flex items-center gap-x-1 text-[10px] font-medium px-1.5 py-0.5 rounded"
+    style="background-color: {color}15; color: {color}"
+  >
+    <svelte:component this={icon} size="12px" {color} />
+    {label}
+  </span>
+</div>
diff --git a/web-admin/src/features/projects/status/ProjectResources.svelte b/web-admin/src/features/projects/status/ProjectResources.svelte
index 0fd5c8ffdbb..37f653e71f0 100644
--- a/web-admin/src/features/projects/status/ProjectResources.svelte
+++ b/web-admin/src/features/projects/status/ProjectResources.svelte
@@ -3,6 +3,7 @@
   import {
     createRuntimeServiceCreateTrigger,
     getRuntimeServiceListResourcesQueryKey,
+    getConnectorServiceOLAPListTablesQueryKey,
   } from "@rilldata/web-common/runtime-client";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import { useQueryClient } from "@tanstack/svelte-query";
@@ -42,6 +43,19 @@
             undefined,
           ),
         });
+
+        // Invalidate table queries
+        void queryClient.invalidateQueries({
+          queryKey: getConnectorServiceOLAPListTablesQueryKey({
+            instanceId,
+            connector: "",
+          }),
+        });
+
+        // Invalidate table metadata
+        void queryClient.invalidateQueries({
+          queryKey: ["tableMetadata", instanceId],
+        });
       });
   }
 </script>
@@ -71,9 +85,6 @@
       data={$resources?.data?.resources}
       tableSizes={$tableSizes?.data ?? new Map()}
     />
-    {#if $tableSizes?.isLoading}
-      <div class="mt-2 text-xs text-gray-500">Loading model sizes...</div>
-    {/if}
   {/if}
 </section>
 
diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index 3af53269d24..da577aa045f 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -106,45 +106,6 @@
           name: getValue() as string,
         }),
     },
-    {
-      id: "size",
-      accessorFn: (row) => {
-        // Only for models
-        if (row.meta.name.kind !== ResourceKind.Model) return undefined;
-
-        const connector = row.model?.state?.resultConnector;
-        const tableName = row.model?.state?.resultTable;
-        if (!connector || !tableName) return undefined;
-
-        const key = `${connector}:${tableName}`;
-        return tableSizes.get(key);
-      },
-      header: "Size",
-      sortingFn: (rowA, rowB) => {
-        const sizeA = rowA.getValue("size") as string | number | undefined;
-        const sizeB = rowB.getValue("size") as string | number | undefined;
-
-        let numA = -1;
-        if (sizeA && sizeA !== "-1") {
-          numA = typeof sizeA === "number" ? sizeA : parseInt(sizeA, 10);
-        }
-
-        let numB = -1;
-        if (sizeB && sizeB !== "-1") {
-          numB = typeof sizeB === "number" ? sizeB : parseInt(sizeB, 10);
-        }
-
-        return numB - numA; // Descending
-      },
-      sortDescFirst: true,
-      cell: ({ getValue }) =>
-        flexRender(ModelSizeCell, {
-          sizeBytes: getValue() as string | number | undefined,
-        }),
-      meta: {
-        widthPercent: 0,
-      },
-    },
     {
       accessorFn: (row) => row.meta.reconcileStatus,
       header: "Status",
@@ -235,7 +196,7 @@
   <VirtualizedTable
     data={tableData}
     {columns}
-    columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 100px 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
+    columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
   />
 {/key}
 
diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
new file mode 100644
index 00000000000..cf081d988b3
--- /dev/null
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -0,0 +1,38 @@
+<script lang="ts">
+  import DelayedSpinner from "@rilldata/web-common/features/entity-management/DelayedSpinner.svelte";
+  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import ProjectTablesTable from "./ProjectTablesTable.svelte";
+  import { useTablesList, useTableMetadata } from "./selectors";
+
+  let tablesList: any;
+  let tableMetadata: any;
+
+  $: ({ instanceId } = $runtime);
+
+  $: tablesList = useTablesList(instanceId, "");
+  $: tableMetadata = useTableMetadata(instanceId, "", $tablesList.data?.tables);
+</script>
+
+<section class="flex flex-col gap-y-4 size-full">
+  <div class="flex items-center justify-between">
+    <h2 class="text-lg font-medium">Tables</h2>
+  </div>
+
+  {#if $tablesList.isLoading}
+    <DelayedSpinner isLoading={$tablesList.isLoading} size="16px" />
+  {:else if $tablesList.isError}
+    <div class="text-red-500">
+      Error loading tables: {$tablesList.error?.message}
+    </div>
+  {:else if $tablesList.data}
+    <ProjectTablesTable
+      tables={$tablesList?.data?.tables ?? []}
+      columnCounts={$tableMetadata?.data?.columnCounts ?? new Map()}
+      rowCounts={$tableMetadata?.data?.rowCounts ?? new Map()}
+      isView={$tableMetadata?.data?.isView ?? new Map()}
+    />
+    {#if $tableMetadata?.isLoading}
+      <div class="mt-2 text-xs text-gray-500">Loading table metadata...</div>
+    {/if}
+  {/if}
+</section>
diff --git a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
new file mode 100644
index 00000000000..eefc10fe6ca
--- /dev/null
+++ b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
@@ -0,0 +1,86 @@
+<script lang="ts">
+  import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
+  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { httpClient } from "@rilldata/web-common/runtime-client/http-client";
+
+  export let instanceId: string;
+  export let tables: V1OlapTableInfo[] = [];
+  export let rowCounts: Map<string, number | "loading" | "error"> = new Map();
+
+  // Track which tables we've already queried
+  let queriedTables = new Set<string>();
+
+  // Reset queriedTables when JWT changes (in case token was refreshed)
+  $: if (!$runtime?.jwt?.token) {
+    queriedTables.clear();
+  }
+
+  // Fetch row counts for all tables (only when JWT is ready)
+  $: if (instanceId && tables && tables.length > 0 && $runtime?.jwt?.token && $runtime.jwt.token !== "") {
+    for (const table of tables) {
+      const tableName = table.name;
+      if (!tableName || queriedTables.has(tableName)) continue;
+
+      queriedTables.add(tableName);
+      rowCounts.set(tableName, "loading");
+      rowCounts = rowCounts;
+
+      // Fetch row count directly with retry logic
+      const fetchCount = async () => {
+        let retryCount = 0;
+        const maxRetries = 3;
+
+        const attemptFetch = async (attempt: number) => {
+          try {
+            const waitTime = attempt === 0 ? 300 : 1500;
+            console.log(`[RowCount] Attempt ${attempt + 1}/${maxRetries + 1} for ${tableName}, waiting ${waitTime}ms`);
+            await new Promise(resolve => setTimeout(resolve, waitTime));
+
+            console.log(`[RowCount] Calling httpClient for ${tableName}...`);
+            const response_body = await httpClient({
+              url: `/v1/instances/${instanceId}/query`,
+              method: "POST",
+              headers: { "Content-Type": "application/json" },
+              data: {
+                sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
+              },
+            });
+
+            console.log(`[RowCount] Success for ${tableName}:`, response_body);
+
+            // Extract count from response
+            if (response_body?.data && Array.isArray(response_body.data) && response_body.data.length > 0) {
+              const firstRow = response_body.data[0] as any;
+              const count = parseInt(String(firstRow?.count ?? 0), 10);
+              console.log(`[RowCount] Extracted count for ${tableName}:`, count);
+              rowCounts.set(tableName, isNaN(count) ? "error" : count);
+            } else {
+              console.warn(`[RowCount] Invalid response structure for ${tableName}:`, response_body);
+              rowCounts.set(tableName, "error");
+            }
+            rowCounts = rowCounts;
+          } catch (error: any) {
+            const status = error?.response?.status || error?.status;
+            const message = error?.message || String(error);
+            console.error(`[RowCount] Attempt ${attempt + 1} failed for ${tableName} (status: ${status}):`, message);
+
+            if ((status === 401 || message.includes("401")) && attempt < maxRetries) {
+              console.log(`[RowCount] Got 401, retrying ${tableName}...`);
+              await attemptFetch(attempt + 1);
+            } else {
+              console.error(`[RowCount] Final error for ${tableName} after ${attempt + 1} attempts`);
+              rowCounts.set(tableName, "error");
+              rowCounts = rowCounts;
+            }
+          }
+        };
+
+        await attemptFetch(0);
+      };
+
+      void fetchCount();
+    }
+  }
+</script>
+
+<!-- This is a data-fetching component, it doesn't render anything -->
diff --git a/web-admin/src/features/projects/status/ProjectTablesTable.svelte b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
new file mode 100644
index 00000000000..5a404785637
--- /dev/null
+++ b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
@@ -0,0 +1,97 @@
+<script lang="ts">
+  import VirtualizedTable from "@rilldata/web-common/components/table/VirtualizedTable.svelte";
+  import { flexRender, type ColumnDef } from "@tanstack/svelte-table";
+  import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
+  import ModelSizeCell from "./ModelSizeCell.svelte";
+  import NameCell from "./NameCell.svelte";
+  import RowCountCell from "./RowCountCell.svelte";
+  import ColumnCountCell from "./ColumnCountCell.svelte";
+  import MaterializationCell from "./MaterializationCell.svelte";
+
+  export let tables: V1OlapTableInfo[] = [];
+  export let columnCounts: Map<string, number> = new Map();
+  export let rowCounts: Map<string, number | "loading" | "error"> = new Map();
+  export let isView: Map<string, boolean> = new Map();
+
+  const columns: ColumnDef<V1OlapTableInfo, any>[] = [
+    {
+      id: "materialization",
+      accessorFn: (row) => isView.get(row.name ?? ""),
+      header: "Type",
+      cell: ({ row, getValue }) =>
+        flexRender(MaterializationCell, {
+          isView: getValue() as boolean | undefined,
+          physicalSizeBytes: row.original.physicalSizeBytes,
+        }),
+    },
+    {
+      accessorFn: (row) => row.name,
+      header: "Name",
+      cell: ({ getValue }) =>
+        flexRender(NameCell, {
+          name: getValue() as string,
+        }),
+    },
+    {
+      id: "rowCount",
+      accessorFn: (row) => rowCounts.get(row.name ?? ""),
+      header: "Row Count",
+      sortingFn: (rowA, rowB) => {
+        const a = rowA.getValue("rowCount");
+        const b = rowB.getValue("rowCount");
+        if (typeof a === "number" && typeof b === "number") return b - a;
+        // "loading" and "error" go to bottom
+        return 0;
+      },
+      cell: ({ getValue }) =>
+        flexRender(RowCountCell, {
+          count: getValue() as number | "loading" | "error" | undefined,
+        }),
+    },
+    {
+      id: "columnCount",
+      accessorFn: (row) => columnCounts.get(row.name ?? ""),
+      header: "Column Count",
+      cell: ({ getValue }) =>
+        flexRender(ColumnCountCell, {
+          count: getValue() as number | undefined,
+        }),
+    },
+    {
+      id: "size",
+      accessorFn: (row) => row.physicalSizeBytes,
+      header: "Database Size",
+      sortDescFirst: true,
+      sortingFn: (rowA, rowB) => {
+        const sizeA = rowA.getValue("size") as string | number | undefined;
+        const sizeB = rowB.getValue("size") as string | number | undefined;
+
+        let numA = -1;
+        if (sizeA && sizeA !== "-1") {
+          numA = typeof sizeA === "number" ? sizeA : parseInt(sizeA, 10);
+        }
+
+        let numB = -1;
+        if (sizeB && sizeB !== "-1") {
+          numB = typeof sizeB === "number" ? sizeB : parseInt(sizeB, 10);
+        }
+
+        return numB - numA; // Descending
+      },
+      cell: ({ getValue }) =>
+        flexRender(ModelSizeCell, {
+          sizeBytes: getValue() as string | number | undefined,
+        }),
+    },
+  ];
+
+  $: tableData = tables;
+</script>
+
+{#key columnCounts && rowCounts}
+  <VirtualizedTable
+    data={tableData}
+    {columns}
+    columnLayout="minmax(60px, 0.5fr) minmax(150px, 3fr) minmax(100px, 1fr) minmax(100px, 1fr) minmax(100px, 1fr)"
+  />
+{/key}
diff --git a/web-admin/src/features/projects/status/RowCountCell.svelte b/web-admin/src/features/projects/status/RowCountCell.svelte
new file mode 100644
index 00000000000..85fbd8445c0
--- /dev/null
+++ b/web-admin/src/features/projects/status/RowCountCell.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+  export let count: number | "loading" | "error" | undefined;
+
+  $: formattedCount = formatCount(count);
+
+  function formatCount(c: typeof count): string {
+    if (c === undefined) return "-";
+    if (c === "loading") return "Loading...";
+    if (c === "error") return "Error";
+    if (typeof c === "number") return c.toLocaleString();
+    return "-";
+  }
+</script>
+
+<div class="truncate text-right tabular-nums">
+  <span
+    class:text-gray-500={formattedCount === "-"}
+    class:text-gray-400={formattedCount === "Loading..."}
+    class:text-red-500={formattedCount === "Error"}
+  >
+    {formattedCount}
+  </span>
+</div>
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 86a9c25a5e8..6f75eb3d58c 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -5,8 +5,11 @@ import {
 import {
   createRuntimeServiceListResources,
   createConnectorServiceOLAPListTables,
+  createConnectorServiceOLAPGetTable,
+  createQueryServiceQuery,
   type V1ListResourcesResponse,
   type V1Resource,
+  type V1OlapTableInfo,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
@@ -246,3 +249,140 @@ export function useModelTableSizes(
 
   return createCachedStore(cacheKey, instanceId, connectorArray);
 }
+
+export function useTablesList(instanceId: string, connector: string = "") {
+  return createConnectorServiceOLAPListTables(
+    {
+      instanceId,
+      connector,
+    },
+    {
+      query: {
+        enabled: !!instanceId,
+        refetchInterval: createSmartRefetchInterval,
+      },
+    },
+  );
+}
+
+export function useTableMetadata(
+  instanceId: string,
+  connector: string = "",
+  tables: V1OlapTableInfo[] | undefined,
+) {
+  // If no tables, return empty store immediately
+  if (!tables || tables.length === 0) {
+    return readable(
+      {
+        data: { columnCounts: new Map<string, number>(), rowCounts: new Map<string, number | "error">(), isView: new Map<string, boolean>() },
+        isLoading: false,
+        isError: false,
+      },
+      () => {},
+    );
+  }
+
+  return readable(
+    {
+      data: { columnCounts: new Map<string, number>(), rowCounts: new Map<string, number | "error">(), isView: new Map<string, boolean>() },
+      isLoading: true,
+      isError: false,
+    },
+    (set) => {
+      const columnCounts = new Map<string, number>();
+      const rowCounts = new Map<string, number | "error">();
+      const isView = new Map<string, boolean>();
+      const tableNames = (tables ?? []).map((t) => t.name).filter((n) => !!n) as string[];
+      const subscriptions: Array<() => void> = [];
+
+      let completedCount = 0;
+      const totalOperations = tableNames.length * 2; // Column + row count fetches
+
+      // Helper to update and notify
+      const updateAndNotify = () => {
+        const isLoading = completedCount < totalOperations;
+        set({
+          data: { columnCounts, rowCounts, isView },
+          isLoading,
+          isError: false,
+        });
+      };
+
+      // Fetch column counts and row counts for each table
+      for (const tableName of tableNames) {
+        // Fetch column count and view status
+        const columnQuery = createConnectorServiceOLAPGetTable(
+          {
+            instanceId,
+            connector,
+            table: tableName,
+          },
+          {
+            query: {
+              enabled: !!instanceId && !!tableName,
+            },
+          },
+        );
+
+        const columnUnsubscribe = columnQuery.subscribe((result) => {
+          if (result.data?.schema?.fields) {
+            columnCounts.set(tableName, result.data.schema.fields.length);
+          }
+          // Capture the view field from the response
+          if (result.data?.view !== undefined) {
+            isView.set(tableName, result.data.view);
+          }
+          completedCount++;
+          updateAndNotify();
+        });
+
+        subscriptions.push(columnUnsubscribe);
+
+        // Fetch row count using TanStack Query to manage JWT lifecycle
+        const rowCountQuery = createQueryServiceQuery(
+          {
+            instanceId,
+            queryServiceQueryBody: {
+              sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
+            },
+          },
+          undefined,
+          {
+            mutation: {
+              onSuccess: (response: any) => {
+                console.log(`[RowCount TQuery] Success for ${tableName}:`, response);
+                if (response?.data && Array.isArray(response.data) && response.data.length > 0) {
+                  const firstRow = response.data[0] as any;
+                  const count = parseInt(String(firstRow?.count ?? 0), 10);
+                  rowCounts.set(tableName, isNaN(count) ? "error" : count);
+                } else {
+                  rowCounts.set(tableName, "error");
+                }
+                completedCount++;
+                updateAndNotify();
+              },
+              onError: (error: any) => {
+                console.error(`[RowCount TQuery] Error for ${tableName}:`, error);
+                rowCounts.set(tableName, "error");
+                completedCount++;
+                updateAndNotify();
+              },
+            },
+          },
+        );
+
+        // Trigger the mutation
+        const rowCountUnsubscribe = rowCountQuery.subscribe(() => {
+          // This ensures the mutation lifecycle is active
+        });
+
+        subscriptions.push(rowCountUnsubscribe);
+      }
+
+      // Return cleanup function
+      return () => {
+        subscriptions.forEach((unsub) => unsub());
+      };
+    },
+  );
+}
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/status/+page.svelte
index ba2ab04ec94..98f89fbe63e 100644
--- a/web-admin/src/routes/[organization]/[project]/-/status/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/status/+page.svelte
@@ -5,6 +5,7 @@
   import ProjectGithubConnection from "@rilldata/web-admin/features/projects/github/ProjectGithubConnection.svelte";
   import ProjectParseErrors from "@rilldata/web-admin/features/projects/status/ProjectParseErrors.svelte";
   import ProjectResources from "@rilldata/web-admin/features/projects/status/ProjectResources.svelte";
+  import ProjectTables from "@rilldata/web-admin/features/projects/status/ProjectTables.svelte";
 
   $: organization = $page.params.organization;
   $: project = $page.params.project;
@@ -18,6 +19,7 @@
     </div>
 
     <ProjectResources />
+    <ProjectTables />
     <ProjectParseErrors />
   </div>
 </ContentContainer>

From c716dffb16303f78818f882ff76520d32cc9f02e Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:04:56 -0500
Subject: [PATCH 11/40] Fix row count fetching with proper mutation pattern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The row count fetching was failing with 401 errors because mutations weren't being triggered. Fixed by:
- Explicitly calling .mutate() on row count mutations instead of just subscribing
- Removing ProjectTablesRowCounts component with manual JWT waiting logic
- Leveraging TanStack Query's built-in JWT handling via httpClient interceptor
- Using mutation state subscription for proper success/error handling

The key insight: createQueryServiceQuery returns a mutation store that requires explicit .mutate() calls to execute—just subscribing to it does nothing.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../status/ProjectTablesRowCounts.svelte      | 86 -------------------
 .../src/features/projects/status/selectors.ts | 60 ++++++-------
 2 files changed, 24 insertions(+), 122 deletions(-)
 delete mode 100644 web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte

diff --git a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
deleted file mode 100644
index eefc10fe6ca..00000000000
--- a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
+++ /dev/null
@@ -1,86 +0,0 @@
-<script lang="ts">
-  import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { httpClient } from "@rilldata/web-common/runtime-client/http-client";
-
-  export let instanceId: string;
-  export let tables: V1OlapTableInfo[] = [];
-  export let rowCounts: Map<string, number | "loading" | "error"> = new Map();
-
-  // Track which tables we've already queried
-  let queriedTables = new Set<string>();
-
-  // Reset queriedTables when JWT changes (in case token was refreshed)
-  $: if (!$runtime?.jwt?.token) {
-    queriedTables.clear();
-  }
-
-  // Fetch row counts for all tables (only when JWT is ready)
-  $: if (instanceId && tables && tables.length > 0 && $runtime?.jwt?.token && $runtime.jwt.token !== "") {
-    for (const table of tables) {
-      const tableName = table.name;
-      if (!tableName || queriedTables.has(tableName)) continue;
-
-      queriedTables.add(tableName);
-      rowCounts.set(tableName, "loading");
-      rowCounts = rowCounts;
-
-      // Fetch row count directly with retry logic
-      const fetchCount = async () => {
-        let retryCount = 0;
-        const maxRetries = 3;
-
-        const attemptFetch = async (attempt: number) => {
-          try {
-            const waitTime = attempt === 0 ? 300 : 1500;
-            console.log(`[RowCount] Attempt ${attempt + 1}/${maxRetries + 1} for ${tableName}, waiting ${waitTime}ms`);
-            await new Promise(resolve => setTimeout(resolve, waitTime));
-
-            console.log(`[RowCount] Calling httpClient for ${tableName}...`);
-            const response_body = await httpClient({
-              url: `/v1/instances/${instanceId}/query`,
-              method: "POST",
-              headers: { "Content-Type": "application/json" },
-              data: {
-                sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
-              },
-            });
-
-            console.log(`[RowCount] Success for ${tableName}:`, response_body);
-
-            // Extract count from response
-            if (response_body?.data && Array.isArray(response_body.data) && response_body.data.length > 0) {
-              const firstRow = response_body.data[0] as any;
-              const count = parseInt(String(firstRow?.count ?? 0), 10);
-              console.log(`[RowCount] Extracted count for ${tableName}:`, count);
-              rowCounts.set(tableName, isNaN(count) ? "error" : count);
-            } else {
-              console.warn(`[RowCount] Invalid response structure for ${tableName}:`, response_body);
-              rowCounts.set(tableName, "error");
-            }
-            rowCounts = rowCounts;
-          } catch (error: any) {
-            const status = error?.response?.status || error?.status;
-            const message = error?.message || String(error);
-            console.error(`[RowCount] Attempt ${attempt + 1} failed for ${tableName} (status: ${status}):`, message);
-
-            if ((status === 401 || message.includes("401")) && attempt < maxRetries) {
-              console.log(`[RowCount] Got 401, retrying ${tableName}...`);
-              await attemptFetch(attempt + 1);
-            } else {
-              console.error(`[RowCount] Final error for ${tableName} after ${attempt + 1} attempts`);
-              rowCounts.set(tableName, "error");
-              rowCounts = rowCounts;
-            }
-          }
-        };
-
-        await attemptFetch(0);
-      };
-
-      void fetchCount();
-    }
-  }
-</script>
-
-<!-- This is a data-fetching component, it doesn't render anything -->
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 6f75eb3d58c..c807c0560bd 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -338,45 +338,33 @@ export function useTableMetadata(
 
         subscriptions.push(columnUnsubscribe);
 
-        // Fetch row count using TanStack Query to manage JWT lifecycle
-        const rowCountQuery = createQueryServiceQuery(
-          {
-            instanceId,
-            queryServiceQueryBody: {
-              sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
-            },
-          },
-          undefined,
-          {
-            mutation: {
-              onSuccess: (response: any) => {
-                console.log(`[RowCount TQuery] Success for ${tableName}:`, response);
-                if (response?.data && Array.isArray(response.data) && response.data.length > 0) {
-                  const firstRow = response.data[0] as any;
-                  const count = parseInt(String(firstRow?.count ?? 0), 10);
-                  rowCounts.set(tableName, isNaN(count) ? "error" : count);
-                } else {
-                  rowCounts.set(tableName, "error");
-                }
-                completedCount++;
-                updateAndNotify();
-              },
-              onError: (error: any) => {
-                console.error(`[RowCount TQuery] Error for ${tableName}:`, error);
-                rowCounts.set(tableName, "error");
-                completedCount++;
-                updateAndNotify();
-              },
-            },
-          },
-        );
+        // Fetch row count using TanStack Query mutation
+        const rowCountMutation = createQueryServiceQuery();
+
+        // Subscribe to mutation state changes
+        const mutationUnsub = rowCountMutation.subscribe((mutationState: any) => {
+          if (mutationState.isSuccess && mutationState.data?.data) {
+            const firstRow = mutationState.data.data[0] as any;
+            const count = parseInt(String(firstRow?.count ?? 0), 10);
+            rowCounts.set(tableName, isNaN(count) ? "error" : count);
+            completedCount++;
+            updateAndNotify();
+          } else if (mutationState.isError) {
+            rowCounts.set(tableName, "error");
+            completedCount++;
+            updateAndNotify();
+          }
+        });
 
-        // Trigger the mutation
-        const rowCountUnsubscribe = rowCountQuery.subscribe(() => {
-          // This ensures the mutation lifecycle is active
+        // CRITICAL: Trigger the mutation with .mutate()
+        rowCountMutation.mutate({
+          instanceId,
+          queryServiceQueryBody: {
+            sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
+          },
         });
 
-        subscriptions.push(rowCountUnsubscribe);
+        subscriptions.push(mutationUnsub);
       }
 
       // Return cleanup function

From c6d1128c052b9155e094034a183e7a12c8b6c5ab Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:08:23 -0500
Subject: [PATCH 12/40] Fix row count query API usage - pass parameters at
 creation time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

createQueryServiceQuery is a query creator, not a mutation creator. It needs:
1. Query parameters (instanceId, queryServiceQueryBody) as first argument
2. Query options with enabled: true as third argument
3. No .mutate() call - queries auto-execute when subscribed

The query store will automatically handle JWT auth through httpClient interceptor.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index c807c0560bd..03726688f4e 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -338,33 +338,38 @@ export function useTableMetadata(
 
         subscriptions.push(columnUnsubscribe);
 
-        // Fetch row count using TanStack Query mutation
-        const rowCountMutation = createQueryServiceQuery();
+        // Fetch row count using TanStack Query
+        const rowCountQuery = createQueryServiceQuery(
+          {
+            instanceId,
+            queryServiceQueryBody: {
+              sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
+            },
+          },
+          undefined,
+          {
+            query: {
+              enabled: true,
+            },
+          },
+        );
 
-        // Subscribe to mutation state changes
-        const mutationUnsub = rowCountMutation.subscribe((mutationState: any) => {
-          if (mutationState.isSuccess && mutationState.data?.data) {
-            const firstRow = mutationState.data.data[0] as any;
+        // Subscribe to query state changes
+        const queryUnsub = rowCountQuery.subscribe((state: any) => {
+          if (state.isSuccess && state.data?.data) {
+            const firstRow = state.data.data[0] as any;
             const count = parseInt(String(firstRow?.count ?? 0), 10);
             rowCounts.set(tableName, isNaN(count) ? "error" : count);
             completedCount++;
             updateAndNotify();
-          } else if (mutationState.isError) {
+          } else if (state.isError) {
             rowCounts.set(tableName, "error");
             completedCount++;
             updateAndNotify();
           }
         });
 
-        // CRITICAL: Trigger the mutation with .mutate()
-        rowCountMutation.mutate({
-          instanceId,
-          queryServiceQueryBody: {
-            sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
-          },
-        });
-
-        subscriptions.push(mutationUnsub);
+        subscriptions.push(queryUnsub);
       }
 
       // Return cleanup function

From 2b47cc94d2031b6648dae6ea1f8c816986968d7f Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:11:00 -0500
Subject: [PATCH 13/40] Add debug logging and fix row count query handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Simplified row count state checking to match column count pattern
- Added process flag to ensure counts only increment once
- Added console logging to diagnose query state issues
- Check for state.data?.data directly instead of state.isSuccess

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 03726688f4e..684d18b4740 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -355,17 +355,27 @@ export function useTableMetadata(
         );
 
         // Subscribe to query state changes
+        let rowCountProcessed = false;
         const queryUnsub = rowCountQuery.subscribe((state: any) => {
-          if (state.isSuccess && state.data?.data) {
-            const firstRow = state.data.data[0] as any;
-            const count = parseInt(String(firstRow?.count ?? 0), 10);
-            rowCounts.set(tableName, isNaN(count) ? "error" : count);
-            completedCount++;
-            updateAndNotify();
-          } else if (state.isError) {
-            rowCounts.set(tableName, "error");
-            completedCount++;
-            updateAndNotify();
+          console.log(`[RowCount] ${tableName}:`, state);
+
+          // Only process once to avoid double-counting
+          if (!rowCountProcessed) {
+            if (state.data?.data && Array.isArray(state.data.data)) {
+              const firstRow = state.data.data[0] as any;
+              const count = parseInt(String(firstRow?.count ?? 0), 10);
+              console.log(`[RowCount] ${tableName} success - count:`, count);
+              rowCounts.set(tableName, isNaN(count) ? "error" : count);
+              rowCountProcessed = true;
+              completedCount++;
+              updateAndNotify();
+            } else if (state.error) {
+              console.error(`[RowCount] ${tableName} error:`, state.error);
+              rowCounts.set(tableName, "error");
+              rowCountProcessed = true;
+              completedCount++;
+              updateAndNotify();
+            }
           }
         });
 

From 5f853efa04a7e00dcf4d3588838e87c2cbcb09fd Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:11:32 -0500
Subject: [PATCH 14/40] Expand row count query debugging to find response data
 structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Log all state properties: isLoading, isFetching, isSuccess, isError, data, error, failureReason
- Try multiple paths to find row data: direct array, nested .data, or .results
- Better error handling to catch failureReason

This will help identify where the actual row count data is stored in the query response.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 684d18b4740..a59c4f3b15f 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -357,20 +357,43 @@ export function useTableMetadata(
         // Subscribe to query state changes
         let rowCountProcessed = false;
         const queryUnsub = rowCountQuery.subscribe((state: any) => {
-          console.log(`[RowCount] ${tableName}:`, state);
+          console.log(`[RowCount] ${tableName} state:`, {
+            isLoading: state.isLoading,
+            isFetching: state.isFetching,
+            isSuccess: state.isSuccess,
+            isError: state.isError,
+            data: state.data,
+            error: state.error,
+            failureReason: state.failureReason
+          });
 
           // Only process once to avoid double-counting
           if (!rowCountProcessed) {
-            if (state.data?.data && Array.isArray(state.data.data)) {
-              const firstRow = state.data.data[0] as any;
-              const count = parseInt(String(firstRow?.count ?? 0), 10);
-              console.log(`[RowCount] ${tableName} success - count:`, count);
-              rowCounts.set(tableName, isNaN(count) ? "error" : count);
-              rowCountProcessed = true;
-              completedCount++;
-              updateAndNotify();
-            } else if (state.error) {
-              console.error(`[RowCount] ${tableName} error:`, state.error);
+            // Check if we have data in the response
+            if (state.data) {
+              console.log(`[RowCount] ${tableName} data structure:`, state.data);
+
+              // Try different paths to find the actual row data
+              let rows: any[] | undefined;
+              if (Array.isArray(state.data)) {
+                rows = state.data;
+              } else if (Array.isArray(state.data?.data)) {
+                rows = state.data.data;
+              } else if (Array.isArray(state.data?.results)) {
+                rows = state.data.results;
+              }
+
+              if (rows && rows.length > 0) {
+                const firstRow = rows[0] as any;
+                const count = parseInt(String(firstRow?.count ?? 0), 10);
+                console.log(`[RowCount] ${tableName} success - count:`, count);
+                rowCounts.set(tableName, isNaN(count) ? "error" : count);
+                rowCountProcessed = true;
+                completedCount++;
+                updateAndNotify();
+              }
+            } else if (state.failureReason || state.error) {
+              console.error(`[RowCount] ${tableName} error:`, state.failureReason || state.error);
               rowCounts.set(tableName, "error");
               rowCountProcessed = true;
               completedCount++;

From 734c7d58af4be9f8fac3b3a41b4e31726f941d58 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:13:00 -0500
Subject: [PATCH 15/40] Simplify row count fetching using direct
 queryServiceQuery function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace TanStack Query mutation wrapper with direct async httpClient function:
- queryServiceQuery(instanceId, queryBody) returns a Promise
- httpClient handles JWT auth automatically via interceptor
- Simpler async/await pattern instead of store subscriptions
- Removed complex state checking logic

This approach is cleaner and properly leverages the built-in auth interceptor.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 91 ++++++-------------
 1 file changed, 29 insertions(+), 62 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index a59c4f3b15f..74598aa3d8e 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -6,7 +6,7 @@ import {
   createRuntimeServiceListResources,
   createConnectorServiceOLAPListTables,
   createConnectorServiceOLAPGetTable,
-  createQueryServiceQuery,
+  queryServiceQuery,
   type V1ListResourcesResponse,
   type V1Resource,
   type V1OlapTableInfo,
@@ -338,71 +338,38 @@ export function useTableMetadata(
 
         subscriptions.push(columnUnsubscribe);
 
-        // Fetch row count using TanStack Query
-        const rowCountQuery = createQueryServiceQuery(
-          {
-            instanceId,
-            queryServiceQueryBody: {
-              sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
-            },
-          },
-          undefined,
-          {
-            query: {
-              enabled: true,
-            },
-          },
-        );
-
-        // Subscribe to query state changes
-        let rowCountProcessed = false;
-        const queryUnsub = rowCountQuery.subscribe((state: any) => {
-          console.log(`[RowCount] ${tableName} state:`, {
-            isLoading: state.isLoading,
-            isFetching: state.isFetching,
-            isSuccess: state.isSuccess,
-            isError: state.isError,
-            data: state.data,
-            error: state.error,
-            failureReason: state.failureReason
-          });
-
-          // Only process once to avoid double-counting
-          if (!rowCountProcessed) {
-            // Check if we have data in the response
-            if (state.data) {
-              console.log(`[RowCount] ${tableName} data structure:`, state.data);
-
-              // Try different paths to find the actual row data
-              let rows: any[] | undefined;
-              if (Array.isArray(state.data)) {
-                rows = state.data;
-              } else if (Array.isArray(state.data?.data)) {
-                rows = state.data.data;
-              } else if (Array.isArray(state.data?.results)) {
-                rows = state.data.results;
-              }
-
-              if (rows && rows.length > 0) {
-                const firstRow = rows[0] as any;
-                const count = parseInt(String(firstRow?.count ?? 0), 10);
-                console.log(`[RowCount] ${tableName} success - count:`, count);
-                rowCounts.set(tableName, isNaN(count) ? "error" : count);
-                rowCountProcessed = true;
-                completedCount++;
-                updateAndNotify();
-              }
-            } else if (state.failureReason || state.error) {
-              console.error(`[RowCount] ${tableName} error:`, state.failureReason || state.error);
+        // Fetch row count using direct httpClient function
+        // The httpClient automatically handles JWT auth
+        (async () => {
+          try {
+            console.log(`[RowCount] Fetching count for ${tableName}...`);
+            const response = await queryServiceQuery(
+              instanceId,
+              {
+                sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
+              },
+            );
+
+            console.log(`[RowCount] ${tableName} response:`, response);
+
+            // Extract count from response
+            if (response?.data && Array.isArray(response.data) && response.data.length > 0) {
+              const firstRow = response.data[0] as any;
+              const count = parseInt(String(firstRow?.count ?? 0), 10);
+              console.log(`[RowCount] ${tableName} success - count:`, count);
+              rowCounts.set(tableName, isNaN(count) ? "error" : count);
+            } else {
+              console.warn(`[RowCount] ${tableName} unexpected response structure:`, response);
               rowCounts.set(tableName, "error");
-              rowCountProcessed = true;
-              completedCount++;
-              updateAndNotify();
             }
+          } catch (error: any) {
+            console.error(`[RowCount] ${tableName} error:`, error);
+            rowCounts.set(tableName, "error");
           }
-        });
 
-        subscriptions.push(queryUnsub);
+          completedCount++;
+          updateAndNotify();
+        })();
       }
 
       // Return cleanup function

From 748cef38864ee586f0db42875f5d9913090178bb Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:13:56 -0500
Subject: [PATCH 16/40] Wait for JWT token availability before making row count
 queries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 401 errors were happening because queryServiceQuery was running before
the JWT token was available in the runtime store. Now we:
- Import runtime store and get function
- Wait for JWT token to be populated (up to 5 seconds)
- Only make the query once JWT is ready

This mirrors the pattern from ProjectTablesRowCounts.svelte but keeps
the async/await approach integrated in the selector.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 74598aa3d8e..2918d3a09f9 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -13,7 +13,8 @@ import {
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
-import { readable } from "svelte/store";
+import { readable, get } from "svelte/store";
+import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -339,9 +340,32 @@ export function useTableMetadata(
         subscriptions.push(columnUnsubscribe);
 
         // Fetch row count using direct httpClient function
-        // The httpClient automatically handles JWT auth
+        // Wait for JWT to be available before making the request
         (async () => {
           try {
+            // Wait for JWT token to be available (with timeout)
+            let jwtReady = false;
+            let waitAttempts = 0;
+            const maxWaitAttempts = 50; // ~5 seconds with 100ms intervals
+
+            while (!jwtReady && waitAttempts < maxWaitAttempts) {
+              const runtimeState = get(runtime);
+              if (runtimeState?.jwt?.token && runtimeState.jwt.token !== "") {
+                jwtReady = true;
+              } else {
+                await new Promise(resolve => setTimeout(resolve, 100));
+                waitAttempts++;
+              }
+            }
+
+            if (!jwtReady) {
+              console.warn(`[RowCount] ${tableName} JWT not available after timeout`);
+              rowCounts.set(tableName, "error");
+              completedCount++;
+              updateAndNotify();
+              return;
+            }
+
             console.log(`[RowCount] Fetching count for ${tableName}...`);
             const response = await queryServiceQuery(
               instanceId,

From 273de0b02c67ec09444755e877bc71eef2cc542f Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:15:55 -0500
Subject: [PATCH 17/40] Move row count fetching to component level for proper
 JWT handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 401 errors were happening because async row count fetching in the
store setup was racing with JWT initialization. Now:

1. Export fetchRowCount(instanceId, tableName) from selectors.ts
   - Uses httpClient which has built-in JWT waiting via maybeWaitForFreshJWT
   - Returns Promise<number | 'error'>

2. Create ProjectTablesRowCounts.svelte component
   - Uses Svelte reactive statements ($:) to wait for JWT
   - Only fetches when: JWT ready AND tables available
   - Tracks fetched tables to avoid duplicates

3. Update ProjectTables.svelte
   - Import and use ProjectTablesRowCounts component
   - Pass rowCounts from component to ProjectTablesTable
   - Component-level approach guarantees JWT is ready

This mirrors the original working pattern but uses httpClient
which has proper JWT sequencing built in.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../projects/status/ProjectTables.svelte      |  9 +-
 .../status/ProjectTablesRowCounts.svelte      | 32 ++++++
 .../src/features/projects/status/selectors.ts | 98 ++++++++-----------
 3 files changed, 79 insertions(+), 60 deletions(-)
 create mode 100644 web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte

diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index cf081d988b3..3245e8f1eb4 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -2,10 +2,12 @@
   import DelayedSpinner from "@rilldata/web-common/features/entity-management/DelayedSpinner.svelte";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import ProjectTablesTable from "./ProjectTablesTable.svelte";
+  import ProjectTablesRowCounts from "./ProjectTablesRowCounts.svelte";
   import { useTablesList, useTableMetadata } from "./selectors";
 
   let tablesList: any;
   let tableMetadata: any;
+  let rowCounts: Map<string, number | "loading" | "error"> = new Map();
 
   $: ({ instanceId } = $runtime);
 
@@ -25,10 +27,15 @@
       Error loading tables: {$tablesList.error?.message}
     </div>
   {:else if $tablesList.data}
+    <ProjectTablesRowCounts
+      {instanceId}
+      tables={$tablesList?.data?.tables ?? []}
+      bind:rowCounts
+    />
     <ProjectTablesTable
       tables={$tablesList?.data?.tables ?? []}
       columnCounts={$tableMetadata?.data?.columnCounts ?? new Map()}
-      rowCounts={$tableMetadata?.data?.rowCounts ?? new Map()}
+      {rowCounts}
       isView={$tableMetadata?.data?.isView ?? new Map()}
     />
     {#if $tableMetadata?.isLoading}
diff --git a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
new file mode 100644
index 00000000000..c85ae66985c
--- /dev/null
+++ b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+  import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
+  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { fetchRowCount } from "./selectors";
+
+  export let instanceId: string;
+  export let tables: V1OlapTableInfo[] = [];
+  export let rowCounts: Map<string, number | "loading" | "error"> = new Map();
+
+  // Track which tables we've already fetched
+  let fetchedTables = new Set<string>();
+
+  // Fetch row counts when JWT is ready and tables change
+  $: if (instanceId && tables.length > 0 && $runtime?.jwt?.token && $runtime.jwt.token !== "") {
+    for (const table of tables) {
+      const tableName = table.name;
+      if (!tableName || fetchedTables.has(tableName)) continue;
+
+      fetchedTables.add(tableName);
+      rowCounts.set(tableName, "loading");
+      rowCounts = rowCounts;
+
+      // Fetch row count
+      fetchRowCount(instanceId, tableName).then((count) => {
+        rowCounts.set(tableName, count);
+        rowCounts = rowCounts;
+      });
+    }
+  }
+</script>
+
+<!-- Data fetching component, renders nothing -->
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 2918d3a09f9..fb6e952a500 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -6,15 +6,14 @@ import {
   createRuntimeServiceListResources,
   createConnectorServiceOLAPListTables,
   createConnectorServiceOLAPGetTable,
-  queryServiceQuery,
   type V1ListResourcesResponse,
   type V1Resource,
   type V1OlapTableInfo,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
-import { readable, get } from "svelte/store";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { readable } from "svelte/store";
+import { httpClient } from "@rilldata/web-common/runtime-client/http-client";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -266,6 +265,38 @@ export function useTablesList(instanceId: string, connector: string = "") {
   );
 }
 
+export async function fetchRowCount(
+  instanceId: string,
+  tableName: string,
+): Promise<number | "error"> {
+  try {
+    console.log(`[RowCount] Fetching count for ${tableName}...`);
+    const response = await httpClient<{ data: any[] }>({
+      url: `/v1/instances/${instanceId}/query`,
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      data: {
+        sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
+      },
+    });
+
+    console.log(`[RowCount] ${tableName} response:`, response);
+
+    if (response?.data && Array.isArray(response.data) && response.data.length > 0) {
+      const firstRow = response.data[0] as any;
+      const count = parseInt(String(firstRow?.count ?? 0), 10);
+      console.log(`[RowCount] ${tableName} success - count:`, count);
+      return isNaN(count) ? "error" : count;
+    }
+
+    console.warn(`[RowCount] ${tableName} unexpected response structure:`, response);
+    return "error";
+  } catch (error: any) {
+    console.error(`[RowCount] ${tableName} error:`, error);
+    return "error";
+  }
+}
+
 export function useTableMetadata(
   instanceId: string,
   connector: string = "",
@@ -297,7 +328,7 @@ export function useTableMetadata(
       const subscriptions: Array<() => void> = [];
 
       let completedCount = 0;
-      const totalOperations = tableNames.length * 2; // Column + row count fetches
+      const totalOperations = tableNames.length; // Only column counts; row counts fetched at component level
 
       // Helper to update and notify
       const updateAndNotify = () => {
@@ -339,61 +370,10 @@ export function useTableMetadata(
 
         subscriptions.push(columnUnsubscribe);
 
-        // Fetch row count using direct httpClient function
-        // Wait for JWT to be available before making the request
-        (async () => {
-          try {
-            // Wait for JWT token to be available (with timeout)
-            let jwtReady = false;
-            let waitAttempts = 0;
-            const maxWaitAttempts = 50; // ~5 seconds with 100ms intervals
-
-            while (!jwtReady && waitAttempts < maxWaitAttempts) {
-              const runtimeState = get(runtime);
-              if (runtimeState?.jwt?.token && runtimeState.jwt.token !== "") {
-                jwtReady = true;
-              } else {
-                await new Promise(resolve => setTimeout(resolve, 100));
-                waitAttempts++;
-              }
-            }
-
-            if (!jwtReady) {
-              console.warn(`[RowCount] ${tableName} JWT not available after timeout`);
-              rowCounts.set(tableName, "error");
-              completedCount++;
-              updateAndNotify();
-              return;
-            }
-
-            console.log(`[RowCount] Fetching count for ${tableName}...`);
-            const response = await queryServiceQuery(
-              instanceId,
-              {
-                sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
-              },
-            );
-
-            console.log(`[RowCount] ${tableName} response:`, response);
-
-            // Extract count from response
-            if (response?.data && Array.isArray(response.data) && response.data.length > 0) {
-              const firstRow = response.data[0] as any;
-              const count = parseInt(String(firstRow?.count ?? 0), 10);
-              console.log(`[RowCount] ${tableName} success - count:`, count);
-              rowCounts.set(tableName, isNaN(count) ? "error" : count);
-            } else {
-              console.warn(`[RowCount] ${tableName} unexpected response structure:`, response);
-              rowCounts.set(tableName, "error");
-            }
-          } catch (error: any) {
-            console.error(`[RowCount] ${tableName} error:`, error);
-            rowCounts.set(tableName, "error");
-          }
-
-          completedCount++;
-          updateAndNotify();
-        })();
+        // Initialize row count as not yet fetched
+        // Row counts will be fetched separately at the component level where JWT is guaranteed ready
+        completedCount++;
+        updateAndNotify();
       }
 
       // Return cleanup function

From 37c71cadcd1220005d15db06d3f16caa459a5e8f Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:16:44 -0500
Subject: [PATCH 18/40] Use direct fetch with manual JWT header for row count
 queries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of relying on httpClient's JWT handling, manually:
- Get runtime store to access JWT token and host
- Build full URL with host from runtime state
- Add Authorization header with Bearer token directly
- Add detailed logging for debugging 401 errors

This eliminates any abstraction layers and makes JWT handling explicit.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index fb6e952a500..d96227141e6 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -12,8 +12,8 @@ import {
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
-import { readable } from "svelte/store";
-import { httpClient } from "@rilldata/web-common/runtime-client/http-client";
+import { readable, get } from "svelte/store";
+import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -271,25 +271,53 @@ export async function fetchRowCount(
 ): Promise<number | "error"> {
   try {
     console.log(`[RowCount] Fetching count for ${tableName}...`);
-    const response = await httpClient<{ data: any[] }>({
-      url: `/v1/instances/${instanceId}/query`,
+
+    // Get runtime state to access JWT and host
+    const runtimeState = get(runtime);
+    const host = runtimeState?.host || "";
+    const jwt = runtimeState?.jwt?.token;
+
+    if (!jwt) {
+      console.error(`[RowCount] ${tableName} JWT token not available`);
+      return "error";
+    }
+
+    const url = `${host}/v1/instances/${instanceId}/query`;
+    console.log(`[RowCount] ${tableName} requesting:`, url);
+
+    const response = await fetch(url, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
-      data: {
-        sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${jwt}`,
       },
+      body: JSON.stringify({
+        sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
+      }),
     });
 
-    console.log(`[RowCount] ${tableName} response:`, response);
+    console.log(`[RowCount] ${tableName} status:`, response.status);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      console.error(
+        `[RowCount] ${tableName} HTTP error ${response.status}:`,
+        errorText,
+      );
+      return "error";
+    }
+
+    const data = await response.json();
+    console.log(`[RowCount] ${tableName} response:`, data);
 
-    if (response?.data && Array.isArray(response.data) && response.data.length > 0) {
-      const firstRow = response.data[0] as any;
+    if (data?.data && Array.isArray(data.data) && data.data.length > 0) {
+      const firstRow = data.data[0] as any;
       const count = parseInt(String(firstRow?.count ?? 0), 10);
       console.log(`[RowCount] ${tableName} success - count:`, count);
       return isNaN(count) ? "error" : count;
     }
 
-    console.warn(`[RowCount] ${tableName} unexpected response structure:`, response);
+    console.warn(`[RowCount] ${tableName} unexpected response structure:`, data);
     return "error";
   } catch (error: any) {
     console.error(`[RowCount] ${tableName} error:`, error);

From be7b25526eab23f7306d836d6d922e708ff6624b Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:17:33 -0500
Subject: [PATCH 19/40] Switch row count fetching to use httpClient with JWT
 interceptor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Manual JWT handling was causing 401 errors because the JWT in the store
wasn't being properly validated or refreshed. Using httpClient instead
leverages the built-in maybeWaitForFreshJWT interceptor which:
- Waits for fresh JWT when needed
- Handles token refresh automatically
- Properly validates tokens with the backend

This eliminates manual JWT token management.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 .../src/features/projects/status/selectors.ts | 41 ++++---------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index d96227141e6..9900d611244 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -12,8 +12,8 @@ import {
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
-import { readable, get } from "svelte/store";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { readable } from "svelte/store";
+import { httpClient } from "@rilldata/web-common/runtime-client/http-client";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -272,42 +272,15 @@ export async function fetchRowCount(
   try {
     console.log(`[RowCount] Fetching count for ${tableName}...`);
 
-    // Get runtime state to access JWT and host
-    const runtimeState = get(runtime);
-    const host = runtimeState?.host || "";
-    const jwt = runtimeState?.jwt?.token;
-
-    if (!jwt) {
-      console.error(`[RowCount] ${tableName} JWT token not available`);
-      return "error";
-    }
-
-    const url = `${host}/v1/instances/${instanceId}/query`;
-    console.log(`[RowCount] ${tableName} requesting:`, url);
-
-    const response = await fetch(url, {
+    const data = await httpClient<{ data: any[] }>({
+      url: `/v1/instances/${instanceId}/query`,
       method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${jwt}`,
-      },
-      body: JSON.stringify({
+      headers: { "Content-Type": "application/json" },
+      data: {
         sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
-      }),
+      },
     });
 
-    console.log(`[RowCount] ${tableName} status:`, response.status);
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      console.error(
-        `[RowCount] ${tableName} HTTP error ${response.status}:`,
-        errorText,
-      );
-      return "error";
-    }
-
-    const data = await response.json();
     console.log(`[RowCount] ${tableName} response:`, data);
 
     if (data?.data && Array.isArray(data.data) && data.data.length > 0) {

From bbea399e1b473c44f6fca7a693202b9a0f2ca98a Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:40:23 -0500
Subject: [PATCH 20/40] removed RowCount issue with JWT, and Query select *

---
 .../status/ProjectTablesRowCounts.svelte      | 23 +------------
 .../src/features/projects/status/selectors.ts | 32 -------------------
 2 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
index c85ae66985c..963de6b17fb 100644
--- a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
+++ b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
@@ -1,32 +1,11 @@
 <script lang="ts">
   import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { fetchRowCount } from "./selectors";
 
   export let instanceId: string;
   export let tables: V1OlapTableInfo[] = [];
   export let rowCounts: Map<string, number | "loading" | "error"> = new Map();
 
-  // Track which tables we've already fetched
-  let fetchedTables = new Set<string>();
-
-  // Fetch row counts when JWT is ready and tables change
-  $: if (instanceId && tables.length > 0 && $runtime?.jwt?.token && $runtime.jwt.token !== "") {
-    for (const table of tables) {
-      const tableName = table.name;
-      if (!tableName || fetchedTables.has(tableName)) continue;
-
-      fetchedTables.add(tableName);
-      rowCounts.set(tableName, "loading");
-      rowCounts = rowCounts;
-
-      // Fetch row count
-      fetchRowCount(instanceId, tableName).then((count) => {
-        rowCounts.set(tableName, count);
-        rowCounts = rowCounts;
-      });
-    }
-  }
+  // Row count fetching logic removed temporarily
 </script>
 
 <!-- Data fetching component, renders nothing -->
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 9900d611244..81ee096af61 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -265,38 +265,6 @@ export function useTablesList(instanceId: string, connector: string = "") {
   );
 }
 
-export async function fetchRowCount(
-  instanceId: string,
-  tableName: string,
-): Promise<number | "error"> {
-  try {
-    console.log(`[RowCount] Fetching count for ${tableName}...`);
-
-    const data = await httpClient<{ data: any[] }>({
-      url: `/v1/instances/${instanceId}/query`,
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      data: {
-        sql: `SELECT COUNT(*) as count FROM "${tableName}"`,
-      },
-    });
-
-    console.log(`[RowCount] ${tableName} response:`, data);
-
-    if (data?.data && Array.isArray(data.data) && data.data.length > 0) {
-      const firstRow = data.data[0] as any;
-      const count = parseInt(String(firstRow?.count ?? 0), 10);
-      console.log(`[RowCount] ${tableName} success - count:`, count);
-      return isNaN(count) ? "error" : count;
-    }
-
-    console.warn(`[RowCount] ${tableName} unexpected response structure:`, data);
-    return "error";
-  } catch (error: any) {
-    console.error(`[RowCount] ${tableName} error:`, error);
-    return "error";
-  }
-}
 
 export function useTableMetadata(
   instanceId: string,

From 86e1c0439d9f1121af8c8d2103b3341171310ce1 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:43:18 -0500
Subject: [PATCH 21/40] e23

---
 web-admin/tests/project-status-tables.spec.ts | 144 ++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 web-admin/tests/project-status-tables.spec.ts

diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
new file mode 100644
index 00000000000..e16abaa3b76
--- /dev/null
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -0,0 +1,144 @@
+import { expect } from "@playwright/test";
+import { test } from "./setup/base";
+
+test.describe("Project Status - Tables", () => {
+  test("should display tables with their metadata values", async ({
+    adminPage,
+  }) => {
+    // Navigate to the Status page of the openrtb project
+    await adminPage.goto("/e2e/openrtb");
+
+    // Click on Status link
+    const statusLink = adminPage.getByRole("link", { name: "Status" });
+    await expect(statusLink).toBeVisible();
+    await statusLink.click();
+
+    // Wait for the Tables heading to be visible
+    const tablesHeading = adminPage.getByRole("heading", { name: "Tables" });
+    await expect(tablesHeading).toBeVisible();
+
+    // Verify the table structure with column headers
+    const headers = adminPage.locator("thead th");
+    await expect(headers.nth(0)).toContainText("Type");
+    await expect(headers.nth(1)).toContainText("Name");
+    await expect(headers.nth(2)).toContainText("Row Count");
+    await expect(headers.nth(3)).toContainText("Column Count");
+    await expect(headers.nth(4)).toContainText("Database Size");
+
+    // Verify table rows are rendered
+    const tableBody = adminPage.locator("tbody tr");
+    const rowCount = await tableBody.count();
+    expect(rowCount).toBeGreaterThan(0);
+
+    // Verify specific table data if auction_data_model exists
+    // Look for any row with auction_data_model
+    const tableNameCells = adminPage.locator("tbody tr td:nth-child(2)");
+    const tableNames = await tableNameCells.allTextContents();
+
+    if (tableNames.some((name) => name.includes("auction_data_model"))) {
+      // Find the row containing auction_data_model
+      const auctionRow = adminPage.locator(
+        'tbody tr:has(td:has-text("auction_data_model"))'
+      );
+      await expect(auctionRow).toBeVisible();
+
+      // Verify that the row has visible values in all columns
+      const cells = auctionRow.locator("td");
+      const cellCount = await cells.count();
+      expect(cellCount).toBeGreaterThanOrEqual(5); // At least 5 columns
+
+      // Get the text content of each cell
+      const cellTexts = await cells.allTextContents();
+      console.log("auction_data_model row cells:", cellTexts);
+
+      // Verify Type column (should show "Table" or icon)
+      await expect(cells.nth(0)).toBeVisible();
+
+      // Verify Name column
+      await expect(cells.nth(1)).toContainText("auction_data_model");
+
+      // Verify Row Count column has some value (number or loading state)
+      const rowCountCell = cells.nth(2);
+      await expect(rowCountCell).toBeVisible();
+
+      // Verify Column Count column has some value
+      const columnCountCell = cells.nth(3);
+      await expect(columnCountCell).toBeVisible();
+
+      // Verify Database Size column has some value
+      const sizeCell = cells.nth(4);
+      await expect(sizeCell).toBeVisible();
+    }
+
+    // Verify other common tables exist
+    const expectedTables = [
+      "annotations_auction",
+      "auction_data_raw",
+      "bids_data_model",
+    ];
+
+    for (const tableName of expectedTables) {
+      const row = adminPage.locator(`tbody tr:has(td:has-text("${tableName}"))`);
+      // These tables might not exist in all environments, so we don't assert they exist
+      // but if they do, we verify their structure
+      const isVisible = await row.isVisible().catch(() => false);
+      if (isVisible) {
+        const cells = row.locator("td");
+        expect(await cells.count()).toBeGreaterThanOrEqual(5);
+      }
+    }
+
+    // Verify that the table is interactive (has scrollable content if needed)
+    const table = adminPage.locator("table").first();
+    await expect(table).toBeVisible();
+  });
+
+  test("should handle empty table list gracefully", async ({ adminPage }) => {
+    // This test verifies the UI renders correctly for a project
+    // Navigate to Status page
+    await adminPage.goto("/e2e/openrtb");
+    await adminPage.getByRole("link", { name: "Status" }).click();
+
+    // Wait for the page to load
+    await expect(
+      adminPage.getByRole("heading", { name: "Tables" })
+    ).toBeVisible();
+
+    // If no tables, it should show the table container (possibly with no data message)
+    // or with the table headers visible
+    const tableSection = adminPage.locator("section").first();
+    await expect(tableSection).toBeVisible();
+  });
+
+  test("should display row count values in the Row Count column", async ({
+    adminPage,
+  }) => {
+    await adminPage.goto("/e2e/openrtb");
+    await adminPage.getByRole("link", { name: "Status" }).click();
+
+    // Wait for tables heading
+    await expect(
+      adminPage.getByRole("heading", { name: "Tables" })
+    ).toBeVisible();
+
+    // Get the Row Count column (3rd data column, index 2)
+    const rowCountCells = adminPage.locator("tbody tr td:nth-child(3)");
+    const cellCount = await rowCountCells.count();
+
+    if (cellCount > 0) {
+      // Get all row count values
+      const rowCounts = await rowCountCells.allTextContents();
+      console.log("Row counts found:", rowCounts);
+
+      // Verify that we have numeric values or loading/error states
+      for (const count of rowCounts) {
+        const trimmedCount = count.trim();
+        // Should be a number, or "loading", "error", or "-"
+        expect(
+          /^\d+$|^loading$|^error$|^-$/.test(trimmedCount) ||
+            trimmedCount === ""
+        ).toBeTruthy();
+      }
+    }
+  });
+});

From ad7a94e90d6f21ee6f2c7bbe641a4fbfed67b6c5 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:45:38 -0500
Subject: [PATCH 22/40] prettier

---
 .../projects/status/MaterializationCell.svelte  |  5 ++++-
 .../src/features/projects/status/selectors.ts   | 17 +++++++++++++----
 web-admin/tests/project-status-tables.spec.ts   | 12 +++++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/web-admin/src/features/projects/status/MaterializationCell.svelte b/web-admin/src/features/projects/status/MaterializationCell.svelte
index 5f78627447b..885e3005269 100644
--- a/web-admin/src/features/projects/status/MaterializationCell.svelte
+++ b/web-admin/src/features/projects/status/MaterializationCell.svelte
@@ -6,7 +6,10 @@
   export let physicalSizeBytes: string | number | undefined;
 
   $: isLikelyView =
-    isView === true || physicalSizeBytes === "-1" || physicalSizeBytes === 0 || !physicalSizeBytes;
+    isView === true ||
+    physicalSizeBytes === "-1" ||
+    physicalSizeBytes === 0 ||
+    !physicalSizeBytes;
 
   $: label = isLikelyView ? "View" : "Table";
   $: icon = isLikelyView ? Code2 : Database;
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 81ee096af61..fbb1ffc913e 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -265,7 +265,6 @@ export function useTablesList(instanceId: string, connector: string = "") {
   );
 }
 
-
 export function useTableMetadata(
   instanceId: string,
   connector: string = "",
@@ -275,7 +274,11 @@ export function useTableMetadata(
   if (!tables || tables.length === 0) {
     return readable(
       {
-        data: { columnCounts: new Map<string, number>(), rowCounts: new Map<string, number | "error">(), isView: new Map<string, boolean>() },
+        data: {
+          columnCounts: new Map<string, number>(),
+          rowCounts: new Map<string, number | "error">(),
+          isView: new Map<string, boolean>(),
+        },
         isLoading: false,
         isError: false,
       },
@@ -285,7 +288,11 @@ export function useTableMetadata(
 
   return readable(
     {
-      data: { columnCounts: new Map<string, number>(), rowCounts: new Map<string, number | "error">(), isView: new Map<string, boolean>() },
+      data: {
+        columnCounts: new Map<string, number>(),
+        rowCounts: new Map<string, number | "error">(),
+        isView: new Map<string, boolean>(),
+      },
       isLoading: true,
       isError: false,
     },
@@ -293,7 +300,9 @@ export function useTableMetadata(
       const columnCounts = new Map<string, number>();
       const rowCounts = new Map<string, number | "error">();
       const isView = new Map<string, boolean>();
-      const tableNames = (tables ?? []).map((t) => t.name).filter((n) => !!n) as string[];
+      const tableNames = (tables ?? [])
+        .map((t) => t.name)
+        .filter((n) => !!n) as string[];
       const subscriptions: Array<() => void> = [];
 
       let completedCount = 0;
diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index e16abaa3b76..66798a490ea 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -38,7 +38,7 @@ test.describe("Project Status - Tables", () => {
     if (tableNames.some((name) => name.includes("auction_data_model"))) {
       // Find the row containing auction_data_model
       const auctionRow = adminPage.locator(
-        'tbody tr:has(td:has-text("auction_data_model"))'
+        'tbody tr:has(td:has-text("auction_data_model"))',
       );
       await expect(auctionRow).toBeVisible();
 
@@ -78,7 +78,9 @@ test.describe("Project Status - Tables", () => {
     ];
 
     for (const tableName of expectedTables) {
-      const row = adminPage.locator(`tbody tr:has(td:has-text("${tableName}"))`);
+      const row = adminPage.locator(
+        `tbody tr:has(td:has-text("${tableName}"))`,
+      );
       // These tables might not exist in all environments, so we don't assert they exist
       // but if they do, we verify their structure
       const isVisible = await row.isVisible().catch(() => false);
@@ -101,7 +103,7 @@ test.describe("Project Status - Tables", () => {
 
     // Wait for the page to load
     await expect(
-      adminPage.getByRole("heading", { name: "Tables" })
+      adminPage.getByRole("heading", { name: "Tables" }),
     ).toBeVisible();
 
     // If no tables, it should show the table container (possibly with no data message)
@@ -118,7 +120,7 @@ test.describe("Project Status - Tables", () => {
 
     // Wait for tables heading
     await expect(
-      adminPage.getByRole("heading", { name: "Tables" })
+      adminPage.getByRole("heading", { name: "Tables" }),
     ).toBeVisible();
 
     // Get the Row Count column (3rd data column, index 2)
@@ -136,7 +138,7 @@ test.describe("Project Status - Tables", () => {
         // Should be a number, or "loading", "error", or "-"
         expect(
           /^\d+$|^loading$|^error$|^-$/.test(trimmedCount) ||
-            trimmedCount === ""
+            trimmedCount === "",
         ).toBeTruthy();
       }
     }

From 327d3da9bb5d69625421df06d7d0151392e3d70d Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:53:16 -0500
Subject: [PATCH 23/40] code qual + prettier

---
 .../projects/status/ProjectResourcesTable.svelte      |  1 -
 .../projects/status/ProjectTablesRowCounts.svelte     | 11 +++++++++++
 web-admin/src/features/projects/status/selectors.ts   |  2 --
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index da577aa045f..55c330ea40f 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -13,7 +13,6 @@
   import type { ColumnDef } from "@tanstack/svelte-table";
   import { flexRender } from "@tanstack/svelte-table";
   import ActionsCell from "./ActionsCell.svelte";
-  import ModelSizeCell from "./ModelSizeCell.svelte";
   import NameCell from "./NameCell.svelte";
   import RefreshCell from "./RefreshCell.svelte";
   import RefreshResourceConfirmDialog from "./RefreshResourceConfirmDialog.svelte";
diff --git a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
index 963de6b17fb..c756b30d0ef 100644
--- a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
+++ b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
@@ -1,11 +1,22 @@
 <script lang="ts">
   import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
 
+  /**
+   * Props are used by parent component via two-way binding.
+   * Suppress unused-export-let warnings as these are intentionally for external reference.
+   */
+  // @ts-ignore unused-export-let
   export let instanceId: string;
+  // @ts-ignore unused-export-let
   export let tables: V1OlapTableInfo[] = [];
+  // @ts-ignore unused-export-let
   export let rowCounts: Map<string, number | "loading" | "error"> = new Map();
 
   // Row count fetching logic removed temporarily
+  // These variables are captured in closure for later when fetching is re-enabled
+  void instanceId;
+  void tables;
+  void rowCounts;
 </script>
 
 <!-- Data fetching component, renders nothing -->
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index fbb1ffc913e..7e26c36a585 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -13,7 +13,6 @@ import {
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
 import { readable } from "svelte/store";
-import { httpClient } from "@rilldata/web-common/runtime-client/http-client";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -259,7 +258,6 @@ export function useTablesList(instanceId: string, connector: string = "") {
     {
       query: {
         enabled: !!instanceId,
-        refetchInterval: createSmartRefetchInterval,
       },
     },
   );

From 641e182a9bed95b60945d10ee8b0fd6b8487baa8 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 14 Jan 2026 09:03:54 -0500
Subject: [PATCH 24/40] updated e2e

---
 web-admin/tests/project-status-tables.spec.ts | 135 ++++++++----------
 1 file changed, 59 insertions(+), 76 deletions(-)

diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index 66798a490ea..f8743a05e69 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -5,7 +5,7 @@ test.describe("Project Status - Tables", () => {
   test("should display tables with their metadata values", async ({
     adminPage,
   }) => {
-    // Navigate to the Status page of the openrtb project
+    // Navigate to the project page
     await adminPage.goto("/e2e/openrtb");
 
     // Click on Status link
@@ -17,33 +17,36 @@ test.describe("Project Status - Tables", () => {
     const tablesHeading = adminPage.getByRole("heading", { name: "Tables" });
     await expect(tablesHeading).toBeVisible();
 
-    // Verify the table structure with column headers
-    const headers = adminPage.locator("thead th");
+    // Verify the table structure with column headers (VirtualizedTable uses role="columnheader")
+    const headers = adminPage.locator('[role="columnheader"]');
     await expect(headers.nth(0)).toContainText("Type");
     await expect(headers.nth(1)).toContainText("Name");
     await expect(headers.nth(2)).toContainText("Row Count");
     await expect(headers.nth(3)).toContainText("Column Count");
     await expect(headers.nth(4)).toContainText("Database Size");
 
-    // Verify table rows are rendered
-    const tableBody = adminPage.locator("tbody tr");
-    const rowCount = await tableBody.count();
+    // Verify table rows are rendered (VirtualizedTable uses .row divs, skip the header row)
+    const tableContainer = adminPage
+      .locator("section")
+      .filter({ hasText: "Tables" })
+      .first();
+    const dataRows = tableContainer.locator(".row").filter({
+      hasNot: adminPage.locator('[role="columnheader"]'),
+    });
+    const rowCount = await dataRows.count();
     expect(rowCount).toBeGreaterThan(0);
 
     // Verify specific table data if auction_data_model exists
-    // Look for any row with auction_data_model
-    const tableNameCells = adminPage.locator("tbody tr td:nth-child(2)");
-    const tableNames = await tableNameCells.allTextContents();
-
-    if (tableNames.some((name) => name.includes("auction_data_model"))) {
-      // Find the row containing auction_data_model
-      const auctionRow = adminPage.locator(
-        'tbody tr:has(td:has-text("auction_data_model"))',
-      );
+    const auctionRow = tableContainer.locator(".row", {
+      hasText: "auction_data_model",
+    });
+    const auctionRowExists = await auctionRow.isVisible().catch(() => false);
+
+    if (auctionRowExists) {
       await expect(auctionRow).toBeVisible();
 
-      // Verify that the row has visible values in all columns
-      const cells = auctionRow.locator("td");
+      // Verify that the row has visible content
+      const cells = auctionRow.locator("> div");
       const cellCount = await cells.count();
       expect(cellCount).toBeGreaterThanOrEqual(5); // At least 5 columns
 
@@ -51,53 +54,17 @@ test.describe("Project Status - Tables", () => {
       const cellTexts = await cells.allTextContents();
       console.log("auction_data_model row cells:", cellTexts);
 
-      // Verify Type column (should show "Table" or icon)
-      await expect(cells.nth(0)).toBeVisible();
-
-      // Verify Name column
-      await expect(cells.nth(1)).toContainText("auction_data_model");
-
-      // Verify Row Count column has some value (number or loading state)
-      const rowCountCell = cells.nth(2);
-      await expect(rowCountCell).toBeVisible();
-
-      // Verify Column Count column has some value
-      const columnCountCell = cells.nth(3);
-      await expect(columnCountCell).toBeVisible();
-
-      // Verify Database Size column has some value
-      const sizeCell = cells.nth(4);
-      await expect(sizeCell).toBeVisible();
-    }
-
-    // Verify other common tables exist
-    const expectedTables = [
-      "annotations_auction",
-      "auction_data_raw",
-      "bids_data_model",
-    ];
-
-    for (const tableName of expectedTables) {
-      const row = adminPage.locator(
-        `tbody tr:has(td:has-text("${tableName}"))`,
-      );
-      // These tables might not exist in all environments, so we don't assert they exist
-      // but if they do, we verify their structure
-      const isVisible = await row.isVisible().catch(() => false);
-      if (isVisible) {
-        const cells = row.locator("td");
-        expect(await cells.count()).toBeGreaterThanOrEqual(5);
-      }
+      // Verify Name column contains auction_data_model
+      await expect(auctionRow).toContainText("auction_data_model");
     }
 
-    // Verify that the table is interactive (has scrollable content if needed)
-    const table = adminPage.locator("table").first();
-    await expect(table).toBeVisible();
+    // Verify the table container is visible
+    await expect(tableContainer).toBeVisible();
   });
 
   test("should handle empty table list gracefully", async ({ adminPage }) => {
     // This test verifies the UI renders correctly for a project
-    // Navigate to Status page
+    // Navigate to project page and click Status link
     await adminPage.goto("/e2e/openrtb");
     await adminPage.getByRole("link", { name: "Status" }).click();
 
@@ -108,13 +75,17 @@ test.describe("Project Status - Tables", () => {
 
     // If no tables, it should show the table container (possibly with no data message)
     // or with the table headers visible
-    const tableSection = adminPage.locator("section").first();
+    const tableSection = adminPage
+      .locator("section")
+      .filter({ hasText: "Tables" })
+      .first();
     await expect(tableSection).toBeVisible();
   });
 
   test("should display row count values in the Row Count column", async ({
     adminPage,
   }) => {
+    // Navigate to project page and click Status link
     await adminPage.goto("/e2e/openrtb");
     await adminPage.getByRole("link", { name: "Status" }).click();
 
@@ -123,23 +94,35 @@ test.describe("Project Status - Tables", () => {
       adminPage.getByRole("heading", { name: "Tables" }),
     ).toBeVisible();
 
-    // Get the Row Count column (3rd data column, index 2)
-    const rowCountCells = adminPage.locator("tbody tr td:nth-child(3)");
-    const cellCount = await rowCountCells.count();
-
-    if (cellCount > 0) {
-      // Get all row count values
-      const rowCounts = await rowCountCells.allTextContents();
-      console.log("Row counts found:", rowCounts);
-
-      // Verify that we have numeric values or loading/error states
-      for (const count of rowCounts) {
-        const trimmedCount = count.trim();
-        // Should be a number, or "loading", "error", or "-"
-        expect(
-          /^\d+$|^loading$|^error$|^-$/.test(trimmedCount) ||
-            trimmedCount === "",
-        ).toBeTruthy();
+    // Get the Tables section
+    const tableContainer = adminPage
+      .locator("section")
+      .filter({ hasText: "Tables" })
+      .first();
+
+    // Get data rows (skip header row which has role="columnheader")
+    const dataRows = tableContainer.locator(".row").filter({
+      hasNot: adminPage.locator('[role="columnheader"]'),
+    });
+    const rowCount = await dataRows.count();
+
+    if (rowCount > 0) {
+      // For each row, get the 3rd column (Row Count, index 2)
+      for (let i = 0; i < Math.min(rowCount, 5); i++) {
+        const row = dataRows.nth(i);
+        const rowCountCell = row.locator("> div").nth(2);
+        const cellText = await rowCountCell.textContent();
+        console.log(`Row ${i} count:`, cellText?.trim());
+
+        // Should be a number, formatted number, or loading/error states
+        if (cellText) {
+          const trimmedCount = cellText.trim();
+          // Should be a number (possibly with commas), or "loading", "error", or "-"
+          expect(
+            /^[\d,]+$|^loading$|^error$|^-$/.test(trimmedCount) ||
+              trimmedCount === "",
+          ).toBeTruthy();
+        }
       }
     }
   });

From 2e049203015f10d4622229ffefa04d50820cc3ac Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 14 Jan 2026 09:31:36 -0500
Subject: [PATCH 25/40] no row count for now

---
 web-admin/tests/project-status-tables.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index f8743a05e69..b1074120004 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -21,7 +21,7 @@ test.describe("Project Status - Tables", () => {
     const headers = adminPage.locator('[role="columnheader"]');
     await expect(headers.nth(0)).toContainText("Type");
     await expect(headers.nth(1)).toContainText("Name");
-    await expect(headers.nth(2)).toContainText("Row Count");
+    // await expect(headers.nth(2)).toContainText("Row Count");
     await expect(headers.nth(3)).toContainText("Column Count");
     await expect(headers.nth(4)).toContainText("Database Size");
 

From 29a8d40f1f582d0a2e2b3d01a5a7e4158a4303db Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 14 Jan 2026 10:26:56 -0500
Subject: [PATCH 26/40] not sure if best practice but for e2e to locate

---
 .../projects/status/ProjectTablesTable.svelte |  1 +
 web-admin/tests/project-status-tables.spec.ts | 25 ++++++++-----------
 .../components/table/VirtualizedTable.svelte  |  2 ++
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectTablesTable.svelte b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
index 5a404785637..83d1caf3360 100644
--- a/web-admin/src/features/projects/status/ProjectTablesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
@@ -90,6 +90,7 @@
 
 {#key columnCounts && rowCounts}
   <VirtualizedTable
+    tableId="project-tables-table"
     data={tableData}
     {columns}
     columnLayout="minmax(60px, 0.5fr) minmax(150px, 3fr) minmax(100px, 1fr) minmax(100px, 1fr) minmax(100px, 1fr)"
diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index b1074120004..66a7aeec78a 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -18,7 +18,9 @@ test.describe("Project Status - Tables", () => {
     await expect(tablesHeading).toBeVisible();
 
     // Verify the table structure with column headers (VirtualizedTable uses role="columnheader")
-    const headers = adminPage.locator('[role="columnheader"]');
+    // Use the #project-tables-table id to scope to the correct table
+    const tablesTable = adminPage.locator("#project-tables-table");
+    const headers = tablesTable.locator('[role="columnheader"]');
     await expect(headers.nth(0)).toContainText("Type");
     await expect(headers.nth(1)).toContainText("Name");
     // await expect(headers.nth(2)).toContainText("Row Count");
@@ -26,18 +28,14 @@ test.describe("Project Status - Tables", () => {
     await expect(headers.nth(4)).toContainText("Database Size");
 
     // Verify table rows are rendered (VirtualizedTable uses .row divs, skip the header row)
-    const tableContainer = adminPage
-      .locator("section")
-      .filter({ hasText: "Tables" })
-      .first();
-    const dataRows = tableContainer.locator(".row").filter({
+    const dataRows = tablesTable.locator(".row").filter({
       hasNot: adminPage.locator('[role="columnheader"]'),
     });
     const rowCount = await dataRows.count();
     expect(rowCount).toBeGreaterThan(0);
 
     // Verify specific table data if auction_data_model exists
-    const auctionRow = tableContainer.locator(".row", {
+    const auctionRow = tablesTable.locator(".row", {
       hasText: "auction_data_model",
     });
     const auctionRowExists = await auctionRow.isVisible().catch(() => false);
@@ -58,8 +56,8 @@ test.describe("Project Status - Tables", () => {
       await expect(auctionRow).toContainText("auction_data_model");
     }
 
-    // Verify the table container is visible
-    await expect(tableContainer).toBeVisible();
+    // Verify the table is visible
+    await expect(tablesTable).toBeVisible();
   });
 
   test("should handle empty table list gracefully", async ({ adminPage }) => {
@@ -94,14 +92,11 @@ test.describe("Project Status - Tables", () => {
       adminPage.getByRole("heading", { name: "Tables" }),
     ).toBeVisible();
 
-    // Get the Tables section
-    const tableContainer = adminPage
-      .locator("section")
-      .filter({ hasText: "Tables" })
-      .first();
+    // Get the Tables table by id
+    const tablesTable = adminPage.locator("#project-tables-table");
 
     // Get data rows (skip header row which has role="columnheader")
-    const dataRows = tableContainer.locator(".row").filter({
+    const dataRows = tablesTable.locator(".row").filter({
       hasNot: adminPage.locator('[role="columnheader"]'),
     });
     const rowCount = await dataRows.count();
diff --git a/web-common/src/components/table/VirtualizedTable.svelte b/web-common/src/components/table/VirtualizedTable.svelte
index 11a8cdf0d4e..d55c3c3d4e4 100644
--- a/web-common/src/components/table/VirtualizedTable.svelte
+++ b/web-common/src/components/table/VirtualizedTable.svelte
@@ -24,6 +24,7 @@
   export let rowHeight = 46;
   export let containerHeight = 400;
   export let overscan = 1;
+  export let tableId: string | undefined = undefined;
 
   let containerElement: HTMLDivElement;
   let sorting: SortingState = [];
@@ -108,6 +109,7 @@
 </script>
 
 <div
+  id={tableId}
   class="flex flex-col border rounded-sm overflow-hidden"
   style:--grid-template-columns={columnLayout}
 >

From 98d16431bcd6edf0db3e15bc2cd34589082823d3 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Fri, 16 Jan 2026 09:17:25 -0500
Subject: [PATCH 27/40] remove row_count, col_count

---
 .../projects/status/ColumnCountCell.svelte    |  16 --
 .../projects/status/ProjectResources.svelte   |   9 +-
 .../status/ProjectResourcesTable.svelte       |  13 +-
 .../projects/status/ProjectTables.svelte      |  29 ++-
 .../status/ProjectTablesRowCounts.svelte      |  22 --
 .../projects/status/ProjectTablesTable.svelte |  33 +--
 .../projects/status/RowCountCell.svelte       |  23 --
 .../src/features/projects/status/selectors.ts | 224 +-----------------
 web-admin/tests/project-status-tables.spec.ts |  48 +---
 9 files changed, 33 insertions(+), 384 deletions(-)
 delete mode 100644 web-admin/src/features/projects/status/ColumnCountCell.svelte
 delete mode 100644 web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
 delete mode 100644 web-admin/src/features/projects/status/RowCountCell.svelte

diff --git a/web-admin/src/features/projects/status/ColumnCountCell.svelte b/web-admin/src/features/projects/status/ColumnCountCell.svelte
deleted file mode 100644
index 29826e3d153..00000000000
--- a/web-admin/src/features/projects/status/ColumnCountCell.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-<script lang="ts">
-  export let count: number | undefined;
-
-  $: formattedCount = formatCount(count);
-
-  function formatCount(c: number | undefined): string {
-    if (c === undefined) return "-";
-    return c.toLocaleString();
-  }
-</script>
-
-<div class="truncate text-right tabular-nums">
-  <span class:text-gray-500={formattedCount === "-"}>
-    {formattedCount}
-  </span>
-</div>
diff --git a/web-admin/src/features/projects/status/ProjectResources.svelte b/web-admin/src/features/projects/status/ProjectResources.svelte
index 37f653e71f0..9488ada69dc 100644
--- a/web-admin/src/features/projects/status/ProjectResources.svelte
+++ b/web-admin/src/features/projects/status/ProjectResources.svelte
@@ -10,19 +10,17 @@
   import Button from "web-common/src/components/button/Button.svelte";
   import ProjectResourcesTable from "./ProjectResourcesTable.svelte";
   import RefreshAllSourcesAndModelsConfirmDialog from "./RefreshAllSourcesAndModelsConfirmDialog.svelte";
-  import { useResources, useModelTableSizes } from "./selectors";
+  import { useResources } from "./selectors";
   import { isResourceReconciling } from "@rilldata/web-admin/lib/refetch-interval-store";
 
   const queryClient = useQueryClient();
   const createTrigger = createRuntimeServiceCreateTrigger();
 
   let isConfirmDialogOpen = false;
-  let tableSizes: any;
 
   $: ({ instanceId } = $runtime);
 
   $: resources = useResources(instanceId);
-  $: tableSizes = useModelTableSizes(instanceId, $resources.data?.resources);
 
   $: hasReconcilingResources = $resources.data?.resources?.some(
     isResourceReconciling,
@@ -81,10 +79,7 @@
       Error loading resources: {$resources.error?.message}
     </div>
   {:else if $resources.data}
-    <ProjectResourcesTable
-      data={$resources?.data?.resources}
-      tableSizes={$tableSizes?.data ?? new Map()}
-    />
+    <ProjectResourcesTable data={$resources?.data?.resources} />
   {/if}
 </section>
 
diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index 55c330ea40f..76a38eb73de 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -19,7 +19,6 @@
   import ResourceErrorMessage from "./ResourceErrorMessage.svelte";
 
   export let data: V1Resource[];
-  export let tableSizes: Map<string, string | number> = new Map();
 
   let isConfirmDialogOpen = false;
   let dialogResourceName = "";
@@ -191,13 +190,11 @@
   );
 </script>
 
-{#key tableSizes}
-  <VirtualizedTable
-    data={tableData}
-    {columns}
-    columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
-  />
-{/key}
+<VirtualizedTable
+  data={tableData}
+  {columns}
+  columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
+/>
 
 <RefreshResourceConfirmDialog
   bind:open={isConfirmDialogOpen}
diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index 3245e8f1eb4..dc7557342b6 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -2,17 +2,22 @@
   import DelayedSpinner from "@rilldata/web-common/features/entity-management/DelayedSpinner.svelte";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import ProjectTablesTable from "./ProjectTablesTable.svelte";
-  import ProjectTablesRowCounts from "./ProjectTablesRowCounts.svelte";
   import { useTablesList, useTableMetadata } from "./selectors";
 
   let tablesList: any;
   let tableMetadata: any;
-  let rowCounts: Map<string, number | "loading" | "error"> = new Map();
 
   $: ({ instanceId } = $runtime);
 
   $: tablesList = useTablesList(instanceId, "");
-  $: tableMetadata = useTableMetadata(instanceId, "", $tablesList.data?.tables);
+
+  // Filter out temporary tables (e.g., __rill_tmp_ prefixed tables)
+  $: filteredTables =
+    $tablesList.data?.tables?.filter(
+      (t: { name?: string }) => t.name && !t.name.startsWith("__rill_tmp_"),
+    ) ?? [];
+
+  $: tableMetadata = useTableMetadata(instanceId, "", filteredTables);
 </script>
 
 <section class="flex flex-col gap-y-4 size-full">
@@ -21,25 +26,23 @@
   </div>
 
   {#if $tablesList.isLoading}
-    <DelayedSpinner isLoading={$tablesList.isLoading} size="16px" />
+    <div class="flex items-center gap-x-2 text-gray-500">
+      <DelayedSpinner isLoading={true} size="16px" />
+      <span class="text-sm">Loading tables...</span>
+    </div>
   {:else if $tablesList.isError}
     <div class="text-red-500">
       Error loading tables: {$tablesList.error?.message}
     </div>
-  {:else if $tablesList.data}
-    <ProjectTablesRowCounts
-      {instanceId}
-      tables={$tablesList?.data?.tables ?? []}
-      bind:rowCounts
-    />
+  {:else if filteredTables.length > 0}
     <ProjectTablesTable
-      tables={$tablesList?.data?.tables ?? []}
-      columnCounts={$tableMetadata?.data?.columnCounts ?? new Map()}
-      {rowCounts}
+      tables={filteredTables}
       isView={$tableMetadata?.data?.isView ?? new Map()}
     />
     {#if $tableMetadata?.isLoading}
       <div class="mt-2 text-xs text-gray-500">Loading table metadata...</div>
     {/if}
+  {:else}
+    <div class="text-gray-500 text-sm">No tables found</div>
   {/if}
 </section>
diff --git a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte b/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
deleted file mode 100644
index c756b30d0ef..00000000000
--- a/web-admin/src/features/projects/status/ProjectTablesRowCounts.svelte
+++ /dev/null
@@ -1,22 +0,0 @@
-<script lang="ts">
-  import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
-
-  /**
-   * Props are used by parent component via two-way binding.
-   * Suppress unused-export-let warnings as these are intentionally for external reference.
-   */
-  // @ts-ignore unused-export-let
-  export let instanceId: string;
-  // @ts-ignore unused-export-let
-  export let tables: V1OlapTableInfo[] = [];
-  // @ts-ignore unused-export-let
-  export let rowCounts: Map<string, number | "loading" | "error"> = new Map();
-
-  // Row count fetching logic removed temporarily
-  // These variables are captured in closure for later when fetching is re-enabled
-  void instanceId;
-  void tables;
-  void rowCounts;
-</script>
-
-<!-- Data fetching component, renders nothing -->
diff --git a/web-admin/src/features/projects/status/ProjectTablesTable.svelte b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
index 83d1caf3360..9571ab6113e 100644
--- a/web-admin/src/features/projects/status/ProjectTablesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
@@ -4,13 +4,9 @@
   import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
   import ModelSizeCell from "./ModelSizeCell.svelte";
   import NameCell from "./NameCell.svelte";
-  import RowCountCell from "./RowCountCell.svelte";
-  import ColumnCountCell from "./ColumnCountCell.svelte";
   import MaterializationCell from "./MaterializationCell.svelte";
 
   export let tables: V1OlapTableInfo[] = [];
-  export let columnCounts: Map<string, number> = new Map();
-  export let rowCounts: Map<string, number | "loading" | "error"> = new Map();
   export let isView: Map<string, boolean> = new Map();
 
   const columns: ColumnDef<V1OlapTableInfo, any>[] = [
@@ -32,31 +28,6 @@
           name: getValue() as string,
         }),
     },
-    {
-      id: "rowCount",
-      accessorFn: (row) => rowCounts.get(row.name ?? ""),
-      header: "Row Count",
-      sortingFn: (rowA, rowB) => {
-        const a = rowA.getValue("rowCount");
-        const b = rowB.getValue("rowCount");
-        if (typeof a === "number" && typeof b === "number") return b - a;
-        // "loading" and "error" go to bottom
-        return 0;
-      },
-      cell: ({ getValue }) =>
-        flexRender(RowCountCell, {
-          count: getValue() as number | "loading" | "error" | undefined,
-        }),
-    },
-    {
-      id: "columnCount",
-      accessorFn: (row) => columnCounts.get(row.name ?? ""),
-      header: "Column Count",
-      cell: ({ getValue }) =>
-        flexRender(ColumnCountCell, {
-          count: getValue() as number | undefined,
-        }),
-    },
     {
       id: "size",
       accessorFn: (row) => row.physicalSizeBytes,
@@ -88,11 +59,11 @@
   $: tableData = tables;
 </script>
 
-{#key columnCounts && rowCounts}
+{#key isView}
   <VirtualizedTable
     tableId="project-tables-table"
     data={tableData}
     {columns}
-    columnLayout="minmax(60px, 0.5fr) minmax(150px, 3fr) minmax(100px, 1fr) minmax(100px, 1fr) minmax(100px, 1fr)"
+    columnLayout="minmax(60px, 0.5fr) minmax(150px, 3fr) minmax(100px, 1fr)"
   />
 {/key}
diff --git a/web-admin/src/features/projects/status/RowCountCell.svelte b/web-admin/src/features/projects/status/RowCountCell.svelte
deleted file mode 100644
index 85fbd8445c0..00000000000
--- a/web-admin/src/features/projects/status/RowCountCell.svelte
+++ /dev/null
@@ -1,23 +0,0 @@
-<script lang="ts">
-  export let count: number | "loading" | "error" | undefined;
-
-  $: formattedCount = formatCount(count);
-
-  function formatCount(c: typeof count): string {
-    if (c === undefined) return "-";
-    if (c === "loading") return "Loading...";
-    if (c === "error") return "Error";
-    if (typeof c === "number") return c.toLocaleString();
-    return "-";
-  }
-</script>
-
-<div class="truncate text-right tabular-nums">
-  <span
-    class:text-gray-500={formattedCount === "-"}
-    class:text-gray-400={formattedCount === "Loading..."}
-    class:text-red-500={formattedCount === "Error"}
-  >
-    {formattedCount}
-  </span>
-</div>
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 7e26c36a585..0b82f3465c0 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -7,7 +7,6 @@ import {
   createConnectorServiceOLAPListTables,
   createConnectorServiceOLAPGetTable,
   type V1ListResourcesResponse,
-  type V1Resource,
   type V1OlapTableInfo,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
@@ -53,202 +52,6 @@ export function useResources(instanceId: string) {
   );
 }
 
-// Cache stores by instanceId and connector array to prevent recreating them
-const modelSizesStoreCache = new Map<
-  string,
-  { store: any; unsubscribe: () => void }
->();
-
-// Keep preloaded query subscriptions alive so they don't get cancelled
-const preloadedQuerySubscriptions = new Map<string, Set<() => void>>();
-
-// Preload queries to ensure they start immediately and keep them alive
-function preloadConnectorQueries(instanceId: string, connectorArray: string[]) {
-  const preloadKey = `${instanceId}:${connectorArray.join(",")}`;
-
-  // Only preload once per connector set
-  if (preloadedQuerySubscriptions.has(preloadKey)) {
-    return;
-  }
-
-  const subscriptions = new Set<() => void>();
-
-  for (const connector of connectorArray) {
-    const query = createConnectorServiceOLAPListTables(
-      {
-        instanceId,
-        connector,
-      },
-      {
-        query: {
-          enabled: true,
-        },
-      },
-    );
-
-    // Eagerly subscribe to keep the query alive
-    const unsubscribe = query.subscribe(() => {});
-    subscriptions.add(unsubscribe);
-  }
-
-  preloadedQuerySubscriptions.set(preloadKey, subscriptions);
-}
-
-function createCachedStore(
-  cacheKey: string,
-  instanceId: string,
-  connectorArray: string[],
-) {
-  // Check if we already have a cached store
-  if (modelSizesStoreCache.has(cacheKey)) {
-    return modelSizesStoreCache.get(cacheKey)!.store;
-  }
-
-  // Preload queries immediately so they start running before store subscribers attach
-  preloadConnectorQueries(instanceId, connectorArray);
-
-  // If no connectors, return an empty readable store
-  if (connectorArray.length === 0) {
-    const emptyStore = readable(
-      {
-        data: new Map<string, string | number>(),
-        isLoading: false,
-        isError: false,
-      },
-      () => {},
-    );
-    modelSizesStoreCache.set(cacheKey, {
-      store: emptyStore,
-      unsubscribe: () => {},
-    });
-    return emptyStore;
-  }
-
-  // Create a new store with pagination support
-  const store = readable(
-    {
-      data: new Map<string, string | number>(),
-      isLoading: true,
-      isError: false,
-    },
-    (set) => {
-      const connectorTables = new Map<string, Array<any>>();
-      const connectorLoading = new Map<string, boolean>();
-      const connectorError = new Map<string, boolean>();
-      const subscriptions = new Set<() => void>();
-
-      const updateAndNotify = () => {
-        const sizeMap = new Map<string, string | number>();
-        let isLoading = false;
-        let isError = false;
-
-        for (const connector of connectorArray) {
-          if (connectorLoading.get(connector)) isLoading = true;
-          if (connectorError.get(connector)) isError = true;
-
-          for (const table of connectorTables.get(connector) || []) {
-            if (
-              table.name &&
-              table.physicalSizeBytes !== undefined &&
-              table.physicalSizeBytes !== null
-            ) {
-              const key = `${connector}:${table.name}`;
-              sizeMap.set(key, table.physicalSizeBytes as string | number);
-            }
-          }
-        }
-
-        set({ data: sizeMap, isLoading, isError });
-      };
-
-      const fetchPage = (connector: string, pageToken?: string) => {
-        const query = createConnectorServiceOLAPListTables(
-          {
-            instanceId,
-            connector,
-            ...(pageToken && { pageToken }),
-          } as any,
-          {
-            query: {
-              enabled: true,
-            },
-          },
-        );
-
-        const unsubscribe = query.subscribe((result: any) => {
-          connectorLoading.set(connector, result.isLoading);
-          connectorError.set(connector, result.isError);
-
-          if (result.data?.tables) {
-            const existing = connectorTables.get(connector) || [];
-            connectorTables.set(connector, [
-              ...existing,
-              ...result.data.tables,
-            ]);
-          }
-
-          // If query completed and has more pages, fetch the next page
-          if (!result.isLoading && result.data?.nextPageToken) {
-            unsubscribe();
-            subscriptions.delete(unsubscribe);
-            fetchPage(connector, result.data.nextPageToken);
-          }
-
-          updateAndNotify();
-        });
-
-        subscriptions.add(unsubscribe);
-      };
-
-      // Start fetching for all connectors
-      for (const connector of connectorArray) {
-        connectorLoading.set(connector, true);
-        connectorError.set(connector, false);
-        connectorTables.set(connector, []);
-        fetchPage(connector);
-      }
-
-      return () => {
-        for (const unsub of subscriptions) {
-          unsub();
-        }
-      };
-    },
-  );
-
-  // Eagerly subscribe to keep queries alive across component re-renders
-  const unsubscribe = store.subscribe(() => {});
-  modelSizesStoreCache.set(cacheKey, { store, unsubscribe });
-
-  return store;
-}
-
-export function useModelTableSizes(
-  instanceId: string,
-  resources: V1Resource[] | undefined,
-) {
-  // Extract unique connectors from model resources
-  const uniqueConnectors = new Set<string>();
-
-  if (resources) {
-    for (const resource of resources) {
-      if (resource?.meta?.name?.kind === ResourceKind.Model) {
-        const connector = resource.model?.state?.resultConnector;
-        const table = resource.model?.state?.resultTable;
-
-        if (connector && table) {
-          uniqueConnectors.add(connector);
-        }
-      }
-    }
-  }
-
-  const connectorArray = Array.from(uniqueConnectors).sort();
-  const cacheKey = `${instanceId}:${connectorArray.join(",")}`;
-
-  return createCachedStore(cacheKey, instanceId, connectorArray);
-}
-
 export function useTablesList(instanceId: string, connector: string = "") {
   return createConnectorServiceOLAPListTables(
     {
@@ -273,8 +76,6 @@ export function useTableMetadata(
     return readable(
       {
         data: {
-          columnCounts: new Map<string, number>(),
-          rowCounts: new Map<string, number | "error">(),
           isView: new Map<string, boolean>(),
         },
         isLoading: false,
@@ -287,16 +88,12 @@ export function useTableMetadata(
   return readable(
     {
       data: {
-        columnCounts: new Map<string, number>(),
-        rowCounts: new Map<string, number | "error">(),
         isView: new Map<string, boolean>(),
       },
       isLoading: true,
       isError: false,
     },
     (set) => {
-      const columnCounts = new Map<string, number>();
-      const rowCounts = new Map<string, number | "error">();
       const isView = new Map<string, boolean>();
       const tableNames = (tables ?? [])
         .map((t) => t.name)
@@ -304,22 +101,21 @@ export function useTableMetadata(
       const subscriptions: Array<() => void> = [];
 
       let completedCount = 0;
-      const totalOperations = tableNames.length; // Only column counts; row counts fetched at component level
+      const totalOperations = tableNames.length;
 
       // Helper to update and notify
       const updateAndNotify = () => {
         const isLoading = completedCount < totalOperations;
         set({
-          data: { columnCounts, rowCounts, isView },
+          data: { isView },
           isLoading,
           isError: false,
         });
       };
 
-      // Fetch column counts and row counts for each table
+      // Fetch view status for each table
       for (const tableName of tableNames) {
-        // Fetch column count and view status
-        const columnQuery = createConnectorServiceOLAPGetTable(
+        const tableQuery = createConnectorServiceOLAPGetTable(
           {
             instanceId,
             connector,
@@ -332,10 +128,7 @@ export function useTableMetadata(
           },
         );
 
-        const columnUnsubscribe = columnQuery.subscribe((result) => {
-          if (result.data?.schema?.fields) {
-            columnCounts.set(tableName, result.data.schema.fields.length);
-          }
+        const unsubscribe = tableQuery.subscribe((result) => {
           // Capture the view field from the response
           if (result.data?.view !== undefined) {
             isView.set(tableName, result.data.view);
@@ -344,12 +137,7 @@ export function useTableMetadata(
           updateAndNotify();
         });
 
-        subscriptions.push(columnUnsubscribe);
-
-        // Initialize row count as not yet fetched
-        // Row counts will be fetched separately at the component level where JWT is guaranteed ready
-        completedCount++;
-        updateAndNotify();
+        subscriptions.push(unsubscribe);
       }
 
       // Return cleanup function
diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index 66a7aeec78a..b4ac8cc7154 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -23,9 +23,7 @@ test.describe("Project Status - Tables", () => {
     const headers = tablesTable.locator('[role="columnheader"]');
     await expect(headers.nth(0)).toContainText("Type");
     await expect(headers.nth(1)).toContainText("Name");
-    // await expect(headers.nth(2)).toContainText("Row Count");
-    await expect(headers.nth(3)).toContainText("Column Count");
-    await expect(headers.nth(4)).toContainText("Database Size");
+    await expect(headers.nth(2)).toContainText("Database Size");
 
     // Verify table rows are rendered (VirtualizedTable uses .row divs, skip the header row)
     const dataRows = tablesTable.locator(".row").filter({
@@ -46,7 +44,7 @@ test.describe("Project Status - Tables", () => {
       // Verify that the row has visible content
       const cells = auctionRow.locator("> div");
       const cellCount = await cells.count();
-      expect(cellCount).toBeGreaterThanOrEqual(5); // At least 5 columns
+      expect(cellCount).toBeGreaterThanOrEqual(3); // At least 3 columns
 
       // Get the text content of each cell
       const cellTexts = await cells.allTextContents();
@@ -79,46 +77,4 @@ test.describe("Project Status - Tables", () => {
       .first();
     await expect(tableSection).toBeVisible();
   });
-
-  test("should display row count values in the Row Count column", async ({
-    adminPage,
-  }) => {
-    // Navigate to project page and click Status link
-    await adminPage.goto("/e2e/openrtb");
-    await adminPage.getByRole("link", { name: "Status" }).click();
-
-    // Wait for tables heading
-    await expect(
-      adminPage.getByRole("heading", { name: "Tables" }),
-    ).toBeVisible();
-
-    // Get the Tables table by id
-    const tablesTable = adminPage.locator("#project-tables-table");
-
-    // Get data rows (skip header row which has role="columnheader")
-    const dataRows = tablesTable.locator(".row").filter({
-      hasNot: adminPage.locator('[role="columnheader"]'),
-    });
-    const rowCount = await dataRows.count();
-
-    if (rowCount > 0) {
-      // For each row, get the 3rd column (Row Count, index 2)
-      for (let i = 0; i < Math.min(rowCount, 5); i++) {
-        const row = dataRows.nth(i);
-        const rowCountCell = row.locator("> div").nth(2);
-        const cellText = await rowCountCell.textContent();
-        console.log(`Row ${i} count:`, cellText?.trim());
-
-        // Should be a number, formatted number, or loading/error states
-        if (cellText) {
-          const trimmedCount = cellText.trim();
-          // Should be a number (possibly with commas), or "loading", "error", or "-"
-          expect(
-            /^[\d,]+$|^loading$|^error$|^-$/.test(trimmedCount) ||
-              trimmedCount === "",
-          ).toBeTruthy();
-        }
-      }
-    }
-  });
 });

From 5b374ca69e23d934504765601cb0ea281baf78fe Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 20 Jan 2026 11:23:23 -0500
Subject: [PATCH 28/40] As Reviewed

---
 package-lock.json                             | 209 +++++++++---------
 .../status/MaterializationCell.svelte         |  10 +-
 .../projects/status/ProjectTables.svelte      |  10 +-
 .../src/features/projects/status/selectors.ts |  26 ++-
 4 files changed, 139 insertions(+), 116 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c6bf46f453e..cd52e958176 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -63,7 +63,6 @@
       "integrity": "sha512-HbjwKeC+pHUFBfLMNzuSjqFE/58+rLVKmOU3lxQrpsxLBOGosYco/Q0GduBb0/jEMRiyEqjNT/01rRdOMWq5pw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@docusaurus/babel": "3.9.2",
         "@docusaurus/bundler": "3.9.2",
@@ -131,7 +130,6 @@
       "version": "3.1.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/mdx": "^2.0.0"
       },
@@ -271,7 +269,6 @@
       "version": "1.88.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -498,7 +495,6 @@
       "integrity": "sha512-G9I2atg1ShtFp0t7zwleP6aPS4DcZvsV4uoQOripp16aR6VJzbEnKFPLW4OFXzX7avgZSpYeBAS+Zx4FOgmpPw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@algolia/client-common": "5.41.0",
         "@algolia/requester-browser-xhr": "5.41.0",
@@ -714,7 +710,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -842,7 +837,6 @@
       "integrity": "sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.27.1",
@@ -2769,8 +2763,7 @@
       "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.10.1.tgz",
       "integrity": "sha512-wJ8ReQbHxsAfXhrf9ixl0aYbZorRuOWpBNzm8pL8ftmSxQx/wnJD5Eg861NwJU/czy2VXFIebCeZnZrI9rktIQ==",
       "dev": true,
-      "license": "(Apache-2.0 AND BSD-3-Clause)",
-      "peer": true
+      "license": "(Apache-2.0 AND BSD-3-Clause)"
     },
     "node_modules/@chevrotain/cst-dts-gen": {
       "version": "11.0.3",
@@ -2974,7 +2967,6 @@
       "integrity": "sha512-A7+f++LodNNc1wGgoRDTt78cOwWm9KVezApgjOMp1W4hM0898nsqBXwF+sbePE7ZRcjN7Sa1Z5m2oN27XkmEjQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -2990,7 +2982,6 @@
       "integrity": "sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.35.0",
@@ -3029,7 +3020,6 @@
       "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@marijn/find-cluster-break": "^1.0.0"
       }
@@ -3040,7 +3030,6 @@
       "integrity": "sha512-yoRo4f+FdnD01fFt4XpfpMCcCAo9QvZOtbrXExn4SqzH32YC6LgzqxfLZw/r6Ge65xyY03mK/UfUqrVw1gFiFg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@codemirror/state": "^6.5.0",
         "style-mod": "^4.1.0",
@@ -3064,7 +3053,6 @@
       "integrity": "sha512-KchMDNtU4CDTdkyf0qG7ugJ6qHTOR/aI7XebYn3OTCNagaDYWiZUVKgRgwH79yeMkpNgvEUaXSK7wKjaBK9b/Q==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "peerDependencies": {
         "@bufbuild/protobuf": "^1.10.0"
       }
@@ -3192,7 +3180,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -3216,7 +3203,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -3331,7 +3317,6 @@
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -3739,7 +3724,6 @@
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -4479,7 +4463,6 @@
       "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -5131,7 +5114,6 @@
       "integrity": "sha512-C5wZsGuKTY8jEYsqdxhhFOe1ZDjH0uIYJ9T/jebHwkyxqnr4wW0jTkB72OMqNjsoQRcb0JN3PcSeTwFlVgzCZg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@docusaurus/core": "3.9.2",
         "@docusaurus/logger": "3.9.2",
@@ -7573,7 +7555,6 @@
       "integrity": "sha512-f++rKLQgUVYDAtECQ6fn/is15GkEH9+nZPM3MS0RcxVqoTfawHvDlSCH7JbMhAM6uJ32v3eXLvLmLvjGu7PTQw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/mdx": "^2.0.0"
       },
@@ -7721,7 +7702,6 @@
       "integrity": "sha512-6c4DAbR6n6nPbnZhY2V3tzpnKnGL+6aOsLvFL26VRqhlczli9eWG0VDUNoCQEPnGwDMhPS42UhSAnz5pThm5Ag==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@docusaurus/mdx-loader": "3.9.2",
         "@docusaurus/module-type-aliases": "3.9.2",
@@ -8284,7 +8264,6 @@
       "integrity": "sha512-lBSBiRruFurFKXr5Hbsl2thmGweAPmddhF3jb99U4EMDA5L+e5Y1rAkOS07Nvrup7HUMBDrCV45meaxZnt28nQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@docusaurus/logger": "3.9.2",
         "@docusaurus/types": "3.9.2",
@@ -9965,8 +9944,7 @@
       "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
       "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@lezer/css": {
       "version": "1.2.0",
@@ -12570,7 +12548,8 @@
       "optional": true,
       "os": [
         "android"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-android-arm64": {
       "version": "4.40.2",
@@ -12584,7 +12563,8 @@
       "optional": true,
       "os": [
         "android"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
       "version": "4.40.2",
@@ -12598,7 +12578,8 @@
       "optional": true,
       "os": [
         "darwin"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-darwin-x64": {
       "version": "4.40.2",
@@ -12612,7 +12593,8 @@
       "optional": true,
       "os": [
         "darwin"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
       "version": "4.40.2",
@@ -12626,7 +12608,8 @@
       "optional": true,
       "os": [
         "freebsd"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
       "version": "4.40.2",
@@ -12640,7 +12623,8 @@
       "optional": true,
       "os": [
         "freebsd"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
       "version": "4.40.2",
@@ -12654,7 +12638,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
       "version": "4.40.2",
@@ -12668,7 +12653,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
       "version": "4.40.2",
@@ -12682,7 +12668,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
       "version": "4.40.2",
@@ -12696,7 +12683,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
       "version": "4.40.2",
@@ -12710,7 +12698,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
       "version": "4.40.2",
@@ -12724,7 +12713,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
       "version": "4.40.2",
@@ -12738,7 +12728,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
       "version": "4.40.2",
@@ -12752,7 +12743,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
       "version": "4.40.2",
@@ -12766,7 +12758,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
       "version": "4.40.2",
@@ -12780,7 +12773,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
       "version": "4.40.2",
@@ -12794,7 +12788,8 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
       "version": "4.40.2",
@@ -12808,7 +12803,8 @@
       "optional": true,
       "os": [
         "win32"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
       "version": "4.40.2",
@@ -12822,7 +12818,8 @@
       "optional": true,
       "os": [
         "win32"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
       "version": "4.40.2",
@@ -12836,7 +12833,8 @@
       "optional": true,
       "os": [
         "win32"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@sagold/json-pointer": {
       "version": "5.1.2",
@@ -13170,7 +13168,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -13285,7 +13282,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -13426,7 +13422,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -14627,7 +14622,6 @@
       "integrity": "sha512-ZDVMlzgqHuYnY6I2xpgPhlv/5Ndj9MiDQSj52y4DBCqNJI3kiU4ZDYLNeorbuCJKYLJ4Fe1nFyut3zDvEl5BlQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@storybook/client-logger": "7.6.20",
         "@storybook/core-client": "7.6.20",
@@ -14886,7 +14880,6 @@
       "integrity": "sha512-kvu4h9qXduiPk1Q1oqFKDLFGu/7mslEYbVaqpbBcBxjlRJnvNCFwEvEwKt0Mx9TtSi8J77xRelvJobrGlst4nQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@sveltejs/acorn-typescript": "^1.0.5",
         "@types/cookie": "^0.6.0",
@@ -14919,7 +14912,6 @@
       "integrity": "sha512-Txsm1tJvtiYeLUVRNqxZGKR/mI+CzuIQuc2gn+YCs9rMTowpNZ2Nqt53JdL8KF9bLhAf2ruR/dr9eZCwdTriRA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@sveltejs/vite-plugin-svelte-inspector": "^2.1.0",
         "debug": "^4.3.4",
@@ -15124,7 +15116,6 @@
       "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.21.3",
         "@svgr/babel-preset": "8.1.0",
@@ -15346,7 +15337,6 @@
       "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -15479,7 +15469,6 @@
       "integrity": "sha512-kmS7ZVpHm1EMnW1Wmft9H5ZLM7E0G0NGBx+aGEHGDcNxZBXD2ZUa76CuWjIhOGpwsPbELp684ZdpF2JWoNi4Dg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
@@ -15567,7 +15556,6 @@
       "integrity": "sha512-plCQDLCZIOc92cizB8NNhBRN0szvYR3cx9i5IXo6v9Xsgcun8KHNcJkesc2AyeqdIs0BtOJZaqQ9adHThz8UDw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-changeset": "^2.3.0",
         "prosemirror-collab": "^1.3.1",
@@ -16467,7 +16455,6 @@
       "integrity": "sha512-gXLBtmlcRJeT09/sI4PxVwyrku6SaNUj/6cMubjE6T6XdY1fDmBL7r0nX0jbSZPU/Xr0KuwLLZh6aOYY5d91Xw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -16773,7 +16760,6 @@
       "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.32.1",
         "@typescript-eslint/types": "8.32.1",
@@ -16895,7 +16881,6 @@
       "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
         "@typescript-eslint/scope-manager": "8.32.1",
@@ -17525,7 +17510,6 @@
       "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -17596,7 +17580,6 @@
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -17666,7 +17649,6 @@
       "integrity": "sha512-9E4b3rJmYbBkn7e3aAPt1as+VVnRhsR4qwRRgOzpeyz4PAOuwKh0HI4AN6mTrqK0S0M9fCCSTOUnuJ8gPY/tvA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@algolia/abtesting": "1.7.0",
         "@algolia/client-abtesting": "5.41.0",
@@ -18899,7 +18881,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001737",
         "electron-to-chromium": "^1.5.211",
@@ -19397,7 +19378,6 @@
       "integrity": "sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@chevrotain/cst-dts-gen": "11.0.3",
         "@chevrotain/gast": "11.0.3",
@@ -20449,7 +20429,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -20792,7 +20771,6 @@
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -21175,7 +21153,6 @@
       "integrity": "sha512-5JHBC9n75kz5851jeklCPmZWcg3hUe6sjqJvyk3+hVqFaKcHwHgxsjeN1yLmggoUc6STbtm9/NQyabQehfjvWQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10"
       }
@@ -21508,6 +21485,7 @@
       "integrity": "sha512-p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "commander": "7",
         "d3-array": "1 - 3",
@@ -21530,6 +21508,7 @@
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 10"
       }
@@ -21686,7 +21665,6 @@
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -23395,7 +23373,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -23522,7 +23499,6 @@
       "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -24481,7 +24457,8 @@
       "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
       "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
@@ -28087,7 +28064,6 @@
       "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 10.16.0"
       }
@@ -31992,7 +31968,6 @@
       "integrity": "sha512-aChaVU/DO5aRPmk1GX8L+whocagUUpBQqoPtJk+cm7UOXUk87J4PeWCh6nNmTTIfEhiR9DI/+FnA8dln/hTK7g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/mobx"
@@ -33807,7 +33782,6 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -34011,7 +33985,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -34676,7 +34649,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "lilconfig": "^3.1.1"
       },
@@ -35084,7 +35056,6 @@
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -35782,7 +35753,6 @@
       "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -36157,7 +36127,6 @@
       "integrity": "sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "orderedmap": "^2.0.0"
       }
@@ -36190,7 +36159,6 @@
       "integrity": "sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.0.0",
         "prosemirror-transform": "^1.0.0",
@@ -36243,7 +36211,6 @@
       "integrity": "sha512-SqMiYMUQNNBP9kfPhLO8WXEk/fon47vc52FQsUiJzTBuyjKgEcoAwMyF04eQ4WZ2ArMn7+ReypYL60aKngbACQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.20.0",
         "prosemirror-state": "^1.0.0",
@@ -36699,7 +36666,6 @@
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -36724,7 +36690,6 @@
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -36786,7 +36751,6 @@
       "integrity": "sha512-YMMxTUQV/QFSnbgrP3tjDzLHRg7vsbMn8e9HAa8o/1iXoiomo48b7sk/kkmWEuWNDPJVlKSJRB6Y2fHqdJk+SQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/react": "*"
       },
@@ -36866,7 +36830,6 @@
       "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
@@ -38685,7 +38648,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -39809,7 +39771,6 @@
       "integrity": "sha512-Wt04pPTO71pwmRmsgkyZhNo4Bvdb/1pBAMsIFb9nQLykEdzzpXjvingxFFvdOG4nIowzwgxD+CLlyRqVJqnATw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@storybook/cli": "7.6.20"
       },
@@ -40164,7 +40125,6 @@
       "integrity": "sha512-1v/e3Dl1BknC37cXMhwGomhO8AkYmN41CqyX9xhUDxry1ns3BFQy2lLDRQXJRdVVWB9OHemv/53xaStimvWyuA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@emotion/is-prop-valid": "1.2.2",
         "@emotion/unitless": "0.8.1",
@@ -40350,7 +40310,6 @@
       "integrity": "sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.15",
@@ -41420,7 +41379,6 @@
       "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -42178,7 +42136,6 @@
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -42289,6 +42246,7 @@
       "integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "commander": "2"
       },
@@ -42303,7 +42261,8 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/toposort": {
       "version": "2.0.2",
@@ -42604,8 +42563,7 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/tsx": {
       "version": "4.19.4",
@@ -42613,7 +42571,6 @@
       "integrity": "sha512-gK5GVzDkJK1SI1zwHf32Mqxf2tSJkNx+eYcNly5+nHvWqXUJYUkWBQtKauoESz3ymezAI++ZwT855x5p5eop+Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "~0.25.0",
         "get-tsconfig": "^4.7.5"
@@ -43208,7 +43165,6 @@
       "integrity": "sha512-xKvKpIywE1rnqqLgjkoq0F3wOqYaKO9nV6YkkSat6IxOWacUCc/7Es0hR3OPmkIqkPoEn7U3x+sYdG72rstZQA==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@gerrit0/mini-shiki": "^3.2.2",
         "lunr": "^2.3.9",
@@ -43246,7 +43202,6 @@
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -44050,7 +44005,8 @@
       "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.7.tgz",
       "integrity": "sha512-OkJ9CACVcN9R5Pi9uF6MZBF06pO6qFpDYHWSKBJsdHP5o724KrsgR6UvbnXFH82FdsiTOff/HqjuaG8C7FL+9Q==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/vega-crossfilter": {
       "version": "4.1.3",
@@ -44058,6 +44014,7 @@
       "integrity": "sha512-nyPJAXAUABc3EocUXvAL1J/IWotZVsApIcvOeZaUdEQEtZ7bt8VtP2nj3CLbHBA8FZZVV+K6SmdwvCOaAD4wFQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "vega-dataflow": "^5.7.7",
@@ -44070,6 +44027,7 @@
       "integrity": "sha512-R2NX2HvgXL+u4E6u+L5lKvvRiCtnE6N6l+umgojfi53suhhkFP+zB+2UAQo4syxuZ4763H1csfkKc4xpqLzKnw==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "vega-format": "^1.1.3",
         "vega-loader": "^4.5.3",
@@ -44082,6 +44040,7 @@
       "integrity": "sha512-ZHQPWSs9mUTGJPZ5yQVhHV+OLDCoTIjR//De93vG6igZX1MQCVo03ePWlfWCUAnPV1IsKfeJLqA3K/Qd11bAFQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "fast-json-patch": "^3.1.1",
         "json-stringify-pretty-compact": "^4.0.0",
@@ -44106,6 +44065,7 @@
       "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -44119,6 +44079,7 @@
       "integrity": "sha512-fsjEY1VaBAmqwt7Jlpz0dpPtfQFiBdP9igEefvumSpy7XUxOJmDQcRDnT3Qh9ctkv3itfPfI9g8FSnGcv2b4jQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-interpolate": "^3.0.1",
@@ -44151,6 +44112,7 @@
       "integrity": "sha512-cHZVaY2VNNIG2RyihhSiWniPd2W9R9kJq0znxzV602CgUVgxEfTKtx/lxnVCn8nNrdKAYrGiqIsBzIeKG1GWHw==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-force": "^3.0.0",
         "vega-dataflow": "^5.7.7",
@@ -44163,6 +44125,7 @@
       "integrity": "sha512-wQhw7KR46wKJAip28FF/CicW+oiJaPAwMKdrxlnTA0Nv8Bf7bloRlc+O3kON4b4H1iALLr9KgRcYTOeXNs2MOA==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-format": "^3.1.0",
@@ -44177,6 +44140,7 @@
       "integrity": "sha512-+D+ey4bDAhZA2CChh7bRZrcqRUDevv05kd2z8xH+il7PbYQLrhi6g1zwvf8z3KpgGInFf5O13WuFK5DQGkz5lQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-color": "^3.1.0",
@@ -44197,6 +44161,7 @@
       "integrity": "sha512-+WnnzEPKIU1/xTFUK3EMu2htN35gp9usNZcC0ZFg2up1/Vqu6JyZsX0PIO51oXSIeXn9bwk6VgzlOmJUcx92tA==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-color": "^3.1.0",
@@ -44214,6 +44179,7 @@
       "integrity": "sha512-0Z+TYKRgOEo8XYXnJc2HWg1EGpcbNAhJ9Wpi9ubIbEyEHqIgjCIyFVN8d4nSfsJOcWDzsSmRqohBztxAhOCSaw==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-hierarchy": "^3.1.2",
         "vega-dataflow": "^5.7.7",
@@ -44243,6 +44209,7 @@
       "integrity": "sha512-Emx4b5s7pvuRj3fBkAJ/E2snCoZACfKAwxVId7f/4kYVlAYLb5Swq6W8KZHrH4M9Qds1XJRUYW9/Y3cceqzEFA==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "vega-canvas": "^1.2.7",
         "vega-dataflow": "^5.7.7",
@@ -44256,7 +44223,6 @@
       "integrity": "sha512-l4J6+AWE3DIjvovEoHl2LdtCUkfm4zs8Xxx7INwZEAv+XVb6kR6vIN1gt3t2gN2gs/y4DYTs/RPoTeYAuEg6mA==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "json-stringify-pretty-compact": "~4.0.0",
         "tslib": "~2.8.1",
@@ -44295,6 +44261,7 @@
       "integrity": "sha512-dUfIpxTLF2magoMaur+jXGvwMxjtdlDZaIS8lFj6N7IhUST6nIvBzuUlRM+zLYepI5GHtCLOnqdKU4XV0NggCA==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-dsv": "^3.0.1",
         "node-fetch": "^2.6.7",
@@ -44309,6 +44276,7 @@
       "integrity": "sha512-jltyrwCTtWeidi/6VotLCybhIl+ehwnzvFWYOdWNUP0z/EskdB64YmawNwjCjzTBMemeiQtY6sJPPbewYqe3Vg==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "vega-dataflow": "^5.7.7",
         "vega-event-selector": "^3.0.1",
@@ -44323,6 +44291,7 @@
       "integrity": "sha512-3pcVaQL9R3Zfk6PzopLX6awzrQUeYOXJzlfLGP2Xd93mqUepBa6m/reVrTUoSFXA3v9lfK4W/PS2AcVzD/MIcQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-geo": "^3.1.0",
         "d3-geo-projection": "^4.0.0",
@@ -44335,6 +44304,7 @@
       "integrity": "sha512-AmccF++Z9uw4HNZC/gmkQGe6JsRxTG/R4QpbcSepyMvQN1Rj5KtVqMcmVFP1r3ivM4dYGFuPlzMWvuqp0iKMkQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "vega-dataflow": "^5.7.7",
@@ -44348,6 +44318,7 @@
       "integrity": "sha512-b4eot3tWKCk++INWqot+6sLn3wDTj/HE+tRSbiaf8aecuniPMlwJEK7wWuhVGeW2Ae5n8fI/8TeTViaC94bNHA==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "vega-dataflow": "^5.7.7",
         "vega-util": "^1.17.3"
@@ -44359,6 +44330,7 @@
       "integrity": "sha512-o6Hl76aU1jlCK7Q8DPYZ8OGsp4PtzLdzI6nGpLt8rxoE78QuB3GBGEwGAQJitp4IF7Lb2rL5oAXEl3ZP6xf9jg==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-interpolate": "^3.0.1",
@@ -44374,6 +44346,7 @@
       "integrity": "sha512-LFY9+sLIxRfdDI9ZTKjLoijMkIAzPLBWHpPkwv4NPYgdyx+0qFmv+puBpAUGUY9VZqAZ736Uj5NJY9zw+/M3yQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-path": "^3.1.0",
         "d3-shape": "^3.2.0",
@@ -44388,7 +44361,8 @@
       "resolved": "https://registry.npmjs.org/vega-schema-url-parser/-/vega-schema-url-parser-3.0.2.tgz",
       "integrity": "sha512-xAnR7KAvNPYewI3O0l5QGdT8Tv0+GCZQjqfP39cW/hbe/b3aYMAQ39vm8O2wfXUHzm04xTe7nolcsx8WQNVLRQ==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/vega-selections": {
       "version": "5.6.0",
@@ -44396,6 +44370,7 @@
       "integrity": "sha512-UE2w78rUUbaV3Ph+vQbQDwh8eywIJYRxBiZdxEG/Tr/KtFMLdy2BDgNZuuDO1Nv8jImPJwONmqjNhNDYwM0VJQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "3.2.4",
         "vega-expression": "^5.2.0",
@@ -44408,6 +44383,7 @@
       "integrity": "sha512-GAqS7mkatpXcMCQKWtFu1eMUKLUymjInU0O8kXshWaQrVWjPIO2lllZ1VNhdgE0qGj4oOIRRS11kzuijLshGXQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2"
       }
@@ -44418,6 +44394,7 @@
       "integrity": "sha512-1iFiI3BNmW9FrsLnDLx0ZKEddsCitRY3XmUAwp6qmp+p+IXyJYc9pfjlVj9E6KXBPfm4cQyU++s0smKNiWzO4g==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "funding": {
         "url": "https://app.hubspot.com/payments/GyPC972GD9Rt"
       },
@@ -44432,6 +44409,7 @@
       "integrity": "sha512-hFcWPdTV844IiY0m97+WUoMLADCp+8yUQR1NStWhzBzwDDA7QEGGwYGxALhdMOaDTwkyoNj3V/nox2rQAJD/vQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-time": "^3.1.0",
@@ -44444,6 +44422,7 @@
       "integrity": "sha512-P1R0JP29v0qnTuwzCQ0SPJlkjAzr6qeyj+H4VgUFSykHmHc1OBxda//XBaFDl/bZgIscEMvjKSjZpXd84x3aZQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "vega-util": "^2.0.0"
       },
@@ -44456,7 +44435,8 @@
       "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-2.0.0.tgz",
       "integrity": "sha512-/ayLYX3VVqfkKJB1mG+xkOKiBVlfFZ9BfUB5vf7eVyIRork24sABXdeH4x+XeWuqDKnLBTDedotA+1a5MxlV2Q==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/vega-transforms": {
       "version": "4.12.1",
@@ -44464,6 +44444,7 @@
       "integrity": "sha512-Qxo+xeEEftY1jYyKgzOGc9NuW4/MqGm1YPZ5WrL9eXg2G0410Ne+xL/MFIjHF4hRX+3mgFF4Io2hPpfy/thjLg==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "vega-dataflow": "^5.7.7",
@@ -44505,6 +44486,7 @@
       "integrity": "sha512-Nxp1MEAY+8bphIm+7BeGFzWPoJnX9+hgvze6wqCAPoM69YiyVR0o0VK8M2EESIL+22+Owr0Fdy94hWHnmon5tQ==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-timer": "^3.0.1",
@@ -44522,6 +44504,7 @@
       "integrity": "sha512-RYlyMJu5kZV4XXjmyTQKADJWDB25SMHsiF+B1rbE1p+pmdQPlp5tGdPl9r5dUJOp3p8mSt/NGI8GPGucmPMxtw==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "vega-dataflow": "^5.7.7",
         "vega-scenegraph": "^4.13.1",
@@ -44534,6 +44517,7 @@
       "integrity": "sha512-lWNimgJAXGeRFu2Pz8axOUqVf1moYhD+5yhBzDSmckE9I5jLOyZc/XvgFTXwFnsVkMd1QW1vxJa+y9yfUblzYw==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "d3-delaunay": "^6.0.2",
         "vega-dataflow": "^5.7.7",
@@ -44546,6 +44530,7 @@
       "integrity": "sha512-lFmF3u9/ozU0P+WqPjeThQfZm0PigdbXDwpIUCxczrCXKYJLYFmZuZLZR7cxtmpZ0/yuvRvAJ4g123LXbSZF8A==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "vega-canvas": "^1.2.7",
         "vega-dataflow": "^5.7.7",
@@ -44605,7 +44590,6 @@
       "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
@@ -44703,6 +44687,7 @@
       "os": [
         "aix"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44720,6 +44705,7 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44737,6 +44723,7 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44754,6 +44741,7 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44771,6 +44759,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44788,6 +44777,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44805,6 +44795,7 @@
       "os": [
         "freebsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44822,6 +44813,7 @@
       "os": [
         "freebsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44839,6 +44831,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44856,6 +44849,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44873,6 +44867,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44890,6 +44885,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44907,6 +44903,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44924,6 +44921,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44941,6 +44939,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44958,6 +44957,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44975,6 +44975,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -44992,6 +44993,7 @@
       "os": [
         "netbsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -45009,6 +45011,7 @@
       "os": [
         "openbsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -45026,6 +45029,7 @@
       "os": [
         "sunos"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -45043,6 +45047,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -45060,6 +45065,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -45077,6 +45083,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -45536,7 +45543,6 @@
       "integrity": "sha512-lQ3CPiSTpfOnrEGeXDwoq5hIGzSjmwD72GdfVzF7CQAI7t47rJG9eDWvcEkEn3CUQymAElVvDg3YNTlCYj+qUQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
@@ -46686,7 +46692,6 @@
       "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/web-admin/src/features/projects/status/MaterializationCell.svelte b/web-admin/src/features/projects/status/MaterializationCell.svelte
index 885e3005269..6245f9c4353 100644
--- a/web-admin/src/features/projects/status/MaterializationCell.svelte
+++ b/web-admin/src/features/projects/status/MaterializationCell.svelte
@@ -13,15 +13,17 @@
 
   $: label = isLikelyView ? "View" : "Table";
   $: icon = isLikelyView ? Code2 : Database;
-  $: color = isLikelyView ? "#0891B2" : "#059669"; // cyan for View, green for Table
 </script>
 
 <div class="shrink-0 flex items-center gap-x-1">
   <span
-    class="shrink-0 flex items-center gap-x-1 text-[10px] font-medium px-1.5 py-0.5 rounded"
-    style="background-color: {color}15; color: {color}"
+    class="shrink-0 flex items-center gap-x-1 text-[10px] font-medium px-1.5 py-0.5 rounded
+      {isLikelyView
+      ? 'bg-cyan-600/15 text-cyan-600'
+      : 'bg-emerald-600/15 text-emerald-600'}"
   >
-    <svelte:component this={icon} size="12px" {color} />
+    <!-- Icon inherits text color via currentColor -->
+    <svelte:component this={icon} size="12px" />
     {label}
   </span>
 </div>
diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index dc7557342b6..c38a5d93567 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -1,21 +1,19 @@
 <script lang="ts">
   import DelayedSpinner from "@rilldata/web-common/features/entity-management/DelayedSpinner.svelte";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
   import ProjectTablesTable from "./ProjectTablesTable.svelte";
   import { useTablesList, useTableMetadata } from "./selectors";
 
-  let tablesList: any;
-  let tableMetadata: any;
-
   $: ({ instanceId } = $runtime);
 
   $: tablesList = useTablesList(instanceId, "");
 
   // Filter out temporary tables (e.g., __rill_tmp_ prefixed tables)
   $: filteredTables =
-    $tablesList.data?.tables?.filter(
-      (t: { name?: string }) => t.name && !t.name.startsWith("__rill_tmp_"),
-    ) ?? [];
+    ($tablesList.data?.tables?.filter(
+      (t: V1OlapTableInfo) => t.name && !t.name.startsWith("__rill_tmp_"),
+    ) ?? []) as V1OlapTableInfo[];
 
   $: tableMetadata = useTableMetadata(instanceId, "", filteredTables);
 </script>
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index f1b847b1e21..ea81057e838 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -10,10 +10,18 @@ import {
   type V1OlapTableInfo,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
-import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
-import { readable } from "svelte/store";
+import { readable, type Readable } from "svelte/store";
 import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 
+/** Type for the table metadata store result */
+export type TableMetadataResult = {
+  data: {
+    isView: Map<string, boolean>;
+  };
+  isLoading: boolean;
+  isError: boolean;
+};
+
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
     orgName,
@@ -67,11 +75,21 @@ export function useTablesList(instanceId: string, connector: string = "") {
   );
 }
 
+/**
+ * Fetches metadata (view status) for each table.
+ *
+ * Note: This creates a separate query per table (N+1 pattern). This is acceptable here because:
+ * 1. The OLAPGetTable API doesn't support batch requests
+ * 2. Tables are typically few in number on the status page
+ * 3. Queries are cached and run in parallel via svelte-query
+ *
+ * If performance becomes an issue with many tables, consider adding a batch API endpoint.
+ */
 export function useTableMetadata(
   instanceId: string,
   connector: string = "",
   tables: V1OlapTableInfo[] | undefined,
-) {
+): Readable<TableMetadataResult> {
   // If no tables, return empty store immediately
   if (!tables || tables.length === 0) {
     return readable(
@@ -114,7 +132,7 @@ export function useTableMetadata(
         });
       };
 
-      // Fetch view status for each table
+      // Fetch view status for each table in parallel
       for (const tableName of tableNames) {
         const tableQuery = createConnectorServiceOLAPGetTable(
           {

From 0813e096b4c6f3de26b35f4cc6b6f1cb9353c0cf Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 20 Jan 2026 11:38:52 -0500
Subject: [PATCH 29/40] better implementation

---
 web-admin/src/features/projects/status/ProjectTables.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index c38a5d93567..2e6ff22b33b 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -11,9 +11,9 @@
 
   // Filter out temporary tables (e.g., __rill_tmp_ prefixed tables)
   $: filteredTables =
-    ($tablesList.data?.tables?.filter(
-      (t: V1OlapTableInfo) => t.name && !t.name.startsWith("__rill_tmp_"),
-    ) ?? []) as V1OlapTableInfo[];
+    $tablesList.data?.tables?.filter(
+      (t): t is V1OlapTableInfo => !!t.name && !t.name.startsWith("__rill_tmp_"),
+    ) ?? [];
 
   $: tableMetadata = useTableMetadata(instanceId, "", filteredTables);
 </script>

From fb367baefcff9dc1f0691d581680453813477150 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 20 Jan 2026 11:39:17 -0500
Subject: [PATCH 30/40] prettier

---
 web-admin/src/features/projects/status/ProjectTables.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index 2e6ff22b33b..d86a2552b27 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -12,7 +12,8 @@
   // Filter out temporary tables (e.g., __rill_tmp_ prefixed tables)
   $: filteredTables =
     $tablesList.data?.tables?.filter(
-      (t): t is V1OlapTableInfo => !!t.name && !t.name.startsWith("__rill_tmp_"),
+      (t): t is V1OlapTableInfo =>
+        !!t.name && !t.name.startsWith("__rill_tmp_"),
     ) ?? [];
 
   $: tableMetadata = useTableMetadata(instanceId, "", filteredTables);

From 6a63658f407ef4b83afd6e76b3cfcbc7df262b23 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:07:30 -0500
Subject: [PATCH 31/40] code qual

---
 web-admin/src/features/projects/status/selectors.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index ea81057e838..2994be08662 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -104,7 +104,7 @@ export function useTableMetadata(
     );
   }
 
-  return readable(
+  return readable<TableMetadataResult>(
     {
       data: {
         isView: new Map<string, boolean>(),

From 86f9bce9914ecc3dfbc57f9a057e3316cdab64c9 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 27 Jan 2026 12:25:45 -0500
Subject: [PATCH 32/40] new approach but need to wait for new API for rest of
 details

---
 .../projects/status/ProjectTables.svelte      |  13 ++-
 .../projects/status/ProjectTablesTable.svelte |  31 ++++-
 .../src/features/projects/status/selectors.ts | 101 +++++++++++++++-
 .../[project]/-/status/+layout.svelte         |  42 +++++++
 .../[project]/-/status/+page.ts               |   5 +
 .../-/status/model-overview/+page.svelte      | 110 ++++++++++++++++++
 .../status/{ => project-status}/+page.svelte  |  21 ++--
 web-admin/tests/project-status-tables.spec.ts |  14 ++-
 8 files changed, 310 insertions(+), 27 deletions(-)
 create mode 100644 web-admin/src/routes/[organization]/[project]/-/status/+layout.svelte
 create mode 100644 web-admin/src/routes/[organization]/[project]/-/status/+page.ts
 create mode 100644 web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
 rename web-admin/src/routes/[organization]/[project]/-/status/{ => project-status}/+page.svelte (51%)

diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index d86a2552b27..83329a05a51 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -3,7 +3,11 @@
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
   import ProjectTablesTable from "./ProjectTablesTable.svelte";
-  import { useTablesList, useTableMetadata } from "./selectors";
+  import {
+    useTablesList,
+    useTableMetadata,
+    useTableCardinality,
+  } from "./selectors";
 
   $: ({ instanceId } = $runtime);
 
@@ -17,11 +21,12 @@
     ) ?? [];
 
   $: tableMetadata = useTableMetadata(instanceId, "", filteredTables);
+  $: tableCardinality = useTableCardinality(instanceId, filteredTables);
 </script>
 
 <section class="flex flex-col gap-y-4 size-full">
   <div class="flex items-center justify-between">
-    <h2 class="text-lg font-medium">Tables</h2>
+    <h2 class="text-lg font-medium">Model Details</h2>
   </div>
 
   {#if $tablesList.isLoading}
@@ -37,8 +42,10 @@
     <ProjectTablesTable
       tables={filteredTables}
       isView={$tableMetadata?.data?.isView ?? new Map()}
+      columnCount={$tableMetadata?.data?.columnCount ?? new Map()}
+      rowCount={$tableCardinality?.data?.rowCount ?? new Map()}
     />
-    {#if $tableMetadata?.isLoading}
+    {#if $tableMetadata?.isLoading || $tableCardinality?.isLoading}
       <div class="mt-2 text-xs text-gray-500">Loading table metadata...</div>
     {/if}
   {:else}
diff --git a/web-admin/src/features/projects/status/ProjectTablesTable.svelte b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
index 9571ab6113e..f63e2e166b0 100644
--- a/web-admin/src/features/projects/status/ProjectTablesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
@@ -2,14 +2,17 @@
   import VirtualizedTable from "@rilldata/web-common/components/table/VirtualizedTable.svelte";
   import { flexRender, type ColumnDef } from "@tanstack/svelte-table";
   import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
+  import { formatCompactInteger } from "@rilldata/web-common/lib/formatters";
   import ModelSizeCell from "./ModelSizeCell.svelte";
   import NameCell from "./NameCell.svelte";
   import MaterializationCell from "./MaterializationCell.svelte";
 
   export let tables: V1OlapTableInfo[] = [];
   export let isView: Map<string, boolean> = new Map();
+  export let columnCount: Map<string, number> = new Map();
+  export let rowCount: Map<string, number> = new Map();
 
-  const columns: ColumnDef<V1OlapTableInfo, any>[] = [
+  $: columns = [
     {
       id: "materialization",
       accessorFn: (row) => isView.get(row.name ?? ""),
@@ -28,6 +31,26 @@
           name: getValue() as string,
         }),
     },
+    {
+      id: "rows",
+      accessorFn: (row) => rowCount.get(row.name ?? ""),
+      header: "Rows",
+      sortDescFirst: true,
+      cell: ({ getValue }) => {
+        const value = getValue() as number | undefined;
+        return value !== undefined ? formatCompactInteger(value) : "-";
+      },
+    },
+    {
+      id: "columns",
+      accessorFn: (row) => columnCount.get(row.name ?? ""),
+      header: "Columns",
+      sortDescFirst: true,
+      cell: ({ getValue }) => {
+        const value = getValue() as number | undefined;
+        return value !== undefined ? String(value) : "-";
+      },
+    },
     {
       id: "size",
       accessorFn: (row) => row.physicalSizeBytes,
@@ -54,16 +77,16 @@
           sizeBytes: getValue() as string | number | undefined,
         }),
     },
-  ];
+  ] as ColumnDef<V1OlapTableInfo, unknown>[];
 
   $: tableData = tables;
 </script>
 
-{#key isView}
+{#key [isView, columnCount, rowCount]}
   <VirtualizedTable
     tableId="project-tables-table"
     data={tableData}
     {columns}
-    columnLayout="minmax(60px, 0.5fr) minmax(150px, 3fr) minmax(100px, 1fr)"
+    columnLayout="minmax(60px, 0.5fr) minmax(150px, 2fr) minmax(80px, 0.8fr) minmax(80px, 0.8fr) minmax(100px, 1fr)"
   />
 {/key}
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index 2994be08662..abf6428855c 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -6,6 +6,7 @@ import {
   createRuntimeServiceListResources,
   createConnectorServiceOLAPListTables,
   createConnectorServiceOLAPGetTable,
+  createQueryServiceTableCardinality,
   type V1ListResourcesResponse,
   type V1OlapTableInfo,
 } from "@rilldata/web-common/runtime-client";
@@ -17,6 +18,7 @@ import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interv
 export type TableMetadataResult = {
   data: {
     isView: Map<string, boolean>;
+    columnCount: Map<string, number>;
   };
   isLoading: boolean;
   isError: boolean;
@@ -96,6 +98,7 @@ export function useTableMetadata(
       {
         data: {
           isView: new Map<string, boolean>(),
+          columnCount: new Map<string, number>(),
         },
         isLoading: false,
         isError: false,
@@ -108,12 +111,14 @@ export function useTableMetadata(
     {
       data: {
         isView: new Map<string, boolean>(),
+        columnCount: new Map<string, number>(),
       },
       isLoading: true,
       isError: false,
     },
     (set) => {
       const isView = new Map<string, boolean>();
+      const columnCount = new Map<string, number>();
       const tableNames = (tables ?? [])
         .map((t) => t.name)
         .filter((n) => !!n) as string[];
@@ -126,7 +131,7 @@ export function useTableMetadata(
       const updateAndNotify = () => {
         const isLoading = completedCount < totalOperations;
         set({
-          data: { isView },
+          data: { isView, columnCount },
           isLoading,
           isError: false,
         });
@@ -152,6 +157,100 @@ export function useTableMetadata(
           if (result.data?.view !== undefined) {
             isView.set(tableName, result.data.view);
           }
+          // Capture the column count from the schema
+          if (result.data?.schema?.fields !== undefined) {
+            columnCount.set(tableName, result.data.schema.fields.length);
+          }
+          completedCount++;
+          updateAndNotify();
+        });
+
+        subscriptions.push(unsubscribe);
+      }
+
+      // Return cleanup function
+      return () => {
+        subscriptions.forEach((unsub) => unsub());
+      };
+    },
+  );
+}
+
+/** Type for the table cardinality store result */
+export type TableCardinalityResult = {
+  data: {
+    rowCount: Map<string, number>;
+  };
+  isLoading: boolean;
+  isError: boolean;
+};
+
+/**
+ * Fetches row count (cardinality) for each table.
+ */
+export function useTableCardinality(
+  instanceId: string,
+  tables: V1OlapTableInfo[] | undefined,
+): Readable<TableCardinalityResult> {
+  // If no tables, return empty store immediately
+  if (!tables || tables.length === 0) {
+    return readable(
+      {
+        data: {
+          rowCount: new Map<string, number>(),
+        },
+        isLoading: false,
+        isError: false,
+      },
+      () => {},
+    );
+  }
+
+  return readable<TableCardinalityResult>(
+    {
+      data: {
+        rowCount: new Map<string, number>(),
+      },
+      isLoading: true,
+      isError: false,
+    },
+    (set) => {
+      const rowCount = new Map<string, number>();
+      const tableNames = (tables ?? [])
+        .map((t) => t.name)
+        .filter((n) => !!n) as string[];
+      const subscriptions: Array<() => void> = [];
+
+      let completedCount = 0;
+      const totalOperations = tableNames.length;
+
+      // Helper to update and notify
+      const updateAndNotify = () => {
+        const isLoading = completedCount < totalOperations;
+        set({
+          data: { rowCount },
+          isLoading,
+          isError: false,
+        });
+      };
+
+      // Fetch cardinality for each table in parallel
+      for (const tableName of tableNames) {
+        const cardinalityQuery = createQueryServiceTableCardinality(
+          instanceId,
+          tableName,
+          {},
+          {
+            query: {
+              enabled: !!instanceId && !!tableName,
+            },
+          },
+        );
+
+        const unsubscribe = cardinalityQuery.subscribe((result) => {
+          if (result.data?.cardinality !== undefined) {
+            rowCount.set(tableName, parseInt(result.data.cardinality, 10) || 0);
+          }
           completedCount++;
           updateAndNotify();
         });
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/+layout.svelte b/web-admin/src/routes/[organization]/[project]/-/status/+layout.svelte
new file mode 100644
index 00000000000..fcecd72c182
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/status/+layout.svelte
@@ -0,0 +1,42 @@
+<!-- PROJECT STATUS -->
+
+<script lang="ts">
+  import { page } from "$app/stores";
+  import ContentContainer from "@rilldata/web-admin/components/layout/ContentContainer.svelte";
+  import LeftNav from "@rilldata/web-admin/components/nav/LeftNav.svelte";
+
+  $: organization = $page.params.organization;
+  $: project = $page.params.project;
+  $: basePage = `/${organization}/${project}/-/status`;
+
+  const navItems = [
+    {
+      label: "Project Status",
+      route: "/project-status",
+      hasPermission: true,
+    },
+    {
+      label: "Model Overview",
+      route: "/model-overview",
+      hasPermission: true,
+    },
+  ];
+</script>
+
+<ContentContainer title="Project status" maxWidth={1100}>
+  <div class="container flex-col md:flex-row">
+    <LeftNav
+      {basePage}
+      baseRoute="/[organization]/[project]/-/status"
+      {navItems}
+      minWidth="180px"
+    />
+    <slot />
+  </div>
+</ContentContainer>
+
+<style lang="postcss">
+  .container {
+    @apply flex pt-6 gap-6 max-w-full overflow-hidden;
+  }
+</style>
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/+page.ts b/web-admin/src/routes/[organization]/[project]/-/status/+page.ts
new file mode 100644
index 00000000000..c7c5d496ab6
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/status/+page.ts
@@ -0,0 +1,5 @@
+import { redirect } from "@sveltejs/kit";
+
+export const load = ({ params }) => {
+  throw redirect(307, `/${params.organization}/${params.project}/-/status/project-status`);
+};
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
new file mode 100644
index 00000000000..cbcd3450f07
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
@@ -0,0 +1,110 @@
+<script lang="ts">
+  import {
+    useTablesList,
+    useTableMetadata,
+  } from "@rilldata/web-admin/features/projects/status/selectors";
+  import ProjectTables from "@rilldata/web-admin/features/projects/status/ProjectTables.svelte";
+  import {
+    createRuntimeServiceGetInstance,
+    type V1OlapTableInfo,
+  } from "@rilldata/web-common/runtime-client";
+  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+
+  $: ({ instanceId } = $runtime);
+
+  // Get instance info for OLAP connector
+  $: instanceQuery = createRuntimeServiceGetInstance(
+    instanceId,
+    { sensitive: true },
+    { query: { enabled: !!instanceId } },
+  );
+  $: olapEngine = $instanceQuery.data?.instance?.olapConnector || "-";
+
+  // Get tables list
+  $: tablesList = useTablesList(instanceId, "");
+  $: filteredTables =
+    $tablesList.data?.tables?.filter(
+      (t): t is V1OlapTableInfo =>
+        !!t.name && !t.name.startsWith("__rill_tmp_"),
+    ) ?? [];
+
+  // Get table metadata to determine views vs tables
+  $: tableMetadata = useTableMetadata(instanceId, "", filteredTables);
+
+  // Count tables and views
+  $: viewCount = Array.from(
+    $tableMetadata?.data?.isView?.values() ?? [],
+  ).filter(Boolean).length;
+  $: tableCount = filteredTables.length - viewCount;
+</script>
+
+<div class="flex flex-col gap-y-6 size-full">
+  <section class="flex flex-col gap-y-4">
+    <h2 class="text-lg font-medium">Model Details</h2>
+    <div class="grid grid-cols-3 gap-4">
+    <div class="flex flex-col gap-y-1 p-4 border rounded-md">
+      <div class="flex items-center gap-x-1">
+        <span class="text-sm text-gray-500">Tables (Materialized Models)</span>
+        <a
+          href="https://docs.rilldata.com/build/models/performance#consider-which-models-to-materialize"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="text-gray-400 hover:text-gray-600"
+          title="Learn about materialized models"
+        >
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 16 16"
+            fill="currentColor"
+            class="w-3.5 h-3.5"
+          >
+            <path
+              fill-rule="evenodd"
+              d="M15 8A7 7 0 1 1 1 8a7 7 0 0 1 14 0ZM9 5a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM6.75 8a.75.75 0 0 0 0 1.5h.75v1.75a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8.25 8h-1.5Z"
+              clip-rule="evenodd"
+            />
+          </svg>
+        </a>
+      </div>
+      <span class="text-2xl font-semibold tabular-nums">
+        {$tableMetadata?.isLoading ? "-" : tableCount}
+      </span>
+    </div>
+    <div class="flex flex-col gap-y-1 p-4 border rounded-md">
+      <span class="text-sm text-gray-500">Views</span>
+      <span class="text-2xl font-semibold tabular-nums">
+        {$tableMetadata?.isLoading ? "-" : viewCount}
+      </span>
+    </div>
+    <div class="flex flex-col gap-y-1 p-4 border rounded-md">
+      <div class="flex items-center gap-x-1">
+        <span class="text-sm text-gray-500">OLAP Engine</span>
+        <a
+          href="https://docs.rilldata.com/reference/olap-engines"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="text-gray-400 hover:text-gray-600"
+          title="Learn about OLAP engines"
+        >
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 16 16"
+            fill="currentColor"
+            class="w-3.5 h-3.5"
+          >
+            <path
+              fill-rule="evenodd"
+              d="M15 8A7 7 0 1 1 1 8a7 7 0 0 1 14 0ZM9 5a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM6.75 8a.75.75 0 0 0 0 1.5h.75v1.75a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8.25 8h-1.5Z"
+              clip-rule="evenodd"
+            />
+          </svg>
+        </a>
+      </div>
+      <span class="text-2xl font-semibold">
+        {$instanceQuery.isLoading ? "-" : olapEngine}
+      </span>
+    </div>
+  </div>
+
+  <ProjectTables />
+</div>
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/status/project-status/+page.svelte
similarity index 51%
rename from web-admin/src/routes/[organization]/[project]/-/status/+page.svelte
rename to web-admin/src/routes/[organization]/[project]/-/status/project-status/+page.svelte
index 98f89fbe63e..4ba3986f36c 100644
--- a/web-admin/src/routes/[organization]/[project]/-/status/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/status/project-status/+page.svelte
@@ -1,25 +1,20 @@
 <script lang="ts">
   import { page } from "$app/stores";
-  import ContentContainer from "@rilldata/web-admin/components/layout/ContentContainer.svelte";
   import ProjectDeploymentStatus from "@rilldata/web-admin/features/projects/status/ProjectDeploymentStatus.svelte";
   import ProjectGithubConnection from "@rilldata/web-admin/features/projects/github/ProjectGithubConnection.svelte";
   import ProjectParseErrors from "@rilldata/web-admin/features/projects/status/ProjectParseErrors.svelte";
   import ProjectResources from "@rilldata/web-admin/features/projects/status/ProjectResources.svelte";
-  import ProjectTables from "@rilldata/web-admin/features/projects/status/ProjectTables.svelte";
 
   $: organization = $page.params.organization;
   $: project = $page.params.project;
 </script>
 
-<ContentContainer title="Project status" maxWidth={1100}>
-  <div class="flex flex-col gap-y-4 size-full">
-    <div class="flex gap-x-20 items-start">
-      <ProjectGithubConnection {organization} {project} />
-      <ProjectDeploymentStatus {organization} {project} />
-    </div>
-
-    <ProjectResources />
-    <ProjectTables />
-    <ProjectParseErrors />
+<div class="flex flex-col gap-y-4 size-full">
+  <div class="flex gap-x-20 items-start">
+    <ProjectGithubConnection {organization} {project} />
+    <ProjectDeploymentStatus {organization} {project} />
   </div>
-</ContentContainer>
+
+  <ProjectResources />
+  <ProjectParseErrors />
+</div>
diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index b4ac8cc7154..84eb7a1dd99 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from "@playwright/test";
 import { test } from "./setup/base";
 
-test.describe("Project Status - Tables", () => {
+test.describe("Project Status - Model Details", () => {
   test("should display tables with their metadata values", async ({
     adminPage,
   }) => {
@@ -13,9 +13,11 @@ test.describe("Project Status - Tables", () => {
     await expect(statusLink).toBeVisible();
     await statusLink.click();
 
-    // Wait for the Tables heading to be visible
-    const tablesHeading = adminPage.getByRole("heading", { name: "Tables" });
-    await expect(tablesHeading).toBeVisible();
+    // Wait for the Model Details heading to be visible
+    const modelDetailsHeading = adminPage.getByRole("heading", {
+      name: "Model Details",
+    });
+    await expect(modelDetailsHeading).toBeVisible();
 
     // Verify the table structure with column headers (VirtualizedTable uses role="columnheader")
     // Use the #project-tables-table id to scope to the correct table
@@ -66,14 +68,14 @@ test.describe("Project Status - Tables", () => {
 
     // Wait for the page to load
     await expect(
-      adminPage.getByRole("heading", { name: "Tables" }),
+      adminPage.getByRole("heading", { name: "Model Details" }),
     ).toBeVisible();
 
     // If no tables, it should show the table container (possibly with no data message)
     // or with the table headers visible
     const tableSection = adminPage
       .locator("section")
-      .filter({ hasText: "Tables" })
+      .filter({ hasText: "Model Details" })
       .first();
     await expect(tableSection).toBeVisible();
   });

From 4b6ae0b6da22461f3fd342cac980850050b530aa Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 27 Jan 2026 12:27:07 -0500
Subject: [PATCH 33/40] prettier

---
 .../[project]/-/status/+page.ts               |   5 +-
 .../-/status/model-overview/+page.svelte      | 120 +++++++++---------
 2 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/web-admin/src/routes/[organization]/[project]/-/status/+page.ts b/web-admin/src/routes/[organization]/[project]/-/status/+page.ts
index c7c5d496ab6..4d875360bc9 100644
--- a/web-admin/src/routes/[organization]/[project]/-/status/+page.ts
+++ b/web-admin/src/routes/[organization]/[project]/-/status/+page.ts
@@ -1,5 +1,8 @@
 import { redirect } from "@sveltejs/kit";
 
 export const load = ({ params }) => {
-  throw redirect(307, `/${params.organization}/${params.project}/-/status/project-status`);
+  throw redirect(
+    307,
+    `/${params.organization}/${params.project}/-/status/project-status`,
+  );
 };
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
index cbcd3450f07..35a46682f46 100644
--- a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
@@ -42,69 +42,71 @@
   <section class="flex flex-col gap-y-4">
     <h2 class="text-lg font-medium">Model Details</h2>
     <div class="grid grid-cols-3 gap-4">
-    <div class="flex flex-col gap-y-1 p-4 border rounded-md">
-      <div class="flex items-center gap-x-1">
-        <span class="text-sm text-gray-500">Tables (Materialized Models)</span>
-        <a
-          href="https://docs.rilldata.com/build/models/performance#consider-which-models-to-materialize"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="text-gray-400 hover:text-gray-600"
-          title="Learn about materialized models"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 16 16"
-            fill="currentColor"
-            class="w-3.5 h-3.5"
+      <div class="flex flex-col gap-y-1 p-4 border rounded-md">
+        <div class="flex items-center gap-x-1">
+          <span class="text-sm text-gray-500">Tables (Materialized Models)</span
           >
-            <path
-              fill-rule="evenodd"
-              d="M15 8A7 7 0 1 1 1 8a7 7 0 0 1 14 0ZM9 5a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM6.75 8a.75.75 0 0 0 0 1.5h.75v1.75a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8.25 8h-1.5Z"
-              clip-rule="evenodd"
-            />
-          </svg>
-        </a>
+          <a
+            href="https://docs.rilldata.com/build/models/performance#consider-which-models-to-materialize"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="text-gray-400 hover:text-gray-600"
+            title="Learn about materialized models"
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 16 16"
+              fill="currentColor"
+              class="w-3.5 h-3.5"
+            >
+              <path
+                fill-rule="evenodd"
+                d="M15 8A7 7 0 1 1 1 8a7 7 0 0 1 14 0ZM9 5a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM6.75 8a.75.75 0 0 0 0 1.5h.75v1.75a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8.25 8h-1.5Z"
+                clip-rule="evenodd"
+              />
+            </svg>
+          </a>
+        </div>
+        <span class="text-2xl font-semibold tabular-nums">
+          {$tableMetadata?.isLoading ? "-" : tableCount}
+        </span>
       </div>
-      <span class="text-2xl font-semibold tabular-nums">
-        {$tableMetadata?.isLoading ? "-" : tableCount}
-      </span>
-    </div>
-    <div class="flex flex-col gap-y-1 p-4 border rounded-md">
-      <span class="text-sm text-gray-500">Views</span>
-      <span class="text-2xl font-semibold tabular-nums">
-        {$tableMetadata?.isLoading ? "-" : viewCount}
-      </span>
-    </div>
-    <div class="flex flex-col gap-y-1 p-4 border rounded-md">
-      <div class="flex items-center gap-x-1">
-        <span class="text-sm text-gray-500">OLAP Engine</span>
-        <a
-          href="https://docs.rilldata.com/reference/olap-engines"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="text-gray-400 hover:text-gray-600"
-          title="Learn about OLAP engines"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 16 16"
-            fill="currentColor"
-            class="w-3.5 h-3.5"
+      <div class="flex flex-col gap-y-1 p-4 border rounded-md">
+        <span class="text-sm text-gray-500">Views</span>
+        <span class="text-2xl font-semibold tabular-nums">
+          {$tableMetadata?.isLoading ? "-" : viewCount}
+        </span>
+      </div>
+      <div class="flex flex-col gap-y-1 p-4 border rounded-md">
+        <div class="flex items-center gap-x-1">
+          <span class="text-sm text-gray-500">OLAP Engine</span>
+          <a
+            href="https://docs.rilldata.com/reference/olap-engines"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="text-gray-400 hover:text-gray-600"
+            title="Learn about OLAP engines"
           >
-            <path
-              fill-rule="evenodd"
-              d="M15 8A7 7 0 1 1 1 8a7 7 0 0 1 14 0ZM9 5a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM6.75 8a.75.75 0 0 0 0 1.5h.75v1.75a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8.25 8h-1.5Z"
-              clip-rule="evenodd"
-            />
-          </svg>
-        </a>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 16 16"
+              fill="currentColor"
+              class="w-3.5 h-3.5"
+            >
+              <path
+                fill-rule="evenodd"
+                d="M15 8A7 7 0 1 1 1 8a7 7 0 0 1 14 0ZM9 5a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM6.75 8a.75.75 0 0 0 0 1.5h.75v1.75a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8.25 8h-1.5Z"
+                clip-rule="evenodd"
+              />
+            </svg>
+          </a>
+        </div>
+        <span class="text-2xl font-semibold">
+          {$instanceQuery.isLoading ? "-" : olapEngine}
+        </span>
       </div>
-      <span class="text-2xl font-semibold">
-        {$instanceQuery.isLoading ? "-" : olapEngine}
-      </span>
     </div>
-  </div>
 
-  <ProjectTables />
+    <ProjectTables />
+  </section>
 </div>

From d300adeee0e636a9a066f212a9250b3a8098258d Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 27 Jan 2026 16:51:04 -0500
Subject: [PATCH 34/40] 
 https://www.loom.com/share/a257d258b1bd4dbea17005d45137536d

---
 .../projects/status/ActionsCell.svelte        |  45 ++++--
 .../projects/status/ModelActionsCell.svelte   |  96 ++++++++++++
 .../projects/status/ModelInfoDialog.svelte    |  53 +++++++
 .../projects/status/ModelLogsPanel.svelte     | 137 +++++++++++++++++
 .../status/ModelPartitionsDialog.svelte       |  48 ++++++
 .../status/ProjectResourcesTable.svelte       |  18 ++-
 .../projects/status/ProjectTables.svelte      | 145 +++++++++++++++++-
 .../projects/status/ProjectTablesTable.svelte |  63 +++++++-
 .../RefreshErroredPartitionsDialog.svelte     |  51 ++++++
 .../RefreshResourceConfirmDialog.svelte       |  19 ++-
 .../status/ResourceErrorMessage.svelte        |  26 ++++
 .../src/features/projects/status/selectors.ts |  33 ++++
 .../-/status/model-overview/+page.svelte      |   2 +-
 .../models/partitions/PartitionsTable.svelte  |   1 +
 .../models/partitions/TriggerPartition.svelte |  18 ++-
 .../tests/projects/incremental-test/rill.yaml |   7 +
 16 files changed, 733 insertions(+), 29 deletions(-)
 create mode 100644 web-admin/src/features/projects/status/ModelActionsCell.svelte
 create mode 100644 web-admin/src/features/projects/status/ModelInfoDialog.svelte
 create mode 100644 web-admin/src/features/projects/status/ModelLogsPanel.svelte
 create mode 100644 web-admin/src/features/projects/status/ModelPartitionsDialog.svelte
 create mode 100644 web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
 create mode 100644 web-common/tests/projects/incremental-test/rill.yaml

diff --git a/web-admin/src/features/projects/status/ActionsCell.svelte b/web-admin/src/features/projects/status/ActionsCell.svelte
index 401987577f6..6d66cbc607d 100644
--- a/web-admin/src/features/projects/status/ActionsCell.svelte
+++ b/web-admin/src/features/projects/status/ActionsCell.svelte
@@ -8,10 +8,12 @@
   export let resourceKind: string;
   export let resourceName: string;
   export let canRefresh: boolean;
+  export let isIncremental: boolean = false;
+  export let hasErroredPartitions: boolean = false;
   export let onClickRefreshDialog: (
     resourceName: string,
     resourceKind: string,
-    refreshType: "full" | "incremental",
+    refreshType: "full" | "incremental" | "errored-partitions",
   ) => void;
   export let isDropdownOpen: boolean;
   export let onDropdownOpenChange: (isOpen: boolean) => void;
@@ -37,17 +39,36 @@
             <span class="ml-2">Full Refresh</span>
           </div>
         </DropdownMenu.Item>
-        <DropdownMenu.Item
-          class="font-normal flex items-center"
-          on:click={() => {
-            onClickRefreshDialog(resourceName, resourceKind, "incremental");
-          }}
-        >
-          <div class="flex items-center">
-            <RefreshCcwIcon size="12px" />
-            <span class="ml-2">Incremental Refresh</span>
-          </div>
-        </DropdownMenu.Item>
+        {#if isIncremental}
+          <DropdownMenu.Item
+            class="font-normal flex items-center"
+            on:click={() => {
+              onClickRefreshDialog(resourceName, resourceKind, "incremental");
+            }}
+          >
+            <div class="flex items-center">
+              <RefreshCcwIcon size="12px" />
+              <span class="ml-2">Incremental Refresh</span>
+            </div>
+          </DropdownMenu.Item>
+        {/if}
+        {#if hasErroredPartitions}
+          <DropdownMenu.Item
+            class="font-normal flex items-center"
+            on:click={() => {
+              onClickRefreshDialog(
+                resourceName,
+                resourceKind,
+                "errored-partitions",
+              );
+            }}
+          >
+            <div class="flex items-center">
+              <RefreshCcwIcon size="12px" />
+              <span class="ml-2">Refresh Errored Partitions</span>
+            </div>
+          </DropdownMenu.Item>
+        {/if}
       {:else}
         <DropdownMenu.Item
           class="font-normal flex items-center"
diff --git a/web-admin/src/features/projects/status/ModelActionsCell.svelte b/web-admin/src/features/projects/status/ModelActionsCell.svelte
new file mode 100644
index 00000000000..d563a5fce91
--- /dev/null
+++ b/web-admin/src/features/projects/status/ModelActionsCell.svelte
@@ -0,0 +1,96 @@
+<script lang="ts">
+  import IconButton from "@rilldata/web-common/components/button/IconButton.svelte";
+  import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
+  import ThreeDot from "@rilldata/web-common/components/icons/ThreeDot.svelte";
+  import {
+    RefreshCcwIcon,
+    FileTextIcon,
+    LayoutGridIcon,
+    AlertCircleIcon,
+  } from "lucide-svelte";
+  import type { V1Resource } from "@rilldata/web-common/runtime-client";
+
+  export let resource: V1Resource | undefined;
+  export let isDropdownOpen: boolean;
+  export let onDropdownOpenChange: (isOpen: boolean) => void;
+  export let onModelInfoClick: (resource: V1Resource) => void;
+  export let onViewPartitionsClick: (resource: V1Resource) => void;
+  export let onRefreshErroredClick: (resource: V1Resource) => void;
+  export let onIncrementalRefreshClick: (resource: V1Resource) => void;
+  export let onFullRefreshClick: (resource: V1Resource) => void;
+
+  $: isPartitioned = !!resource?.model?.spec?.partitionsResolver;
+  $: isIncremental = !!resource?.model?.spec?.incremental;
+  $: hasErroredPartitions =
+    !!resource?.model?.state?.partitionsModelId &&
+    !!resource?.model?.state?.partitionsHaveErrors;
+</script>
+
+{#if resource}
+  <DropdownMenu.Root open={isDropdownOpen} onOpenChange={onDropdownOpenChange}>
+    <DropdownMenu.Trigger class="flex-none">
+      <IconButton rounded active={isDropdownOpen} size={20}>
+        <ThreeDot size="16px" />
+      </IconButton>
+    </DropdownMenu.Trigger>
+    <DropdownMenu.Content align="start">
+      <DropdownMenu.Item
+        class="font-normal flex items-center"
+        on:click={() => onModelInfoClick(resource)}
+      >
+        <div class="flex items-center">
+          <FileTextIcon size="12px" />
+          <span class="ml-2">Model Information</span>
+        </div>
+      </DropdownMenu.Item>
+
+      {#if isPartitioned}
+        <DropdownMenu.Item
+          class="font-normal flex items-center"
+          on:click={() => onViewPartitionsClick(resource)}
+        >
+          <div class="flex items-center">
+            <LayoutGridIcon size="12px" />
+            <span class="ml-2">View Partitions</span>
+          </div>
+        </DropdownMenu.Item>
+      {/if}
+
+      {#if hasErroredPartitions}
+        <DropdownMenu.Item
+          class="font-normal flex items-center"
+          on:click={() => onRefreshErroredClick(resource)}
+        >
+          <div class="flex items-center">
+            <AlertCircleIcon size="12px" />
+            <span class="ml-2">Refresh Errored Partitions</span>
+          </div>
+        </DropdownMenu.Item>
+      {/if}
+
+      <DropdownMenu.Separator />
+
+      <DropdownMenu.Item
+        class="font-normal flex items-center"
+        on:click={() => onFullRefreshClick(resource)}
+      >
+        <div class="flex items-center">
+          <RefreshCcwIcon size="12px" />
+          <span class="ml-2">Full Refresh</span>
+        </div>
+      </DropdownMenu.Item>
+
+      {#if isIncremental}
+        <DropdownMenu.Item
+          class="font-normal flex items-center"
+          on:click={() => onIncrementalRefreshClick(resource)}
+        >
+          <div class="flex items-center">
+            <RefreshCcwIcon size="12px" />
+            <span class="ml-2">Incremental Refresh</span>
+          </div>
+        </DropdownMenu.Item>
+      {/if}
+    </DropdownMenu.Content>
+  </DropdownMenu.Root>
+{/if}
diff --git a/web-admin/src/features/projects/status/ModelInfoDialog.svelte b/web-admin/src/features/projects/status/ModelInfoDialog.svelte
new file mode 100644
index 00000000000..67772c99557
--- /dev/null
+++ b/web-admin/src/features/projects/status/ModelInfoDialog.svelte
@@ -0,0 +1,53 @@
+<script lang="ts">
+  import * as Dialog from "@rilldata/web-common/components/dialog";
+  import YamlPreview from "@rilldata/web-common/features/sources/modal/YamlPreview.svelte";
+  import type { V1Resource } from "@rilldata/web-common/runtime-client";
+  import { stringify } from "yaml";
+
+  export let open = false;
+  export let resource: V1Resource | null = null;
+  export let onClose: () => void = () => {};
+
+  $: modelName = resource?.meta?.name?.name ?? "Model";
+
+  // Build a clean object for YAML display, similar to `rill project describe`
+  $: modelInfo = resource
+    ? {
+        name: resource.meta?.name?.name,
+        kind: resource.meta?.name?.kind,
+        filePaths: resource.meta?.filePaths,
+        spec: resource.model?.spec,
+        state: {
+          executorConnector: resource.model?.state?.executorConnector,
+          resultConnector: resource.model?.state?.resultConnector,
+          resultTable: resource.model?.state?.resultTable,
+          resultSchema: resource.model?.state?.resultSchema,
+          partitionsModelId: resource.model?.state?.partitionsModelId,
+          partitionsHaveErrors: resource.model?.state?.partitionsHaveErrors,
+        },
+      }
+    : null;
+
+  $: yamlContent = modelInfo
+    ? stringify(modelInfo, { indent: 2, lineWidth: 0 })
+    : "";
+</script>
+
+<Dialog.Root
+  {open}
+  onOpenChange={(o) => {
+    if (!o) onClose();
+  }}
+>
+  <Dialog.Content class="max-w-2xl max-h-[80vh] overflow-y-auto">
+    <Dialog.Header>
+      <Dialog.Title>Model: {modelName}</Dialog.Title>
+    </Dialog.Header>
+
+    {#if yamlContent}
+      <YamlPreview title="Model Information" yaml={yamlContent} />
+    {:else}
+      <div class="text-gray-500 py-4">No model information available</div>
+    {/if}
+  </Dialog.Content>
+</Dialog.Root>
diff --git a/web-admin/src/features/projects/status/ModelLogsPanel.svelte b/web-admin/src/features/projects/status/ModelLogsPanel.svelte
new file mode 100644
index 00000000000..8bd450b2f1a
--- /dev/null
+++ b/web-admin/src/features/projects/status/ModelLogsPanel.svelte
@@ -0,0 +1,137 @@
+<script lang="ts">
+  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import {
+    createRuntimeServiceGetLogs,
+    RuntimeServiceGetLogsLevel,
+  } from "@rilldata/web-common/runtime-client";
+  import DelayedSpinner from "@rilldata/web-common/features/entity-management/DelayedSpinner.svelte";
+  import { onMount, tick } from "svelte";
+
+  $: ({ instanceId } = $runtime);
+
+  // Auto-scroll tracking
+  let logsContainer: HTMLDivElement;
+  let userScrolledUp = false;
+
+  $: logsQuery = createRuntimeServiceGetLogs(
+    instanceId,
+    {
+      limit: 200,
+      ascending: true,
+      level: RuntimeServiceGetLogsLevel.LOG_LEVEL_INFO,
+    },
+    {
+      query: {
+        enabled: !!instanceId,
+        refetchInterval: 1000, // Always live - refresh every second
+      },
+    },
+  );
+
+  // Filter logs to only show model-related entries
+  $: modelLogs =
+    $logsQuery.data?.logs?.filter(
+      (log) =>
+        log.message?.toLowerCase().includes("model") ||
+        log.jsonPayload?.toLowerCase().includes("model"),
+    ) ?? [];
+
+  // Auto-scroll to bottom when logs update (if user hasn't scrolled up)
+  $: if (modelLogs.length > 0 && !userScrolledUp) {
+    tick().then(() => scrollToBottom());
+  }
+
+  function scrollToBottom() {
+    if (logsContainer) {
+      logsContainer.scrollTop = logsContainer.scrollHeight;
+    }
+  }
+
+  function handleScroll() {
+    if (!logsContainer) return;
+    const { scrollTop, scrollHeight, clientHeight } = logsContainer;
+    // Consider "at bottom" if within 20px of the bottom
+    userScrolledUp = scrollHeight - scrollTop - clientHeight > 20;
+  }
+
+  onMount(() => {
+    // Scroll to bottom on initial load
+    tick().then(() => scrollToBottom());
+  });
+
+  function formatTime(time: string | undefined): string {
+    if (!time) return "";
+    const date = new Date(time);
+    return date.toLocaleTimeString(undefined, {
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+    });
+  }
+
+  function getLevelClass(level: string | undefined): string {
+    switch (level) {
+      case "LOG_LEVEL_ERROR":
+      case "LOG_LEVEL_FATAL":
+        return "text-red-600";
+      case "LOG_LEVEL_WARN":
+        return "text-yellow-600";
+      default:
+        return "text-gray-500";
+    }
+  }
+
+  function getLevelLabel(level: string | undefined): string {
+    switch (level) {
+      case "LOG_LEVEL_ERROR":
+        return "ERROR";
+      case "LOG_LEVEL_FATAL":
+        return "FATAL";
+      case "LOG_LEVEL_WARN":
+        return "WARN";
+      case "LOG_LEVEL_INFO":
+        return "INFO";
+      case "LOG_LEVEL_DEBUG":
+        return "DEBUG";
+      default:
+        return "INFO";
+    }
+  }
+</script>
+
+<section class="flex flex-col gap-y-2">
+  <div class="flex items-center justify-between">
+    <h2 class="text-lg font-medium">Model Logs</h2>
+    {#if $logsQuery.isLoading}
+      <DelayedSpinner isLoading={true} size="14px" />
+    {/if}
+  </div>
+
+  <div
+    bind:this={logsContainer}
+    on:scroll={handleScroll}
+    class="bg-gray-50 border border-gray-200 rounded-md p-3 font-mono text-xs h-64 overflow-y-auto"
+  >
+    {#if $logsQuery.isError}
+      <div class="text-red-600">
+        Error loading logs: {$logsQuery.error?.response?.data?.message ??
+          $logsQuery.error?.message ??
+          "Unknown error"}
+      </div>
+    {:else if modelLogs.length === 0}
+      <div class="text-gray-500">No model logs found</div>
+    {:else}
+      {#each modelLogs as log}
+        <div class="py-0.5 flex gap-x-2 hover:bg-gray-100">
+          <span class="text-gray-500 flex-none">{formatTime(log.time)}</span>
+          <span class="{getLevelClass(log.level)} flex-none w-12"
+            >{getLevelLabel(log.level)}</span
+          >
+          <span class="text-gray-700 break-all"
+            >{log.message}{log.jsonPayload ? ` ${log.jsonPayload}` : ""}</span
+          >
+        </div>
+      {/each}
+    {/if}
+  </div>
+</section>
diff --git a/web-admin/src/features/projects/status/ModelPartitionsDialog.svelte b/web-admin/src/features/projects/status/ModelPartitionsDialog.svelte
new file mode 100644
index 00000000000..533e9d87260
--- /dev/null
+++ b/web-admin/src/features/projects/status/ModelPartitionsDialog.svelte
@@ -0,0 +1,48 @@
+<script lang="ts">
+  import * as Dialog from "@rilldata/web-common/components/dialog";
+  import PartitionsTable from "@rilldata/web-common/features/models/partitions/PartitionsTable.svelte";
+  import PartitionsFilter from "@rilldata/web-common/features/models/partitions/PartitionsFilter.svelte";
+  import type { V1Resource } from "@rilldata/web-common/runtime-client";
+  import type { Selected } from "bits-ui";
+
+  export let open = false;
+  export let resource: V1Resource | null = null;
+  export let onClose: () => void = () => {};
+
+  let selectedFilter = "all";
+
+  function onFilterChange(newSelection: Selected<string>) {
+    if (newSelection?.value) {
+      selectedFilter = newSelection.value;
+    }
+  }
+
+  $: modelName = resource?.meta?.name?.name ?? "";
+  $: whereErrored = selectedFilter === "errors";
+  $: wherePending = selectedFilter === "pending";
+</script>
+
+<Dialog.Root
+  {open}
+  onOpenChange={(o) => {
+    if (!o) {
+      selectedFilter = "all";
+      onClose();
+    }
+  }}
+>
+  <Dialog.Content class="max-w-screen-xl max-h-[90vh] flex flex-col">
+    <Dialog.Header>
+      <Dialog.Title>Model Partitions: {modelName}</Dialog.Title>
+    </Dialog.Header>
+
+    {#if resource}
+      <div class="flex justify-end mb-4">
+        <PartitionsFilter {selectedFilter} onChange={onFilterChange} />
+      </div>
+      <div class="flex-1 overflow-hidden">
+        <PartitionsTable {resource} {whereErrored} {wherePending} />
+      </div>
+    {/if}
+  </Dialog.Content>
+</Dialog.Root>
diff --git a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
index 76a38eb73de..77d70790949 100644
--- a/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectResourcesTable.svelte
@@ -23,7 +23,7 @@
   let isConfirmDialogOpen = false;
   let dialogResourceName = "";
   let dialogResourceKind = "";
-  let dialogRefreshType: "full" | "incremental" = "full";
+  let dialogRefreshType: "full" | "incremental" | "errored-partitions" = "full";
 
   let openDropdownResourceKey = "";
 
@@ -33,7 +33,7 @@
   const openRefreshDialog = (
     resourceName: string,
     resourceKind: string,
-    refreshType: "full" | "incremental",
+    refreshType: "full" | "incremental" | "errored-partitions",
   ) => {
     dialogResourceName = resourceName;
     dialogResourceKind = resourceKind;
@@ -62,6 +62,7 @@
             {
               model: dialogResourceName,
               full: dialogRefreshType === "full",
+              allErroredPartitions: dialogRefreshType === "errored-partitions",
             },
           ],
         },
@@ -165,12 +166,23 @@
           status === V1ReconcileStatus.RECONCILE_STATUS_RUNNING;
         if (!isRowReconciling) {
           const resourceKey = `${row.original.meta.name.kind}:${row.original.meta.name.name}`;
+          // Check if model is incremental and has errored partitions
+          const isModel = row.original.meta.name.kind === ResourceKind.Model;
+          const modelSpec = row.original.model?.spec;
+          const modelState = row.original.model?.state;
+          const isIncremental = isModel && !!modelSpec?.incremental;
+          const hasErroredPartitions =
+            isModel &&
+            !!modelState?.partitionsModelId &&
+            !!modelState?.partitionsHaveErrors;
           return flexRender(ActionsCell, {
             resourceKind: row.original.meta.name.kind,
             resourceName: row.original.meta.name.name,
             canRefresh:
               row.original.meta.name.kind === ResourceKind.Model ||
               row.original.meta.name.kind === ResourceKind.Source,
+            isIncremental,
+            hasErroredPartitions,
             onClickRefreshDialog: openRefreshDialog,
             isDropdownOpen: isDropdownOpen(resourceKey),
             onDropdownOpenChange: (isOpen: boolean) =>
@@ -193,7 +205,7 @@
 <VirtualizedTable
   data={tableData}
   {columns}
-  columnLayout="minmax(95px, 108px) minmax(100px, 3fr) 48px minmax(80px, 2fr) minmax(100px, 2fr) 56px"
+  columnLayout="minmax(160px, 0.5fr) minmax(150px, 2fr) minmax(80px, 0.8fr) minmax(80px, 0.8fr) minmax(100px, 1fr) 56px"
 />
 
 <RefreshResourceConfirmDialog
diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index 83329a05a51..1142b6bf5b1 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -1,13 +1,25 @@
 <script lang="ts">
   import DelayedSpinner from "@rilldata/web-common/features/entity-management/DelayedSpinner.svelte";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
+  import {
+    createRuntimeServiceCreateTrigger,
+    getRuntimeServiceListResourcesQueryKey,
+    type V1OlapTableInfo,
+    type V1Resource,
+  } from "@rilldata/web-common/runtime-client";
+  import { useQueryClient } from "@tanstack/svelte-query";
   import ProjectTablesTable from "./ProjectTablesTable.svelte";
   import {
     useTablesList,
     useTableMetadata,
     useTableCardinality,
+    useModelResources,
   } from "./selectors";
+  import ModelInfoDialog from "./ModelInfoDialog.svelte";
+  import ModelLogsPanel from "./ModelLogsPanel.svelte";
+  import ModelPartitionsDialog from "./ModelPartitionsDialog.svelte";
+  import RefreshErroredPartitionsDialog from "./RefreshErroredPartitionsDialog.svelte";
+  import RefreshResourceConfirmDialog from "./RefreshResourceConfirmDialog.svelte";
 
   $: ({ instanceId } = $runtime);
 
@@ -22,6 +34,93 @@
 
   $: tableMetadata = useTableMetadata(instanceId, "", filteredTables);
   $: tableCardinality = useTableCardinality(instanceId, filteredTables);
+  $: modelResourcesQuery = useModelResources(instanceId);
+  $: modelResources = $modelResourcesQuery.data ?? new Map();
+
+  // Dialog states
+  let modelInfoDialogOpen = false;
+  let partitionsDialogOpen = false;
+  let erroredPartitionsDialogOpen = false;
+  let incrementalRefreshDialogOpen = false;
+  let fullRefreshDialogOpen = false;
+
+  let selectedResource: V1Resource | null = null;
+  let selectedModelName = "";
+
+  const createTrigger = createRuntimeServiceCreateTrigger();
+  const queryClient = useQueryClient();
+
+  // Handlers
+  function handleModelInfoClick(resource: V1Resource) {
+    selectedResource = resource;
+    modelInfoDialogOpen = true;
+  }
+
+  function handleViewPartitionsClick(resource: V1Resource) {
+    selectedResource = resource;
+    partitionsDialogOpen = true;
+  }
+
+  function handleRefreshErroredClick(resource: V1Resource) {
+    selectedResource = resource;
+    selectedModelName = resource.meta?.name?.name ?? "";
+    erroredPartitionsDialogOpen = true;
+  }
+
+  function handleIncrementalRefreshClick(resource: V1Resource) {
+    selectedModelName = resource.meta?.name?.name ?? "";
+    incrementalRefreshDialogOpen = true;
+  }
+
+  function handleFullRefreshClick(resource: V1Resource) {
+    selectedModelName = resource.meta?.name?.name ?? "";
+    fullRefreshDialogOpen = true;
+  }
+
+  async function handleRefreshErrored() {
+    if (!selectedModelName) return;
+
+    await $createTrigger.mutateAsync({
+      instanceId,
+      data: {
+        models: [{ model: selectedModelName, allErroredPartitions: true }],
+      },
+    });
+
+    await queryClient.invalidateQueries({
+      queryKey: getRuntimeServiceListResourcesQueryKey(instanceId, undefined),
+    });
+  }
+
+  async function handleIncrementalRefresh() {
+    if (!selectedModelName) return;
+
+    await $createTrigger.mutateAsync({
+      instanceId,
+      data: {
+        models: [{ model: selectedModelName }],
+      },
+    });
+
+    await queryClient.invalidateQueries({
+      queryKey: getRuntimeServiceListResourcesQueryKey(instanceId, undefined),
+    });
+  }
+
+  async function handleFullRefresh() {
+    if (!selectedModelName) return;
+
+    await $createTrigger.mutateAsync({
+      instanceId,
+      data: {
+        models: [{ model: selectedModelName, full: true }],
+      },
+    });
+
+    await queryClient.invalidateQueries({
+      queryKey: getRuntimeServiceListResourcesQueryKey(instanceId, undefined),
+    });
+  }
 </script>
 
 <section class="flex flex-col gap-y-4 size-full">
@@ -44,6 +143,12 @@
       isView={$tableMetadata?.data?.isView ?? new Map()}
       columnCount={$tableMetadata?.data?.columnCount ?? new Map()}
       rowCount={$tableCardinality?.data?.rowCount ?? new Map()}
+      {modelResources}
+      onModelInfoClick={handleModelInfoClick}
+      onViewPartitionsClick={handleViewPartitionsClick}
+      onRefreshErroredClick={handleRefreshErroredClick}
+      onIncrementalRefreshClick={handleIncrementalRefreshClick}
+      onFullRefreshClick={handleFullRefreshClick}
     />
     {#if $tableMetadata?.isLoading || $tableCardinality?.isLoading}
       <div class="mt-2 text-xs text-gray-500">Loading table metadata...</div>
@@ -52,3 +157,41 @@
     <div class="text-gray-500 text-sm">No tables found</div>
   {/if}
 </section>
+
+<ModelLogsPanel />
+
+<ModelInfoDialog
+  bind:open={modelInfoDialogOpen}
+  resource={selectedResource}
+  onClose={() => {
+    modelInfoDialogOpen = false;
+  }}
+/>
+
+<ModelPartitionsDialog
+  bind:open={partitionsDialogOpen}
+  resource={selectedResource}
+  onClose={() => {
+    partitionsDialogOpen = false;
+  }}
+/>
+
+<RefreshErroredPartitionsDialog
+  bind:open={erroredPartitionsDialogOpen}
+  modelName={selectedModelName}
+  onRefresh={handleRefreshErrored}
+/>
+
+<RefreshResourceConfirmDialog
+  bind:open={incrementalRefreshDialogOpen}
+  name={selectedModelName}
+  refreshType="incremental"
+  onRefresh={handleIncrementalRefresh}
+/>
+
+<RefreshResourceConfirmDialog
+  bind:open={fullRefreshDialogOpen}
+  name={selectedModelName}
+  refreshType="full"
+  onRefresh={handleFullRefresh}
+/>
diff --git a/web-admin/src/features/projects/status/ProjectTablesTable.svelte b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
index f63e2e166b0..1df6c60dce8 100644
--- a/web-admin/src/features/projects/status/ProjectTablesTable.svelte
+++ b/web-admin/src/features/projects/status/ProjectTablesTable.svelte
@@ -1,16 +1,32 @@
 <script lang="ts">
   import VirtualizedTable from "@rilldata/web-common/components/table/VirtualizedTable.svelte";
   import { flexRender, type ColumnDef } from "@tanstack/svelte-table";
-  import type { V1OlapTableInfo } from "@rilldata/web-common/runtime-client";
+  import type {
+    V1OlapTableInfo,
+    V1Resource,
+  } from "@rilldata/web-common/runtime-client";
+  import { V1ReconcileStatus } from "@rilldata/web-common/runtime-client";
   import { formatCompactInteger } from "@rilldata/web-common/lib/formatters";
   import ModelSizeCell from "./ModelSizeCell.svelte";
   import NameCell from "./NameCell.svelte";
   import MaterializationCell from "./MaterializationCell.svelte";
+  import ModelActionsCell from "./ModelActionsCell.svelte";
+  import ResourceErrorMessage from "./ResourceErrorMessage.svelte";
 
   export let tables: V1OlapTableInfo[] = [];
   export let isView: Map<string, boolean> = new Map();
   export let columnCount: Map<string, number> = new Map();
   export let rowCount: Map<string, number> = new Map();
+  export let modelResources: Map<string, V1Resource> = new Map();
+  export let onModelInfoClick: (resource: V1Resource) => void = () => {};
+  export let onViewPartitionsClick: (resource: V1Resource) => void = () => {};
+  export let onRefreshErroredClick: (resource: V1Resource) => void = () => {};
+  export let onIncrementalRefreshClick: (
+    resource: V1Resource,
+  ) => void = () => {};
+  export let onFullRefreshClick: (resource: V1Resource) => void = () => {};
+
+  let openDropdownTableName = "";
 
   $: columns = [
     {
@@ -31,6 +47,26 @@
           name: getValue() as string,
         }),
     },
+    {
+      id: "status",
+      header: "Status",
+      accessorFn: (row) => {
+        const resource = modelResources.get((row.name ?? "").toLowerCase());
+        return resource?.meta?.reconcileStatus;
+      },
+      cell: ({ row }) => {
+        const resource = modelResources.get(
+          (row.original.name ?? "").toLowerCase(),
+        );
+        return flexRender(ResourceErrorMessage, {
+          message: resource?.meta?.reconcileError ?? "",
+          status:
+            resource?.meta?.reconcileStatus ??
+            V1ReconcileStatus.RECONCILE_STATUS_UNSPECIFIED,
+          testErrors: resource?.model?.state?.testErrors ?? [],
+        });
+      },
+    },
     {
       id: "rows",
       accessorFn: (row) => rowCount.get(row.name ?? ""),
@@ -77,16 +113,37 @@
           sizeBytes: getValue() as string | number | undefined,
         }),
     },
+    {
+      id: "actions",
+      header: "",
+      enableSorting: false,
+      cell: ({ row }) => {
+        const tableName = row.original.name ?? "";
+        const resource = modelResources.get(tableName.toLowerCase());
+        return flexRender(ModelActionsCell, {
+          resource,
+          isDropdownOpen: openDropdownTableName === tableName,
+          onDropdownOpenChange: (isOpen: boolean) => {
+            openDropdownTableName = isOpen ? tableName : "";
+          },
+          onModelInfoClick,
+          onViewPartitionsClick,
+          onRefreshErroredClick,
+          onIncrementalRefreshClick,
+          onFullRefreshClick,
+        });
+      },
+    },
   ] as ColumnDef<V1OlapTableInfo, unknown>[];
 
   $: tableData = tables;
 </script>
 
-{#key [isView, columnCount, rowCount]}
+{#key [isView, columnCount, rowCount, modelResources]}
   <VirtualizedTable
     tableId="project-tables-table"
     data={tableData}
     {columns}
-    columnLayout="minmax(60px, 0.5fr) minmax(150px, 2fr) minmax(80px, 0.8fr) minmax(80px, 0.8fr) minmax(100px, 1fr)"
+    columnLayout="minmax(95px, 0.5fr) minmax(150px, 2fr) 64px minmax(80px, 0.8fr) minmax(80px, 0.8fr) minmax(100px, 1fr) 56px"
   />
 {/key}
diff --git a/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte b/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
new file mode 100644
index 00000000000..e3c8b85ae1f
--- /dev/null
+++ b/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
@@ -0,0 +1,51 @@
+<script lang="ts">
+  import {
+    AlertDialog,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+  } from "@rilldata/web-common/components/alert-dialog/index.js";
+  import { Button } from "@rilldata/web-common/components/button/index.js";
+
+  export let open = false;
+  export let modelName: string;
+  export let onRefresh: () => void;
+
+  function handleRefresh() {
+    try {
+      onRefresh();
+      open = false;
+    } catch (error) {
+      console.error("Failed to refresh errored partitions:", error);
+    }
+  }
+</script>
+
+<AlertDialog bind:open>
+  <AlertDialogContent>
+    <AlertDialogHeader>
+      <AlertDialogTitle>
+        Refresh Errored Partitions for {modelName}?
+      </AlertDialogTitle>
+      <AlertDialogDescription>
+        <div class="mt-1">
+          This will re-execute all partitions that failed during their last run.
+          The refresh will happen in the background.
+        </div>
+      </AlertDialogDescription>
+    </AlertDialogHeader>
+    <AlertDialogFooter>
+      <Button
+        type="plain"
+        onClick={() => {
+          open = false;
+        }}>Cancel</Button
+      >
+      <Button type="primary" onClick={handleRefresh}
+        >Refresh Errored Partitions</Button
+      >
+    </AlertDialogFooter>
+  </AlertDialogContent>
+</AlertDialog>
diff --git a/web-admin/src/features/projects/status/RefreshResourceConfirmDialog.svelte b/web-admin/src/features/projects/status/RefreshResourceConfirmDialog.svelte
index a1fbf2e9b69..d987962093a 100644
--- a/web-admin/src/features/projects/status/RefreshResourceConfirmDialog.svelte
+++ b/web-admin/src/features/projects/status/RefreshResourceConfirmDialog.svelte
@@ -12,7 +12,19 @@
   export let open = false;
   export let name: string;
   export let onRefresh: () => void;
-  export let refreshType: "full" | "incremental" = "full";
+  export let refreshType: "full" | "incremental" | "errored-partitions" =
+    "full";
+
+  function getDialogTitle(type: typeof refreshType): string {
+    switch (type) {
+      case "full":
+        return "Full Refresh";
+      case "incremental":
+        return "Incremental Refresh";
+      case "errored-partitions":
+        return "Refresh Errored Partitions";
+    }
+  }
 
   function handleRefresh() {
     try {
@@ -28,7 +40,7 @@
   <AlertDialogContent>
     <AlertDialogHeader>
       <AlertDialogTitle>
-        {refreshType === "full" ? "Full Refresh" : "Incremental Refresh"}
+        {getDialogTitle(refreshType)}
         {name}?
       </AlertDialogTitle>
       <AlertDialogDescription>
@@ -38,6 +50,9 @@
             This operation can take a significant amount of time and will update
             all dependent resources. Only proceed if you're certain this is
             necessary.
+          {:else if refreshType === "errored-partitions"}
+            This will re-run all partitions that failed during their last
+            execution. Successfully completed partitions will not be affected.
           {:else}
             Refreshing this resource will update all dependent resources.
           {/if}
diff --git a/web-admin/src/features/projects/status/ResourceErrorMessage.svelte b/web-admin/src/features/projects/status/ResourceErrorMessage.svelte
index 1d8173908f7..1ef0ea6f8da 100644
--- a/web-admin/src/features/projects/status/ResourceErrorMessage.svelte
+++ b/web-admin/src/features/projects/status/ResourceErrorMessage.svelte
@@ -7,14 +7,40 @@
   import TooltipContent from "@rilldata/web-common/components/tooltip/TooltipContent.svelte";
   import { copyToClipboard } from "@rilldata/web-common/lib/actions/copy-to-clipboard";
   import { V1ReconcileStatus } from "@rilldata/web-common/runtime-client";
+  import { AlertTriangleIcon } from "lucide-svelte";
 
   export let message: string;
   export let status: V1ReconcileStatus;
+  export let testErrors: string[] = [];
+
+  $: hasTestErrors = testErrors.length > 0;
+  $: testErrorMessage = testErrors.join("\n");
 </script>
 
 <div class="container">
   {#if status === V1ReconcileStatus.RECONCILE_STATUS_PENDING || status === V1ReconcileStatus.RECONCILE_STATUS_RUNNING}
     <LoadingSpinner size="18px" />
+  {:else if hasTestErrors}
+    <Tooltip distance={8}>
+      <button
+        class="hover:bg-slate-100 rounded p-1 active:bg-slate-200 group"
+        on:click={() =>
+          copyToClipboard(testErrorMessage, "Copied test error to clipboard")}
+      >
+        <CopyIcon
+          size="18px"
+          className="text-gray-500 hidden group-hover:block"
+        />
+
+        <AlertTriangleIcon
+          size="18px"
+          class="text-yellow-500 group-hover:hidden"
+        />
+      </button>
+      <TooltipContent slot="tooltip-content" maxWidth="300px">
+        <p class="line-clamp-6">{testErrorMessage}</p>
+      </TooltipContent>
+    </Tooltip>
   {:else if message}
     <Tooltip distance={8}>
       <button
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index abf6428855c..569b1c3c602 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -9,6 +9,7 @@ import {
   createQueryServiceTableCardinality,
   type V1ListResourcesResponse,
   type V1OlapTableInfo,
+  type V1Resource,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { readable, type Readable } from "svelte/store";
@@ -265,3 +266,35 @@ export function useTableCardinality(
     },
   );
 }
+
+/**
+ * Fetches model resources and maps them by their result table name.
+ * This allows looking up model resource data by the OLAP table name.
+ */
+export function useModelResources(instanceId: string) {
+  return createRuntimeServiceListResources(
+    instanceId,
+    { kind: ResourceKind.Model },
+    {
+      query: {
+        select: (data: V1ListResourcesResponse) => {
+          const map = new Map<string, V1Resource>();
+          data.resources?.forEach((resource) => {
+            // Index by resultTable (the actual output table name)
+            const tableName = resource.model?.state?.resultTable;
+            if (tableName) {
+              map.set(tableName.toLowerCase(), resource);
+            }
+            // Also index by model name as fallback
+            const modelName = resource.meta?.name?.name;
+            if (modelName) {
+              map.set(modelName.toLowerCase(), resource);
+            }
+          });
+          return map;
+        },
+        enabled: !!instanceId,
+      },
+    },
+  );
+}
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
index 35a46682f46..37c4b72e293 100644
--- a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
@@ -40,7 +40,7 @@
 
 <div class="flex flex-col gap-y-6 size-full">
   <section class="flex flex-col gap-y-4">
-    <h2 class="text-lg font-medium">Model Details</h2>
+    <h2 class="text-lg font-medium">Model Overview</h2>
     <div class="grid grid-cols-3 gap-4">
       <div class="flex flex-col gap-y-1 p-4 border rounded-md">
         <div class="flex items-center gap-x-1">
diff --git a/web-common/src/features/models/partitions/PartitionsTable.svelte b/web-common/src/features/models/partitions/PartitionsTable.svelte
index 9c609641da9..4a5dcdc3759 100644
--- a/web-common/src/features/models/partitions/PartitionsTable.svelte
+++ b/web-common/src/features/models/partitions/PartitionsTable.svelte
@@ -135,6 +135,7 @@
               flexRender(TriggerPartition, {
                 partitionKey: (row as Row<V1ModelPartition>).original
                   .key as string,
+                resource,
               }),
           },
         ]
diff --git a/web-common/src/features/models/partitions/TriggerPartition.svelte b/web-common/src/features/models/partitions/TriggerPartition.svelte
index 51b13cf3a45..41dff446bf7 100644
--- a/web-common/src/features/models/partitions/TriggerPartition.svelte
+++ b/web-common/src/features/models/partitions/TriggerPartition.svelte
@@ -5,6 +5,7 @@
   import {
     V1ReconcileStatus,
     createRuntimeServiceCreateTrigger,
+    type V1Resource,
   } from "../../../runtime-client";
   import { runtime } from "../../../runtime-client/runtime-store";
   import { addLeadingSlash } from "../../entity-management/entity-mappers";
@@ -14,6 +15,7 @@
   const triggerMutation = createRuntimeServiceCreateTrigger();
 
   export let partitionKey: string;
+  export let resource: V1Resource | undefined = undefined;
 
   function trigger() {
     $triggerMutation.mutate({
@@ -21,7 +23,7 @@
       data: {
         models: [
           {
-            model: resource?.meta?.name?.name as string,
+            model: resolvedResource?.meta?.name?.name as string,
             partitions: [partitionKey],
           },
         ],
@@ -31,18 +33,20 @@
 
   $: ({ instanceId } = $runtime);
 
-  // We access the `GetResource` result store from directly within this component
-  // This avoids needing to pass down the result through the table & needing to hack reactivity
+  // If resource is passed as prop, use it directly; otherwise derive from URL params (web-local)
   $: ({ params } = $page);
-  $: fileArtifact = fileArtifacts.getFileArtifact(addLeadingSlash(params.file));
-  $: resourceQuery = fileArtifact.getResource(queryClient, instanceId);
-  $: resource = $resourceQuery.data;
+  $: fileArtifact =
+    params.file !== undefined
+      ? fileArtifacts.getFileArtifact(addLeadingSlash(params.file))
+      : undefined;
+  $: resourceQuery = fileArtifact?.getResource(queryClient, instanceId);
+  $: resolvedResource = resource ?? $resourceQuery?.data;
 </script>
 
 <Button
   type="secondary"
   onClick={trigger}
-  disabled={resource?.meta?.reconcileStatus ===
+  disabled={resolvedResource?.meta?.reconcileStatus ===
     V1ReconcileStatus.RECONCILE_STATUS_RUNNING}
   noWrap
 >
diff --git a/web-common/tests/projects/incremental-test/rill.yaml b/web-common/tests/projects/incremental-test/rill.yaml
new file mode 100644
index 00000000000..519835a2d97
--- /dev/null
+++ b/web-common/tests/projects/incremental-test/rill.yaml
@@ -0,0 +1,7 @@
+# Rill project file
+# Reference documentation: https://docs.rilldata.com/reference/project-files/rill-yaml
+
+title: Incremental Test Project
+description: Test project for incremental model refresh functionality
+
+olap_connector: duckdb

From 8ac79e98e41cbe073ea0abe7f8a8580807b4adb3 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Tue, 27 Jan 2026 17:16:13 -0500
Subject: [PATCH 35/40] e2e, will fail as duckdb not showing for OLAP engine
 atm

---
 .../tests/project-status-refresh.spec.ts      | 241 ++++++++++++++++++
 web-admin/tests/project-status-tables.spec.ts | 130 +++++++---
 web-admin/tests/setup/setup.ts                |  44 ++++
 .../projects/incremental-test/.gitignore      |   6 +
 .../models/failed_partition.yaml              |  26 ++
 .../models/success_partition.yaml             |  26 ++
 6 files changed, 431 insertions(+), 42 deletions(-)
 create mode 100644 web-admin/tests/project-status-refresh.spec.ts
 create mode 100644 web-common/tests/projects/incremental-test/.gitignore
 create mode 100644 web-common/tests/projects/incremental-test/models/failed_partition.yaml
 create mode 100644 web-common/tests/projects/incremental-test/models/success_partition.yaml

diff --git a/web-admin/tests/project-status-refresh.spec.ts b/web-admin/tests/project-status-refresh.spec.ts
new file mode 100644
index 00000000000..0f000f66c42
--- /dev/null
+++ b/web-admin/tests/project-status-refresh.spec.ts
@@ -0,0 +1,241 @@
+import { expect } from "@playwright/test";
+import { test } from "./setup/base";
+
+test.describe("Project Status - Resource Refresh (openrtb)", () => {
+  test.beforeEach(async ({ adminPage }) => {
+    // Navigate to the project status page
+    await adminPage.goto("/e2e/openrtb/-/status");
+    // Wait for the resources table to load with actual data
+    await expect(adminPage.getByText("Resources")).toBeVisible();
+    // Wait for a specific model name to appear (indicates data is loaded)
+    // Note: VirtualizedTable uses div.row elements, not role="row"
+    await expect(adminPage.getByText("auction_data_model")).toBeVisible({
+      timeout: 60_000,
+    });
+  });
+
+  test("should show Full Refresh option for models", async ({ adminPage }) => {
+    // Find the auction_data_model row and click its actions menu
+    // The row contains both the model name and a "Model" badge
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "auction_data_model",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // Verify "Full Refresh" is visible
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Full Refresh" }),
+    ).toBeVisible();
+  });
+
+  test("should show Full Refresh option for sources", async ({ adminPage }) => {
+    // Find a source row and click its actions menu
+    const sourceRow = adminPage.locator(".row").filter({
+      hasText: "auction_data_raw",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await sourceRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // Verify "Full Refresh" is visible
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Full Refresh" }),
+    ).toBeVisible();
+
+    // Incremental Refresh should NOT be visible for sources
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Incremental Refresh" }),
+    ).not.toBeVisible();
+  });
+
+  test("should not show Incremental Refresh for non-incremental models", async ({
+    adminPage,
+  }) => {
+    // Find the auction_data_model row and click its actions menu
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "auction_data_model",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // Verify "Full Refresh" is visible
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Full Refresh" }),
+    ).toBeVisible();
+
+    // For non-incremental models, "Incremental Refresh" should not be visible
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Incremental Refresh" }),
+    ).not.toBeVisible();
+  });
+
+  test("should not show Refresh Errored Partitions for models without errors", async ({
+    adminPage,
+  }) => {
+    // Find the auction_data_model row and click its actions menu
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "auction_data_model",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // "Refresh Errored Partitions" should not be visible for models without errored partitions
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Refresh Errored Partitions" }),
+    ).not.toBeVisible();
+  });
+
+  test("should show correct dialog for Full Refresh", async ({ adminPage }) => {
+    // Find the auction_data_model row and click its actions menu
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "auction_data_model",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // Click "Full Refresh"
+    await adminPage.getByRole("menuitem", { name: "Full Refresh" }).click();
+
+    // Verify the dialog shows "Full Refresh" in the title
+    await expect(adminPage.getByRole("alertdialog")).toBeVisible();
+    await expect(
+      adminPage.getByRole("heading", { name: /Full Refresh/ }),
+    ).toBeVisible();
+
+    // Verify the warning message about full refresh
+    await expect(
+      adminPage.getByText(/Warning.*will re-ingest ALL data from scratch/),
+    ).toBeVisible();
+
+    // Close dialog by clicking cancel
+    await adminPage.getByRole("button", { name: "Cancel" }).click();
+    await expect(adminPage.getByRole("alertdialog")).not.toBeVisible();
+  });
+});
+
+test.describe("Project Status - Incremental Model Refresh (incremental-test)", () => {
+  test.beforeEach(async ({ adminPage }) => {
+    // Navigate to the incremental-test project status page
+    await adminPage.goto("/e2e/incremental-test/-/status");
+    // Wait for the resources table to load with actual data
+    await expect(adminPage.getByText("Resources")).toBeVisible();
+    // Wait for the specific model rows to appear (indicates data is loaded)
+    // Note: VirtualizedTable uses div.row elements, not role="row"
+    await expect(adminPage.getByText("success_partition")).toBeVisible({
+      timeout: 60_000,
+    });
+  });
+
+  test("should show Incremental Refresh option for incremental models", async ({
+    adminPage,
+  }) => {
+    // Find the success_partition model row and click its actions menu
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "success_partition",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // Verify both "Full Refresh" and "Incremental Refresh" are visible
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Full Refresh" }),
+    ).toBeVisible();
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Incremental Refresh" }),
+    ).toBeVisible();
+  });
+
+  test("should show correct dialog for Incremental Refresh", async ({
+    adminPage,
+  }) => {
+    // Find the success_partition model row and click its actions menu
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "success_partition",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // Click "Incremental Refresh"
+    await adminPage
+      .getByRole("menuitem", { name: "Incremental Refresh" })
+      .click();
+
+    // Verify the dialog shows "Incremental Refresh" in the title
+    await expect(adminPage.getByRole("alertdialog")).toBeVisible();
+    await expect(
+      adminPage.getByRole("heading", { name: /Incremental Refresh/ }),
+    ).toBeVisible();
+
+    // Verify the message about updating dependent resources
+    await expect(
+      adminPage.getByText("will update all dependent resources"),
+    ).toBeVisible();
+
+    // Close dialog by clicking cancel
+    await adminPage.getByRole("button", { name: "Cancel" }).click();
+    await expect(adminPage.getByRole("alertdialog")).not.toBeVisible();
+  });
+
+  test("should show Refresh Errored Partitions for models with errored partitions", async ({
+    adminPage,
+  }) => {
+    // Find the failed_partition model row and click its actions menu
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "failed_partition",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // Verify "Refresh Errored Partitions" is visible for models with errors
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Refresh Errored Partitions" }),
+    ).toBeVisible();
+  });
+
+  test("should show correct dialog for Refresh Errored Partitions", async ({
+    adminPage,
+  }) => {
+    // Find the failed_partition model row and click its actions menu
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "failed_partition",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // Click "Refresh Errored Partitions"
+    await adminPage
+      .getByRole("menuitem", { name: "Refresh Errored Partitions" })
+      .click();
+
+    // Verify the dialog shows "Refresh Errored Partitions" in the title
+    await expect(adminPage.getByRole("alertdialog")).toBeVisible();
+    await expect(
+      adminPage.getByRole("heading", { name: /Refresh Errored Partitions/ }),
+    ).toBeVisible();
+
+    // Verify the message about re-running failed partitions
+    await expect(
+      adminPage.getByText("re-run all partitions that failed"),
+    ).toBeVisible();
+
+    // Close dialog by clicking cancel
+    await adminPage.getByRole("button", { name: "Cancel" }).click();
+    await expect(adminPage.getByRole("alertdialog")).not.toBeVisible();
+  });
+
+  test("should not show Refresh Errored Partitions for successful incremental models", async ({
+    adminPage,
+  }) => {
+    // Find the success_partition model row and click its actions menu
+    const modelRow = adminPage.locator(".row").filter({
+      hasText: "success_partition",
+    });
+    // Target the dropdown menu trigger specifically (rows may have multiple buttons)
+    await modelRow.locator("[data-melt-dropdown-menu-trigger]").click();
+
+    // "Refresh Errored Partitions" should NOT be visible for models without errors
+    await expect(
+      adminPage.getByRole("menuitem", { name: "Refresh Errored Partitions" }),
+    ).not.toBeVisible();
+  });
+});
diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index 84eb7a1dd99..9041e5905a5 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -1,18 +1,52 @@
 import { expect } from "@playwright/test";
 import { test } from "./setup/base";
 
-test.describe("Project Status - Model Details", () => {
-  test("should display tables with their metadata values", async ({
-    adminPage,
-  }) => {
-    // Navigate to the project page
-    await adminPage.goto("/e2e/openrtb");
+test.describe("Project Status - Model Overview", () => {
+  test.beforeEach(async ({ adminPage }) => {
+    // Navigate directly to the model-overview page
+    await adminPage.goto("/e2e/openrtb/-/status/model-overview");
+    // Wait for the Model Overview heading to be visible
+    await expect(
+      adminPage.getByRole("heading", { name: "Model Overview" }),
+    ).toBeVisible({ timeout: 30_000 });
+  });
 
-    // Click on Status link
-    const statusLink = adminPage.getByRole("link", { name: "Status" });
-    await expect(statusLink).toBeVisible();
-    await statusLink.click();
+  test("should display Model Overview summary cards", async ({ adminPage }) => {
+    // Verify the three summary cards are visible
+    // Tables (Materialized Models) card
+    await expect(
+      adminPage.getByText("Tables (Materialized Models)"),
+    ).toBeVisible();
+
+    // Views card
+    await expect(adminPage.getByText("Views")).toBeVisible();
 
+    // OLAP Engine card
+    await expect(adminPage.getByText("OLAP Engine")).toBeVisible();
+
+    // Verify that the counts are displayed (not loading placeholders)
+    // The cards should show numeric values (not just "-")
+    const tablesCard = adminPage
+      .locator("div")
+      .filter({ hasText: "Tables (Materialized Models)" })
+      .first();
+    await expect(tablesCard).toBeVisible();
+
+    const viewsCard = adminPage
+      .locator("div")
+      .filter({ hasText: /^Views$/ })
+      .first();
+    await expect(viewsCard).toBeVisible();
+
+    // OLAP Engine should show "duckdb" for the openrtb project
+    await expect(adminPage.getByText("duckdb")).toBeVisible({
+      timeout: 15_000,
+    });
+  });
+
+  test("should display Model Details table with correct columns", async ({
+    adminPage,
+  }) => {
     // Wait for the Model Details heading to be visible
     const modelDetailsHeading = adminPage.getByRole("heading", {
       name: "Model Details",
@@ -34,49 +68,61 @@ test.describe("Project Status - Model Details", () => {
     const rowCount = await dataRows.count();
     expect(rowCount).toBeGreaterThan(0);
 
-    // Verify specific table data if auction_data_model exists
+    // Verify the table is visible
+    await expect(tablesTable).toBeVisible();
+  });
+
+  test("should display table rows with model data", async ({ adminPage }) => {
+    // Scope to the project tables table
+    const tablesTable = adminPage.locator("#project-tables-table");
+
+    // Wait for rows to load
+    await expect(tablesTable.locator(".row").first()).toBeVisible({
+      timeout: 30_000,
+    });
+
+    // Verify specific table data - auction_data_model should exist
     const auctionRow = tablesTable.locator(".row", {
       hasText: "auction_data_model",
     });
-    const auctionRowExists = await auctionRow.isVisible().catch(() => false);
+    await expect(auctionRow).toBeVisible({ timeout: 30_000 });
 
-    if (auctionRowExists) {
-      await expect(auctionRow).toBeVisible();
+    // Verify that the row has visible content
+    const cells = auctionRow.locator("> div");
+    const cellCount = await cells.count();
+    expect(cellCount).toBeGreaterThanOrEqual(3); // At least 3 columns
 
-      // Verify that the row has visible content
-      const cells = auctionRow.locator("> div");
-      const cellCount = await cells.count();
-      expect(cellCount).toBeGreaterThanOrEqual(3); // At least 3 columns
+    // Verify Name column contains auction_data_model
+    await expect(auctionRow).toContainText("auction_data_model");
+  });
 
-      // Get the text content of each cell
-      const cellTexts = await cells.allTextContents();
-      console.log("auction_data_model row cells:", cellTexts);
+  test("should navigate to Model Overview from Status link", async ({
+    adminPage,
+  }) => {
+    // Start from the project home page
+    await adminPage.goto("/e2e/openrtb");
 
-      // Verify Name column contains auction_data_model
-      await expect(auctionRow).toContainText("auction_data_model");
-    }
+    // Click on Status link
+    const statusLink = adminPage.getByRole("link", { name: "Status" });
+    await expect(statusLink).toBeVisible();
+    await statusLink.click();
 
-    // Verify the table is visible
-    await expect(tablesTable).toBeVisible();
-  });
+    // Should redirect to project-status page first
+    await adminPage.waitForURL("**/status/project-status");
 
-  test("should handle empty table list gracefully", async ({ adminPage }) => {
-    // This test verifies the UI renders correctly for a project
-    // Navigate to project page and click Status link
-    await adminPage.goto("/e2e/openrtb");
-    await adminPage.getByRole("link", { name: "Status" }).click();
+    // Click on Model Overview nav link
+    const modelOverviewLink = adminPage.getByRole("link", {
+      name: "Model Overview",
+    });
+    await expect(modelOverviewLink).toBeVisible();
+    await modelOverviewLink.click();
+
+    // Should navigate to model-overview page
+    await adminPage.waitForURL("**/status/model-overview");
 
-    // Wait for the page to load
+    // Verify the Model Overview heading is visible
     await expect(
-      adminPage.getByRole("heading", { name: "Model Details" }),
+      adminPage.getByRole("heading", { name: "Model Overview" }),
     ).toBeVisible();
-
-    // If no tables, it should show the table container (possibly with no data message)
-    // or with the table headers visible
-    const tableSection = adminPage
-      .locator("section")
-      .filter({ hasText: "Model Details" })
-      .first();
-    await expect(tableSection).toBeVisible();
   });
 });
diff --git a/web-admin/tests/setup/setup.ts b/web-admin/tests/setup/setup.ts
index ce2ddd7dd07..c4bd104e8ca 100644
--- a/web-admin/tests/setup/setup.ts
+++ b/web-admin/tests/setup/setup.ts
@@ -325,4 +325,48 @@ setup.describe("global setup", () => {
       adminPage.getByRole("link", { name: "Adbids dashboard" }),
     ).toBeVisible();
   });
+
+  setup("should deploy the incremental-test project", async ({ adminPage }) => {
+    // Deploy the incremental-test project (for testing incremental model refresh)
+    const { match } = await spawnAndMatch(
+      "rill",
+      [
+        "deploy",
+        "--path",
+        "../web-common/tests/projects/incremental-test",
+        "--project",
+        "incremental-test",
+        "--archive",
+        "--interactive=false",
+      ],
+      /https?:\/\/[^\s]+/,
+    );
+
+    // Navigate to the project URL and expect to see the successful deployment
+    const url = match[0];
+    await adminPage.goto(url);
+    await expect(
+      adminPage.getByRole("link", { name: RILL_ORG_NAME }),
+    ).toBeVisible(); // Organization breadcrumb
+    await expect(
+      adminPage.getByRole("link", { name: "incremental-test", exact: true }),
+    ).toBeVisible(); // Project breadcrumb
+
+    // Expect to land on the project home page
+    await adminPage.waitForURL(`/${RILL_ORG_NAME}/incremental-test`);
+
+    // Wait for the project to be ready by checking the status page
+    await adminPage.goto(`/${RILL_ORG_NAME}/incremental-test/-/status`);
+    await expect(adminPage.getByText("Resources")).toBeVisible({
+      timeout: 60_000,
+    });
+
+    // Verify the incremental models are listed
+    await expect(adminPage.getByText("success_partition")).toBeVisible({
+      timeout: 30_000,
+    });
+    await expect(adminPage.getByText("failed_partition")).toBeVisible({
+      timeout: 30_000,
+    });
+  });
 });
diff --git a/web-common/tests/projects/incremental-test/.gitignore b/web-common/tests/projects/incremental-test/.gitignore
new file mode 100644
index 00000000000..791be6cde56
--- /dev/null
+++ b/web-common/tests/projects/incremental-test/.gitignore
@@ -0,0 +1,6 @@
+.rill/
+tmp/
+
+.DS_Store
+.env
+tmp
\ No newline at end of file
diff --git a/web-common/tests/projects/incremental-test/models/failed_partition.yaml b/web-common/tests/projects/incremental-test/models/failed_partition.yaml
new file mode 100644
index 00000000000..054709740cb
--- /dev/null
+++ b/web-common/tests/projects/incremental-test/models/failed_partition.yaml
@@ -0,0 +1,26 @@
+# Model YAML
+# Reference documentation: https://docs.rilldata.com/reference/project-files/models
+#
+# NOTE: This glob intentionally includes malformed CSV files in the bucket
+# to trigger partition errors for E2E testing of "Refresh Errored Partitions"
+
+type: model
+materialize: true
+
+connector: duckdb
+
+create_secrets_from_connectors: gcs
+incremental: true
+
+# Matches all CSV files including malformed ones that will fail parsing
+partitions:
+  glob: gs://rilldata-public/e2e/incremental/*.csv
+
+sql: |
+  select *
+  from read_csv(
+    '{{.partition.uri}}',
+    header=true,
+    auto_detect=1,
+    ignore_errors=0
+  )
diff --git a/web-common/tests/projects/incremental-test/models/success_partition.yaml b/web-common/tests/projects/incremental-test/models/success_partition.yaml
new file mode 100644
index 00000000000..d3ef7556606
--- /dev/null
+++ b/web-common/tests/projects/incremental-test/models/success_partition.yaml
@@ -0,0 +1,26 @@
+# Model YAML
+# Reference documentation: https://docs.rilldata.com/reference/project-files/models
+#
+# NOTE: This glob only matches well-formed CSV files (dt*.csv pattern)
+# to ensure this model completes without partition errors
+
+type: model
+materialize: true
+
+connector: duckdb
+
+create_secrets_from_connectors: gcs
+incremental: true
+
+# Matches only valid dt*.csv files, avoiding malformed ones
+partitions:
+  glob: gs://rilldata-public/e2e/incremental/dt*.csv
+
+sql: |
+  select *
+  from read_csv(
+    '{{.partition.uri}}',
+    header=true,
+    auto_detect=1,
+    ignore_errors=0
+  )

From 9cea91afedd240bc4ff03b915d28a5049fd6c5a4 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 28 Jan 2026 10:24:05 -0500
Subject: [PATCH 36/40] dark mode

---
 .../projects/status/ModelInfoDialog.svelte       |  2 +-
 .../projects/status/ModelLogsPanel.svelte        | 12 ++++++------
 .../projects/status/ModelSizeCell.svelte         |  2 +-
 .../projects/status/ProjectTables.svelte         |  6 +++---
 .../projects/status/ResourceErrorMessage.svelte  |  6 +++---
 .../-/status/model-overview/+page.svelte         | 16 ++++++++--------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/web-admin/src/features/projects/status/ModelInfoDialog.svelte b/web-admin/src/features/projects/status/ModelInfoDialog.svelte
index 67772c99557..ca5df911b0b 100644
--- a/web-admin/src/features/projects/status/ModelInfoDialog.svelte
+++ b/web-admin/src/features/projects/status/ModelInfoDialog.svelte
@@ -47,7 +47,7 @@
     {#if yamlContent}
       <YamlPreview title="Model Information" yaml={yamlContent} />
     {:else}
-      <div class="text-gray-500 py-4">No model information available</div>
+      <div class="text-fg-secondary py-4">No model information available</div>
     {/if}
   </Dialog.Content>
 </Dialog.Root>
diff --git a/web-admin/src/features/projects/status/ModelLogsPanel.svelte b/web-admin/src/features/projects/status/ModelLogsPanel.svelte
index 8bd450b2f1a..4aaa5b93acc 100644
--- a/web-admin/src/features/projects/status/ModelLogsPanel.svelte
+++ b/web-admin/src/features/projects/status/ModelLogsPanel.svelte
@@ -77,7 +77,7 @@
       case "LOG_LEVEL_WARN":
         return "text-yellow-600";
       default:
-        return "text-gray-500";
+        return "text-fg-muted";
     }
   }
 
@@ -110,7 +110,7 @@
   <div
     bind:this={logsContainer}
     on:scroll={handleScroll}
-    class="bg-gray-50 border border-gray-200 rounded-md p-3 font-mono text-xs h-64 overflow-y-auto"
+    class="bg-surface border rounded-md p-3 font-mono text-xs h-64 overflow-y-auto"
   >
     {#if $logsQuery.isError}
       <div class="text-red-600">
@@ -119,15 +119,15 @@
           "Unknown error"}
       </div>
     {:else if modelLogs.length === 0}
-      <div class="text-gray-500">No model logs found</div>
+      <div class="text-fg-secondary">No model logs found</div>
     {:else}
       {#each modelLogs as log}
-        <div class="py-0.5 flex gap-x-2 hover:bg-gray-100">
-          <span class="text-gray-500 flex-none">{formatTime(log.time)}</span>
+        <div class="py-0.5 flex gap-x-2 hover:bg-surface-hover">
+          <span class="text-fg-muted flex-none">{formatTime(log.time)}</span>
           <span class="{getLevelClass(log.level)} flex-none w-12"
             >{getLevelLabel(log.level)}</span
           >
-          <span class="text-gray-700 break-all"
+          <span class="text-fg-secondary break-all"
             >{log.message}{log.jsonPayload ? ` ${log.jsonPayload}` : ""}</span
           >
         </div>
diff --git a/web-admin/src/features/projects/status/ModelSizeCell.svelte b/web-admin/src/features/projects/status/ModelSizeCell.svelte
index 5507d8036dc..91ec3639569 100644
--- a/web-admin/src/features/projects/status/ModelSizeCell.svelte
+++ b/web-admin/src/features/projects/status/ModelSizeCell.svelte
@@ -21,7 +21,7 @@
 </script>
 
 <div class="truncate text-right tabular-nums">
-  <span class:text-gray-500={formattedSize === "-"}>
+  <span class:text-fg-muted={formattedSize === "-"}>
     {formattedSize}
   </span>
 </div>
diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index 1142b6bf5b1..01f1659ec71 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -129,7 +129,7 @@
   </div>
 
   {#if $tablesList.isLoading}
-    <div class="flex items-center gap-x-2 text-gray-500">
+    <div class="flex items-center gap-x-2 text-fg-secondary">
       <DelayedSpinner isLoading={true} size="16px" />
       <span class="text-sm">Loading tables...</span>
     </div>
@@ -151,10 +151,10 @@
       onFullRefreshClick={handleFullRefreshClick}
     />
     {#if $tableMetadata?.isLoading || $tableCardinality?.isLoading}
-      <div class="mt-2 text-xs text-gray-500">Loading table metadata...</div>
+      <div class="mt-2 text-xs text-fg-secondary">Loading table metadata...</div>
     {/if}
   {:else}
-    <div class="text-gray-500 text-sm">No tables found</div>
+    <div class="text-fg-secondary text-sm">No tables found</div>
   {/if}
 </section>
 
diff --git a/web-admin/src/features/projects/status/ResourceErrorMessage.svelte b/web-admin/src/features/projects/status/ResourceErrorMessage.svelte
index cf8c6c5ac5e..c9e9d60ef5e 100644
--- a/web-admin/src/features/projects/status/ResourceErrorMessage.svelte
+++ b/web-admin/src/features/projects/status/ResourceErrorMessage.svelte
@@ -23,13 +23,13 @@
   {:else if hasTestErrors}
     <Tooltip distance={8}>
       <button
-        class="hover:bg-slate-100 rounded p-1 active:bg-slate-200 group"
+        class="hover:bg-surface-hover rounded p-1 active:bg-surface-active group"
         on:click={() =>
           copyToClipboard(testErrorMessage, "Copied test error to clipboard")}
       >
         <CopyIcon
           size="18px"
-          className="text-gray-500 hidden group-hover:block"
+          className="text-fg-secondary hidden group-hover:block"
         />
 
         <AlertTriangleIcon
@@ -44,7 +44,7 @@
   {:else if message}
     <Tooltip distance={8}>
       <button
-        class="hover:bg-surface-hover rounded p-1 active:bg-gray-200 group"
+        class="hover:bg-surface-hover rounded p-1 active:bg-surface-active group"
         on:click={() =>
           copyToClipboard(message, "Copied error message to clipboard")}
       >
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
index 37c4b72e293..46a66203e06 100644
--- a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
@@ -42,15 +42,15 @@
   <section class="flex flex-col gap-y-4">
     <h2 class="text-lg font-medium">Model Overview</h2>
     <div class="grid grid-cols-3 gap-4">
-      <div class="flex flex-col gap-y-1 p-4 border rounded-md">
+      <div class="flex flex-col gap-y-1 p-4 border rounded-md bg-surface">
         <div class="flex items-center gap-x-1">
-          <span class="text-sm text-gray-500">Tables (Materialized Models)</span
+          <span class="text-sm text-fg-secondary">Tables (Materialized Models)</span
           >
           <a
             href="https://docs.rilldata.com/build/models/performance#consider-which-models-to-materialize"
             target="_blank"
             rel="noopener noreferrer"
-            class="text-gray-400 hover:text-gray-600"
+            class="text-fg-muted hover:text-fg-secondary"
             title="Learn about materialized models"
           >
             <svg
@@ -71,20 +71,20 @@
           {$tableMetadata?.isLoading ? "-" : tableCount}
         </span>
       </div>
-      <div class="flex flex-col gap-y-1 p-4 border rounded-md">
-        <span class="text-sm text-gray-500">Views</span>
+      <div class="flex flex-col gap-y-1 p-4 border rounded-md bg-surface">
+        <span class="text-sm text-fg-secondary">Views</span>
         <span class="text-2xl font-semibold tabular-nums">
           {$tableMetadata?.isLoading ? "-" : viewCount}
         </span>
       </div>
-      <div class="flex flex-col gap-y-1 p-4 border rounded-md">
+      <div class="flex flex-col gap-y-1 p-4 border rounded-md bg-surface">
         <div class="flex items-center gap-x-1">
-          <span class="text-sm text-gray-500">OLAP Engine</span>
+          <span class="text-sm text-fg-secondary">OLAP Engine</span>
           <a
             href="https://docs.rilldata.com/reference/olap-engines"
             target="_blank"
             rel="noopener noreferrer"
-            class="text-gray-400 hover:text-gray-600"
+            class="text-fg-muted hover:text-fg-secondary"
             title="Learn about OLAP engines"
           >
             <svg

From f27ed0a41c4178a8343abf3382a322e30a85c380 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 28 Jan 2026 18:34:17 -0500
Subject: [PATCH 37/40] prettier and code qual

---
 runtime/parser/parse_node.go                   | 18 +++++++++---------
 runtime/parser/parser.go                       |  5 +++--
 .../projects/status/ModelInfoDialog.svelte     |  1 -
 .../projects/status/ProjectTables.svelte       |  4 +++-
 .../RefreshErroredPartitionsDialog.svelte      |  2 +-
 .../-/status/model-overview/+page.svelte       |  3 ++-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/runtime/parser/parse_node.go b/runtime/parser/parse_node.go
index 4e950135a35..9685bb4ef4f 100644
--- a/runtime/parser/parse_node.go
+++ b/runtime/parser/parse_node.go
@@ -248,26 +248,26 @@ func (p *Parser) parseStem(paths []string, ymlPath, yml, sqlPath, sql string) (*
 			v, ok := v.(string)
 			if !ok {
 				err = fmt.Errorf("invalid type %T for property 'type'", v)
-				break
-			}
-			res.Kind, err = ParseResourceKind(v)
-			if err != nil {
-				break
+			} else {
+				res.Kind, err = ParseResourceKind(v)
 			}
 		case "name":
 			v, ok := v.(string)
 			if !ok {
 				err = fmt.Errorf("invalid type %T for property 'name'", v)
-				break
+			} else {
+				res.Name = v
 			}
-			res.Name = v
 		case "connector":
 			v, ok := v.(string)
 			if !ok {
 				err = fmt.Errorf("invalid type %T for property 'connector'", v)
-				break
+			} else {
+				res.Connector = v
 			}
-			res.Connector = v
+		}
+		if err != nil {
+			break
 		}
 	}
 	if err != nil {
diff --git a/runtime/parser/parser.go b/runtime/parser/parser.go
index f5f25d4fbd7..51bc9b799d0 100644
--- a/runtime/parser/parser.go
+++ b/runtime/parser/parser.go
@@ -634,12 +634,13 @@ func (p *Parser) parsePaths(ctx context.Context, paths []string) error {
 	// NOTE 2: Using a map since the two-way check (necessary for reparses) may match the same resource twice.
 	modelsWithNameErrs := make(map[ResourceName]string)
 	for _, r := range p.insertedResources {
-		if r.Name.Kind == ResourceKindSource {
+		switch r.Name.Kind {
+		case ResourceKindSource:
 			n := ResourceName{Kind: ResourceKindModel, Name: r.Name.Name}.Normalized()
 			if _, ok := p.Resources[n]; ok {
 				modelsWithNameErrs[n] = r.Name.Name
 			}
-		} else if r.Name.Kind == ResourceKindModel {
+		case ResourceKindModel:
 			n := ResourceName{Kind: ResourceKindSource, Name: r.Name.Name}.Normalized()
 			if r2, ok := p.Resources[n]; ok {
 				modelsWithNameErrs[r.Name.Normalized()] = r2.Name.Name
diff --git a/web-admin/src/features/projects/status/ModelInfoDialog.svelte b/web-admin/src/features/projects/status/ModelInfoDialog.svelte
index ca5df911b0b..825cda07c5e 100644
--- a/web-admin/src/features/projects/status/ModelInfoDialog.svelte
+++ b/web-admin/src/features/projects/status/ModelInfoDialog.svelte
@@ -21,7 +21,6 @@
           executorConnector: resource.model?.state?.executorConnector,
           resultConnector: resource.model?.state?.resultConnector,
           resultTable: resource.model?.state?.resultTable,
-          resultSchema: resource.model?.state?.resultSchema,
           partitionsModelId: resource.model?.state?.partitionsModelId,
           partitionsHaveErrors: resource.model?.state?.partitionsHaveErrors,
         },
diff --git a/web-admin/src/features/projects/status/ProjectTables.svelte b/web-admin/src/features/projects/status/ProjectTables.svelte
index 01f1659ec71..248e4b98c1a 100644
--- a/web-admin/src/features/projects/status/ProjectTables.svelte
+++ b/web-admin/src/features/projects/status/ProjectTables.svelte
@@ -151,7 +151,9 @@
       onFullRefreshClick={handleFullRefreshClick}
     />
     {#if $tableMetadata?.isLoading || $tableCardinality?.isLoading}
-      <div class="mt-2 text-xs text-fg-secondary">Loading table metadata...</div>
+      <div class="mt-2 text-xs text-fg-secondary">
+        Loading table metadata...
+      </div>
     {/if}
   {:else}
     <div class="text-fg-secondary text-sm">No tables found</div>
diff --git a/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte b/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
index e3c8b85ae1f..1367773265e 100644
--- a/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
+++ b/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
@@ -38,7 +38,7 @@
     </AlertDialogHeader>
     <AlertDialogFooter>
       <Button
-        type="plain"
+        type="secondary"
         onClick={() => {
           open = false;
         }}>Cancel</Button
diff --git a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
index 46a66203e06..f41ced3b4b6 100644
--- a/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/status/model-overview/+page.svelte
@@ -44,7 +44,8 @@
     <div class="grid grid-cols-3 gap-4">
       <div class="flex flex-col gap-y-1 p-4 border rounded-md bg-surface">
         <div class="flex items-center gap-x-1">
-          <span class="text-sm text-fg-secondary">Tables (Materialized Models)</span
+          <span class="text-sm text-fg-secondary"
+            >Tables (Materialized Models)</span
           >
           <a
             href="https://docs.rilldata.com/build/models/performance#consider-which-models-to-materialize"

From f7e6ebd709a91a020e73cc215547f29eb5e67ea9 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 29 Jan 2026 09:47:23 -0500
Subject: [PATCH 38/40] e2e, fix partition refresh

---
 .../RefreshErroredPartitionsDialog.svelte     | 18 ++++--
 web-admin/tests/project-status-tables.spec.ts |  6 +-
 .../models/partitions/TriggerPartition.svelte | 55 +++++++++++++++++--
 3 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte b/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
index 1367773265e..3cf7ab9b6a6 100644
--- a/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
+++ b/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
@@ -11,14 +11,19 @@
 
   export let open = false;
   export let modelName: string;
-  export let onRefresh: () => void;
+  export let onRefresh: () => void | Promise<void>;
 
-  function handleRefresh() {
+  let isRefreshing = false;
+
+  async function handleRefresh() {
     try {
-      onRefresh();
+      isRefreshing = true;
+      await onRefresh();
       open = false;
     } catch (error) {
       console.error("Failed to refresh errored partitions:", error);
+    } finally {
+      isRefreshing = false;
     }
   }
 </script>
@@ -39,11 +44,16 @@
     <AlertDialogFooter>
       <Button
         type="secondary"
+        disabled={isRefreshing}
         onClick={() => {
           open = false;
         }}>Cancel</Button
       >
-      <Button type="primary" onClick={handleRefresh}
+      <Button
+        type="primary"
+        onClick={handleRefresh}
+        disabled={isRefreshing}
+        loading={isRefreshing}
         >Refresh Errored Partitions</Button
       >
     </AlertDialogFooter>
diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index 9041e5905a5..f35450b4c88 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -59,7 +59,11 @@ test.describe("Project Status - Model Overview", () => {
     const headers = tablesTable.locator('[role="columnheader"]');
     await expect(headers.nth(0)).toContainText("Type");
     await expect(headers.nth(1)).toContainText("Name");
-    await expect(headers.nth(2)).toContainText("Database Size");
+    await expect(headers.nth(2)).toContainText("Status");
+    await expect(headers.nth(3)).toContainText("Rows");
+    await expect(headers.nth(4)).toContainText("Columns");
+    await expect(headers.nth(5)).toContainText("Database Size");
+
 
     // Verify table rows are rendered (VirtualizedTable uses .row divs, skip the header row)
     const dataRows = tablesTable.locator(".row").filter({
diff --git a/web-common/src/features/models/partitions/TriggerPartition.svelte b/web-common/src/features/models/partitions/TriggerPartition.svelte
index 41dff446bf7..8acef2221a1 100644
--- a/web-common/src/features/models/partitions/TriggerPartition.svelte
+++ b/web-common/src/features/models/partitions/TriggerPartition.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
   import { page } from "$app/stores";
+  import { onDestroy } from "svelte";
   import { useQueryClient } from "@tanstack/svelte-query";
   import { Button } from "../../../components/button";
   import {
     V1ReconcileStatus,
     createRuntimeServiceCreateTrigger,
+    getRuntimeServiceGetModelPartitionsQueryKey,
     type V1Resource,
   } from "../../../runtime-client";
   import { runtime } from "../../../runtime-client/runtime-store";
@@ -17,21 +19,62 @@
   export let partitionKey: string;
   export let resource: V1Resource | undefined = undefined;
 
-  function trigger() {
-    $triggerMutation.mutate({
+  let pollInterval: ReturnType<typeof setInterval> | null = null;
+
+  onDestroy(() => {
+    if (pollInterval) {
+      clearInterval(pollInterval);
+    }
+  });
+
+  async function trigger() {
+    const modelName = resolvedResource?.meta?.name?.name;
+    if (!modelName) return;
+
+    // Clear any existing poll interval
+    if (pollInterval) {
+      clearInterval(pollInterval);
+      pollInterval = null;
+    }
+
+    await $triggerMutation.mutateAsync({
       instanceId,
       data: {
         models: [
           {
-            model: resolvedResource?.meta?.name?.name as string,
+            model: modelName,
             partitions: [partitionKey],
           },
         ],
       },
     });
+
+    // Poll for updates since partition execution happens asynchronously
+    const invalidate = () =>
+      queryClient.invalidateQueries({
+        queryKey: getRuntimeServiceGetModelPartitionsQueryKey(
+          instanceId,
+          modelName,
+        ),
+      });
+
+    await invalidate();
+
+    // Poll every 2 seconds for up to 30 seconds to catch the update
+    let pollCount = 0;
+    const maxPolls = 15;
+    pollInterval = setInterval(async () => {
+      pollCount++;
+      await invalidate();
+      if (pollCount >= maxPolls && pollInterval) {
+        clearInterval(pollInterval);
+        pollInterval = null;
+      }
+    }, 2000);
   }
 
   $: ({ instanceId } = $runtime);
+  $: isLoading = $triggerMutation.isPending;
 
   // If resource is passed as prop, use it directly; otherwise derive from URL params (web-local)
   $: ({ params } = $page);
@@ -46,8 +89,10 @@
 <Button
   type="secondary"
   onClick={trigger}
-  disabled={resolvedResource?.meta?.reconcileStatus ===
-    V1ReconcileStatus.RECONCILE_STATUS_RUNNING}
+  disabled={isLoading ||
+    resolvedResource?.meta?.reconcileStatus ===
+      V1ReconcileStatus.RECONCILE_STATUS_RUNNING}
+  loading={isLoading}
   noWrap
 >
   Refresh partition

From cf0d061ed47bb947399c72a1a706628a5453d792 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 29 Jan 2026 09:47:38 -0500
Subject: [PATCH 39/40] prettier

---
 .../projects/status/RefreshErroredPartitionsDialog.svelte      | 3 +--
 web-admin/tests/project-status-tables.spec.ts                  | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte b/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
index 3cf7ab9b6a6..d493f72ad2b 100644
--- a/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
+++ b/web-admin/src/features/projects/status/RefreshErroredPartitionsDialog.svelte
@@ -53,8 +53,7 @@
         type="primary"
         onClick={handleRefresh}
         disabled={isRefreshing}
-        loading={isRefreshing}
-        >Refresh Errored Partitions</Button
+        loading={isRefreshing}>Refresh Errored Partitions</Button
       >
     </AlertDialogFooter>
   </AlertDialogContent>
diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index f35450b4c88..f5e93644909 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -64,7 +64,6 @@ test.describe("Project Status - Model Overview", () => {
     await expect(headers.nth(4)).toContainText("Columns");
     await expect(headers.nth(5)).toContainText("Database Size");
 
-
     // Verify table rows are rendered (VirtualizedTable uses .row divs, skip the header row)
     const dataRows = tablesTable.locator(".row").filter({
       hasNot: adminPage.locator('[role="columnheader"]'),

From 3461dbdfe2abc1d5d8181c76df85f9f6eef60b0e Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 29 Jan 2026 20:34:41 -0500
Subject: [PATCH 40/40] e2e fix

---
 .../tests/project-status-refresh.spec.ts      | 11 ++++++++
 web-admin/tests/project-status-tables.spec.ts | 28 ++++++-------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/web-admin/tests/project-status-refresh.spec.ts b/web-admin/tests/project-status-refresh.spec.ts
index 0f000f66c42..871dc254f97 100644
--- a/web-admin/tests/project-status-refresh.spec.ts
+++ b/web-admin/tests/project-status-refresh.spec.ts
@@ -2,6 +2,9 @@ import { expect } from "@playwright/test";
 import { test } from "./setup/base";
 
 test.describe("Project Status - Resource Refresh (openrtb)", () => {
+  // Increase timeout for tests that interact with virtualized tables
+  test.setTimeout(60_000);
+
   test.beforeEach(async ({ adminPage }) => {
     // Navigate to the project status page
     await adminPage.goto("/e2e/openrtb/-/status");
@@ -30,6 +33,11 @@ test.describe("Project Status - Resource Refresh (openrtb)", () => {
   });
 
   test("should show Full Refresh option for sources", async ({ adminPage }) => {
+    // Wait for the source row to be visible before interacting
+    await expect(adminPage.getByText("auction_data_raw")).toBeVisible({
+      timeout: 60_000,
+    });
+
     // Find a source row and click its actions menu
     const sourceRow = adminPage.locator(".row").filter({
       hasText: "auction_data_raw",
@@ -114,6 +122,9 @@ test.describe("Project Status - Resource Refresh (openrtb)", () => {
 });
 
 test.describe("Project Status - Incremental Model Refresh (incremental-test)", () => {
+  // Increase timeout for tests that interact with virtualized tables
+  test.setTimeout(60_000);
+
   test.beforeEach(async ({ adminPage }) => {
     // Navigate to the incremental-test project status page
     await adminPage.goto("/e2e/incremental-test/-/status");
diff --git a/web-admin/tests/project-status-tables.spec.ts b/web-admin/tests/project-status-tables.spec.ts
index f5e93644909..c37c7587ca2 100644
--- a/web-admin/tests/project-status-tables.spec.ts
+++ b/web-admin/tests/project-status-tables.spec.ts
@@ -2,6 +2,9 @@ import { expect } from "@playwright/test";
 import { test } from "./setup/base";
 
 test.describe("Project Status - Model Overview", () => {
+  // Increase timeout for tests that load data from virtualized tables
+  test.setTimeout(60_000);
+
   test.beforeEach(async ({ adminPage }) => {
     // Navigate directly to the model-overview page
     await adminPage.goto("/e2e/openrtb/-/status/model-overview");
@@ -18,25 +21,12 @@ test.describe("Project Status - Model Overview", () => {
       adminPage.getByText("Tables (Materialized Models)"),
     ).toBeVisible();
 
-    // Views card
-    await expect(adminPage.getByText("Views")).toBeVisible();
-
-    // OLAP Engine card
-    await expect(adminPage.getByText("OLAP Engine")).toBeVisible();
-
-    // Verify that the counts are displayed (not loading placeholders)
-    // The cards should show numeric values (not just "-")
-    const tablesCard = adminPage
-      .locator("div")
-      .filter({ hasText: "Tables (Materialized Models)" })
-      .first();
-    await expect(tablesCard).toBeVisible();
-
-    const viewsCard = adminPage
-      .locator("div")
-      .filter({ hasText: /^Views$/ })
-      .first();
-    await expect(viewsCard).toBeVisible();
+    // Views card - the span contains exactly "Views" text
+    const viewsLabel = adminPage.locator("span", { hasText: /^Views$/ });
+    await expect(viewsLabel).toBeVisible();
+
+    // OLAP Engine card - shows "OLAP (Rill Managed)" for DuckDB
+    await expect(adminPage.getByText("OLAP (Rill Managed)")).toBeVisible();
 
     // OLAP Engine should show "duckdb" for the openrtb project
     await expect(adminPage.getByText("duckdb")).toBeVisible({