@oxy.so/services 6.2.0 → 8.0.0

package/src/ui/hooks/mutations/useAccountMutations.ts

@@ -1,6 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { authenticatedApiCall } from '@oxy.so/core';
 import type {
+  AssetMetadata,
   AssetUploadInput,
   NotificationPreferences,
   PrivacySettings,
@@ -37,7 +38,7 @@ export const useUpdateProfile = () => {
       return authenticatedApiCall<User>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.updateProfile(updates)
+        () => oxyServices.users.updateMe(updates)
       );
     },
     // Optimistic update
@@ -134,7 +135,7 @@ export const useUploadAvatar = () => {
     mutationKey: [...mutationKeys.account.uploadAvatar],
     mutationFn: async (file: { uri: string; type?: string; name?: string; size?: number }) => {
       return authenticatedApiCall<User>(oxyServices, activeSessionId, async () => {
-        const uploadResult = await oxyServices.assetUpload(file, 'public');
+        const uploadResult = await oxyServices.assets.upload(file, { visibility: 'public' });
         const fileId = uploadResult?.file?.id;
 
         if (!fileId || typeof fileId !== 'string') {
@@ -142,7 +143,7 @@ export const useUploadAvatar = () => {
         }
 
         // Update profile with file ID
-        return await oxyServices.updateProfile({ avatar: fileId });
+        return await oxyServices.users.updateMe({ avatar: fileId });
       });
     },
     onMutate: async (file) => {
@@ -255,7 +256,7 @@ export const useUpdateAccountSettings = () => {
       const updatedPrivacy = await authenticatedApiCall<PrivacySettings>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.updatePrivacySettings(updates, userId)
+        () => oxyServices.privacy.updateSettings(updates, userId)
       );
       // Rebuild against the dispatch-time snapshot, NOT the live cache.
       // The cache may have been mutated by a sibling write between
@@ -361,7 +362,7 @@ export const useUpdatePrivacySettings = () => {
       return authenticatedApiCall<PrivacySettings>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.updatePrivacySettings(settings, targetUserId)
+        () => oxyServices.privacy.updateSettings(settings, targetUserId)
       );
     },
     // Optimistic update
@@ -532,7 +533,7 @@ export const useUpdateNotificationPreferences = () => {
       return authenticatedApiCall<User>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.updateNotificationPreferences(preferences)
+        () => oxyServices.users.updateMe({ notificationPreferences: preferences })
       );
     },
     onMutate: async (preferences) => {
@@ -590,7 +591,7 @@ export const useUpdateUserPreferences = () => {
       return authenticatedApiCall<User>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.updateUserPreferences(preferences)
+        () => oxyServices.users.updateMe({ userPreferences: preferences })
       );
     },
     onMutate: async (preferences) => {
@@ -643,7 +644,7 @@ export const useRevokeConnectedApp = () => {
     mutationKey: [...mutationKeys.connectedApps.revoke],
     mutationFn: async (applicationId: string) => {
       return authenticatedApiCall<void>(oxyServices, activeSessionId, () =>
-        oxyServices.revokeAppGrant(applicationId)
+        oxyServices.apps.connected.revoke(applicationId)
       );
     },
     onSuccess: () => {
@@ -673,13 +674,13 @@ export const useUploadFile = () => {
     }: {
       file: AssetUploadInput;
       visibility?: 'private' | 'public' | 'unlisted';
-      metadata?: Record<string, unknown>;
+      metadata?: AssetMetadata;
       onProgress?: (progress: number) => void;
     }) => {
       return authenticatedApiCall<UploadResult>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.assetUpload(file, visibility, metadata, onProgress)
+        () => oxyServices.assets.upload(file, { visibility, metadata, onProgress })
       );
     },
   });

package/src/ui/hooks/mutations/useServicesMutations.ts

@@ -48,7 +48,7 @@ export const useLogoutSession = () => {
       }
       
       const sessionToLogout = targetSessionId || activeSessionId;
