@lobehub/lobehub 2.0.0-next.157 → 2.0.0-next.159

package/packages/database/migrations/meta/_journal.json

@@ -406,6 +406,20 @@
       "when": 1764734167674,
       "tag": "0057_add_topic_user_memory_extract_status",
       "breakpoints": true
+    },
+    {
+      "idx": 58,
+      "version": "7",
+      "when": 1764842015809,
+      "tag": "0058_add_source_into_user_plugins",
+      "breakpoints": true
+    },
+    {
+      "idx": 59,
+      "version": "7",
+      "when": 1764858574403,
+      "tag": "0059_add_normalized_email_indexes",
+      "breakpoints": true
     }
   ],
   "version": "6"

package/packages/database/src/core/migrations.json

@@ -223,10 +223,7 @@
     "hash": "9646161fa041354714f823d726af27247bcd6e60fa3be5698c0d69f337a5700b"
   },
   {
-    "sql": [
-      "DROP TABLE \"user_budgets\";",
-      "\nDROP TABLE \"user_subscriptions\";"
-    ],
+    "sql": ["DROP TABLE \"user_budgets\";", "\nDROP TABLE \"user_subscriptions\";"],
     "bps": true,
     "folderMillis": 1729699958471,
     "hash": "7dad43a2a25d1aec82124a4e53f8d82f8505c3073f23606c1dc5d2a4598eacf9"
@@ -298,9 +295,7 @@
     "hash": "845a692ceabbfc3caf252a97d3e19a213bc0c433df2689900135f9cfded2cf49"
   },
   {
-    "sql": [
-      "ALTER TABLE \"messages\" ADD COLUMN \"reasoning\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"messages\" ADD COLUMN \"reasoning\" jsonb;"],
     "bps": true,
     "folderMillis": 1737609172353,
     "hash": "2cb36ae4fcdd7b7064767e04bfbb36ae34518ff4bb1b39006f2dd394d1893868"
@@ -515,9 +510,7 @@
     "hash": "a7ccf007fd185ff922823148d1eae6fafe652fc98d2fd2793f84a84f29e93cd1"
   },
   {
-    "sql": [
-      "ALTER TABLE \"ai_providers\" ADD COLUMN \"config\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"ai_providers\" ADD COLUMN \"config\" jsonb;"],
     "bps": true,
     "folderMillis": 1749309388370,
     "hash": "39cea379f08ee4cb944875c0b67f7791387b508c2d47958bb4cd501ed1ef33eb"
@@ -635,9 +628,7 @@
     "hash": "1ba9b1f74ea13348da98d6fcdad7867ab4316ed565bf75d84d160c526cdac14b"
   },
   {
-    "sql": [
-      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"virtual\" boolean DEFAULT false;"
-    ],
+    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"virtual\" boolean DEFAULT false;"],
     "bps": true,
     "folderMillis": 1759116400580,
     "hash": "433ddae88e785f2db734e49a4c115eee93e60afe389f7919d66e5ba9aa159a37"
