@oxyhq/auth 2.0.4 → 2.0.6

package/dist/esm/WebOxyProvider.js

@@ -9,7 +9,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, } from 'react';
 import { OxyServices, CrossDomainAuth, createAuthManager, } from '@oxyhq/core';
 import { QueryClientProvider } from '@tanstack/react-query';
-import { createQueryClient } from './hooks/queryClient';
+import { attachQueryPersistence, createQueryClient } from './hooks/queryClient';
 const WebOxyContext = createContext(null);
 /**
  * Web-only Oxy Provider
@@ -35,6 +35,29 @@ export function WebOxyProvider({ children, baseURL, authWebUrl, onAuthStateChang
     const [crossDomainAuth] = useState(() => new CrossDomainAuth(oxyServices));
     const [authManager] = useState(() => createAuthManager(oxyServices, { autoRefresh: true }));
     const [queryClient] = useState(() => createQueryClient());
+    // Block first render until the persisted localStorage cache has been
+    // restored — mirrors the RN OxyProvider pattern. Without this gate the
+    // first paint observes an empty cache and any consumer reading
+    // `getQueryData(...)` synchronously (or using `placeholderData: 'previous'`
+    // gating) misses the persisted blob.
+    //
+    // Persistence is attached inside the same effect so we can hold a
+    // reference to the `restored` promise and only flip `isRestoring` to
+    // false once it settles (success OR failure). Detach on unmount so HMR
+    // doesn't leak subscriptions.
+    const [isRestoring, setIsRestoring] = useState(true);
+    useEffect(() => {
+        let mounted = true;
+        const { restored, unsubscribe } = attachQueryPersistence(queryClient);
+        restored.finally(() => {
+            if (mounted)
+                setIsRestoring(false);
+        });
+        return () => {
+            mounted = false;
+            unsubscribe();
+        };
+    }, [queryClient]);
     // Auth state
     const [user, setUser] = useState(null);
     const [isLoading, setIsLoading] = useState(!skipAutoCheck);
@@ -253,6 +276,20 @@ export function WebOxyProvider({ children, baseURL, authWebUrl, onAuthStateChang
         signIn, signInWithFedCM, signInWithPopup, signInWithRedirect,
         signOut, isFedCMSupported, switchSession, clearSessionState,
     ]);
+    // Mirror the RN OxyProvider pattern: don't expose the QueryClient (or
+    // mount children) until the persisted cache has been restored. On the
+    // web this prevents the first paint from observing an empty
+    // localStorage-backed cache, which would otherwise force every
+    // identity/session/auth query to refetch from the network even when a
+    // fresh blob was available on disk.
+    //
+    // The restored promise is wired with `.finally(...)` upstream, so this
+    // unblocks on both success and failure within typically <50ms (sync
+    // localStorage read + JSON.parse). A safety net is unnecessary: the
+    // restore promise always settles synchronously after one microtask.
+    if (isRestoring) {
+        return null;
+    }
     return (_jsx(QueryClientProvider, { client: queryClient, children: _jsx(WebOxyContext.Provider, { value: contextValue, children: children }) }));
 }
 /**

package/dist/esm/hooks/mutations/index.js

@@ -8,3 +8,5 @@
 export { useUpdateProfile, useUploadAvatar, useUpdateAccountSettings, useUpdatePrivacySettings, useUploadFile, } from './useAccountMutations';
 // Service mutation hooks (sessions, devices)
 export { useSwitchSession, useLogoutSession, useLogoutAll, useUpdateDeviceName, useRemoveDevice, } from './useServicesMutations';
+// App-data KV store mutation hooks
+export { useSetAppData, useDeleteAppData } from './useAppData';

package/dist/esm/hooks/mutations/useAccountMutations.js

@@ -1,6 +1,6 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { authenticatedApiCall } from '@oxyhq/core';
-import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../queries/queryKeys';
+import { queryKeys, invalidateAccountQueries, invalidateUserQueries, invalidateSessionQueries } from '../queries/queryKeys';
 import { useWebOxy } from '../../WebOxyProvider';
 import { toast } from 'sonner';
 import { refreshAvatarInStore } from '../../utils/avatarUtils';
@@ -9,7 +9,7 @@ import { useAuthStore } from '../../stores/authStore';
  * Update user profile with optimistic updates and offline queue support
  */
 export const useUpdateProfile = () => {
-    const { oxyServices, activeSessionId, user } = useWebOxy();
+    const { oxyServices, activeSessionId } = useWebOxy();
     const queryClient = useQueryClient();
     return useMutation({
         mutationFn: async (updates) => {
@@ -37,12 +37,30 @@ export const useUpdateProfile = () => {
             }
             return { previousUser };
         },
-        // On error, rollback
+        // On error, rollback ONLY the keys this mutation tried to change
         onError: (error, updates, context) => {
-            if (context?.previousUser) {
-                queryClient.setQueryData(queryKeys.accounts.current(), context.previousUser);
+            if (context?.previousUser && updates) {
+                const previousUser = context.previousUser;
+                const changedKeys = Object.keys(updates);
+                const partialRollback = changedKeys.reduce((acc, key) => {
+                    acc[key] = previousUser[key];
+                    return acc;
+                }, {});
+                const current = queryClient.getQueryData(queryKeys.accounts.current());
+                if (current) {
+                    queryClient.setQueryData(queryKeys.accounts.current(), {
+                        ...current,
+                        ...partialRollback,
+                    });
+                }
                 if (activeSessionId) {
-                    queryClient.setQueryData(queryKeys.users.profile(activeSessionId), context.previousUser);
+                    const currentProfile = queryClient.getQueryData(queryKeys.users.profile(activeSessionId));
+                    if (currentProfile) {
+                        queryClient.setQueryData(queryKeys.users.profile(activeSessionId), {
+                            ...currentProfile,
+                            ...partialRollback,
+                        });
+                    }
                 }
             }
             toast.error(error instanceof Error ? error.message : 'Failed to update profile');
@@ -60,9 +78,13 @@ export const useUpdateProfile = () => {
             if (updates.avatar && activeSessionId && oxyServices) {
                 refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
             }
-            // Invalidate all related queries to refresh everywhere
+            // Invalidate all related queries so every consumer (AccountSwitcher,
+            // session lists, managed accounts, etc.) refetches the fresh profile.
+            // Critical right after `username` is set the first time, when every
+            // cached "session profile" still reports the user as unnamed.
             invalidateUserQueries(queryClient);
             invalidateAccountQueries(queryClient);
+            invalidateSessionQueries(queryClient);
         },
     });
 };
@@ -102,11 +124,25 @@ export const useUploadAvatar = () => {
             }
             return { previousUser };
         },
-        onError: (error, file, context) => {
+        onError: (error, _file, context) => {
+            // Avatar upload only mutates the `avatar` field — restore only that key
             if (context?.previousUser) {
-                queryClient.setQueryData(queryKeys.accounts.current(), context.previousUser);
+                const previousAvatar = context.previousUser.avatar;
+                const current = queryClient.getQueryData(queryKeys.accounts.current());
+                if (current) {
+                    queryClient.setQueryData(queryKeys.accounts.current(), {
+                        ...current,
+                        avatar: previousAvatar,
+                    });
+                }
                 if (activeSessionId) {
-                    queryClient.setQueryData(queryKeys.users.profile(activeSessionId), context.previousUser);
+                    const currentProfile = queryClient.getQueryData(queryKeys.users.profile(activeSessionId));
+                    if (currentProfile) {
+                        queryClient.setQueryData(queryKeys.users.profile(activeSessionId), {
+                            ...currentProfile,
+                            avatar: previousAvatar,
+                        });
+                    }
                 }
             }
             toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
@@ -122,24 +158,46 @@ export const useUploadAvatar = () => {
             if (data?.avatar && activeSessionId && oxyServices) {
                 refreshAvatarInStore(activeSessionId, data.avatar, oxyServices);
             }
-            // Invalidate all related queries to refresh everywhere
+            // Invalidate all related queries to refresh everywhere, including the
+            // sessions cache so other-account avatars update too.
             invalidateUserQueries(queryClient);
             invalidateAccountQueries(queryClient);
+            invalidateSessionQueries(queryClient);
             toast.success('Avatar updated successfully');
         },
     });
 };
 /**
- * Update account settings
+ * Update account settings (privacy preferences).
+ *
+ * Privacy settings are not part of the `PUT /users/me` allow-list; the API
+ * would silently drop them. Route through `updatePrivacySettings` so the
+ * dedicated `PATCH /privacy/:id/privacy` endpoint performs a dot-path merge
+ * and returns the updated `privacySettings` object.
+ *
+ * The returned object exposes the standard mutation surface PLUS a
+ * convenience `mutate(updates)` / `mutateAsync(updates)` that snapshots
+ * the current user from `useWebOxy()` at dispatch time.
  */
 export const useUpdateAccountSettings = () => {
-    const { oxyServices, activeSessionId } = useWebOxy();
+    const { oxyServices, activeSessionId, user } = useWebOxy();
     const queryClient = useQueryClient();
-    return useMutation({
-        mutationFn: async (settings) => {
-            return await oxyServices.updateProfile({ privacySettings: settings });
+    const mutation = useMutation({
+        mutationFn: async ({ updates, currentUser }) => {
+            const userId = currentUser.id;
+            if (!userId) {
+                throw new Error('User ID is required to update account settings');
+            }
+            const updatedPrivacy = await authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.updatePrivacySettings(updates, userId));
+            // Rebuild against the dispatch-time snapshot, NOT the live cache.
+            // The cache may have been mutated by a sibling write between
+            // dispatch and settle.
+            return {
+                ...currentUser,
+                privacySettings: updatedPrivacy,
+            };
         },
-        onMutate: async (settings) => {
+        onMutate: async ({ updates }) => {
             await queryClient.cancelQueries({ queryKey: queryKeys.accounts.settings() });
             const previousUser = queryClient.getQueryData(queryKeys.accounts.current());
             if (previousUser) {
@@ -147,15 +205,31 @@ export const useUpdateAccountSettings = () => {
                     ...previousUser,
                     privacySettings: {
                         ...previousUser.privacySettings,
-                        ...settings,
+                        ...updates,
                     },
                 });
             }
             return { previousUser };
         },
-        onError: (error, settings, context) => {
-            if (context?.previousUser) {
-                queryClient.setQueryData(queryKeys.accounts.current(), context.previousUser);
+        onError: (error, { updates }, context) => {
+            // Restore only the privacySettings keys this mutation tried to change
+            if (context?.previousUser && updates) {
+                const previousPrivacy = context.previousUser.privacySettings ?? {};
+                const changedKeys = Object.keys(updates);
+                const partialPrivacyRollback = changedKeys.reduce((acc, key) => {
+                    acc[key] = previousPrivacy[key];
+                    return acc;
+                }, {});
+                const current = queryClient.getQueryData(queryKeys.accounts.current());
+                if (current) {
+                    queryClient.setQueryData(queryKeys.accounts.current(), {
+                        ...current,
+                        privacySettings: {
+                            ...(current.privacySettings ?? {}),
+                            ...partialPrivacyRollback,
+                        },
+                    });
+                }
             }
             toast.error(error instanceof Error ? error.message : 'Failed to update settings');
         },
@@ -170,6 +244,26 @@ export const useUpdateAccountSettings = () => {
             queryClient.invalidateQueries({ queryKey: queryKeys.accounts.settings() });
         },
     });
+    // Wrap mutate/mutateAsync so call sites pass a plain settings object and
+    // the current user is captured at dispatch time.
+    return {
+        ...mutation,
+        mutate: (updates) => {
+            const currentUser = user ?? queryClient.getQueryData(queryKeys.accounts.current());
+            if (!currentUser) {
+                toast.error('Cannot update account settings: no current user');
+                return;
+            }
+            mutation.mutate({ updates, currentUser });
+        },
+        mutateAsync: async (updates) => {
+            const currentUser = user ?? queryClient.getQueryData(queryKeys.accounts.current());
+            if (!currentUser) {
+                throw new Error('Cannot update account settings: no current user');
+            }
+            return mutation.mutateAsync({ updates, currentUser });
+        },
+    };
 };
 /**
  * Update privacy settings with optimistic updates and authentication handling
@@ -215,43 +309,91 @@ export const useUpdatePrivacySettings = () => {
             }
             return { previousPrivacySettings, previousUser };
         },
-        // On error, rollback
-        onError: (error, { userId }, context) => {
+        // On error, rollback ONLY the privacy keys this mutation tried to change.
+        // Restoring the entire previous object would wipe out other concurrent
+        // optimistic updates (e.g. user toggles two privacy switches in quick
+        // succession; failure on one must not revert the other).
+        onError: (error, { settings, userId }, context) => {
             const targetUserId = userId || user?.id;
-            if (context?.previousPrivacySettings && targetUserId) {
-                queryClient.setQueryData(queryKeys.privacy.settings(targetUserId), context.previousPrivacySettings);
+            const changedKeys = settings ? Object.keys(settings) : [];
+            // Rollback the privacy.settings query (partial)
+            if (context?.previousPrivacySettings && targetUserId && changedKeys.length > 0) {
+                const previousPrivacy = context.previousPrivacySettings;
+                const partialPrivacyRollback = changedKeys.reduce((acc, key) => {
+                    acc[key] = previousPrivacy[key];
+                    return acc;
+                }, {});
+                const currentPrivacy = queryClient.getQueryData(queryKeys.privacy.settings(targetUserId));
+                if (currentPrivacy) {
+                    queryClient.setQueryData(queryKeys.privacy.settings(targetUserId), {
+                        ...currentPrivacy,
+                        ...partialPrivacyRollback,
+                    });
+                }
             }
-            if (context?.previousUser) {
-                queryClient.setQueryData(queryKeys.accounts.current(), context.previousUser);
+            // Rollback the accounts.current() user.privacySettings (partial)
+            if (context?.previousUser && changedKeys.length > 0) {
+                const previousPrivacy = (context.previousUser.privacySettings ?? {});
+                const partialPrivacyRollback = changedKeys.reduce((acc, key) => {
+                    acc[key] = previousPrivacy[key];
+                    return acc;
+                }, {});
+                const current = queryClient.getQueryData(queryKeys.accounts.current());
+                if (current) {
+                    queryClient.setQueryData(queryKeys.accounts.current(), {
+                        ...current,
+                        privacySettings: {
+                            ...(current.privacySettings ?? {}),
+                            ...partialPrivacyRollback,
+                        },
+                    });
+                }
+            }
+            // After partial rollback, reconcile against the server so the cache
+            // converges to the authoritative state for the failed keys.
+            if (targetUserId) {
+                queryClient.invalidateQueries({ queryKey: queryKeys.privacy.settings(targetUserId) });
             }
             toast.error(error instanceof Error ? error.message : 'Failed to update privacy settings');
         },
-        // On success, invalidate and refetch
-        onSuccess: (data, { userId }) => {
+        // On success, MERGE the server response into the cached state. Older
+        // API builds returned only the changed field (or wiped the privacySettings
+        // subdocument when handed a partial update), which would clobber every
+        // other toggle if we blindly replaced. Defensive merge means the UI stays
+        // consistent regardless of server behaviour.
+        //
+        // BOTH the privacy.settings query AND the accounts.current() user are
+        // gated on `targetUserId`. If it's missing (no userId param, no logged-in
+        // user) the optimistic update in onMutate would have early-returned too,
+        // so neither cache was ever touched — there's nothing to reconcile here.
+        onSuccess: (data, { userId, settings }) => {
             const targetUserId = userId || user?.id;
-            if (targetUserId) {
-                queryClient.setQueryData(queryKeys.privacy.settings(targetUserId), data);
-            }
-            // Also update account query if it contains privacy settings
+            if (!targetUserId)
+                return;
+            const incoming = (data ?? {});
+            const requested = (settings ?? {});
+            queryClient.setQueryData(queryKeys.privacy.settings(targetUserId), (previous) => ({
+                ...(previous ?? {}),
+                ...requested,
+                ...incoming, // server wins for fields it explicitly returned
+            }));
             const currentUser = queryClient.getQueryData(queryKeys.accounts.current());
             if (currentUser) {
                 const updatedUser = {
                     ...currentUser,
-                    privacySettings: data,
+                    privacySettings: {
+                        ...(currentUser.privacySettings ?? {}),
+                        ...requested,
+                        ...incoming,
+                    },
                 };
                 queryClient.setQueryData(queryKeys.accounts.current(), updatedUser);
-                // Update authStore so frontend components see the changes immediately
                 useAuthStore.getState().setUser(updatedUser);
             }
-            invalidateAccountQueries(queryClient);
-        },
-        // Always refetch after error or success
-        onSettled: (data, error, { userId }) => {
-            const targetUserId = userId || user?.id;
-            if (targetUserId) {
-                queryClient.invalidateQueries({ queryKey: queryKeys.privacy.settings(targetUserId) });
-            }
-            queryClient.invalidateQueries({ queryKey: queryKeys.accounts.current() });
+            // Deliberately NOT invalidating any queries here. invalidateAccountQueries
+            // invalidates accounts.all which is the prefix for accounts.current(),
+            // triggering a background refetch of useCurrentUser that would overwrite
+            // the merged state above. The onSuccess merge is the source of truth.
         },
     });
 };

package/dist/esm/hooks/mutations/useAppData.js

@@ -0,0 +1,128 @@
+/**
+ * App-Data Mutation Hooks
+ *
+ * Write side of the per-user JSON KV store. Both `useSetAppData` and
+ * `useDeleteAppData` apply optimistic updates against the two query keys
+ * that observe this data (`appDataQueryKeys.value` and the surrounding
+ * `appDataQueryKeys.namespace`) and roll back on error.
+ *
+ * When the underlying request fails because the endpoint isn't reachable
+ * (404 / network), the mutation still surfaces the error — write attempts
+ * are user-initiated and the caller may want to retry or fall back to
+ * local persistence. Reads are silent about missing endpoints; writes are
+ * not.
+ */
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { authenticatedApiCall } from '@oxyhq/core';
+import { useWebOxy } from '../../WebOxyProvider';
+import { appDataQueryKeys } from '../queries/appDataQueryKeys';
+/**
+ * Upsert a per-user JSON value. Returns the value the server confirmed it
+ * stored — typically identical to the input but consumers should prefer the
+ * returned value (the server is the source of truth).
+ *
+ * Applies optimistic updates against both the single-value query key and
+ * the surrounding namespace query key, then rolls back on error.
+ */
+export const useSetAppData = () => {
+    const { oxyServices, activeSessionId } = useWebOxy();
+    const queryClient = useQueryClient();
+    return useMutation({
+        mutationKey: ['appData', 'set'],
+        mutationFn: async ({ namespace, key, value }) => {
+            return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.setAppData(namespace, key, value));
+        },
+        onMutate: async ({ namespace, key, value }) => {
+            const valueKey = appDataQueryKeys.value(namespace, key);
+            const namespaceKey = appDataQueryKeys.namespace(namespace);
+            await Promise.all([
+                queryClient.cancelQueries({ queryKey: valueKey }),
+                queryClient.cancelQueries({ queryKey: namespaceKey }),
+            ]);
+            const previousValue = queryClient.getQueryData(valueKey);
+            const previousNamespace = queryClient.getQueryData(namespaceKey);
+            queryClient.setQueryData(valueKey, value);
+            if (previousNamespace) {
+                queryClient.setQueryData(namespaceKey, {
+                    ...previousNamespace,
+                    [key]: value,
+                });
+            }
+            return { previousValue, previousNamespace };
+        },
+        onError: (_error, { namespace, key }, context) => {
+            if (!context)
+                return;
+            const valueKey = appDataQueryKeys.value(namespace, key);
+            const namespaceKey = appDataQueryKeys.namespace(namespace);
+            // Restore exactly the snapshots we captured in onMutate. Don't merge
+            // with whatever's currently in the cache — that could splice in writes
+            // from concurrent mutations and undo their state.
+            queryClient.setQueryData(valueKey, context.previousValue ?? null);
+            if (context.previousNamespace !== undefined) {
+                queryClient.setQueryData(namespaceKey, context.previousNamespace);
+            }
+        },
+        onSuccess: (data, { namespace, key }) => {
+            const valueKey = appDataQueryKeys.value(namespace, key);
+            const namespaceKey = appDataQueryKeys.namespace(namespace);
+            queryClient.setQueryData(valueKey, data);
+            const existingNamespace = queryClient.getQueryData(namespaceKey);
+            if (existingNamespace) {
+                queryClient.setQueryData(namespaceKey, {
+                    ...existingNamespace,
+                    [key]: data,
+                });
+            }
+        },
+    });
+};
+/**
+ * Delete a per-user JSON value. Optimistically removes the entry from the
+ * single-value cache and from the surrounding namespace map, then rolls back
+ * on error.
+ */
+export const useDeleteAppData = () => {
+    const { oxyServices, activeSessionId } = useWebOxy();
+    const queryClient = useQueryClient();
+    return useMutation({
+        mutationKey: ['appData', 'delete'],
+        mutationFn: async ({ namespace, key }) => {
+            await authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.deleteAppData(namespace, key));
+        },
+        onMutate: async ({ namespace, key }) => {
+            const valueKey = appDataQueryKeys.value(namespace, key);
+            const namespaceKey = appDataQueryKeys.namespace(namespace);
+            await Promise.all([
+                queryClient.cancelQueries({ queryKey: valueKey }),
+                queryClient.cancelQueries({ queryKey: namespaceKey }),
+            ]);
+            const previousValue = queryClient.getQueryData(valueKey);
+            const previousNamespace = queryClient.getQueryData(namespaceKey);
+            queryClient.setQueryData(valueKey, null);
+            if (previousNamespace && key in previousNamespace) {
+                const next = { ...previousNamespace };
+                delete next[key];
+                queryClient.setQueryData(namespaceKey, next);
+            }
+            return { previousValue, previousNamespace };
+        },
+        onError: (_error, { namespace, key }, context) => {
+            if (!context)
+                return;
+            const valueKey = appDataQueryKeys.value(namespace, key);
+            const namespaceKey = appDataQueryKeys.namespace(namespace);
+            queryClient.setQueryData(valueKey, context.previousValue ?? null);
+            if (context.previousNamespace !== undefined) {
+                queryClient.setQueryData(namespaceKey, context.previousNamespace);
+            }
+        },
+        onSuccess: (_data, { namespace, key }) => {
+            queryClient.setQueryData(appDataQueryKeys.value(namespace, key), null);
+            // Confirm the value is gone from the namespace cache too. If the
+            // optimistic update wasn't applied (e.g. cache was empty), this is a
+            // no-op; if it was, we already removed it in onMutate, so this is also
+            // a no-op. The work happens in onMutate — onSuccess is the commit point.
+        },
+    });
+};

package/dist/esm/hooks/queries/appDataQueryKeys.js

@@ -0,0 +1,42 @@
+/**
+ * Query keys + error utilities for `useAppData` hooks.
+ *
+ * Lives next to the hook file so consumers can import the keys directly
+ * when they need to imperatively invalidate a value (e.g. after a non-React
+ * write through `oxyServices.setAppData`).
+ */
+export const appDataQueryKeys = {
+    all: ['appData'],
+    namespaces: () => [...appDataQueryKeys.all, 'namespace'],
+    namespace: (namespace) => [...appDataQueryKeys.namespaces(), namespace],
+    values: () => [...appDataQueryKeys.all, 'value'],
+    value: (namespace, key) => [...appDataQueryKeys.values(), namespace, key],
+};
+/**
+ * True when `error` indicates the app-data endpoint isn't reachable — either
+ * because the API deployment doesn't have it yet (404) or there's a network
+ * failure with no response. We treat these as "no value stored" so consumers
+ * fall back to local persistence without surfacing a user-facing error.
+ *
+ * Anything else (401, 403, 500) propagates normally — those are real bugs
+ * the auth or retry pipeline needs to see.
+ */
+export function isMissingAppDataEndpointError(error) {
+    if (!error || typeof error !== 'object') {
+        return false;
+    }
+    const candidate = error;
+    const status = candidate.status ?? candidate.statusCode ?? candidate.response?.status;
+    // 404: endpoint not deployed on this API instance yet.
+    if (status === 404)
+        return true;
+    // Network errors: no response received at all. Common during local dev
+    // when the API server is down, or when offline.
+    if (candidate.code === 'NETWORK_ERROR')
+        return true;
+    const message = typeof candidate.message === 'string' ? candidate.message : '';
+    if (message.includes('Network Error') || message.includes('Failed to fetch')) {
+        return true;
+    }
+    return false;
+}

package/dist/esm/hooks/queries/index.js

@@ -12,3 +12,6 @@ export { useSessions, useSession, useDeviceSessions, useUserDevices, useSecurity
 export { useSecurityActivity, useRecentSecurityActivity, } from './useSecurityQueries';
 // Query keys and invalidation helpers (for advanced usage)
 export { queryKeys, invalidateAccountQueries, invalidateUserQueries, invalidateSessionQueries } from './queryKeys';
+// App-data KV store query hooks
+export { useAppData, useAppDataNamespace } from './useAppData';
+export { appDataQueryKeys, isMissingAppDataEndpointError } from './appDataQueryKeys';

package/dist/esm/hooks/queries/useAppData.js

@@ -0,0 +1,82 @@
+/**
+ * App-Data Query Hooks
+ *
+ * Read side of the `/users/me/app-data/...` per-user JSON KV store. Gated on
+ * `isAuthenticated` — when signed out the query stays `enabled: false` and
+ * `data` is `null`, so consumers can fall back to localStorage without ever
+ * issuing a doomed request.
+ *
+ * Errors from the network (404 because the endpoint isn't deployed yet,
+ * 401 because the session lapsed, etc.) are not user-facing here. Hooks
+ * return `data: null` on error so the calling component renders the
+ * "nothing yet" state and the consuming app can quietly fall back to local
+ * persistence. Mutations still propagate errors so write attempts surface
+ * a toast — only reads are silent.
+ */
+import { useQuery } from '@tanstack/react-query';
+import { authenticatedApiCall } from '@oxyhq/core';
+import { useWebOxy } from '../../WebOxyProvider';
+import { appDataQueryKeys, isMissingAppDataEndpointError } from './appDataQueryKeys';
+/**
+ * Read a single per-user JSON value.
+ *
+ * @param namespace - kebab/snake-case identifier (e.g. `"academy"`).
+ * @param key       - kebab/snake-case identifier (e.g. course slug).
+ * @param options   - optional `enabled`/`staleTime`/`gcTime` overrides.
+ *
+ * @returns A `useQuery` result with `data` of type `T | null`. The query
+ *   stays disabled when the user is signed out; when enabled but the server
+ *   has no stored value, `data` is `null`. Reads that fail because the
+ *   endpoint isn't reachable also resolve to `null` so the consumer can
+ *   fall back to local persistence.
+ */
+export const useAppData = (namespace, key, options) => {
+    const { oxyServices, activeSessionId, isAuthenticated } = useWebOxy();
+    return useQuery({
+        queryKey: appDataQueryKeys.value(namespace, key),
+        queryFn: async () => {
+            try {
+                return await authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.getAppData(namespace, key));
+            }
+            catch (error) {
+                // Endpoint not deployed yet, no network, etc. — return null so the
+                // consumer falls back to localStorage rather than rendering a broken
+                // UI state. Authentication errors still bubble up so the auth retry
+                // pipeline can surface them at the provider level.
+                if (isMissingAppDataEndpointError(error)) {
+                    return null;
+                }
+                throw error;
+            }
+        },
+        enabled: (options?.enabled !== false) && isAuthenticated,
+        staleTime: options?.staleTime ?? 60 * 1000,
+        gcTime: options?.gcTime ?? 30 * 60 * 1000,
+    });
+};
+/**
+ * Read every value in a namespace.
+ *
+ * @returns A `useQuery` result with `data` as a `Record<string, T>`. Empty
+ *   object when the namespace contains nothing (or when fetching failed).
+ */
+export const useAppDataNamespace = (namespace, options) => {
+    const { oxyServices, activeSessionId, isAuthenticated } = useWebOxy();
+    return useQuery({
+        queryKey: appDataQueryKeys.namespace(namespace),
+        queryFn: async () => {
+            try {
+                return await authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.listAppData(namespace));
+            }
+            catch (error) {
+                if (isMissingAppDataEndpointError(error)) {
+                    return {};
+                }
+                throw error;
+            }
+        },
+        enabled: (options?.enabled !== false) && isAuthenticated,
+        staleTime: options?.staleTime ?? 60 * 1000,
+        gcTime: options?.gcTime ?? 30 * 60 * 1000,
+    });
+};