-      await oxyServices.logoutSession(activeSessionId, sessionToLogout);
+      await oxyServices.session.logout(activeSessionId, sessionToLogout);
       
       return sessionToLogout;
     },
@@ -101,7 +101,7 @@ export const useLogoutAll = () => {
         throw new Error('No active session');
       }
       
-      await oxyServices.logoutAllSessions(activeSessionId);
+      await oxyServices.session.logoutAll(activeSessionId);
       await clearSessionState();
     },
     onSuccess: () => {
@@ -129,7 +129,7 @@ export const useUpdateDeviceName = () => {
         throw new Error('No active session');
       }
       
-      return await oxyServices.updateDeviceName(activeSessionId, deviceName);
+      return await oxyServices.devices.rename(activeSessionId, deviceName);
     },
     onSuccess: () => {
       // Invalidate device and session queries
@@ -153,7 +153,7 @@ export const useRemoveDevice = () => {
   return useMutation({
     mutationKey: [...mutationKeys.session.removeDevice],
     mutationFn: async (deviceId: string) => {
-      await oxyServices.removeDevice(deviceId);
+      await oxyServices.devices.remove(deviceId);
       return deviceId;
     },
     onSuccess: () => {

package/src/ui/hooks/queries/queryKeys.ts

@@ -75,6 +75,8 @@ export const queryKeys = {
   privacy: {
     all: ['privacy'] as const,
     settings: (userId?: string) => [...queryKeys.privacy.all, 'settings', userId || 'current'] as const,
+    /** The active account's blocked + restricted lists. */
+    lists: (userId?: string) => [...queryKeys.privacy.all, 'lists', userId || 'current'] as const,
   },
 
   // Security activity queries
@@ -88,7 +90,13 @@ export const queryKeys = {
       [...queryKeys.security.all, 'infinite', limit, eventType] as const,
   },
 
-  // Linked authentication methods (passwords, identity keys, passkeys, social)
+  // Linked authentication methods (the identity key)
+  /** How the signed-in account signs in: email, password, authenticator (`GET /users/me/sign-in-methods`). */
+  signInMethods: {
+    all: ['signInMethods'] as const,
+    current: (userId?: string) => [...queryKeys.signInMethods.all, userId || 'current'] as const,
+  },
+
   authMethods: {
     all: ['authMethods'] as const,
     list: (userId?: string) => [...queryKeys.authMethods.all, 'list', userId || 'current'] as const,
@@ -119,6 +127,22 @@ export const queryKeys = {
     counts: (userId: string) => [...queryKeys.follow.all, 'counts', userId] as const,
   },
 
+  // Oxy Trust reputation (the active account's standing)
+  reputation: {
+    all: ['reputation'] as const,
+    balance: (userId?: string) => [...queryKeys.reputation.all, 'balance', userId || 'current'] as const,
+    transactions: (userId: string | undefined, limit: number, offset = 0) =>
+      [...queryKeys.reputation.all, 'transactions', userId || 'current', limit, offset] as const,
+    rules: () => [...queryKeys.reputation.all, 'rules'] as const,
+    leaderboard: () => [...queryKeys.reputation.all, 'leaderboard'] as const,
+  },
+
+  // Verified domains on the signed-in identity
+  domains: {
+    all: ['domains'] as const,
+    list: (userId?: string) => [...queryKeys.domains.all, 'list', userId || 'current'] as const,
+  },
+
   // Payment / wallet / subscription queries
   payments: {
     all: ['payments'] as const,
@@ -191,7 +215,7 @@ export const invalidateStorageQueries = (queryClient: QueryClient): void => {
 
 /**
  * Helper to invalidate the user's linked auth-methods list (call after linking
- * or removing a passkey / password / identity key).
+ * or rotating the identity key).
  */
 export const invalidateAuthMethodsQueries = (queryClient: QueryClient): void => {
   queryClient.invalidateQueries({ queryKey: queryKeys.authMethods.all });

package/src/ui/hooks/queries/useAccountQueries.ts

@@ -19,7 +19,7 @@ export const useUserProfile = (sessionId: string | null, options?: { enabled?: b
       if (!sessionId) {
         throw new Error('Session ID is required');
       }
-      return await oxyServices.getUserBySession(sessionId);
+      return await oxyServices.users.bySession(sessionId);
     },
     enabled: (options?.enabled !== false) && !!sessionId,
     staleTime: 5 * 60 * 1000, // 5 minutes
@@ -37,7 +37,7 @@ export const useUserProfiles = (sessionIds: string[], options?: { enabled?: bool
     queries: sessionIds.map((sessionId) => ({
       queryKey: queryKeys.users.profile(sessionId),
       queryFn: async () => {
-        const results = await oxyServices.getUsersBySessions([sessionId]);
+        const results = await oxyServices.users.bySessions([sessionId]);
         return results[0]?.user || null;
       },
       enabled: (options?.enabled !== false) && !!sessionId,
@@ -76,7 +76,7 @@ export const useCurrentUser = (options?: { enabled?: boolean }) => {
   const query = useQuery({
     queryKey: queryKeys.accounts.current(activeSessionId),
     queryFn: async () => {
-      return await oxyServices.getCurrentUser();
+      return await oxyServices.users.me();
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,
     staleTime: 1 * 60 * 1000, // 1 minute for current user
@@ -175,7 +175,7 @@ export const useUserById = (userId: string | null, options?: { enabled?: boolean
       if (!userId) {
         throw new Error('User ID is required');
       }
-      return await oxyServices.getUserById(userId);
+      return await oxyServices.users.get(userId);
     },
     enabled: (options?.enabled !== false) && !!userId,
     staleTime: 5 * 60 * 1000,
@@ -209,7 +209,7 @@ export const useUserByUsername = (username: string | null, options?: { enabled?:
       // Match queryKeys.users.byUsername normalization so the cache key and
       // the API request agree (case-insensitive local handles).
       const normalizedUsername = username.trim().toLowerCase();
-      return await oxyServices.getProfileByUsername(normalizedUsername);
+      return await oxyServices.users.byUsername(normalizedUsername);
     },
     enabled: (options?.enabled !== false) && !!username,
     staleTime: 5 * 60 * 1000,
@@ -245,7 +245,7 @@ export const useUsersBySessions = (sessionIds: string[], options?: { enabled?: b
       if (sessionIds.length === 0) {
         return [];
       }
-      return await oxyServices.getUsersBySessions(sessionIds);
+      return await oxyServices.users.bySessions(sessionIds);
     },
     enabled: (options?.enabled !== false) && sessionIds.length > 0,
     staleTime: 5 * 60 * 1000,
@@ -267,7 +267,7 @@ export const useConnectedApps = (options?: { enabled?: boolean }) => {
       return authenticatedApiCall<ConnectedApp[]>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.listConnectedApps()
+        () => oxyServices.apps.connected.list()
       );
     },
     enabled: (options?.enabled !== false) && isAuthenticated,
@@ -296,7 +296,7 @@ export const usePrivacySettings = (userId?: string, options?: { enabled?: boolea
       return authenticatedApiCall(
         oxyServices,
         activeSessionId,
-        () => oxyServices.getPrivacySettings(targetUserId)
+        () => oxyServices.privacy.settings(targetUserId)
       );
     },
     enabled: (options?.enabled !== false) && !!targetUserId,

package/src/ui/hooks/queries/useAuthMethods.ts

@@ -1,6 +1,5 @@
-import { useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import type { AuthMethodEntry, AuthMethodsResponse } from '@oxy.so/contracts';
+import type { AuthMethodEntry, AuthMethodsResponse, SignInMethods } from '@oxy.so/contracts';
 import { queryKeys } from './queryKeys';
 import { useOxy } from '../../context/OxyContext';
 
@@ -8,38 +7,42 @@ import { useOxy } from '../../context/OxyContext';
 const EMPTY_METHODS: readonly AuthMethodEntry[] = Object.freeze([]);
 
 /**
- * The current account's linked authentication methods (`GET /auth/methods`),
- * plus convenience projections. Backs the security / account surfaces that let a
- * user see and manage their passwords, identity key, social logins, and passkeys.
- *
- * `passkeys` is the `type === 'webauthn'` subset — one entry per registered
- * credential. Invalidate via `queryKeys.authMethods.all` after linking a passkey
- * (`useOxy().addPasskey()` does this) or removing one.
+ * The current account's linked authentication methods (`GET /auth/methods`).
+ * Backs the security / account surfaces that let a user see their identity key
+ * and social logins.
  */
 export const useAuthMethods = (options?: { enabled?: boolean }) => {
   const { oxyServices, activeSessionId } = useOxy();
 
   const query = useQuery<AuthMethodsResponse>({
     queryKey: queryKeys.authMethods.list(),
-    queryFn: () => oxyServices.listAuthMethods(),
+    queryFn: () => oxyServices.identity.authMethods(),
     enabled: options?.enabled !== false && !!activeSessionId,
     staleTime: 5 * 60 * 1000, // 5 minutes
     gcTime: 10 * 60 * 1000, // 10 minutes
   });
 
-  const methods = query.data?.methods ?? EMPTY_METHODS;
-  const passkeys = useMemo(
-    () => methods.filter((method) => method.type === 'webauthn'),
-    [methods],
-  );
-
   return {
     ...query,
     /** Every linked auth method. Empty while loading. */
-    methods,
-    /** The registered passkeys (a `type === 'webauthn'` subset of `methods`). */
-    passkeys,
+    methods: query.data?.methods ?? EMPTY_METHODS,
     /** The account's DID, or `null` while loading. */
     did: query.data?.did ?? null,
   };
 };
+
+/**
+ * How the signed-in account signs in (`GET /users/me/sign-in-methods`): whether
+ * it has an email, a password, an authenticator app, and how many backup codes
+ * are left. Invalidate `queryKeys.signInMethods.all` after changing any of them
+ * (the security panels do).
+ */
+export const useSignInMethods = (options?: { enabled?: boolean }) => {
+  const { oxyServices, activeSessionId, user } = useOxy();
+  return useQuery<SignInMethods>({
+    queryKey: queryKeys.signInMethods.current(user?.id),
+    queryFn: () => oxyServices.auth.methods(),
+    enabled: options?.enabled !== false && !!activeSessionId,
+    staleTime: 60 * 1000,
+  });
+};

package/src/ui/hooks/queries/useFileQueries.ts

@@ -21,7 +21,7 @@ import { queryKeys } from './queryKeys';
 /** Files fetched per page. */
 export const FILES_PAGE_SIZE = 40;
 
-/** Raw file record as returned by `oxyServices.listUserFiles` / `assetUpload`. */
+/** Raw file record as returned by `oxyServices.assets.list` / `assetUpload`. */
 export interface RawUserFile {
     id: string;
     originalName?: string;
@@ -68,7 +68,7 @@ export const useUserFilesInfinite = (ownerId?: string) => {
         queryKey: queryKeys.files.list(ownerId),
         queryFn: async ({ pageParam }) => {
             const offset = typeof pageParam === 'number' ? pageParam : 0;
-            const response = await oxyServices.listUserFiles(FILES_PAGE_SIZE, offset);
+            const response = await oxyServices.assets.list({ limit: FILES_PAGE_SIZE, offset });
             const raw = (response.files ?? []) as RawUserFile[];
             const files = raw.map(mapRawFileToMetadata);
             return {

package/src/ui/hooks/queries/usePaymentQueries.ts

@@ -29,7 +29,7 @@ import type {
 /**
  * Get the current user's subscription.
  *
- * Wraps `oxyServices.getCurrentUserSubscription()`
+ * Wraps `oxyServices.billing.subscription()`
  * (`GET /subscription/:userId`, billing-first). Returns the persisted
  * subscription or the API's `{ plan: 'basic' }` fallback when the user has
  * never subscribed.
@@ -43,7 +43,7 @@ export const useUserSubscription = (options?: { enabled?: boolean }) => {
       return authenticatedApiCall<Subscription>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.getCurrentUserSubscription(),
+        () => oxyServices.billing.subscription(),
       );
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
@@ -56,7 +56,7 @@ export const useUserSubscription = (options?: { enabled?: boolean }) => {
 /**
  * Get the current user's payment / billing history.
  *
- * Wraps `oxyServices.getUserPayments()` (`GET /payments/user`), which
+ * Wraps `oxyServices.billing.payments()` (`GET /payments/user`), which
  * returns the user's `deposit` and `purchase` transactions newest-first.
  */
 export const useUserPayments = (options?: { enabled?: boolean }) => {
@@ -68,7 +68,7 @@ export const useUserPayments = (options?: { enabled?: boolean }) => {
       return authenticatedApiCall<Payment[]>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.getUserPayments(),
+        () => oxyServices.billing.payments(),
       );
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
@@ -81,7 +81,7 @@ export const useUserPayments = (options?: { enabled?: boolean }) => {
 /**
  * Get the current user's FairCoin wallet balance.
  *
- * Wraps `oxyServices.getCurrentUserWallet()` (`GET /wallet/:userId`).
+ * Wraps `oxyServices.billing.wallet()` (`GET /wallet/:userId`).
  * Balance changes frequently, so the fresh window is intentionally short.
  */
 export const useUserWallet = (options?: { enabled?: boolean }) => {
@@ -93,7 +93,7 @@ export const useUserWallet = (options?: { enabled?: boolean }) => {
       return authenticatedApiCall<Wallet>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.getCurrentUserWallet(),
+        () => oxyServices.billing.wallet(),
       );
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
@@ -105,7 +105,7 @@ export const useUserWallet = (options?: { enabled?: boolean }) => {
 /**
  * Get the current user's wallet transaction history (paginated).
  *
- * Wraps `oxyServices.getCurrentUserWalletTransactions(options)`
+ * Wraps `oxyServices.billing.walletTransactions(options)`
  * (`GET /wallet/transactions/:userId`). The API responds with a
  * `{ data, pagination }` envelope, preserved here as
  * `WalletTransactionsResponse`.
@@ -127,7 +127,7 @@ export const useUserWalletTransactions = (
       return authenticatedApiCall<WalletTransactionsResponse>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.getCurrentUserWalletTransactions({ limit, offset }),
+        () => oxyServices.billing.walletTransactions({ limit, offset }),
       );
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,

package/src/ui/hooks/queries/useSecurityQueries.ts

@@ -27,7 +27,7 @@ export const useSecurityActivity = (
         throw new Error('No active session');
       }
 
-      const response = await oxyServices.getSecurityActivity(
+      const response = await oxyServices.devices.securityActivity(
         options?.limit,
         options?.offset,
         options?.eventType
@@ -54,7 +54,8 @@ export const useRecentSecurityActivity = (limit = 10) => {
         throw new Error('No active session');
       }
 
-      return await oxyServices.getRecentSecurityActivity(limit);
+      const page = await oxyServices.devices.securityActivity(limit, 0);
+      return page.data;
     },
     enabled: !!activeSessionId,
     staleTime: 5 * 60 * 1000, // 5 minutes
@@ -85,7 +86,7 @@ export const useInfiniteSecurityActivity = (
       }
 
       const offset = typeof pageParam === 'number' ? pageParam : 0;
-      return await oxyServices.getSecurityActivity(
+      return await oxyServices.devices.securityActivity(
         limit,
         offset,
         options?.eventType

package/src/ui/hooks/queries/useServicesQueries.ts

@@ -50,7 +50,7 @@ export const useSession = (sessionId: string | null, options?: { enabled?: boole
         throw new Error('Session ID is required');
       }
       
-      const validation = await oxyServices.validateSession(sessionId, { useHeaderValidation: true });
+      const validation = await oxyServices.session.validate(sessionId, { useHeaderValidation: true });
       if (!validation?.valid || !validation.user) {
         throw new Error('Session not found or invalid');
       }
@@ -84,7 +84,7 @@ export const useDeviceSessions = (options?: { enabled?: boolean }) => {
         throw new Error('No active session');
       }
       
-      return await oxyServices.getDeviceSessions(activeSessionId);
+      return await oxyServices.devices.sessions(activeSessionId);
     },
     enabled: (options?.enabled !== false) && !!activeSessionId,
     staleTime: 2 * 60 * 1000,
@@ -104,7 +104,7 @@ export const useUserDevices = (options?: { enabled?: boolean }) => {
       return authenticatedApiCall(
         oxyServices,
         activeSessionId,
-        () => oxyServices.getUserDevices()
+        () => oxyServices.devices.list()
       );
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,
@@ -122,7 +122,7 @@ export const useSecurityInfo = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: [...queryKeys.devices.all, 'security'],
     queryFn: async () => {
-      return await oxyServices.getSecurityInfo();
+      return await oxyServices.devices.securityInfo();
     },
     enabled: (options?.enabled !== false) && isAuthenticated,
     staleTime: 5 * 60 * 1000,
@@ -132,7 +132,7 @@ export const useSecurityInfo = (options?: { enabled?: boolean }) => {
 
 /**
  * Get account storage usage (server-aggregated usage across assets, mail,
- * recordings, etc.). Wraps `oxyServices.getAccountStorageUsage()` in a
+ * recordings, etc.). Wraps `oxyServices.assets.usage()` in a
  * TanStack query so consumers get caching, background refetch, and a
  * consistent `isLoading` / `refetch` surface instead of hand-rolled
  * `useEffect` fetches.
@@ -146,7 +146,7 @@ export const useAccountStorageUsage = (options?: { enabled?: boolean }) => {
       return authenticatedApiCall(
         oxyServices,
         activeSessionId,
-        () => oxyServices.getAccountStorageUsage()
+        () => oxyServices.assets.usage()
       );
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,

package/src/ui/hooks/useAssets.ts

@@ -1,12 +1,7 @@
 import { useCallback } from 'react';
 import { useAssetStore } from '../stores/assetStore';
 import type { OxyServices } from '@oxy.so/core';
-import {
-  type Asset,
-  AssetLinkRequest,
-  AssetUnlinkRequest,
-  AssetUploadProgress
-} from '@oxy.so/core';
+import type { Asset, AssetMetadata, AssetRecord, AssetVariant, UploadedAsset } from '@oxy.so/core';
 
 // Create a singleton instance for the hook
 let oxyInstance: OxyServices | null = null;
@@ -24,7 +19,7 @@ export const useAssets = () => {
     uploadProgress,
     loading,
     errors,
-    setAsset,
+    mergeAsset,
     setAssets,
     removeAsset,
     setUploadProgress,
@@ -47,9 +42,9 @@ export const useAssets = () => {
 
   // Upload asset with progress tracking
   const upload = useCallback(async (
-    file: File, 
-    metadata?: Record<string, unknown>
-  ): Promise<Asset | null> => {
+    file: File,
+    metadata?: AssetMetadata
+  ): Promise<UploadedAsset | null> => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
@@ -58,7 +53,7 @@ export const useAssets = () => {
       clearErrors();
       setUploading(true);
       
-      const result = await oxyInstance.assetUpload(file, undefined, metadata);
+      const result = await oxyInstance.assets.upload(file, { metadata });
 
       // Update progress with final status
       if (result?.file) {
@@ -79,7 +74,7 @@ export const useAssets = () => {
 
       // Add asset to store
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
         return result.file;
       }
       
@@ -95,7 +90,7 @@ export const useAssets = () => {
     setUploading, 
     setUploadProgress, 
     removeUploadProgress, 
-    setAsset, 
+    mergeAsset, 
     setUploadError
   ]);
 
@@ -119,10 +114,10 @@ export const useAssets = () => {
         ? 'public' as const
         : undefined;
       
-      const result = await oxyInstance.assetLink(assetId, app, entityType, entityId, visibility);
+      const result = await oxyInstance.assets.link(assetId, { app, entityType, entityId }, { visibility });
       
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
       } else {
         // If API doesn't return full file, update store optimistically
         addLink(assetId, {
@@ -139,7 +134,7 @@ export const useAssets = () => {
     } finally {
       setLinking(false);
     }
-  }, [clearErrors, setLinking, setAsset, addLink, setLinkError]);
+  }, [clearErrors, setLinking, mergeAsset, addLink, setLinkError]);
 
   // Unlink asset from entity
   const unlink = useCallback(async (
@@ -156,10 +151,10 @@ export const useAssets = () => {
       clearErrors();
       setLinking(true);
       
-      const result = await oxyInstance.assetUnlink(assetId, app, entityType, entityId);
+      const result = await oxyInstance.assets.unlink(assetId, { app, entityType, entityId });
       
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
       } else {
         // Update store optimistically
         removeLink(assetId, app, entityType, entityId);
@@ -170,7 +165,7 @@ export const useAssets = () => {
     } finally {
       setLinking(false);
     }
-  }, [clearErrors, setLinking, setAsset, removeLink, setLinkError]);
+  }, [clearErrors, setLinking, mergeAsset, removeLink, setLinkError]);
 
   // Get asset URL
   const getUrl = useCallback(async (
@@ -181,22 +176,21 @@ export const useAssets = () => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
-      const result = await oxyInstance.assetGetUrl(assetId, variant, expiresIn);
-      return result.url;
+      return oxyInstance.assets.url(assetId, variant, expiresIn);
   }, []);
 
   // Get asset metadata
-  const getAsset = useCallback(async (assetId: string): Promise<Asset> => {
+  const getAsset = useCallback(async (assetId: string): Promise<AssetRecord> => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
-      const result = await oxyInstance.assetGet(assetId);
+      const result = await oxyInstance.assets.get(assetId);
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
         return result.file;
       }
       throw new Error('Asset not found');
-  }, [setAsset]);
+  }, [mergeAsset]);
 
   // Delete asset
   const deleteAsset = useCallback(async (
@@ -211,7 +205,7 @@ export const useAssets = () => {
       clearErrors();
       setDeleting(true);
       
-      await oxyInstance.assetDelete(assetId, force);
+      await oxyInstance.assets.delete(assetId, { force });
       removeAsset(assetId);
     } catch (error: unknown) {
       setDeleteError((error instanceof Error ? error.message : null) || 'Delete failed');
@@ -226,18 +220,19 @@ export const useAssets = () => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
-      const result = await oxyInstance.assetRestore(assetId);
+      const result = await oxyInstance.assets.restore(assetId);
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
       }
-  }, [setAsset]);
+  }, [mergeAsset]);
 
   // Get variants
-  const getVariants = useCallback(async (assetId: string) => {
+  const getVariants = useCallback(async (assetId: string): Promise<AssetVariant[]> => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
-      return await oxyInstance.assetGetVariants(assetId);
+      const { file } = await oxyInstance.assets.get(assetId);
+      return file?.variants ?? [];
   }, []);
 
   return {