@@ -687,17 +678,13 @@
     "hash": "4bdc6505797d7a33b622498c138cfd47f637239f6905e1c484cd01d9d5f21d6b"
   },
   {
-    "sql": [
-      "ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"image\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"image\" jsonb;"],
     "bps": true,
     "folderMillis": 1760108430562,
     "hash": "ce09b301abb80f6563abc2f526bdd20b4f69bae430f09ba2179b9e3bfec43067"
   },
   {
-    "sql": [
-      "ALTER TABLE \"documents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"documents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"],
     "bps": true,
     "folderMillis": 1761554153406,
     "hash": "bf2f21293e90e11cf60a784cf3ec219eafa95f7545d7d2f9d1449c0b0949599a"
@@ -777,17 +764,13 @@
     "hash": "923ccbdf46c32be9a981dabd348e6923b4a365444241e9b8cc174bf5b914cbc5"
   },
   {
-    "sql": [
-      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"market_identifier\" text;\n"
-    ],
+    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"market_identifier\" text;\n"],
     "bps": true,
     "folderMillis": 1762870034882,
     "hash": "4178aacb4b8892b7fd15d29209bbf9b1d1f9d7c406ba796f27542c0bcd919680"
   },
   {
-    "sql": [
-      "ALTER TABLE \"message_plugins\" ADD COLUMN IF NOT EXISTS \"intervention\" jsonb;\n"
-    ],
+    "sql": ["ALTER TABLE \"message_plugins\" ADD COLUMN IF NOT EXISTS \"intervention\" jsonb;\n"],
     "bps": true,
     "folderMillis": 1762911968658,
     "hash": "552a032cc0e595277232e70b5f9338658585bafe9481ae8346a5f322b673a68b"
@@ -816,9 +799,7 @@
     "hash": "f823b521f4d25e5dc5ab238b372727d2d2d7f0aed27b5eabc8a9608ce4e50568"
   },
   {
-    "sql": [
-      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"],
     "bps": true,
     "folderMillis": 1764215503726,
     "hash": "4188893a9083b3c7baebdbad0dd3f9d9400ede7584ca2394f5c64305dc9ec7b0"
@@ -859,9 +840,7 @@
     "hash": "2c103eee82bdf329944fb622dd9c2b9f20df80eb54f23eb9254d2285de413099"
   },
   {
-    "sql": [
-      "ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"market\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"market\" jsonb;"],
     "bps": true,
     "folderMillis": 1764335703306,
     "hash": "28c0d738c0b1fdf5fd871363be1a1477b4accbabdc140fe8dc6e9b339aae2c89"
@@ -939,5 +918,25 @@
     "bps": true,
     "folderMillis": 1764734167674,
     "hash": "89c134be2948d3afc360d6bac11dea0c6fd5c902bf6093ed077033adb920fd02"
+  },
+  {
+    "sql": [
+      "ALTER TABLE \"user_installed_plugins\" ADD COLUMN IF NOT EXISTS \"source\" varchar(255);"
+    ],
+    "bps": true,
+    "folderMillis": 1764842015809,
+    "hash": "276514dc101fffc66794156f4ba644599a4ae5997a68b9e7f54452ee374bfa61"
+  },
+  {
+    "sql": [
+      "ALTER TABLE \"users\" ADD COLUMN IF NOT EXISTS \"normalized_email\" text;",
+      "\nCREATE INDEX IF NOT EXISTS \"users_email_idx\" ON \"users\" USING btree (\"email\");",
+      "\nCREATE INDEX IF NOT EXISTS \"users_username_idx\" ON \"users\" USING btree (\"username\");",
+      "\nCREATE UNIQUE INDEX IF NOT EXISTS \"users_normalized_email_unique_idx\" ON \"users\" USING btree (\"normalized_email\");",
+      "\n"
+    ],
+    "bps": true,
+    "folderMillis": 1764858574403,
+    "hash": "7838f9938b370867470e5e11807855253d23b11c2ac6aa9e90687844a356c949"
   }
-]
+]

package/packages/database/src/models/user.ts

