@svadmin/core 0.31.0 → 0.32.0

package/src/i18n.svelte.ts

@@ -1,6 +1,6 @@
 // Minimal i18n — simple key-value translation
 
-
+import { createContext } from 'svelte';
 
 const baseLocales: Record<string, Record<string, string>> = {
   'zh-CN': {
@@ -994,52 +994,189 @@ export interface I18nProvider {
   getAvailableLocales?: () => string[];
 }
 
+/** Owner-controlled values for one component-tree i18n scope. */
+export interface I18nScopeOptions {
+  locale?: string;
+  provider?: I18nProvider;
+  onLocaleChange?: (locale: string) => void;
+}
+
+/**
+ * Tree-local i18n state. `updateOwner` synchronizes props without emitting a
+ * change event, while `setLocale` represents a change requested inside the tree.
+ */
+export interface I18nScope {
+  readonly locale: string;
+  readonly provider: I18nProvider | undefined;
+  translate: (key: string, params?: Record<string, string | number>) => string;
+  setLocale: (locale: string) => void;
+  setProvider: (provider: I18nProvider | undefined) => void;
+  getAvailableLocales: () => string[];
+  updateOwner: (options: I18nScopeOptions) => void;
+}
+
+const [readI18nScopeContext, writeI18nScopeContext] = createContext<I18nScope>();
+
+function translateFromTables(
+  locale: string,
+  key: string,
+  params?: Record<string, string | number>,
+): string {
+  const localeTable = locales[locale];
+  let text = localeTable?.[key] ?? locales.en?.[key] ?? key;
+
+  if (params) {
+    for (const [param, value] of Object.entries(params)) {
+      text = text.replaceAll(`{${param}}`, String(value));
+    }
+  }
+
+  return text;
+}
+
+function readCurrentI18nScope(): I18nScope | undefined {
+  try {
+    return readI18nScopeContext();
+  } catch {
+    // Context is only readable while Svelte owns the current render/effect.
+    // Public facade calls made outside a component intentionally use legacy state.
+    return undefined;
+  }
+}
+
+/** Create reactive i18n state that can be owned by one AdminApp tree. */
+export function createI18nScope(options: I18nScopeOptions = {}): I18nScope {
+  const initialProviderLocale = options.provider?.getLocale();
+  const initialLocale = options.locale ?? initialProviderLocale ?? detectLocale();
+  let scopeLocale = $state(initialLocale);
+  let scopeProvider = $state.raw<I18nProvider | undefined>(options.provider);
+  let onLocaleChange = $state.raw<((locale: string) => void) | undefined>(options.onLocaleChange);
+  let ownerControlsLocale = options.locale !== undefined;
+
+  function synchronizeProviderLocale(locale: string): void {
+    if (scopeProvider && scopeProvider.getLocale() !== locale) {
+      scopeProvider.setLocale(locale);
+    }
+  }
+
+  if (options.locale !== undefined) {
+    synchronizeProviderLocale(options.locale);
+  }
+
+  const scope: I18nScope = {
+    get locale() {
+      return scopeLocale;
+    },
+    get provider() {
+      return scopeProvider;
+    },
+    translate(key, params) {
+      // Establish the locale dependency even when a provider owns translation.
+      const locale = scopeLocale;
+      return scopeProvider?.translate(key, params) ?? translateFromTables(locale, key, params);
+    },
+    setLocale(locale) {
+      const providerLocale = scopeProvider?.getLocale();
+      const changed = scopeLocale !== locale || (scopeProvider !== undefined && providerLocale !== locale);
+
+      scopeLocale = locale;
+      synchronizeProviderLocale(locale);
+      if (changed) onLocaleChange?.(locale);
+    },
+    setProvider(provider) {
+      if (scopeProvider === provider) return;
+      scopeProvider = provider;
+      // Provider replacement is owner configuration, not a tree locale action.
+      scopeLocale = provider?.getLocale() || detectLocale();
+    },
+    getAvailableLocales() {
+      return scopeProvider?.getAvailableLocales?.() ?? Object.keys(locales);
+    },
+    updateOwner(nextOptions) {
+      const providerChanged = scopeProvider !== nextOptions.provider;
+      const clearedControlledLocale = ownerControlsLocale && nextOptions.locale === undefined;
+      scopeProvider = nextOptions.provider;
+      onLocaleChange = nextOptions.onLocaleChange;
+      ownerControlsLocale = nextOptions.locale !== undefined;
+
+      if (nextOptions.locale !== undefined) {
+        scopeLocale = nextOptions.locale;
+        synchronizeProviderLocale(nextOptions.locale);
+      } else if (providerChanged || clearedControlledLocale) {
+        scopeLocale = scopeProvider?.getLocale() || detectLocale();
+      }
+    },
+  };
+
+  return scope;
+}
+
+/** Attach an i18n scope to the current component tree. */
+export function provideI18nScope(scope: I18nScope): I18nScope {
+  writeI18nScopeContext(scope);
+  return scope;
+}
+
+/** Return the current tree scope when called during a Svelte render/effect. */
+export function getI18nScope(): I18nScope | undefined {
+  return readCurrentI18nScope();
+}
+
 let i18nProvider: I18nProvider | undefined;
 
+function setLegacyLocale(locale: string): void {
+  i18nProvider?.setLocale(locale);
+  currentLocale = locale;
+}
+
+function getLegacyLocale(): string {
+  // Reading the rune keeps legacy consumers reactive.
+  const locale = currentLocale;
+  return i18nProvider?.getLocale() ?? locale;
+}
+
+function getLegacyAvailableLocales(): string[] {
+  return i18nProvider?.getAvailableLocales?.() ?? Object.keys(locales);
+}
+
+function translateLegacy(key: string, params?: Record<string, string | number>): string {
+  const locale = currentLocale;
+  return i18nProvider?.translate(key, params) ?? translateFromTables(locale, key, params);
+}
+
 export function setI18nProvider(provider: I18nProvider | undefined): void {
+  const scope = readCurrentI18nScope();
+  if (scope) {
+    scope.setProvider(provider);
+    return;
+  }
   i18nProvider = provider;
 }
 
 export function getI18nProvider(): I18nProvider | undefined {
-  return i18nProvider;
+  const scope = readCurrentI18nScope();
+  return scope ? scope.provider : i18nProvider;
 }
 
 export function setLocale(locale: string): void {
-  if (i18nProvider) {
-    i18nProvider.setLocale(locale);
+  const scope = readCurrentI18nScope();
+  if (scope) {
+    scope.setLocale(locale);
+    return;
   }
-  // 同步更新 local state，确保 Svelte $state 依赖追踪触发模板刷新
-  currentLocale = locale;
+  setLegacyLocale(locale);
 }
 
 export function getLocale(): string {
-  // 读取 currentLocale 以保持 Svelte $state 响应式追踪
-  // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-  currentLocale;
-  if (i18nProvider) return i18nProvider.getLocale();
-  return currentLocale;
+  return readCurrentI18nScope()?.locale ?? getLegacyLocale();
 }
 
 export function getAvailableLocales(): string[] {
-  if (i18nProvider?.getAvailableLocales) return i18nProvider.getAvailableLocales();
-  return Object.keys(locales);
+  return readCurrentI18nScope()?.getAvailableLocales() ?? getLegacyAvailableLocales();
 }
 
 export function t(key: string, params?: Record<string, string | number>): string {
-  // 读取 currentLocale 以建立 Svelte $state 依赖追踪，
-  // 确保无论是否使用 provider，语言切换都能触发模板刷新。
-  // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-  currentLocale;
-  if (i18nProvider) return i18nProvider.translate(key, params);
-  const locale = locales[currentLocale];
-  let text = locale?.[key] ?? locales['en']?.[key] ?? key;
-
-  if (params) {
-    for (const [k, v] of Object.entries(params)) {
-      text = text.replaceAll(`{${k}}`, String(v));
-    }
-  }
-  return text;
+  return readCurrentI18nScope()?.translate(key, params) ?? translateLegacy(key, params);
 }
 
 export function addTranslations(locale: string, translations: Record<string, string>): void {
@@ -1048,7 +1185,7 @@ export function addTranslations(locale: string, translations: Record<string, str
 
 export function resetI18n(): void {
   currentLocale = detectLocale();
-  locales = initialLocales;
+  locales = structuredClone(initialLocales);
   i18nProvider = undefined;
 }
 
@@ -1057,14 +1194,23 @@ export function resetI18n(): void {
  * Tracks locale changes natively.
  */
 export function useTranslation() {
-  const translate = (key: string, params?: Record<string, string | number>): string => {
-    return t(key, params);
-  };
-  
+  // Capture context while the component is initializing. Event handlers and
+  // async continuations cannot safely call getContext later.
+  const scope = readCurrentI18nScope();
+  const translate = scope
+    ? (key: string, params?: Record<string, string | number>) => scope.translate(key, params)
+    : translateLegacy;
+  const changeLocale = scope
+    ? (locale: string) => scope.setLocale(locale)
+    : setLegacyLocale;
+  const availableLocales = scope
+    ? () => scope.getAvailableLocales()
+    : getLegacyAvailableLocales;
+
   return {
     get t() { return translate; },
-    get locale() { return getLocale(); },
-    setLocale,
-    getAvailableLocales
+    get locale() { return scope?.locale ?? getLegacyLocale(); },
+    setLocale: changeLocale,
+    getAvailableLocales: availableLocales,
   };
 }

package/src/index.ts

@@ -7,9 +7,10 @@ export {
   setRouterProvider, getRouterProvider,
   setLiveProvider, getLiveProvider,
   setTaskProvider, getTaskProvider,
+  createAdminContext, provideAdminContext, getAdminContext, captureAdminContext,
   resetContext,
 } from './context.svelte';
-export type { DataProviderInput } from './context.svelte';
+export type { DataProviderInput, AdminContextSource, AdminContextValue, AdminContextAccessor } from './context.svelte';
 export {
   useList, useInfiniteList,
   useOne, useShow,
@@ -36,14 +37,14 @@ export { setAccessControlProvider, getAccessControlProvider, getAccessControlOpt
 export { useLive, useSubscription, usePublish } from './live.svelte';
 export { toast, getToastQueue, consumeToastQueue, getPromiseQueue, consumePromiseQueue, resetToast } from './toast.svelte';
 export { notify, closeNotification, setNotificationProvider, getNotificationProvider } from './notification.svelte';
-export { t, setLocale, getLocale, getAvailableLocales, addTranslations, useTranslation, setI18nProvider, getI18nProvider, resetI18n } from './i18n.svelte';
-export type { I18nProvider } from './i18n.svelte';
+export { t, setLocale, getLocale, getAvailableLocales, addTranslations, useTranslation, setI18nProvider, getI18nProvider, createI18nScope, provideI18nScope, getI18nScope, resetI18n } from './i18n.svelte';
+export type { I18nProvider, I18nScope, I18nScopeOptions } from './i18n.svelte';
 export { audit, setAuditHandler, setAuditLogProvider, getAuditLogProvider } from './audit';
 export type { AuditLogProvider } from './audit';
 export { setChatProvider, getChatProvider, setChatContext, getChatContext, setAgentProvider, getAgentProvider, registerApproval, resolveApproval, hasPendingApprovals, resetChatProvider } from './chatProvider.svelte';
 export type { ChatProvider, ChatMessage, ChatContext, ChatAction, AgentProvider, AgentEvent, AgentOptions, AdminTool, AdminToolParameter, ToolResult } from './chatProvider.svelte';
-export { getTheme, setTheme, toggleTheme, getResolvedTheme, getColorTheme, setColorTheme, getColorThemes, configureTheme, getThemeConfig, clearCssOverrides, builtinPresets, registerColorPreset, getColorPresets, resetTheme } from './theme.svelte';
-export type { ThemeMode, ColorTheme, ThemeStrategy, ThemeConfig, ColorPreset } from './theme.svelte';
+export { getTheme, setTheme, toggleTheme, getResolvedTheme, getColorTheme, setColorTheme, getColorThemes, configureTheme, getThemeConfig, clearCssOverrides, builtinPresets, registerColorPreset, getColorPresets, registerThemeOwner, updateThemeOwner, unregisterThemeOwner, resetTheme } from './theme.svelte';
+export type { ThemeMode, ColorTheme, ThemeStrategy, ThemeConfig, ColorPreset, ThemeOwnerOptions, ThemeOwnerToken } from './theme.svelte';
 export { setUnsavedChanges, getUnsavedChanges, initUnsavedChangesNotifier, resetUnsavedChanges } from './unsaved-changes.svelte';
 export { setAdminOptions, getAdminOptions, getTextTransformers } from './options.svelte';
 export type { AdminOptions, TextTransformers, OvertimeConfig } from './options.svelte';
@@ -54,7 +55,7 @@ export * from './query-keys';
 export { HttpError, UndoError } from './types';
 export type {
   DataProvider, AuthProvider, NotificationProvider, MutationMode,
-  ValidationErrors, CrudOperator, LogicalFilter, FieldFilter,
+  ValidationErrors, HttpErrorOptions, CrudOperator, LogicalFilter, FieldFilter,
   CustomParams, CustomResult,
   GetListParams, GetListResult,
   GetOneParams, GetOneResult,

package/src/mutation-hooks.svelte.ts

@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { createMutation, useQueryClient } from '@tanstack/svelte-query';
 import { getAdminOptions } from './options.svelte';
-import { getDataProviderForResource, getResource, getLiveProvider } from './context.svelte';
+import { captureAdminContext } from './context.svelte';
+import type { AdminContextAccessor } from './context.svelte';
 import { useParsed } from './useParsed.svelte';
 import { audit } from './audit';
 import { UndoError } from './types';
@@ -12,9 +13,14 @@ import { toast } from './toast.svelte';
 
 // ─── Helper: publish live events after mutations ────────────────
 
-export function publishLiveEvent(resource: string, type: 'created' | 'updated' | 'deleted', ids?: (string | number)[]) {
+export function publishLiveEvent(
+  resource: string,
+  type: 'created' | 'updated' | 'deleted',
+  ids?: (string | number)[],
+  adminContext: AdminContextAccessor = captureAdminContext(),
+) {
   try {
-    const liveProvider = getLiveProvider();
+    const liveProvider = adminContext.liveProvider;
     if (liveProvider?.publish) {
       liveProvider.publish({
         type: type === 'created' ? 'INSERT' : type === 'updated' ? 'UPDATE' : 'DELETE',
@@ -42,7 +48,9 @@ export function invalidateByScopes(
 ): void {
   if (scopes === false) return;
   const effectiveScopes = (scopes && scopes.length > 0) ? scopes : defaults;
-  const dpMatch = (q: { queryKey: readonly unknown[] }) => q.queryKey[0] === dataProviderName;
+  const dpMatch = dataProviderName === undefined
+    ? () => true
+    : (q: { queryKey: readonly unknown[] }) => q.queryKey[0] === dataProviderName;
   for (const scope of effectiveScopes) {
     if (scope === 'list') queryClient.invalidateQueries({ predicate: (q) => dpMatch(q) && q.queryKey[1] === resource && (q.queryKey[2] === 'list' || q.queryKey[2] === 'infiniteList' || q.queryKey[2] === 'select' || q.queryKey[2] === 'select-defaults') });
     else if (scope === 'many') queryClient.invalidateQueries({ predicate: (q) => dpMatch(q) && q.queryKey[1] === resource && q.queryKey[2] === 'many' });
@@ -99,6 +107,7 @@ export interface UseCreateMutateParams<TVariables> {
 }
 
 export function useCreate<TData extends BaseRecord = BaseRecord, TError = HttpError, TVariables = Record<string, unknown>>(options: UseCreateOptions = {}) {
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
   const defaultResource = options.resource ?? parsed.resource ?? '';
   const adminOptions = getAdminOptions();
@@ -114,7 +123,7 @@ export function useCreate<TData extends BaseRecord = BaseRecord, TError = HttpEr
     ...options.mutationOptions,
     mutationFn: async (params) => {
       const resName = params.resource ?? defaultResource;
-      const provider = getDataProviderForResource(resName, params.dataProviderName);
+      const provider = adminContext.getDataProviderForResource(resName, params.dataProviderName);
       return await provider.create<TData, TVariables>({
           resource: resName,
           variables: params.variables,
@@ -125,11 +134,11 @@ export function useCreate<TData extends BaseRecord = BaseRecord, TError = HttpEr
     onSuccess: (data, params, context) => {
       const resName = params.resource ?? defaultResource;
       fireSuccessNotification(params.successNotification, 'Created successfully', data.data, params.variables, resName);
-      const res = getResource(resName);
+      const res = adminContext.getResource(resName);
       const pk = res.primaryKey ?? 'id';
       const newId = (data.data as Record<string, unknown>)[pk];
       audit({ action: 'create', resource: resName, recordId: String(newId) });
-      publishLiveEvent(resName, 'created', newId != null ? [newId as string | number] : undefined);
+      publishLiveEvent(resName, 'created', newId != null ? [newId as string | number] : undefined, adminContext);
       // Invalidation in onSuccess for create (refine pattern — no optimistic data to reconcile on error)
       invalidateByScopes(queryClient, resName, params.invalidates, ['list', 'many'], undefined, params.dataProviderName);
       if (typeof options.mutationOptions?.onSuccess === 'function') {
@@ -137,7 +146,7 @@ export function useCreate<TData extends BaseRecord = BaseRecord, TError = HttpEr
       }
     },
     onError: (error, params, context) => {
-      checkError(error);
+      checkError(error, adminContext);
       fireErrorNotification(params.errorNotification, 'Create failed', error, params.resource ?? defaultResource);
       if (typeof options.mutationOptions?.onError === 'function') {
         (options.mutationOptions.onError as (...a: unknown[]) => unknown)(error, params, context);
@@ -177,6 +186,7 @@ export interface UseUpdateMutateParams<TVariables> {
 }
 
 export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpError, TVariables = Record<string, unknown>>(options: UseUpdateOptions = {}) {
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
   const defaultResource = options.resource ?? parsed.resource ?? '';
   const defaultId = options.id ?? parsed.id;
@@ -207,7 +217,7 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
         });
       }
 
-      const provider = getDataProviderForResource(resName, params.dataProviderName);
+      const provider = adminContext.getDataProviderForResource(resName, params.dataProviderName);
       return await provider.update<TData, TVariables>({
           resource: resName,
           id: targetId,
@@ -229,7 +239,7 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
 
       const previousQueries = queryClient.getQueriesData({ predicate: (q) => dp(q) && q.queryKey[1] === resName });
       
-      const pk = getResource(resName).primaryKey ?? 'id';
+      const pk = adminContext.getResource(resName).primaryKey ?? 'id';
       const updater = params.optimisticUpdateMap ?? { list: true, many: true, detail: true };
       
       if (updater.detail !== false) {
@@ -267,7 +277,7 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
       const targetId = params.id ?? defaultId;
       fireSuccessNotification(params.successNotification, 'Updated successfully', data.data, params.variables, resName);
       audit({ action: 'update', resource: resName, recordId: String(targetId) });
-      publishLiveEvent(resName, 'updated', targetId != null ? [targetId] : undefined);
+      publishLiveEvent(resName, 'updated', targetId != null ? [targetId] : undefined, adminContext);
       if (typeof options.mutationOptions?.onSuccess === 'function') {
         (options.mutationOptions.onSuccess as (...a: unknown[]) => unknown)(data, params, extractedCtx);
       }
@@ -289,7 +299,7 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
         }
       }
       if (error instanceof UndoError) return;
-      checkError(error);
+      checkError(error, adminContext);
       const extractedCtx = ctx?._svadmin_ctx ? ctx.userContext : context;
       fireErrorNotification(params.errorNotification, 'Update failed', error, params.resource ?? defaultResource);
       if (typeof options.mutationOptions?.onError === 'function') {
@@ -325,6 +335,7 @@ export interface UseDeleteMutateParams<TVariables> {
 }
 
 export function useDelete<TData extends BaseRecord = BaseRecord, TError = HttpError, TVariables = Record<string, unknown>>(options: UseDeleteOptions = {}) {
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
   const defaultResource = options.resource ?? parsed.resource ?? '';
   const defaultId = options.id ?? parsed.id;
@@ -355,7 +366,7 @@ export function useDelete<TData extends BaseRecord = BaseRecord, TError = HttpEr
         });
       }
 
-      const provider = getDataProviderForResource(resName, params.dataProviderName);
+      const provider = adminContext.getDataProviderForResource(resName, params.dataProviderName);
       return await provider.deleteOne<TData, TVariables>({
           resource: resName,
           id: targetId,
@@ -377,7 +388,7 @@ export function useDelete<TData extends BaseRecord = BaseRecord, TError = HttpEr
 
       const previousQueries = queryClient.getQueriesData({ predicate: (q) => dp(q) && q.queryKey[1] === resName });
       
-      const pk = getResource(resName).primaryKey ?? 'id';
+      const pk = adminContext.getResource(resName).primaryKey ?? 'id';
       
       if (targetId != null) queryClient.removeQueries({ predicate: (q) => dp(q) && q.queryKey[1] === resName && q.queryKey[2] === 'one' && q.queryKey[3] === targetId });
 
@@ -408,7 +419,7 @@ export function useDelete<TData extends BaseRecord = BaseRecord, TError = HttpEr
 
       fireSuccessNotification(params.successNotification, 'Deleted successfully', data.data, params.variables, resName);
       audit({ action: 'delete', resource: resName, recordId: String(targetId) });
-      publishLiveEvent(resName, 'deleted', targetId != null ? [targetId] : undefined);
+      publishLiveEvent(resName, 'deleted', targetId != null ? [targetId] : undefined, adminContext);
       if (typeof options.mutationOptions?.onSuccess === 'function') {
         (options.mutationOptions.onSuccess as (...a: unknown[]) => unknown)(data, params, extractedCtx);
       }
@@ -430,7 +441,7 @@ export function useDelete<TData extends BaseRecord = BaseRecord, TError = HttpEr
         }
       }
       if (error instanceof UndoError) return;
-      checkError(error);
+      checkError(error, adminContext);
       const extractedCtx = ctx?._svadmin_ctx ? ctx.userContext : context;
       fireErrorNotification(params.errorNotification, 'Delete failed', error, params.resource ?? defaultResource);
       if (typeof options.mutationOptions?.onError === 'function') {

package/src/query-hooks.svelte.ts

@@ -1,6 +1,6 @@
 import { createQuery } from '@tanstack/svelte-query';
 import { getAdminOptions } from './options.svelte';
-import { getDataProviderForResource, getDataProvider, getLiveProvider } from './context.svelte';
+import { captureAdminContext } from './context.svelte';
 import { useParsed } from './useParsed.svelte';
 import {
   checkError,
@@ -11,8 +11,8 @@ import {
 } from './hook-utils.svelte';
 import type { NotificationConfig, OvertimeOptions, LiveSubscriptionParams } from './hook-utils.svelte';
 import type {
-  GetListParams, GetListResult, Pagination, Sort, Filter, BaseRecord, HttpError,
-  GetOneParams, GetOneResult, GetManyParams, GetManyResult, CustomParams, CustomResult,
+  GetListResult, Pagination, Sort, Filter, BaseRecord, HttpError,
+  GetOneResult, GetManyResult,
   KnownResources,
 } from './types';
 import type { LiveMode, LiveEvent } from './live.svelte';
@@ -74,6 +74,7 @@ export interface UseListOptions<_TData extends BaseRecord = BaseRecord, _TError
 }
 
 export function useList<TData extends BaseRecord = BaseRecord, TError = HttpError>(optionsOrGetter: MaybeGetter<UseListOptions<TData, TError>> = {}) {
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
   const adminOptions = getAdminOptions();
   
@@ -83,7 +84,7 @@ export function useList<TData extends BaseRecord = BaseRecord, TError = HttpErro
   const query = createQuery<GetListResult<TData>, TError>(() => {
     const opts = getOptions();
     const resource = getResource();
-    const provider = getDataProviderForResource(resource, opts.dataProviderName);
+    const provider = adminContext.getDataProviderForResource(resource, opts.dataProviderName);
     const queryOptions = opts.queryOptions;
     const pagination = cloneQueryKeyPart(opts.pagination);
     const sorters = cloneQueryKeyPart(opts.sorters);
@@ -129,7 +130,7 @@ export function useList<TData extends BaseRecord = BaseRecord, TError = HttpErro
     const opts = getOptions();
     return {
       resource: getResource(),
-      liveProvider: getLiveProvider(),
+      liveProvider: adminContext.liveProvider,
       liveMode: opts.liveMode ?? adminOptions.liveMode,
       onLiveEvent: (e: LiveEvent) => {
         opts.onLiveEvent?.(e);
@@ -153,7 +154,7 @@ export function useList<TData extends BaseRecord = BaseRecord, TError = HttpErro
       }
     } else if (query.isError && query.errorUpdatedAt > lastErrorAt) {
       lastErrorAt = query.errorUpdatedAt;
-      checkError(query.error);
+      checkError(query.error, adminContext);
       fireErrorNotification(opts.errorNotification, 'Fetch failed', query.error, getResource());
     }
   });
@@ -178,6 +179,7 @@ export interface UseOneOptions<_TData extends BaseRecord = BaseRecord, _TError =
 }
 
 export function useOne<TData extends BaseRecord = BaseRecord, TError = HttpError>(optionsOrGetter: MaybeGetter<UseOneOptions<TData, TError>> = {}) {
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
   const adminOptions = getAdminOptions();
   
@@ -189,7 +191,7 @@ export function useOne<TData extends BaseRecord = BaseRecord, TError = HttpError
     const opts = getOptions();
     const resource = getResource();
     const id = getId();
-    const provider = getDataProviderForResource(resource, opts.dataProviderName);
+    const provider = adminContext.getDataProviderForResource(resource, opts.dataProviderName);
     const queryOptions = opts.queryOptions;
 
     return {
@@ -217,7 +219,7 @@ export function useOne<TData extends BaseRecord = BaseRecord, TError = HttpError
     const resource = getResource();
     return {
       resource,
-      liveProvider: getLiveProvider(),
+      liveProvider: adminContext.liveProvider,
       liveMode: opts.liveMode ?? adminOptions.liveMode,
       onLiveEvent: (e: LiveEvent) => {
         opts.onLiveEvent?.(e);
@@ -240,7 +242,7 @@ export function useOne<TData extends BaseRecord = BaseRecord, TError = HttpError
       }
     } else if (query.isError && query.errorUpdatedAt > lastErrorAt) {
       lastErrorAt = query.errorUpdatedAt;
-      checkError(query.error);
+      checkError(query.error, adminContext);
       fireErrorNotification(opts.errorNotification, 'Fetch failed', query.error, getResource());
     }
   });
@@ -288,13 +290,14 @@ export interface UseManyOptions<_TData extends BaseRecord = BaseRecord, _TError
 }
 
 export function useMany<TData extends BaseRecord = BaseRecord, TError = HttpError>(optionsOrGetter: MaybeGetter<UseManyOptions<TData, TError>>) {
+  const adminContext = captureAdminContext();
   const adminOptions = getAdminOptions();
   const getOptions = () => typeof optionsOrGetter === 'function' ? optionsOrGetter() : optionsOrGetter;
 
   const query = createQuery<GetManyResult<TData>, TError>(() => {
     const opts = getOptions();
     const { resource, ids, meta, dataProviderName, queryOptions } = opts;
-    const provider = getDataProviderForResource(resource, dataProviderName);
+    const provider = adminContext.getDataProviderForResource(resource, dataProviderName);
 
     return {
       queryKey: [dataProviderName, resource, 'many', ids, meta],
@@ -319,7 +322,7 @@ export function useMany<TData extends BaseRecord = BaseRecord, TError = HttpErro
     const opts = getOptions();
     return {
       resource: opts.resource,
-      liveProvider: getLiveProvider(),
+      liveProvider: adminContext.liveProvider,
       liveMode: opts.liveMode ?? adminOptions.liveMode,
       onLiveEvent: (e: LiveEvent) => {
         opts.onLiveEvent?.(e);
@@ -342,7 +345,7 @@ export function useMany<TData extends BaseRecord = BaseRecord, TError = HttpErro
       }
     } else if (query.isError && query.errorUpdatedAt > lastErrorAt) {
       lastErrorAt = query.errorUpdatedAt;
-      checkError(query.error);
+      checkError(query.error, adminContext);
       fireErrorNotification(opts.errorNotification, 'Fetch failed', query.error, opts.resource);
     }
   });
@@ -351,5 +354,5 @@ export function useMany<TData extends BaseRecord = BaseRecord, TError = HttpErro
 }
 
 export function useApiUrl(dataProviderName?: string): string {
-  return getDataProvider(dataProviderName).getApiUrl();
+  return captureAdminContext().getDataProvider(dataProviderName).getApiUrl();
 }

package/src/router.ts

@@ -67,14 +67,22 @@ export function matchRoute(
   return null;
 }
 
-export async function navigate(path: string, options?: { replaceState?: boolean }): Promise<void> {
-  const from = currentPath();
+/**
+ * Navigate with an explicit tree-scoped provider while preserving the same
+ * guards, path synchronization, and after hooks as the legacy active router.
+ */
+export async function navigateWithProvider(
+  provider: RouterProvider | undefined,
+  path: string,
+  options?: { replaceState?: boolean },
+): Promise<void> {
+  const from = currentPathWithProvider(provider);
   for (const guard of _beforeGuards) {
     const allowed = await guard(path, from);
     if (!allowed) return;
   }
-  if (_routerProvider) {
-    _routerProvider.go({ to: path, type: options?.replaceState ? 'replace' : 'push' });
+  if (provider) {
+    provider.go({ to: path, type: options?.replaceState ? 'replace' : 'push' });
   } else if (typeof window !== 'undefined') {
     window.location.hash = '#' + path.replace(/^#/, '');
   }
@@ -84,19 +92,31 @@ export async function navigate(path: string, options?: { replaceState?: boolean
   }
 }
 
+export async function navigate(path: string, options?: { replaceState?: boolean }): Promise<void> {
+  await navigateWithProvider(_routerProvider, path, options);
+}
+
 /**
  * Format a path into an href suitable for <a> tags.
  */
 export function formatLink(path: string): string {
-  if (_routerProvider?.formatLink) {
-    return _routerProvider.formatLink(path);
+  return formatLinkWithProvider(_routerProvider, path);
+}
+
+export function formatLinkWithProvider(provider: RouterProvider | undefined, path: string): string {
+  if (provider?.formatLink) {
+    return provider.formatLink(path);
   }
   return '#' + path.replace(/^#/, '');
 }
 
 export function currentPath(): string {
-  if (_routerProvider) {
-    const parsed = _routerProvider.parse();
+  return currentPathWithProvider(_routerProvider);
+}
+
+export function currentPathWithProvider(provider: RouterProvider | undefined): string {
+  if (provider) {
+    const parsed = provider.parse();
     const pathname = parsed.pathname || '/';
     let qs = '';
     if (parsed.params && Object.keys(parsed.params).length > 0) {