API to trigger queryKeyHashFn recalculation for active observers (multi-tenant context switching)

[dbssman]

Use Case

Multi-tenant application where users can switch tenant context without navigating away (e.g., tenant switcher dropdown). We use queryKeyHashFn to transparently scope queries by user and tenant:

  const queryKeyHashFn = (queryKey: QueryKey) => {
    const tenant = tenantService.getTenant()
    return hashKey(['tenant', tenant, ...queryKey])
  }

This gives us context-agnostic query definitions that work across different tenants without explicitly adding tenant to every queryKey.

The Problem

When tenant changes mid-session, active observers still have their cached queryHash. There's no official API to trigger hash recalculation.

Current Workaround

We force recalculation by calling setOptions without queryHash or _defaulted:

  for (const query of queryClient.getQueryCache().getAll()) {
    for (const observer of query.observers) {
      const { queryHash, _defaulted, ...options } = observer.options
      observer.setOptions(options)
    }
  }

This works because setOptions recomputes the hash when not provided, but it relies on internal behavior (_defaulted causing early return in defaultQueryOptions).

Proposal

An official API to rescope active observers, e.g.:

  queryClient.rescopeQueries()
  // or
  queryCache.rehashObservers()

Alternatives Considered

Approach	Downside
Include tenant in queryKey explicitly	Verbose, loses context-agnostic reusability
Clear cache on context change	Defeats caching purpose
Multiple QueryClients per tenant	Bad when you have global queries cached (with no context)
Force UI rerender	Unnecessary remounts, loses component state

Question

Is there an official/recommended way to handle this? Or would a new API be considered for this use case?