@@ -199,7 +199,7 @@ export class UserModel {
    * Normalize unique user fields so empty strings become null, keeping unique constraints safe.
    */
   private static normalizeUniqueUserFields = <
-    T extends { email?: string | null; phone?: string | null },
+    T extends { email?: string | null; phone?: string | null; username?: string | null },
   >(
     value: T,
   ) => {
@@ -207,11 +207,16 @@ export class UserModel {
       typeof value.email === 'string' && value.email.trim() === '' ? null : value.email;
     const normalizedPhone =
       typeof value.phone === 'string' && value.phone.trim() === '' ? null : value.phone;
+    const normalizedUsername =
+      typeof value.username === 'string' && value.username.trim() === ''
+        ? null
+        : value.username?.trim();
 
     return {
       ...value,
       ...(value.email !== undefined ? { email: normalizedEmail } : {}),
       ...(value.phone !== undefined ? { phone: normalizedPhone } : {}),
+      ...(value.username !== undefined ? { username: normalizedUsername } : {}),
     };
   };
 
@@ -241,6 +246,13 @@ export class UserModel {
     return db.query.users.findFirst({ where: eq(users.id, id) });
   };
 
+  static findByUsername = async (db: LobeChatDatabase, username: string) => {
+    const normalizedUsername = username.trim();
+    if (!normalizedUsername) return null;
+
+    return db.query.users.findFirst({ where: eq(users.username, normalizedUsername) });
+  };
+
   static findByEmail = async (db: LobeChatDatabase, email: string) => {
     return db.query.users.findFirst({ where: eq(users.email, email) });
   };

package/packages/database/src/schemas/user.ts

@@ -2,46 +2,54 @@
 import { DEFAULT_PREFERENCE } from '@lobechat/const';
 import type { CustomPluginParams } from '@lobechat/types';
 import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
-import { boolean, jsonb, pgTable, primaryKey, text } from 'drizzle-orm/pg-core';
+import { boolean, index, jsonb, pgTable, primaryKey, text } from 'drizzle-orm/pg-core';
 
-import { timestamps, timestamptz } from './_helpers';
+import { timestamps, timestamptz, varchar255 } from './_helpers';
 
-export const users = pgTable('users', {
-  id: text('id').primaryKey().notNull(),
-  username: text('username').unique(),
-  email: text('email').unique(),
+export const users = pgTable(
+  'users',
+  {
+    id: text('id').primaryKey().notNull(),
+    username: text('username').unique(),
+    email: text('email').unique(),
+    normalizedEmail: text('normalized_email').unique(),
 
-  avatar: text('avatar'),
-  phone: text('phone').unique(),
-  firstName: text('first_name'),
-  lastName: text('last_name'),
-  fullName: text('full_name'),
+    avatar: text('avatar'),
+    phone: text('phone').unique(),
+    firstName: text('first_name'),
+    lastName: text('last_name'),
+    fullName: text('full_name'),
 
-  isOnboarded: boolean('is_onboarded').default(false),
-  // Time user was created in Clerk
-  clerkCreatedAt: timestamptz('clerk_created_at'),
+    isOnboarded: boolean('is_onboarded').default(false),
+    // Time user was created in Clerk
+    clerkCreatedAt: timestamptz('clerk_created_at'),
 
-  // Required by better-auth
-  emailVerified: boolean('email_verified').default(false).notNull(),
-  // Required by nextauth, all null allowed
-  emailVerifiedAt: timestamptz('email_verified_at'),
+    // Required by better-auth
+    emailVerified: boolean('email_verified').default(false).notNull(),
+    // Required by nextauth, all null allowed
+    emailVerifiedAt: timestamptz('email_verified_at'),
 
-  preference: jsonb('preference').$defaultFn(() => DEFAULT_PREFERENCE),
+    preference: jsonb('preference').$defaultFn(() => DEFAULT_PREFERENCE),
 
-  // better-auth admin
-  role: text('role'),
-  banned: boolean('banned').default(false),
-  banReason: text('ban_reason'),
-  banExpires: timestamptz('ban_expires'),
+    // better-auth admin
+    role: text('role'),
+    banned: boolean('banned').default(false),
+    banReason: text('ban_reason'),
+    banExpires: timestamptz('ban_expires'),
 
-  // better-auth two-factor
-  twoFactorEnabled: boolean('two_factor_enabled').default(false),
+    // better-auth two-factor
+    twoFactorEnabled: boolean('two_factor_enabled').default(false),
 
-  // better-auth phone number
-  phoneNumberVerified: boolean('phone_number_verified'),
+    // better-auth phone number
+    phoneNumberVerified: boolean('phone_number_verified'),
 
-  ...timestamps,
-});
+    ...timestamps,
+  },
+  (table) => ({
+    emailIdx: index('users_email_idx').on(table.email),
+    usernameIdx: index('users_username_idx').on(table.username),
+  }),
+);
 
 export type NewUser = typeof users.$inferInsert;
 export type UserItem = typeof users.$inferSelect;
@@ -76,7 +84,7 @@ export const userInstalledPlugins = pgTable(
     manifest: jsonb('manifest').$type<LobeChatPluginManifest>(),
     settings: jsonb('settings'),
     customParams: jsonb('custom_params').$type<CustomPluginParams>(),
-
+    source: varchar255('source'),
     ...timestamps,
   },
   (self) => ({

package/src/app/(backend)/api/auth/check-user/route.ts

@@ -6,10 +6,8 @@ import { users } from '@/database/schemas/user';
 import { serverDB } from '@/database/server';
 
 export interface CheckUserResponseData {
-  emailVerified?: boolean;
   exists: boolean;
   hasPassword?: boolean;
-  providers?: string[];
 }
 
 /**
@@ -47,18 +45,14 @@ export async function POST(req: NextRequest) {
       })
       .from(account)
       .where(and(eq(account.userId, user.id)));
-
-    const providers = Array.from(new Set(accounts.map((a) => a.providerId).filter(Boolean)));
     const hasPassword = accounts.some(
       (a) =>
         a.providerId === 'credential' && typeof a.password === 'string' && a.password.length > 0,
     );
 
     return NextResponse.json({
-      emailVerified: user.emailVerified,
       exists: true,
       hasPassword,
-      providers,
     } satisfies CheckUserResponseData);
   } catch (error) {
     console.error('Error checking user existence:', error);

package/src/app/(backend)/api/auth/resolve-username/route.ts

@@ -0,0 +1,52 @@
+import { eq } from 'drizzle-orm';
+import { NextRequest, NextResponse } from 'next/server';
+
+import { users } from '@/database/schemas/user';
+import { serverDB } from '@/database/server';
+
+export interface ResolveUsernameResponseData {
+  email?: string | null;
+  exists: boolean;
+}
+
+/**
+ * Resolve a username to the associated email address.
+ * @param req - POST request with { username: string }
+ * @returns { exists: boolean, email?: string | null }
+ */
+export async function POST(req: NextRequest) {
+  try {
+    const body = await req.json();
+    const { username } = body;
+
+    if (!username || typeof username !== 'string') {
+      return NextResponse.json({ error: 'Username is required', exists: false }, { status: 400 });
+    }
+
+    const normalizedUsername = username.trim();
+
+    if (!normalizedUsername) {
+      return NextResponse.json({ error: 'Username is required', exists: false }, { status: 400 });
+    }
+
+    const [user] = await serverDB
+      .select({ email: users.email })
+      .from(users)
+      .where(eq(users.username, normalizedUsername))
+      .limit(1);
+
+    if (!user || !user.email) {
+      return NextResponse.json({ exists: false } satisfies ResolveUsernameResponseData);
+    }
+
+    return NextResponse.json({
+      email: user.email,
+      exists: true,
+    } satisfies ResolveUsernameResponseData);
+  } catch (error) {
+    console.error('Error resolving username to email:', error);
+    return NextResponse.json({ error: 'Internal server error', exists: false }, { status: 500 });
+  }
+}
+
+export const runtime = 'nodejs';

package/src/app/[variants]/(auth)/signin/page.tsx

@@ -11,6 +11,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import type { CheckUserResponseData } from '@/app/(backend)/api/auth/check-user/route';
+import type { ResolveUsernameResponseData } from '@/app/(backend)/api/auth/resolve-username/route';
 import { message } from '@/components/AntdStaticMethods';
 import AuthIcons from '@/components/NextAuth/AuthIcons';
 import { getAuthConfig } from '@/envs/auth';
@@ -18,7 +19,7 @@ import { requestPasswordReset, signIn } from '@/libs/better-auth/auth-client';
 import { isBuiltinProvider, normalizeProviderId } from '@/libs/better-auth/utils/client';
 import { useServerConfigStore } from '@/store/serverConfig';
 
-const useStyles = createStyles(({ css, token }) => ({
+const useStyles = createStyles(({ css, token, responsive }) => ({
   backButton: css`
     cursor: pointer;
     font-size: 14px;
@@ -29,10 +30,13 @@ const useStyles = createStyles(({ css, token }) => ({
     }
   `,
   card: css`
+    display: flex;
+    flex-direction: column;
     padding-block: 2.5rem;
     padding-inline: 2rem;
   `,
   container: css`
+    overflow: hidden;
     width: 360px;
     border: 1px solid ${token.colorBorder};
     border-radius: ${token.borderRadiusLG}px;
@@ -42,6 +46,11 @@ const useStyles = createStyles(({ css, token }) => ({
     height: 1px;
     background: ${token.colorBorder};
   `,
+  dividerRow: css`
+    ${responsive.mobile} {
+      order: -1;
+    }
+  `,
   dividerText: css`
     font-size: 14px;
     color: ${token.colorTextSecondary};
@@ -51,6 +60,13 @@ const useStyles = createStyles(({ css, token }) => ({
     color: ${token.colorTextSecondary};
     text-align: center;
   `,
+  emailForm: css`
+    margin-block-start: 0.5rem;
+
+    ${responsive.mobile} {
+      margin-block: 0;
+    }
+  `,
   footer: css`
     padding: 1rem;
     border-block-start: 1px solid ${token.colorBorder};
@@ -61,6 +77,12 @@ const useStyles = createStyles(({ css, token }) => ({
 
     background: ${token.colorBgElevated};
   `,
+  socialSection: css`
+    ${responsive.mobile} {
+      order: 1;
+      margin-block-start: 1rem;
+    }
+  `,
   subtitle: css`
     margin-block-start: 0.5rem;
     font-size: 14px;
@@ -77,13 +99,22 @@ const useStyles = createStyles(({ css, token }) => ({
   `,
 }));
 
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+const USERNAME_REGEX = /^\w+$/;
+
 type Step = 'email' | 'password';
+type IdentifierType = 'email' | 'username';
 
 interface SignInFormValues {
   email: string;
   password: string;
 }
 
+interface ResolvedEmailResult {
+  email: string;
+  identifierType: IdentifierType;
+}
+
 export default function SignInPage() {
   const { styles } = useStyles();
   const theme = useTheme();
@@ -154,12 +185,56 @@ export default function SignInPage() {
     }
   };
 
+  const resolveEmailFromIdentifier = async (
+    identifier: string,
+  ): Promise<ResolvedEmailResult | null> => {
+    const trimmedIdentifier = identifier.trim();
+
+    if (!trimmedIdentifier) return null;
+
+    const isEmailIdentifier = EMAIL_REGEX.test(trimmedIdentifier);
+
+    if (isEmailIdentifier) {
+      return { email: trimmedIdentifier.toLowerCase(), identifierType: 'email' };
+    }
+
+    if (!USERNAME_REGEX.test(trimmedIdentifier)) {
+      message.error(t('betterAuth.errors.emailInvalid'));
+      return null;
+    }
+
+    try {
+      const response = await fetch('/api/auth/resolve-username', {
+        body: JSON.stringify({ username: trimmedIdentifier }),
+        headers: { 'Content-Type': 'application/json' },
+        method: 'POST',
+      });
+
+      const data: ResolveUsernameResponseData = await response.json();
+
+      if (!response.ok || !data.exists || !data.email) {
+        message.error(t('betterAuth.errors.usernameNotRegistered'));
+        return null;
+      }
+
+      return { email: data.email, identifierType: 'username' };
+    } catch (error) {
+      console.error('Error resolving username:', error);
+      message.error(t('betterAuth.signin.error'));
+      return null;
+    }
+  };
+
   // Check if user exists
   const handleCheckUser = async (values: Pick<SignInFormValues, 'email'>) => {
     setLoading(true);
     try {
+      const resolvedEmail = await resolveEmailFromIdentifier(values.email);
+      if (!resolvedEmail) return;
+      const { email: targetEmail, identifierType } = resolvedEmail;
+
       const response = await fetch('/api/auth/check-user', {
-        body: JSON.stringify({ email: values.email }),
+        body: JSON.stringify({ email: targetEmail }),
         headers: { 'Content-Type': 'application/json' },
         method: 'POST',
       });
@@ -167,14 +242,18 @@ export default function SignInPage() {
       const data: CheckUserResponseData = await response.json();
 
       if (!data.exists) {
-        // User not found, redirect to signup page with email pre-filled
+        if (identifierType === 'username') {
+          message.error(t('betterAuth.errors.usernameNotRegistered'));
+          return;
+        }
+
         const callbackUrl = searchParams.get('callbackUrl') || '/';
         router.push(
-          `/signup?email=${encodeURIComponent(values.email)}&callbackUrl=${encodeURIComponent(callbackUrl)}`,
+          `/signup?email=${encodeURIComponent(targetEmail)}&callbackUrl=${encodeURIComponent(callbackUrl)}`,
         );
         return;
       }
-      setEmail(values.email);
+      setEmail(targetEmail);
 
       if (data.hasPassword) {
         setStep('password');
@@ -182,7 +261,7 @@ export default function SignInPage() {
       }
 
       if (enableMagicLink) {
-        await handleSendMagicLink(values.email);
+        await handleSendMagicLink(targetEmail);
         return;
       }
 
@@ -302,13 +381,11 @@ export default function SignInPage() {
 
           {step === 'email' && (
             <>
-              <p className={styles.subtitle}>{t('betterAuth.signin.emailStep.subtitle')}</p>
-
               {/* Social Login Section Skeleton */}
               {!serverConfigInit && (
-                <Flexbox gap={12} style={{ marginTop: '2rem' }}>
+                <Flexbox className={styles.socialSection} gap={12}>
                   <Skeleton.Button active block size="large" />
-                  <Flexbox align="center" gap={12} horizontal>
+                  <Flexbox align="center" className={styles.dividerRow} gap={12} horizontal>
                     <div className={styles.divider} />
                     <Skeleton.Input active size="small" style={{ minWidth: 80, width: 80 }} />
                     <div className={styles.divider} />
@@ -318,7 +395,7 @@ export default function SignInPage() {
 
               {/* Social Login Section */}
               {serverConfigInit && oAuthSSOProviders.length > 0 && (
-                <Flexbox gap={12} style={{ marginTop: '2rem' }}>
+                <Flexbox className={styles.socialSection} gap={12}>
                   {oAuthSSOProviders.map((provider) => (
                     <Button
                       block
@@ -333,7 +410,7 @@ export default function SignInPage() {
                   ))}
 
                   {/* Divider */}
-                  <Flexbox align="center" gap={12} horizontal>
+                  <Flexbox align="center" className={styles.dividerRow} gap={12} horizontal>
                     <div className={styles.divider} />
                     <span className={styles.dividerText}>
                       {t('betterAuth.signin.orContinueWith')}
@@ -344,16 +421,27 @@ export default function SignInPage() {
               )}
 
               <Form
+                className={styles.emailForm}
                 form={form}
                 layout="vertical"
                 onFinish={handleCheckUser}
-                style={{ marginTop: '0.5rem' }}
               >
                 <Form.Item
                   name="email"
                   rules={[
                     { message: t('betterAuth.errors.emailRequired'), required: true },
-                    { message: t('betterAuth.errors.emailInvalid'), type: 'email' },
+                    {
+                      validator: (_, value) => {
+                        if (!value) return Promise.resolve();
+
+                        const trimmedValue = (value as string).trim();
+                        if (EMAIL_REGEX.test(trimmedValue) || USERNAME_REGEX.test(trimmedValue)) {
+                          return Promise.resolve();
+                        }
+
+                        return Promise.reject(new Error(t('betterAuth.errors.emailInvalid')));
+                      },
+                    },
                   ]}
                   style={{ marginBottom: 0 }}
                 >

package/src/app/[variants]/(auth)/signup/[[...signup]]/BetterAuthSignUpForm.tsx

@@ -88,6 +88,21 @@ export default function BetterAuthSignUpForm() {
       });
 
       if (error) {
+        const isEmailDuplicate =
+          error.code === 'FAILED_TO_CREATE_USER' &&
+          // Postgres unique constraint violation
+          (error as any)?.details?.cause?.code === '23505';
+
+        if (isEmailDuplicate) {
+          message.error(t('betterAuth.errors.emailExists'));
+          return;
+        }
+
+        if (error.code === 'INVALID_EMAIL') {
+          message.error(t('betterAuth.errors.emailInvalid'));
+          return;
+        }
+
         message.error(error.message || t('betterAuth.signup.error'));
         return;
       }