@better-auth-ui/react 1.6.2 → 1.6.4

package/src/components/{email → auth/email}/email-changed.tsx

@@ -16,7 +16,7 @@ import {
 } from "@react-email/components"
 import type { ReactNode } from "react"
 
-import { cn } from "../../lib/utils"
+import { cn } from "../../../lib/utils"
 import {
   type EmailClassNames,
   type EmailColors,

package/src/components/{email → auth/email}/email-verification.tsx

@@ -16,7 +16,7 @@ import {
 } from "@react-email/components"
 import type { ReactNode } from "react"
 
-import { cn } from "../../lib/utils"
+import { cn } from "../../../lib/utils"
 import {
   type EmailClassNames,
   type EmailColors,

package/src/components/{email → auth/email}/magic-link.tsx

@@ -16,7 +16,7 @@ import {
 } from "@react-email/components"
 import type { ReactNode } from "react"
 
-import { cn } from "../../lib/utils"
+import { cn } from "../../../lib/utils"
 import {
   type EmailClassNames,
   type EmailColors,

package/src/components/{email → auth/email}/new-device.tsx

@@ -16,7 +16,7 @@ import {
 } from "@react-email/components"
 import type { ReactNode } from "react"
 
-import { cn } from "../../lib/utils"
+import { cn } from "../../../lib/utils"
 import {
   type EmailClassNames,
   type EmailColors,

package/src/components/{email → auth/email}/otp-email.tsx

@@ -15,7 +15,7 @@ import {
 } from "@react-email/components"
 import type { ReactNode } from "react"
 
-import { cn } from "../../lib/utils"
+import { cn } from "../../../lib/utils"
 import {
   type EmailClassNames,
   type EmailColors,

package/src/components/{email → auth/email}/password-changed.tsx

@@ -16,7 +16,7 @@ import {
 } from "@react-email/components"
 import type { ReactNode } from "react"
 
-import { cn } from "../../lib/utils"
+import { cn } from "../../../lib/utils"
 import {
   type EmailClassNames,
   type EmailColors,

package/src/components/{email → auth/email}/reset-password.tsx

@@ -16,7 +16,7 @@ import {
 } from "@react-email/components"
 import type { ReactNode } from "react"
 
-import { cn } from "../../lib/utils"
+import { cn } from "../../../lib/utils"
 import {
   type EmailClassNames,
   type EmailColors,

package/src/email.ts

@@ -0,0 +1 @@
+export * from "./components/auth/email"

package/src/hooks/auth/use-authenticate.ts

@@ -1,21 +1,24 @@
 import { useEffect } from "react"
-
 import { useAuth } from "../../components/auth/auth-provider"
 import type { AuthClient } from "../../lib/auth-client"
-import type { UseAuthQueryOptions, UseAuthQueryResult } from "./use-auth-query"
-import { useSession } from "./use-session"
+import {
+  type UseSessionOptions,
+  useSession
+} from "../../queries/auth/session-query"
 
 /**
- * Redirects unauthenticated users to the sign-in page while preserving the current URL and exposes the active auth session state.
+ * Calls `useSession` and redirects unauthenticated users to the sign-in page,
+ * preserving the current URL as a `redirectTo` query param.
  *
- * @param options - Query options forwarded to the session query hook
- * @returns An object containing `data` (the current session or `undefined`), `isPending` (whether the session query is in progress), and other session query state
+ * @param authClient - The Better Auth client.
+ * @param options - `getSession` params & `useQuery` options.
  */
-export function useAuthenticate(
-  options?: Partial<UseAuthQueryOptions<AuthClient["getSession"]>>
-): UseAuthQueryResult<AuthClient["getSession"]> {
+export function useAuthenticate<TAuthClient extends AuthClient>(
+  authClient: TAuthClient,
+  options?: UseSessionOptions<TAuthClient>
+) {
   const { basePaths, viewPaths, navigate } = useAuth()
-  const session = useSession(options)
+  const session = useSession(authClient, options)
 
   useEffect(() => {
     if (session.data || session.isPending) return

package/src/hooks/auth/use-user.ts

@@ -1,17 +1,21 @@
 import type { AuthClient } from "../../lib/auth-client"
-import type { UseAuthQueryOptions } from "./use-auth-query"
-import { useSession } from "./use-session"
+import {
+  type UseSessionOptions,
+  useSession
+} from "../../queries/auth/session-query"
 
 /**
- * Retrieve the current authenticated user.
+ * Retrieve the current authenticated user. Thin wrapper over `useSession`
+ * that returns `session.user` as `data`.
  *
- * @param options - Options to merge into the React Query configuration for the session query.
- * @returns The React Query result with `data` containing the user object from the session.
+ * @param authClient - The Better Auth client.
+ * @param options - `getSession` params & `useQuery` options.
  */
-export function useUser(
-  options?: Partial<UseAuthQueryOptions<AuthClient["getSession"]>>
+export function useUser<TAuthClient extends AuthClient>(
+  authClient: TAuthClient,
+  options?: UseSessionOptions<TAuthClient>
 ) {
-  const { data, ...rest } = useSession(options)
+  const { data, ...rest } = useSession(authClient, options)
 
   return {
     data: data?.user,

package/src/hooks/use-auth-mutation.ts

@@ -0,0 +1,47 @@
+import {
+  type MutationKey,
+  type UseMutationOptions,
+  useMutation
+} from "@tanstack/react-query"
+import type { BetterFetchError } from "better-auth/client"
+
+import {
+  type AuthMutationFn,
+  type AuthMutationFnData,
+  type AuthMutationFnVariables,
+  authMutationOptions
+} from "../mutations/auth-mutation-options"
+
+type UseAuthMutationOptions<TFn extends AuthMutationFn> = Omit<
+  UseMutationOptions<
+    AuthMutationFnData<TFn>,
+    BetterFetchError,
+    AuthMutationFnVariables<TFn>
+  >,
+  "mutationKey" | "mutationFn"
+>
+
+/**
+ * Escape-hatch hook for Better Auth write endpoints that don't have a
+ * purpose-built mutation hook in this library yet. Thin wrapper over
+ * `useMutation` and `authMutationOptions`.
+ *
+ * @param authFn - Better Auth client method (e.g. `authClient.emailOtp.sendVerificationOtp`).
+ * @param mutationKey - Stable key for the mutation. Prefer an entry from
+ *   `authMutationKeys` over an inline tuple so `useIsMutating` and global
+ *   `MutationCache` observers line up.
+ * @param options - React Query options forwarded to `useMutation`.
+ */
+export function useAuthMutation<
+  TFn extends AuthMutationFn,
+  const TMutationKey extends MutationKey
+>(
+  authFn: TFn,
+  mutationKey: TMutationKey,
+  options?: UseAuthMutationOptions<TFn>
+) {
+  return useMutation({
+    ...authMutationOptions(authFn, mutationKey),
+    ...options
+  })
+}

package/src/hooks/use-auth-plugin.ts

@@ -0,0 +1,50 @@
+"use client"
+
+import { useAuth } from "../components/auth/auth-provider"
+import type { AuthPlugin } from "../lib/auth-plugin"
+
+/**
+ * Plugin factory shape accepted by {@link useAuthPlugin}. The `id` is read as
+ * a static property — the factory is never invoked — so plugins with required
+ * options (e.g. `themePlugin`'s `setTheme`) can still be looked up.
+ *
+ * Always produced by `createAuthPlugin` from `@better-auth-ui/core`.
+ */
+export type AuthPluginFactory<T extends AuthPlugin = AuthPlugin> = {
+  id: string
+  // biome-ignore lint/suspicious/noExplicitAny: factory args vary by plugin
+  (...args: any[]): T
+}
+
+/**
+ * Access a registered plugin by passing its factory.
+ *
+ * Use inside plugin slot components to read plugin state (localization,
+ * config, etc.) without prop drilling.
+ *
+ * Throws if the plugin isn't registered on `AuthProvider` — this is an
+ * invariant: plugin slot components only render when their plugin is in
+ * `plugins`.
+ *
+ * @example
+ * ```tsx
+ * function PasskeyButton() {
+ *   const { localization } = useAuthPlugin(passkeyPlugin)
+ *   return <button>{localization.passkey}</button>
+ * }
+ * ```
+ */
+export function useAuthPlugin<T extends AuthPlugin>(
+  pluginFactory: AuthPluginFactory<T>
+): T {
+  const { plugins } = useAuth()
+  const plugin = plugins?.find((p) => p.id === pluginFactory.id)
+
+  if (!plugin) {
+    throw new Error(
+      `[Better Auth UI] useAuthPlugin: plugin "${pluginFactory.id}" is not registered on AuthProvider.`
+    )
+  }
+
+  return plugin as T
+}

package/src/hooks/use-auth-query.ts

@@ -0,0 +1,40 @@
+import { type QueryKey, useQuery } from "@tanstack/react-query"
+import {
+  type AuthQueryFn,
+  type AuthQueryOptions,
+  authQueryOptions
+} from "../queries/auth-query-options"
+
+type UseAuthQueryOptions<
+  TFn extends AuthQueryFn,
+  TPrefix extends QueryKey
+> = Omit<AuthQueryOptions<TFn, TPrefix>, "queryKey" | "queryFn"> &
+  Pick<NonNullable<Parameters<TFn>[0]>, "query" | "fetchOptions">
+
+/**
+ * Escape-hatch hook for Better Auth endpoints that don't have a purpose-built
+ * hook in this library yet. Thin wrapper over `useQuery` and `authQueryOptions`.
+ *
+ * @param authFn - Better Auth client method (e.g. `authClient.magicLink.list`).
+ * @param queryKey - Scope prefix for the key. `options.query` is appended automatically.
+ * @param options - Better Auth params (`query`, `fetchOptions`) and React
+ *   Query options forwarded to `useQuery`.
+ */
+export function useAuthQuery<
+  TFn extends AuthQueryFn,
+  const TQueryKey extends QueryKey
+>(
+  authFn: TFn,
+  queryKey: TQueryKey,
+  options?: UseAuthQueryOptions<TFn, TQueryKey>
+) {
+  const { query, fetchOptions, ...queryOptions } = options ?? {}
+
+  return useQuery({
+    ...authQueryOptions(authFn, queryKey, {
+      query,
+      fetchOptions
+    } as Parameters<TFn>[0]),
+    ...queryOptions
+  })
+}

package/src/index.ts

@@ -1,42 +1,43 @@
 "use client"
 
 export * from "./components/auth/auth-provider"
-export * from "./components/email"
 export * from "./components/icons"
 export * from "./components/settings/account/theme-preview"
-export * from "./hooks/auth/use-auth-mutation"
-export * from "./hooks/auth/use-auth-query"
 export * from "./hooks/auth/use-authenticate"
-export * from "./hooks/auth/use-is-username-available"
-export * from "./hooks/auth/use-request-password-reset"
-export * from "./hooks/auth/use-reset-password"
-export * from "./hooks/auth/use-send-verification-email"
-export * from "./hooks/auth/use-session"
-export * from "./hooks/auth/use-sign-in-email"
-export * from "./hooks/auth/use-sign-in-magic-link"
-export * from "./hooks/auth/use-sign-in-passkey"
-export * from "./hooks/auth/use-sign-in-social"
-export * from "./hooks/auth/use-sign-in-username"
-export * from "./hooks/auth/use-sign-out"
-export * from "./hooks/auth/use-sign-up-email"
 export * from "./hooks/auth/use-user"
-export * from "./hooks/settings/use-account-info"
-export * from "./hooks/settings/use-add-passkey"
-export * from "./hooks/settings/use-change-email"
-export * from "./hooks/settings/use-change-password"
-export * from "./hooks/settings/use-delete-passkey"
-export * from "./hooks/settings/use-delete-user"
-export * from "./hooks/settings/use-link-social"
-export * from "./hooks/settings/use-list-accounts"
-export * from "./hooks/settings/use-list-device-sessions"
-export * from "./hooks/settings/use-list-sessions"
-export * from "./hooks/settings/use-list-user-passkeys"
-export * from "./hooks/settings/use-revoke-multi-session"
-export * from "./hooks/settings/use-revoke-session"
-export * from "./hooks/settings/use-set-active-session"
-export * from "./hooks/settings/use-unlink-account"
-export * from "./hooks/settings/use-update-user"
-export * from "./lib/auth-client"
-export * from "./lib/auth-config"
-export * from "./lib/auth-context"
+export * from "./hooks/use-auth-mutation"
+export * from "./hooks/use-auth-plugin"
+export * from "./hooks/use-auth-query"
+export type * from "./lib/auth-client"
+export * from "./lib/auth-plugin"
 export * from "./lib/provider-icons"
+export * from "./mutations/auth/request-password-reset-mutation"
+export * from "./mutations/auth/reset-password-mutation"
+export * from "./mutations/auth/send-verification-email-mutation"
+export * from "./mutations/auth/sign-in-email-mutation"
+export * from "./mutations/auth/sign-in-social-mutation"
+export * from "./mutations/auth/sign-out-mutation"
+export * from "./mutations/auth/sign-up-email-mutation"
+export * from "./mutations/auth-mutation-options"
+export * from "./mutations/magic-link/sign-in-magic-link-mutation"
+export * from "./mutations/multi-session/revoke-multi-session-mutation"
+export * from "./mutations/multi-session/set-active-session-mutation"
+export * from "./mutations/passkey/add-passkey-mutation"
+export * from "./mutations/passkey/delete-passkey-mutation"
+export * from "./mutations/passkey/sign-in-passkey-mutation"
+export * from "./mutations/settings/change-email-mutation"
+export * from "./mutations/settings/change-password-mutation"
+export * from "./mutations/settings/delete-user-mutation"
+export * from "./mutations/settings/link-social-mutation"
+export * from "./mutations/settings/revoke-session-mutation"
+export * from "./mutations/settings/unlink-account-mutation"
+export * from "./mutations/settings/update-user-mutation"
+export * from "./mutations/username/is-username-available-mutation"
+export * from "./mutations/username/sign-in-username-mutation"
+export * from "./queries/auth/session-query"
+export * from "./queries/auth-query-options"
+export * from "./queries/multi-session/list-device-sessions-query"
+export * from "./queries/passkey/list-passkeys-query"
+export * from "./queries/settings/account-info-query"
+export * from "./queries/settings/list-accounts-query"
+export * from "./queries/settings/list-sessions-query"

package/src/lib/auth-client.ts

@@ -1,43 +1,45 @@
-import { passkeyClient } from "@better-auth/passkey/client"
-import {
+import type { passkeyClient } from "@better-auth/passkey/client"
+import type {
   magicLinkClient,
   multiSessionClient,
   usernameClient
 } from "better-auth/client/plugins"
-import { createAuthClient } from "better-auth/react"
-import type { AuthConfig } from "./auth-config"
+import type { createAuthClient } from "better-auth/react"
 
-export type { PathToObject } from "better-auth/client"
+export type AuthClient = ReturnType<typeof createAuthClient>
 
-/**
- * Type representing any auth client created with `createAuthClient`.
- *
- * Used for type flexibility when accepting auth clients that may have different
- * plugin configurations or feature sets.
- */
-export type AnyAuthClient = Omit<ReturnType<typeof createAuthClient>, "signUp">
+// The per-plugin client types below are pure type-level declarations — no
+// runtime code is emitted for them. This avoids relying on `/* @__PURE__ */`
+// being honoured by every downstream bundler (RSC graphs, dev builds,
+// Turbopack, older configs, etc.) and keeps the plugin packages out of
+// consumers' runtime bundles entirely.
 
-const authClient = createAuthClient({
-  plugins: [
-    magicLinkClient(),
-    multiSessionClient(),
-    passkeyClient(),
-    usernameClient()
-  ]
-})
+export type MagicLinkAuthClient = ReturnType<
+  typeof createAuthClient<{ plugins: [ReturnType<typeof magicLinkClient>] }>
+>
 
-/**
- * Type representing the default auth client with plugins enabled.
- *
- * This is the standard auth client type used throughout the React package
- * and includes all required plugins enabled.
- */
+export type MultiSessionAuthClient = ReturnType<
+  typeof createAuthClient<{ plugins: [ReturnType<typeof multiSessionClient>] }>
+>
 
-type ResolveAuthClient<T> = "AuthClient" extends keyof T
-  ? T["AuthClient"]
-  : typeof authClient
+export type PasskeyAuthClient = ReturnType<
+  typeof createAuthClient<{ plugins: [ReturnType<typeof passkeyClient>] }>
+>
+
+export type UsernameAuthClient = ReturnType<
+  typeof createAuthClient<{ plugins: [ReturnType<typeof usernameClient>] }>
+>
 
 /**
- * The resolved auth client type, either from user augmentation or the default.
+ * Unwraps a Better Auth client method's `data` payload.
+ *
+ * Pass the method type directly, e.g. `TAuthClient["getSession"]` or
+ * `TAuthClient["passkey"]["listUserPasskeys"]`. Keeping it method-typed
+ * (instead of a path-string utility) preserves IntelliSense on the derived
+ * types.
  */
-export type AuthClient = ResolveAuthClient<AuthConfig>
+export type InferData<TMethod> = TMethod extends (
+  ...args: infer _Args
+) => Promise<infer TResult extends { data: unknown }>
+  ? TResult["data"]
+  : never

package/src/lib/auth-plugin.ts

@@ -0,0 +1,75 @@
+import type { AuthPluginBase, AuthView } from "@better-auth-ui/core"
+import type { ComponentType, ReactNode } from "react"
+
+export type { AuthPluginViewPaths } from "@better-auth-ui/core"
+
+/** Props for plugin-contributed auth buttons (e.g. passkey, magic link). */
+export type AuthButtonProps = {
+  className?: string
+  children?: ReactNode
+  /** Current auth view — lets buttons context-switch (e.g. show "back to sign-in"). */
+  view?: AuthView
+}
+
+/** Props for plugin-contributed cards under `/settings/security`. */
+export type SecurityCardProps = {
+  className?: string
+  children?: ReactNode
+}
+
+/** Props for plugin-contributed cards under `/settings/account`. */
+export type AccountCardProps = {
+  className?: string
+  children?: ReactNode
+}
+
+/** Props for plugin-contributed items in the `UserButton` dropdown. */
+export type UserMenuItemProps = {
+  className?: string
+}
+
+/** Framework-agnostic slot component shapes. UI packages narrow these via `TComponents`. */
+export type AuthPluginComponents = {
+  /** Rendered below the submit button in auth forms. */
+  authButtons?: ComponentType<AuthButtonProps>[]
+  /** Rendered as cards inside security settings. */
+  securityCards?: ComponentType<SecurityCardProps>[]
+  /** Rendered as cards inside account settings. */
+  accountCards?: ComponentType<AccountCardProps>[]
+  /** Rendered as items inside the `UserButton` dropdown. */
+  userMenuItems?: ComponentType<UserMenuItemProps>[]
+}
+
+/** Plugin view overrides keyed by `AuthPluginViewPaths`. Always replaces the built-in view. */
+export type AuthPluginViews<TAuthViewProps, TSettingsViewProps> = {
+  auth?: Record<string, ComponentType<TAuthViewProps>>
+  settings?: Record<string, ComponentType<TSettingsViewProps>>
+}
+
+/** Conditional view replacements — only used when the built-in flow isn't viable. */
+export type AuthPluginFallbackViews<TAuthViewProps> = {
+  auth?: {
+    /** Rendered at `/auth/sign-in` when `emailAndPassword.enabled === false`. */
+    signIn?: ComponentType<TAuthViewProps>
+  }
+}
+
+/**
+ * UI-aware plugin definition. UI packages bind the generics in their own
+ * `AuthPlugin` re-export so plugin authors don't have to.
+ *
+ * @typeParam TComponents - Slot component shapes (e.g. heroui variant unions).
+ * @typeParam TAuthViewProps - Props the `<Auth>` router spreads onto plugin auth views.
+ * @typeParam TSettingsViewProps - Props the `<Settings>` router spreads onto plugin settings views.
+ */
+export type AuthPlugin<
+  TComponents = AuthPluginComponents,
+  // biome-ignore lint/suspicious/noExplicitAny: any
+  TAuthViewProps = any,
+  // biome-ignore lint/suspicious/noExplicitAny: any
+  TSettingsViewProps = any
+> = AuthPluginBase &
+  TComponents & {
+    views?: AuthPluginViews<TAuthViewProps, TSettingsViewProps>
+    fallbackViews?: AuthPluginFallbackViews<TAuthViewProps>
+  }

package/src/lib/auth-server.ts

@@ -0,0 +1,30 @@
+import type { passkey } from "@better-auth/passkey"
+import type { Auth } from "better-auth"
+import type { magicLink, multiSession, username } from "better-auth/plugins"
+
+export type AuthServer = Pick<Auth, "api">
+
+// Per-plugin variants mirror the client-side types in `auth-client.ts` so
+// server-side query factories can depend on a narrow `auth` shape that
+// includes the plugin's API surface without requiring the full `betterAuth`
+// return type to be threaded through as a generic.
+
+export type MagicLinkAuthServer = Pick<
+  Auth<{ plugins: [ReturnType<typeof magicLink>] }>,
+  "api"
+>
+
+export type MultiSessionAuthServer = Pick<
+  Auth<{ plugins: [ReturnType<typeof multiSession>] }>,
+  "api"
+>
+
+export type PasskeyAuthServer = Pick<
+  Auth<{ plugins: [ReturnType<typeof passkey>] }>,
+  "api"
+>
+
+export type UsernameAuthServer = Pick<
+  Auth<{ plugins: [ReturnType<typeof username>] }>,
+  "api"
+>

package/src/mutations/auth/request-password-reset-mutation.ts

@@ -0,0 +1,58 @@
+import { authMutationKeys } from "@better-auth-ui/core"
+import { mutationOptions, useMutation } from "@tanstack/react-query"
+import type { BetterFetchError } from "better-auth/react"
+
+import type { AuthClient } from "../../lib/auth-client"
+
+export type RequestPasswordResetParams<TAuthClient extends AuthClient> =
+  Parameters<TAuthClient["requestPasswordReset"]>[0]
+
+export type RequestPasswordResetOptions<TAuthClient extends AuthClient> = Omit<
+  ReturnType<typeof requestPasswordResetOptions<TAuthClient>>,
+  "mutationKey" | "mutationFn"
+>
+
+/**
+ * Mutation options factory for requesting a password reset email.
+ *
+ * @param authClient - The Better Auth client.
+ */
+export function requestPasswordResetOptions<TAuthClient extends AuthClient>(
+  authClient: TAuthClient
+) {
+  const mutationKey = authMutationKeys.requestPasswordReset
+
+  const mutationFn = (params: RequestPasswordResetParams<TAuthClient>) =>
+    authClient.requestPasswordReset({
+      ...params,
+      fetchOptions: { ...params?.fetchOptions, throw: true }
+    })
+
+  return mutationOptions<
+    Awaited<ReturnType<typeof mutationFn>>,
+    BetterFetchError,
+    Parameters<typeof mutationFn>[0]
+  >({
+    mutationKey,
+    mutationFn
+  })
+}
+
+/**
+ * Create a mutation for requesting a password reset email.
+ *
+ * Wraps `authClient.requestPasswordReset` and forwards React Query mutation
+ * options such as `onSuccess`, `onError`, and `retry`.
+ *
+ * @param authClient - The Better Auth client.
+ * @param options - React Query options forwarded to `useMutation`.
+ */
+export function useRequestPasswordReset<TAuthClient extends AuthClient>(
+  authClient: TAuthClient,
+  options?: RequestPasswordResetOptions<TAuthClient>
+) {
+  return useMutation({
+    ...requestPasswordResetOptions(authClient),
+    ...options
+  })
+}

package/src/mutations/auth/reset-password-mutation.ts

@@ -0,0 +1,60 @@
+import { authMutationKeys } from "@better-auth-ui/core"
+import { mutationOptions, useMutation } from "@tanstack/react-query"
+import type { BetterFetchError } from "better-auth/react"
+
+import type { AuthClient } from "../../lib/auth-client"
+
+export type ResetPasswordParams<TAuthClient extends AuthClient> = Parameters<
+  TAuthClient["resetPassword"]
+>[0]
+
+export type ResetPasswordOptions<TAuthClient extends AuthClient> = Omit<
+  ReturnType<typeof resetPasswordOptions<TAuthClient>>,
+  "mutationKey" | "mutationFn"
+>
+
+/**
+ * Mutation options factory for completing a password reset.
+ *
+ * @param authClient - The Better Auth client.
+ */
+export function resetPasswordOptions<TAuthClient extends AuthClient>(
+  authClient: TAuthClient
+) {
+  const mutationKey = authMutationKeys.resetPassword
+
+  const mutationFn = (params: ResetPasswordParams<TAuthClient>) =>
+    authClient.resetPassword({
+      ...params,
+      fetchOptions: { ...params?.fetchOptions, throw: true }
+    })
+
+  return mutationOptions<
+    Awaited<ReturnType<typeof mutationFn>>,
+    BetterFetchError,
+    Parameters<typeof mutationFn>[0]
+  >({
+    mutationKey,
+    mutationFn
+  })
+}
+
+/**
+ * Create a mutation for completing a password reset.
+ *
+ * Wraps `authClient.resetPassword` (using the token from the reset email)
+ * and forwards React Query mutation options such as `onSuccess`, `onError`,
+ * and `retry`.
+ *
+ * @param authClient - The Better Auth client.
+ * @param options - React Query options forwarded to `useMutation`.
+ */
+export function useResetPassword<TAuthClient extends AuthClient>(
+  authClient: TAuthClient,
+  options?: ResetPasswordOptions<TAuthClient>
+) {
+  return useMutation({
+    ...resetPasswordOptions(authClient),
+    ...options
+  })
+}