@oxyhq/services 6.9.46 → 6.10.1

package/lib/commonjs/ui/hooks/index.js

@@ -3,16 +3,34 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "attachQueryPersistence", {
+  enumerable: true,
+  get: function () {
+    return _queryClient.attachQueryPersistence;
+  }
+});
+Object.defineProperty(exports, "clearQueryCache", {
+  enumerable: true,
+  get: function () {
+    return _queryClient.clearQueryCache;
+  }
+});
+Object.defineProperty(exports, "createQueryClient", {
+  enumerable: true,
+  get: function () {
+    return _queryClient.createQueryClient;
+  }
+});
 Object.defineProperty(exports, "executeWithToast", {
   enumerable: true,
   get: function () {
     return _useAsyncAction.executeWithToast;
   }
 });
-Object.defineProperty(exports, "setOxyFileUrlInstance", {
+Object.defineProperty(exports, "mutationKeys", {
   enumerable: true,
   get: function () {
-    return _useFileDownloadUrl.setOxyFileUrlInstance;
+    return _mutationKeys.mutationKeys;
   }
 });
 Object.defineProperty(exports, "useAsyncAction", {
@@ -39,34 +57,36 @@ Object.defineProperty(exports, "useFollowerCounts", {
     return _useFollow.useFollowerCounts;
   }
 });
-Object.defineProperty(exports, "useSettingToggle", {
+Object.defineProperty(exports, "useMutationStatus", {
   enumerable: true,
   get: function () {
-    return _useSettingToggle.useSettingToggle;
+    return _useMutationStatus.useMutationStatus;
   }
 });
-Object.defineProperty(exports, "useSettingToggles", {
+Object.defineProperty(exports, "useOnlineStatus", {
   enumerable: true,
   get: function () {
-    return _useSettingToggle.useSettingToggles;
+    return _useOnlineStatus.useOnlineStatus;
   }
 });
-Object.defineProperty(exports, "useThemeColors", {
+Object.defineProperty(exports, "useSettingToggle", {
   enumerable: true,
   get: function () {
-    return _useThemeColors.useThemeColors;
+    return _useSettingToggle.useSettingToggle;
   }
 });
-Object.defineProperty(exports, "useThemeStyles", {
+Object.defineProperty(exports, "useSettingToggles", {
   enumerable: true,
   get: function () {
-    return _useThemeStyles.useThemeStyles;
+    return _useSettingToggle.useSettingToggles;
   }
 });
 var _useFollow = require("./useFollow.js");
 var _useFileDownloadUrl = require("./useFileDownloadUrl.js");
-var _useThemeStyles = require("./useThemeStyles.js");
-var _useThemeColors = require("./useThemeColors.js");
 var _useAsyncAction = require("./useAsyncAction.js");
 var _useSettingToggle = require("./useSettingToggle.js");
+var _useMutationStatus = require("./useMutationStatus.js");
+var _useOnlineStatus = require("./useOnlineStatus.js");
+var _mutationKeys = require("./mutations/mutationKeys.js");
+var _queryClient = require("./queryClient.js");
 //# sourceMappingURL=index.js.map

package/lib/commonjs/ui/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_useFollow","require","_useFileDownloadUrl","_useThemeStyles","_useThemeColors","_useAsyncAction","_useSettingToggle"],"sourceRoot":"../../../../src","sources":["ui/hooks/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,iBAAA,GAAAL,OAAA","ignoreList":[]}
+{"version":3,"names":["_useFollow","require","_useFileDownloadUrl","_useAsyncAction","_useSettingToggle","_useMutationStatus","_useOnlineStatus","_mutationKeys","_queryClient"],"sourceRoot":"../../../../src","sources":["ui/hooks/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AACA,IAAAI,kBAAA,GAAAJ,OAAA;AACA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,aAAA,GAAAN,OAAA;AACA,IAAAO,YAAA,GAAAP,OAAA","ignoreList":[]}

package/lib/commonjs/ui/hooks/mutations/mutationFactory.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createGenericMutation = createGenericMutation;
 exports.createProfileMutation = createProfileMutation;
 var _queryKeys = require("../queries/queryKeys.js");
-var _sonner = require("../../../lib/sonner");
+var _bloom = require("@oxyhq/bloom");
 var _authStore = require("../../stores/authStore.js");
 /**
  * Mutation Factory - Creates standardized mutations with optimistic updates
@@ -29,6 +29,7 @@ var _authStore = require("../../stores/authStore.js");
  * @example
  * ```ts
  * const updateProfile = createProfileMutation({
+ *   mutationKey: mutationKeys.account.updateProfile,
  *   mutationFn: (updates) => oxyServices.updateProfile(updates),
  *   optimisticUpdate: (user, updates) => updates,
  *   errorMessage: 'Failed to update profile',
@@ -38,6 +39,7 @@ var _authStore = require("../../stores/authStore.js");
 function createProfileMutation(config, queryClient, activeSessionId) {
   const {
     mutationFn,
+    mutationKey,
     cancelQueryKeys = [],
     optimisticUpdate,
     errorMessage = 'Operation failed',
@@ -48,6 +50,7 @@ function createProfileMutation(config, queryClient, activeSessionId) {
     onSuccess: customOnSuccess
   } = config;
   return {
+    mutationKey: [...mutationKey],
     mutationFn,
     onMutate: async variables => {
       // Cancel queries that might conflict
@@ -90,7 +93,7 @@ function createProfileMutation(config, queryClient, activeSessionId) {
 
       // Show error toast
       const message = typeof errorMessage === 'function' ? errorMessage(error) : error instanceof Error ? error.message : errorMessage;
-      _sonner.toast.error(message);
+      _bloom.toast.error(message);
     },
     onSuccess: (data, variables) => {
       // Update cache with server response
@@ -114,7 +117,7 @@ function createProfileMutation(config, queryClient, activeSessionId) {
 
       // Show success toast if configured
       if (successMessage) {
-        _sonner.toast.success(successMessage);
+        _bloom.toast.success(successMessage);
       }
 
       // Call custom onSuccess handler
@@ -135,6 +138,7 @@ function createProfileMutation(config, queryClient, activeSessionId) {
 function createGenericMutation(config, queryClient) {
   const {
     mutationFn,
+    mutationKey,
     queryKey,
     optimisticData,
     errorMessage = 'Operation failed',
@@ -142,6 +146,7 @@ function createGenericMutation(config, queryClient) {
     invalidateQueries = []
   } = config;
   return {
+    mutationKey: [...mutationKey],
     mutationFn,
     onMutate: async variables => {
       await queryClient.cancelQueries({
@@ -159,7 +164,7 @@ function createGenericMutation(config, queryClient) {
       if (context?.previous !== undefined) {
         queryClient.setQueryData(queryKey, context.previous);
       }
-      _sonner.toast.error(error instanceof Error ? error.message : errorMessage);
+      _bloom.toast.error(error instanceof Error ? error.message : errorMessage);
     },
     onSuccess: data => {
       queryClient.setQueryData(queryKey, data);
@@ -169,7 +174,7 @@ function createGenericMutation(config, queryClient) {
         });
       }
       if (successMessage) {
-        _sonner.toast.success(successMessage);
+        _bloom.toast.success(successMessage);
       }
     }
   };

package/lib/commonjs/ui/hooks/mutations/mutationFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["_queryKeys","require","_sonner","_authStore","createProfileMutation","config","queryClient","activeSessionId","mutationFn","cancelQueryKeys","optimisticUpdate","errorMessage","successMessage","updateAuthStore","invalidateUserQueries","shouldInvalidateUserQueries","invalidateAccountQueries","shouldInvalidateAccountQueries","onSuccess","customOnSuccess","onMutate","variables","cancelQueries","queryKey","queryKeys","accounts","current","key","previousUser","getQueryData","updates","optimisticUser","setQueryData","users","profile","onError","error","_variables","context","message","Error","toast","data","useAuthStore","getState","setUser","success","createGenericMutation","optimisticData","invalidateQueries","previous","undefined"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/mutationFactory.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_queryKeys","require","_bloom","_authStore","createProfileMutation","config","queryClient","activeSessionId","mutationFn","mutationKey","cancelQueryKeys","optimisticUpdate","errorMessage","successMessage","updateAuthStore","invalidateUserQueries","shouldInvalidateUserQueries","invalidateAccountQueries","shouldInvalidateAccountQueries","onSuccess","customOnSuccess","onMutate","variables","cancelQueries","queryKey","queryKeys","accounts","current","key","previousUser","getQueryData","updates","optimisticUser","setQueryData","users","profile","onError","error","_variables","context","message","Error","toast","data","useAuthStore","getState","setUser","success","createGenericMutation","optimisticData","invalidateQueries","previous","undefined"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/mutationFactory.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/mutations/mutationKeys.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mutationKeys = void 0;
+/**
+ * Stable mutation key factories.
+ *
+ * Mutations that may be queued while offline MUST declare a stable
+ * `mutationKey`. When the network comes back, TanStack Query resumes
+ * paused mutations grouped by key — so the keys here should be stable
+ * across renders and across reloads when persistence is enabled.
+ */
+
+const mutationKeys = exports.mutationKeys = {
+  // Account-related writes
+  account: {
+    updateProfile: ['mutation', 'account', 'updateProfile'],
+    uploadAvatar: ['mutation', 'account', 'uploadAvatar'],
+    updateSettings: ['mutation', 'account', 'updateSettings'],
+    updatePrivacySettings: ['mutation', 'account', 'updatePrivacySettings'],
+    uploadFile: ['mutation', 'account', 'uploadFile']
+  },
+  // Session / device writes
+  session: {
+    switch: ['mutation', 'session', 'switch'],
+    logout: ['mutation', 'session', 'logout'],
+    logoutAll: ['mutation', 'session', 'logoutAll'],
+    updateDeviceName: ['mutation', 'session', 'updateDeviceName'],
+    removeDevice: ['mutation', 'session', 'removeDevice']
+  }
+};
+//# sourceMappingURL=mutationKeys.js.map

package/lib/commonjs/ui/hooks/mutations/mutationKeys.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["mutationKeys","exports","account","updateProfile","uploadAvatar","updateSettings","updatePrivacySettings","uploadFile","session","switch","logout","logoutAll","updateDeviceName","removeDevice"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/mutationKeys.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEO,MAAMA,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAG;EAC1B;EACAE,OAAO,EAAE;IACPC,aAAa,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAU;IAChEC,YAAY,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,cAAc,CAAU;IAC9DC,cAAc,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,gBAAgB,CAAU;IAClEC,qBAAqB,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,uBAAuB,CAAU;IAChFC,UAAU,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY;EAClD,CAAC;EAED;EACAC,OAAO,EAAE;IACPC,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAU;IAClDC,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAU;IAClDC,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAU;IACxDC,gBAAgB,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,kBAAkB,CAAU;IACtEC,YAAY,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,cAAc;EACtD;AACF,CAAU","ignoreList":[]}

package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js

@@ -7,8 +7,9 @@ exports.useUploadFile = exports.useUploadAvatar = exports.useUpdateProfile = exp
 var _reactQuery = require("@tanstack/react-query");
 var _core = require("@oxyhq/core");
 var _queryKeys = require("../queries/queryKeys.js");
+var _mutationKeys = require("./mutationKeys.js");
 var _OxyContext = require("../../context/OxyContext.js");
-var _sonner = require("../../../lib/sonner");
+var _bloom = require("@oxyhq/bloom");
 var _avatarUtils = require("../../utils/avatarUtils.js");
 var _authStore = require("../../stores/authStore.js");
 /**
@@ -22,6 +23,7 @@ const useUpdateProfile = () => {
   } = (0, _OxyContext.useOxy)();
   const queryClient = (0, _reactQuery.useQueryClient)();
   return (0, _reactQuery.useMutation)({
+    mutationKey: [..._mutationKeys.mutationKeys.account.updateProfile],
     mutationFn: async updates => {
       return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.updateProfile(updates));
     },
@@ -54,15 +56,33 @@ const useUpdateProfile = () => {
         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.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.queryKeys.accounts.current());
+        if (current) {
+          queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), {
+            ...current,
+            ...partialRollback
+          });
+        }
         if (activeSessionId) {
-          queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), context.previousUser);
+          const currentProfile = queryClient.getQueryData(_queryKeys.queryKeys.users.profile(activeSessionId));
+          if (currentProfile) {
+            queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), {
+              ...currentProfile,
+              ...partialRollback
+            });
+          }
         }
       }
-      _sonner.toast.error(error instanceof Error ? error.message : 'Failed to update profile');
+      _bloom.toast.error(error instanceof Error ? error.message : 'Failed to update profile');
     },
     // On success, invalidate and refetch
     onSuccess: (data, updates) => {
@@ -80,9 +100,13 @@ const useUpdateProfile = () => {
         (0, _avatarUtils.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.
+      // This is critical right after `username` is set the first time, when
+      // every cached "session profile" still reports the user as unnamed.
       (0, _queryKeys.invalidateUserQueries)(queryClient);
       (0, _queryKeys.invalidateAccountQueries)(queryClient);
+      (0, _queryKeys.invalidateSessionQueries)(queryClient);
     }
   });
 };
@@ -98,6 +122,7 @@ const useUploadAvatar = () => {
   } = (0, _OxyContext.useOxy)();
   const queryClient = (0, _reactQuery.useQueryClient)();
   return (0, _reactQuery.useMutation)({
+    mutationKey: [..._mutationKeys.mutationKeys.account.uploadAvatar],
     mutationFn: async file => {
       return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, async () => {
         const uploadResult = await oxyServices.assetUpload(file, 'public');
@@ -133,14 +158,28 @@ const useUploadAvatar = () => {
         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.queryKeys.accounts.current(), context.previousUser);
+        const previousAvatar = context.previousUser.avatar;
+        const current = queryClient.getQueryData(_queryKeys.queryKeys.accounts.current());
+        if (current) {
+          queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), {
+            ...current,
+            avatar: previousAvatar
+          });
+        }
         if (activeSessionId) {
-          queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), context.previousUser);
+          const currentProfile = queryClient.getQueryData(_queryKeys.queryKeys.users.profile(activeSessionId));
+          if (currentProfile) {
+            queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), {
+              ...currentProfile,
+              avatar: previousAvatar
+            });
+          }
         }
       }
-      _sonner.toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
+      _bloom.toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
     },
     onSuccess: data => {
       queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), data);
@@ -156,31 +195,72 @@ const useUploadAvatar = () => {
         (0, _avatarUtils.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.
       (0, _queryKeys.invalidateUserQueries)(queryClient);
       (0, _queryKeys.invalidateAccountQueries)(queryClient);
-      _sonner.toast.success('Avatar updated successfully');
+      (0, _queryKeys.invalidateSessionQueries)(queryClient);
+      _bloom.toast.success('Avatar updated successfully');
     }
   });
 };
 
 /**
- * Update account settings
+ * Variables accepted by the `useUpdateAccountSettings` mutation.
+ *
+ * `currentUser` is captured at dispatch time so the rebuilt user object the
+ * mutation returns is computed against a stable snapshot — NOT the cache
+ * value at the moment the API call settles. Reading from the cache inside
+ * `mutationFn` would race with sibling optimistic updates: a concurrent
+ * write could already have overwritten the cache by the time the privacy
+ * update returns, causing the rebuilt user to clobber the sibling's
+ * optimistic value.
  */
 exports.useUploadAvatar = useUploadAvatar;
+/**
+ * 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 `useOxy()` at dispatch time. Callers that need to
+ * supply their own user snapshot (testing, server-side) can call the
+ * underlying `.mutate({ updates, currentUser })` form via `.mutation`.
+ */
 const useUpdateAccountSettings = () => {
   const {
     oxyServices,
-    activeSessionId
+    activeSessionId,
+    user
   } = (0, _OxyContext.useOxy)();
   const queryClient = (0, _reactQuery.useQueryClient)();
-  return (0, _reactQuery.useMutation)({
-    mutationFn: async settings => {
-      return await oxyServices.updateProfile({
-        privacySettings: settings
-      });
+  const mutation = (0, _reactQuery.useMutation)({
+    mutationKey: [..._mutationKeys.mutationKeys.account.updateSettings],
+    mutationFn: async ({
+      updates,
+      currentUser
+    }) => {
+      const userId = currentUser.id;
+      if (!userId) {
+        throw new Error('User ID is required to update account settings');
+      }
+      const updatedPrivacy = await (0, _core.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; using `currentUser` keeps this mutation
+      // hermetic.
+      return {
+        ...currentUser,
+        privacySettings: updatedPrivacy
+      };
     },
-    onMutate: async settings => {
+    onMutate: async ({
+      updates
+    }) => {
       await queryClient.cancelQueries({
         queryKey: _queryKeys.queryKeys.accounts.settings()
       });
@@ -190,7 +270,7 @@ const useUpdateAccountSettings = () => {
           ...previousUser,
           privacySettings: {
             ...previousUser.privacySettings,
-            ...settings
+            ...updates
           }
         });
       }
@@ -198,11 +278,29 @@ const useUpdateAccountSettings = () => {
         previousUser
       };
     },
-    onError: (error, settings, context) => {
-      if (context?.previousUser) {
-        queryClient.setQueryData(_queryKeys.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.queryKeys.accounts.current());
+        if (current) {
+          queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), {
+            ...current,
+            privacySettings: {
+              ...(current.privacySettings ?? {}),
+              ...partialPrivacyRollback
+            }
+          });
+        }
       }
-      _sonner.toast.error(error instanceof Error ? error.message : 'Failed to update settings');
+      _bloom.toast.error(error instanceof Error ? error.message : 'Failed to update settings');
     },
     onSuccess: data => {
       queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), data);
@@ -210,7 +308,7 @@ const useUpdateAccountSettings = () => {
       // Update authStore so frontend components see the changes immediately
       _authStore.useAuthStore.getState().setUser(data);
       (0, _queryKeys.invalidateAccountQueries)(queryClient);
-      _sonner.toast.success('Settings updated successfully');
+      _bloom.toast.success('Settings updated successfully');
     },
     onSettled: () => {
       queryClient.invalidateQueries({
@@ -218,6 +316,35 @@ const useUpdateAccountSettings = () => {
       });
     }
   });
+
+  // Snapshot the current user at dispatch time. Reading `user` here (from
+  // the `useOxy()` closure of the call to `useUpdateAccountSettings`) is
+  // the dispatch-time value, captured the moment `mutate()` runs — exactly
+  // what the race fix needs.
+  return {
+    ...mutation,
+    mutate: updates => {
+      const currentUser = user ?? queryClient.getQueryData(_queryKeys.queryKeys.accounts.current());
+      if (!currentUser) {
+        _bloom.toast.error('Cannot update account settings: no current user');
+        return;
+      }
+      mutation.mutate({
+        updates,
+        currentUser
+      });
+    },
+    mutateAsync: async updates => {
+      const currentUser = user ?? queryClient.getQueryData(_queryKeys.queryKeys.accounts.current());
+      if (!currentUser) {
+        throw new Error('Cannot update account settings: no current user');
+      }
+      return mutation.mutateAsync({
+        updates,
+        currentUser
+      });
+    }
+  };
 };
 
 /**
@@ -232,6 +359,7 @@ const useUpdatePrivacySettings = () => {
   } = (0, _OxyContext.useOxy)();
   const queryClient = (0, _reactQuery.useQueryClient)();
   return (0, _reactQuery.useMutation)({
+    mutationKey: [..._mutationKeys.mutationKeys.account.updatePrivacySettings],
     mutationFn: async ({
       settings,
       userId
@@ -285,54 +413,103 @@ const useUpdatePrivacySettings = () => {
         previousUser
       };
     },
-    // On error, rollback
+    // 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.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.queryKeys.privacy.settings(targetUserId));
+        if (currentPrivacy) {
+          queryClient.setQueryData(_queryKeys.queryKeys.privacy.settings(targetUserId), {
+            ...currentPrivacy,
+            ...partialPrivacyRollback
+          });
+        }
       }
-      if (context?.previousUser) {
-        queryClient.setQueryData(_queryKeys.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.queryKeys.accounts.current());
+        if (current) {
+          queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), {
+            ...current,
+            privacySettings: {
+              ...(current.privacySettings ?? {}),
+              ...partialPrivacyRollback
+            }
+          });
+        }
+      }
+
+      // After partial rollback, force a fresh fetch from the server so any
+      // concurrent-mutation state we may have failed to restore correctly
+      // gets reconciled with the source of truth. Targeted at privacy.settings
+      // only — NOT onSettled, which would defeat the merge fix on success.
+      if (targetUserId) {
+        queryClient.invalidateQueries({
+          queryKey: _queryKeys.queryKeys.privacy.settings(targetUserId)
+        });
       }
-      _sonner.toast.error(error instanceof Error ? error.message : 'Failed to update privacy settings');
+      _bloom.toast.error(error instanceof Error ? error.message : 'Failed to update privacy settings');
     },
-    // On success, invalidate and refetch
+    // 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
+      userId,
+      settings
     }) => {
       const targetUserId = userId || user?.id;
-      if (targetUserId) {
-        queryClient.setQueryData(_queryKeys.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.queryKeys.privacy.settings(targetUserId), previous => ({
+        ...(previous ?? {}),
+        ...requested,
+        ...incoming // server wins for fields it explicitly returned
+      }));
       const currentUser = queryClient.getQueryData(_queryKeys.queryKeys.accounts.current());
       if (currentUser) {
         const updatedUser = {
           ...currentUser,
-          privacySettings: data
+          privacySettings: {
+            ...(currentUser.privacySettings ?? {}),
+            ...requested,
+            ...incoming
+          }
         };
         queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), updatedUser);
-
-        // Update authStore so frontend components see the changes immediately
         _authStore.useAuthStore.getState().setUser(updatedUser);
       }
-      (0, _queryKeys.invalidateAccountQueries)(queryClient);
-    },
-    // Always refetch after error or success
-    onSettled: (data, error, {
-      userId
-    }) => {
-      const targetUserId = userId || user?.id;
-      if (targetUserId) {
-        queryClient.invalidateQueries({
-          queryKey: _queryKeys.queryKeys.privacy.settings(targetUserId)
-        });
-      }
-      queryClient.invalidateQueries({
-        queryKey: _queryKeys.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.
     }
   });
 };
@@ -350,6 +527,7 @@ const useUploadFile = () => {
     activeSessionId
   } = (0, _OxyContext.useOxy)();
   return (0, _reactQuery.useMutation)({
+    mutationKey: [..._mutationKeys.mutationKeys.account.uploadFile],
     mutationFn: async ({
       file,
       visibility,