@lobehub/lobehub 2.0.0-next.354 → 2.0.0-next.356

package/src/app/[variants]/(main)/agent/cron/[cronId]/features/CronJobContentEditor.tsx

@@ -11,7 +11,7 @@ import { Editor, useEditor } from '@lobehub/editor/react';
 import { Flexbox, Icon, Text } from '@lobehub/ui';
 import { Card } from 'antd';
 import { Clock } from 'lucide-react';
-import { memo, useCallback, useEffect, useRef } from 'react';
+import { type RefObject, memo, useCallback, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
 interface CronJobContentEditorProps {
@@ -20,8 +20,12 @@ interface CronJobContentEditorProps {
   onChange: (value: string) => void;
 }
 
-const CronJobContentEditor = memo<CronJobContentEditorProps>(
-  ({ enableRichRender, initialValue, onChange }) => {
+interface CronJobContentEditorInnerProps extends CronJobContentEditorProps {
+  contentRef: RefObject<string>;
+}
+
+const CronJobContentEditorInner = memo<CronJobContentEditorInnerProps>(
+  ({ enableRichRender, initialValue, onChange, contentRef }) => {
     const { t } = useTranslation('setting');
     const editor = useEditor();
     const currentValueRef = useRef(initialValue);
@@ -31,23 +35,6 @@ const CronJobContentEditor = memo<CronJobContentEditorProps>(
       currentValueRef.current = initialValue;
     }, [initialValue]);
 
-    // Initialize editor content when editor is ready
-    useEffect(() => {
-      if (!editor) return;
-      try {
-        setTimeout(() => {
-          if (initialValue) {
-            editor.setDocument(enableRichRender ? 'markdown' : 'text', initialValue);
-          }
-        }, 100);
-      } catch (error) {
-        console.error('[CronJobContentEditor] Failed to initialize editor content:', error);
-        setTimeout(() => {
-          editor.setDocument(enableRichRender ? 'markdown' : 'text', initialValue);
-        }, 100);
-      }
-    }, [editor, enableRichRender, initialValue]);
-
     // Handle content changes
     const handleContentChange = useCallback(
       (e: any) => {
@@ -57,13 +44,18 @@ const CronJobContentEditor = memo<CronJobContentEditorProps>(
 
         const finalContent = nextContent || '';
 
+        // Save to parent ref for restoration
+        if (contentRef) {
+          (contentRef as { current: string }).current = finalContent;
+        }
+
         // Only call onChange if content actually changed
         if (finalContent !== currentValueRef.current) {
           currentValueRef.current = finalContent;
           onChange(finalContent);
         }
       },
-      [enableRichRender, onChange],
+      [enableRichRender, onChange, contentRef],
     );
 
     return (
@@ -82,6 +74,14 @@ const CronJobContentEditor = memo<CronJobContentEditorProps>(
               content={''}
               editor={editor}
               lineEmptyPlaceholder={t('agentCronJobs.form.content.placeholder')}
+              onInit={(editor) => {
+                // Restore content from parent ref when editor re-initializes
+                if (contentRef?.current) {
+                  editor.setDocument(enableRichRender ? 'markdown' : 'text', contentRef.current);
+                } else if (initialValue) {
+                  editor.setDocument(enableRichRender ? 'markdown' : 'text', initialValue);
+                }
+              }}
               onTextChange={handleContentChange}
               placeholder={t('agentCronJobs.form.content.placeholder')}
               plugins={
@@ -108,4 +108,17 @@ const CronJobContentEditor = memo<CronJobContentEditorProps>(
   },
 );
 
+const CronJobContentEditor = (props: CronJobContentEditorProps) => {
+  // Ref to persist content across re-mounts when enableRichRender changes
+  const contentRef = useRef<string>(props.initialValue);
+
+  return (
+    <CronJobContentEditorInner
+      contentRef={contentRef}
+      key={`editor-${props.enableRichRender}`}
+      {...props}
+    />
+  );
+};
+
 export default CronJobContentEditor;

package/src/app/[variants]/(main)/agent/features/Conversation/ConversationArea.tsx

@@ -1,6 +1,7 @@
 'use client';
 
 import { Flexbox } from '@lobehub/ui';
+import debug from 'debug';
 import { Suspense, memo, useMemo } from 'react';
 
 import ChatMiniMap from '@/features/ChatMiniMap';
@@ -18,6 +19,8 @@ import ThreadHydration from './ThreadHydration';
 import { useActionsBarConfig } from './useActionsBarConfig';
 import { useAgentContext } from './useAgentContext';
 
+const log = debug('lobe-render:agent:ConversationArea');
+
 /**
  * ConversationArea
  *
@@ -35,6 +38,7 @@ const Conversation = memo(() => {
   );
   const replaceMessages = useChatStore((s) => s.replaceMessages);
   const messages = useChatStore((s) => s.dbMessagesMap[chatKey]);
+  log('contextKey %s: %o', chatKey, messages);
 
   // Get operation state from ChatStore for reactive updates
   const operationState = useOperationState(context);

package/src/app/[variants]/(main)/group/_layout/Sidebar/Topic/List/Item/index.tsx

@@ -111,6 +111,7 @@ const TopicItem = memo<TopicItemProps>(({ id, title, fav, active, threadId }) =>
             fill={fav ? cssVar.colorWarning : 'transparent'}
             icon={Star}
             onClick={(e) => {
+              e.preventDefault();
               e.stopPropagation();
               favoriteTopic(id, !fav);
             }}

package/src/app/[variants]/(main)/home/_layout/Body/Agent/List/AgentItem/index.tsx

@@ -106,7 +106,7 @@ const AgentItem = memo<AgentItemProps>(({ item, style, className }) => {
 
   return (
     <>
-      <Link aria-label={id} to={agentUrl}>
+      <Link aria-label={displayTitle} to={agentUrl}>
         <NavItem
           actions={<Actions dropdownMenu={dropdownMenu} />}
           className={className}

package/src/app/[variants]/(main)/home/_layout/Body/Agent/List/InboxItem.tsx

@@ -2,8 +2,8 @@
 
 import { DEFAULT_INBOX_AVATAR, SESSION_CHAT_URL } from '@lobechat/const';
 import { Avatar } from '@lobehub/ui';
-import { type CSSProperties, memo, useCallback } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { type CSSProperties, memo } from 'react';
+import { Link } from 'react-router-dom';
 
 import NavItem from '@/features/NavPanel/components/NavItem';
 import { useAgentStore } from '@/store/agent';
@@ -17,38 +17,28 @@ interface InboxItemProps {
 }
 
 const InboxItem = memo<InboxItemProps>(({ className, style }) => {
-  const navigate = useNavigate();
-
   const inboxAgentId = useAgentStore(builtinAgentSelectors.inboxAgentId);
-  const activeAgentId = useAgentStore((s) => s.activeAgentId);
-  const isActive = !!inboxAgentId && activeAgentId === inboxAgentId;
 
-  const isLoading = useChatStore(
-    useCallback(
-      (s) => (isActive ? operationSelectors.isAgentRuntimeRunning(s) : false),
-      [isActive],
-    ),
-  );
+  const isLoading = useChatStore(operationSelectors.isAgentRuntimeRunning);
   const inboxAgentTitle = 'Lobe AI';
 
-  const handleClick = useCallback(() => {
-    if (inboxAgentId) {
-      navigate(SESSION_CHAT_URL(inboxAgentId, false));
-    }
-  }, [inboxAgentId, navigate]);
-
   return (
-    <NavItem
-      active={isActive}
-      className={className}
-      icon={
-        <Avatar avatar={DEFAULT_INBOX_AVATAR} emojiScaleWithBackground shape={'square'} size={24} />
-      }
-      loading={isLoading}
-      onClick={handleClick}
-      style={style}
-      title={inboxAgentTitle}
-    />
+    <Link aria-label={inboxAgentTitle} to={SESSION_CHAT_URL(inboxAgentId, false)}>
+      <NavItem
+        className={className}
+        icon={
+          <Avatar
+            avatar={DEFAULT_INBOX_AVATAR}
+            emojiScaleWithBackground
+            shape={'square'}
+            size={24}
+          />
+        }
+        loading={isLoading}
+        style={style}
+        title={inboxAgentTitle}
+      />
+    </Link>
   );
 });
 

package/src/app/[variants]/(main)/home/_layout/Body/Agent/List/List.tsx

@@ -4,6 +4,7 @@ import { MoreHorizontal } from 'lucide-react';
 import { type CSSProperties, memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import EmptyNavItem from '@/features/NavPanel/components/EmptyNavItem';
 import NavItem from '@/features/NavPanel/components/NavItem';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
@@ -11,7 +12,6 @@ import { useHomeStore } from '@/store/home';
 import { homeAgentListSelectors } from '@/store/home/selectors';
 import { SessionDefaultGroup } from '@/types/session';
 
-import EmptyNavItem from '../../../../../../../../features/NavPanel/components/EmptyNavItem';
 import { useCreateMenuItems } from '../../../hooks';
 import GroupItem from './AgentGroupItem';
 import AgentItem from './AgentItem';

package/src/app/[variants]/(main)/home/_layout/Body/Agent/ModalProvider.tsx

@@ -5,8 +5,8 @@ import { type ReactNode, createContext, memo, useContext, useMemo, useState } fr
 import { ChatGroupWizard } from '@/components/ChatGroupWizard';
 import { MemberSelectionModal } from '@/components/MemberSelectionModal';
 
-import CreateGroupModal from '../../CreateGroupModal';
 import ConfigGroupModal from './Modals/ConfigGroupModal';
+import CreateGroupModal from './Modals/CreateGroupModal';
 
 interface AgentModalContextValue {
   closeAllModals: () => void;

package/src/app/[variants]/(main)/settings/profile/features/SSOProvidersList/index.tsx

@@ -5,8 +5,7 @@ import { type CSSProperties, memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { modal, notification } from '@/components/AntdStaticMethods';
-import AuthIcons from '@/components/NextAuth/AuthIcons';
-import { userService } from '@/services/user';
+import AuthIcons from '@/components/AuthIcons';
 import { useServerConfigStore } from '@/store/serverConfig';
 import { serverConfigSelectors } from '@/store/serverConfig/selectors';
 import { useUserStore } from '@/store/user';
@@ -17,7 +16,7 @@ const providerNameStyle: CSSProperties = {
 };
 
 export const SSOProvidersList = memo(() => {
-  const isLoginWithBetterAuth = useUserStore(authSelectors.isLoginWithBetterAuth);
+  const isLogin = useUserStore(authSelectors.isLogin);
   const providers = useUserStore(authSelectors.authProviders);
   const hasPasswordAccount = useUserStore(authSelectors.hasPasswordAccount);
   const refreshAuthProviders = useUserStore((s) => s.refreshAuthProviders);
@@ -26,7 +25,7 @@ export const SSOProvidersList = memo(() => {
 
   // Allow unlink if user has multiple SSO providers OR has email/password login
   const allowUnlink = providers.length > 1 || hasPasswordAccount;
-  const enableBetterAuthActions = !isDesktop && isLoginWithBetterAuth;
+  const enableAuthActions = !isDesktop && isLogin;
 
   // Get linked provider IDs for filtering
   const linkedProviderIds = useMemo(() => {
@@ -38,9 +37,9 @@ export const SSOProvidersList = memo(() => {
     return (oAuthSSOProviders || []).filter((provider) => !linkedProviderIds.has(provider));
   }, [oAuthSSOProviders, linkedProviderIds]);
 
-  const handleUnlinkSSO = async (provider: string, providerAccountId: string) => {
+  const handleUnlinkSSO = async (provider: string) => {
     // Better-auth link/unlink operations are not available on desktop
-    if (isDesktop && isLoginWithBetterAuth) return;
+    if (isDesktop) return;
 
     // Prevent unlink if this is the only login method
     if (!allowUnlink) {
@@ -55,14 +54,8 @@ export const SSOProvidersList = memo(() => {
         danger: true,
       },
       onOk: async () => {
-        if (isLoginWithBetterAuth) {
-          // Use better-auth native API
-          const { unlinkAccount } = await import('@/libs/better-auth/auth-client');
-          await unlinkAccount({ providerId: provider });
-        } else {
-          // Fallback for NextAuth
-          await userService.unlinkSSOProvider(provider, providerAccountId);
-        }
+        const { unlinkAccount } = await import('@/libs/better-auth/auth-client');
+        await unlinkAccount({ providerId: provider });
         refreshAuthProviders();
       },
       title: <span style={providerNameStyle}>{t('profile.sso.unlink.title', { provider })}</span>,
@@ -70,7 +63,7 @@ export const SSOProvidersList = memo(() => {
   };
 
   const handleLinkSSO = async (provider: string) => {
-    if (enableBetterAuthActions) {
+    if (enableAuthActions) {
       // Use better-auth native linkSocial API
       const { linkSocial } = await import('@/libs/better-auth/auth-client');
       await linkSocial({
@@ -107,19 +100,19 @@ export const SSOProvidersList = memo(() => {
               </Text>
             )}
           </Flexbox>
-          {!(isDesktop && isLoginWithBetterAuth) && (
+          {!isDesktop && (
             <ActionIcon
               disabled={!allowUnlink}
               icon={Unlink}
-              onClick={() => handleUnlinkSSO(item.provider, item.providerAccountId)}
+              onClick={() => handleUnlinkSSO(item.provider)}
               size={'small'}
             />
           )}
         </Flexbox>
       ))}
 
-      {/* Link Account Button - Only show for Better-Auth users with available providers */}
-      {enableBetterAuthActions && availableProviders.length > 0 && (
+      {/* Link Account Button - Only show for logged in users with available providers */}
+      {enableAuthActions && availableProviders.length > 0 && (
         <DropdownMenu items={linkMenuItems} popupProps={{ style: { maxWidth: '200px' } }}>
           <Flexbox align={'center'} gap={6} horizontal style={{ cursor: 'pointer', fontSize: 12 }}>
             <Plus size={14} />

package/src/app/[variants]/(main)/settings/profile/index.tsx

@@ -51,10 +51,7 @@ interface ProfileSettingProps {
 }
 
 const ProfileSetting = ({ mobile }: ProfileSettingProps) => {
-  const [isLoginWithNextAuth, isLoginWithBetterAuth] = useUserStore((s) => [
-    authSelectors.isLoginWithNextAuth(s),
-    authSelectors.isLoginWithBetterAuth(s),
-  ]);
+  const isLogin = useUserStore(authSelectors.isLogin);
   const [userProfile, isUserLoaded] = useUserStore((s) => [
     userProfileSelectors.userProfile(s),
     s.isLoaded,
@@ -72,17 +69,14 @@ const ProfileSetting = ({ mobile }: ProfileSettingProps) => {
   // Fetch Klavis servers
   useFetchUserKlavisServers(enableKlavis);
 
-  const isLoginWithAuth = isLoginWithNextAuth || isLoginWithBetterAuth;
   const isLoading =
-    !isUserLoaded ||
-    (isLoginWithAuth && !isLoadedAuthProviders) ||
-    (enableKlavis && !isServersInit);
+    !isUserLoaded || (isLogin && !isLoadedAuthProviders) || (enableKlavis && !isServersInit);
 
   useEffect(() => {
-    if (isLoginWithAuth) {
+    if (isLogin) {
       fetchAuthProviders();
     }
-  }, [isLoginWithAuth, fetchAuthProviders]);
+  }, [isLogin, fetchAuthProviders]);
 
   const { t } = useTranslation('auth');
 
@@ -118,8 +112,8 @@ const ProfileSetting = ({ mobile }: ProfileSettingProps) => {
           {/* Interests Row - Editable */}
           <InterestsRow mobile={mobile} />
 
-          {/* Password Row - For Better Auth users to change or set password */}
-          {!isDesktop && isLoginWithBetterAuth && (
+          {/* Password Row - For logged in users to change or set password */}
+          {!isDesktop && isLogin && (
             <>
               <Divider style={{ margin: 0 }} />
               <PasswordRow mobile={mobile} />
@@ -127,7 +121,7 @@ const ProfileSetting = ({ mobile }: ProfileSettingProps) => {
           )}
 
           {/* Email Row - Read Only */}
-          {isLoginWithAuth && userProfile?.email && (
+          {isLogin && userProfile?.email && (
             <>
               <Divider style={{ margin: 0 }} />
               <ProfileRow label={t('profile.email')} mobile={mobile}>
@@ -137,7 +131,7 @@ const ProfileSetting = ({ mobile }: ProfileSettingProps) => {
           )}
 
           {/* SSO Providers Row */}
-          {isLoginWithAuth && (
+          {isLogin && (
             <>
               <Divider style={{ margin: 0 }} />
               <ProfileRow label={t('profile.sso.providers')} mobile={mobile}>

package/src/components/{NextAuth/AuthIcons.tsx → AuthIcons.tsx}

@@ -8,12 +8,10 @@ import {
   Github,
   Logto,
   MicrosoftEntra,
-  NextAuth,
   Zitadel,
 } from '@lobehub/ui/icons';
-import React from 'react';
+import { User } from 'lucide-react';
 
-// TODO: check this
 const iconComponents: { [key: string]: any } = {
   'apple': Apple,
   'auth0': Auth0,
@@ -22,7 +20,6 @@ const iconComponents: { [key: string]: any } = {
   'casdoor': Casdoor.Color,
   'cloudflare': Cloudflare.Color,
   'cognito': Aws.Color,
-  'default': NextAuth.Color,
   'github': Github,
   'google': Google.Color,
   'logto': Logto.Color,
@@ -32,14 +29,15 @@ const iconComponents: { [key: string]: any } = {
 };
 
 /**
- * Get the auth icons component for the given id
- * @param id
- * @param size default is 36
- * @returns
+ * Get the auth icons component for the given provider id
  */
 const AuthIcons = (id: string, size = 36) => {
-  const IconComponent = iconComponents[id] || iconComponents.default;
-  return <IconComponent size={size} />;
+  const IconComponent = iconComponents[id];
+  if (IconComponent) {
+    return <IconComponent size={size} />;
+  }
+  // Fallback to generic user icon for unknown providers
+  return <User size={size} />;
 };
 
 export default AuthIcons;

package/src/envs/auth.ts

@@ -6,23 +6,15 @@ declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace NodeJS {
     interface ProcessEnv {
-      // ===== Auth (shared by Better Auth / Next Auth) ===== //
+      // ===== Better Auth ===== //
       AUTH_SECRET?: string;
       AUTH_EMAIL_VERIFICATION?: string;
       ENABLE_MAGIC_LINK?: string;
       AUTH_SSO_PROVIDERS?: string;
       AUTH_TRUSTED_ORIGINS?: string;
+      AUTH_ALLOWED_EMAILS?: string;
 
-      // ===== Next Auth ===== //
-      NEXT_AUTH_SECRET?: string;
-
-      NEXT_AUTH_SSO_PROVIDERS?: string;
-
-      NEXT_AUTH_DEBUG?: string;
-
-      NEXT_AUTH_SSO_SESSION_STRATEGY?: string;
-
-      // ===== Next Auth Provider Credentials ===== //
+      // ===== Auth Provider Credentials ===== //
       AUTH_GOOGLE_ID?: string;
       AUTH_GOOGLE_SECRET?: string;
 
@@ -130,26 +122,14 @@ declare global {
 
 export const getAuthConfig = () => {
   return createEnv({
-    client: {
-      // ---------------------------------- better auth ----------------------------------
-      NEXT_PUBLIC_ENABLE_BETTER_AUTH: z.boolean().optional(),
-
-      // ---------------------------------- next auth ----------------------------------
-      NEXT_PUBLIC_ENABLE_NEXT_AUTH: z.boolean().optional(),
-    },
+    client: {},
     server: {
-      // ---------------------------------- better auth ----------------------------------
       AUTH_SECRET: z.string().optional(),
       AUTH_SSO_PROVIDERS: z.string().optional().default(''),
       AUTH_TRUSTED_ORIGINS: z.string().optional(),
       AUTH_EMAIL_VERIFICATION: z.boolean().optional().default(false),
       ENABLE_MAGIC_LINK: z.boolean().optional().default(false),
-
-      // ---------------------------------- next auth ----------------------------------
-      NEXT_AUTH_SECRET: z.string().optional(),
-      NEXT_AUTH_SSO_PROVIDERS: z.string().optional().default('auth0'),
-      NEXT_AUTH_DEBUG: z.boolean().optional().default(false),
-      NEXT_AUTH_SSO_SESSION_STRATEGY: z.enum(['jwt', 'database']).optional().default('jwt'),
+      AUTH_ALLOWED_EMAILS: z.string().optional(),
 
       AUTH_GOOGLE_ID: z.string().optional(),
       AUTH_GOOGLE_SECRET: z.string().optional(),
@@ -248,33 +228,19 @@ export const getAuthConfig = () => {
     },
 
     runtimeEnv: {
-      // ---------------------------------- better auth ----------------------------------
-      NEXT_PUBLIC_ENABLE_BETTER_AUTH: process.env.NEXT_PUBLIC_ENABLE_BETTER_AUTH === '1',
-      // Fallback to NEXT_PUBLIC_* for seamless migration
-      AUTH_EMAIL_VERIFICATION:
-        process.env.AUTH_EMAIL_VERIFICATION === '1' ||
-        process.env.NEXT_PUBLIC_AUTH_EMAIL_VERIFICATION === '1',
-      ENABLE_MAGIC_LINK:
-        process.env.ENABLE_MAGIC_LINK === '1' || process.env.NEXT_PUBLIC_ENABLE_MAGIC_LINK === '1',
-      // Fallback to NEXT_AUTH_SECRET for seamless migration from next-auth
-      AUTH_SECRET: process.env.AUTH_SECRET || process.env.NEXT_AUTH_SECRET,
-      // Fallback to NEXT_AUTH_SSO_PROVIDERS for seamless migration from next-auth
-      AUTH_SSO_PROVIDERS: process.env.AUTH_SSO_PROVIDERS || process.env.NEXT_AUTH_SSO_PROVIDERS,
+      AUTH_EMAIL_VERIFICATION: process.env.AUTH_EMAIL_VERIFICATION === '1',
+      ENABLE_MAGIC_LINK: process.env.ENABLE_MAGIC_LINK === '1',
+      AUTH_SECRET: process.env.AUTH_SECRET,
+      AUTH_SSO_PROVIDERS: process.env.AUTH_SSO_PROVIDERS,
       AUTH_TRUSTED_ORIGINS: process.env.AUTH_TRUSTED_ORIGINS,
+      AUTH_ALLOWED_EMAILS: process.env.AUTH_ALLOWED_EMAILS,
 
-      // better-auth env for Cognito provider is different from next-auth's one
+      // Cognito provider specific env vars
       AUTH_COGNITO_DOMAIN: process.env.AUTH_COGNITO_DOMAIN,
       AUTH_COGNITO_REGION: process.env.AUTH_COGNITO_REGION,
       AUTH_COGNITO_USERPOOL_ID: process.env.AUTH_COGNITO_USERPOOL_ID,
 
-      // ---------------------------------- next auth ----------------------------------
-      NEXT_PUBLIC_ENABLE_NEXT_AUTH: process.env.NEXT_PUBLIC_ENABLE_NEXT_AUTH === '1',
-      NEXT_AUTH_SSO_PROVIDERS: process.env.NEXT_AUTH_SSO_PROVIDERS,
-      NEXT_AUTH_SECRET: process.env.NEXT_AUTH_SECRET,
-      NEXT_AUTH_DEBUG: !!process.env.NEXT_AUTH_DEBUG,
-      NEXT_AUTH_SSO_SESSION_STRATEGY: process.env.NEXT_AUTH_SSO_SESSION_STRATEGY || 'jwt',
-
-      // Next Auth Provider Credentials
+      // Auth Provider Credentials
       AUTH_GOOGLE_ID: process.env.AUTH_GOOGLE_ID,
       AUTH_GOOGLE_SECRET: process.env.AUTH_GOOGLE_SECRET,
 
@@ -374,11 +340,6 @@ export const getAuthConfig = () => {
 
 export const authEnv = getAuthConfig();
 
-// Auth flags - use process.env directly for build-time dead code elimination
-// Better Auth is the default auth solution when NextAuth is not explicitly enabled
-export const enableNextAuth = process.env.NEXT_PUBLIC_ENABLE_NEXT_AUTH === '1';
-export const enableBetterAuth = !enableNextAuth;
-
 // Auth headers and constants
 export const LOBE_CHAT_AUTH_HEADER = 'X-lobe-chat-auth';
 export const LOBE_CHAT_OIDC_AUTH_HEADER = 'Oidc-Auth';

package/src/envs/email.ts

@@ -9,6 +9,7 @@ declare global {
       EMAIL_SERVICE_PROVIDER?: string;
       RESEND_API_KEY?: string;
       RESEND_FROM?: string;
+      SMTP_FROM?: string;
       SMTP_HOST?: string;
       SMTP_PASS?: string;
       SMTP_PORT?: string;
@@ -24,6 +25,7 @@ export const getEmailConfig = () => {
       EMAIL_SERVICE_PROVIDER: z.enum(['nodemailer', 'resend']).optional(),
       RESEND_API_KEY: z.string().optional(),
       RESEND_FROM: z.string().optional(),
+      SMTP_FROM: z.string().optional(),
       SMTP_HOST: z.string().optional(),
       SMTP_PORT: z.coerce.number().optional(),
       SMTP_SECURE: z.boolean().optional(),
@@ -31,6 +33,7 @@ export const getEmailConfig = () => {
       SMTP_PASS: z.string().optional(),
     },
     runtimeEnv: {
+      SMTP_FROM: process.env.SMTP_FROM,
       SMTP_HOST: process.env.SMTP_HOST,
       SMTP_PORT: process.env.SMTP_PORT ? Number(process.env.SMTP_PORT) : undefined,
       SMTP_SECURE: process.env.SMTP_SECURE === 'true',

package/src/envs/redis.ts

@@ -4,8 +4,6 @@ import { z } from 'zod';
 
 import type { RedisConfig } from '@/libs/redis';
 
-type UpstashRedisConfig = { token: string; url: string };
-
 const parseNumber = (value?: string) => {
   const parsed = Number.parseInt(value ?? '', 10);
 
@@ -30,8 +28,6 @@ export const getRedisEnv = () => {
       REDIS_TLS: parseRedisTls(process.env.REDIS_TLS),
       REDIS_URL: process.env.REDIS_URL,
       REDIS_USERNAME: process.env.REDIS_USERNAME,
-      UPSTASH_REDIS_REST_TOKEN: process.env.UPSTASH_REDIS_REST_TOKEN,
-      UPSTASH_REDIS_REST_URL: process.env.UPSTASH_REDIS_REST_URL,
     },
     server: {
       REDIS_DATABASE: z.number().int().optional(),
@@ -40,67 +36,29 @@ export const getRedisEnv = () => {
       REDIS_TLS: z.boolean().default(false),
       REDIS_URL: z.string().url().optional(),
       REDIS_USERNAME: z.string().optional(),
-      UPSTASH_REDIS_REST_TOKEN: z.string().optional(),
-      UPSTASH_REDIS_REST_URL: z.string().url().optional(),
     },
   });
 };
 
 export const redisEnv = getRedisEnv();
 
-export const getUpstashRedisConfig = (): UpstashRedisConfig | null => {
-  const upstashConfigSchema = z.union([
-    z.object({
-      token: z.string(),
-      url: z.string().url(),
-    }),
-    z.object({
-      token: z.undefined().optional(),
-      url: z.undefined().optional(),
-    }),
-  ]);
-
-  const parsed = upstashConfigSchema.safeParse({
-    token: redisEnv.UPSTASH_REDIS_REST_TOKEN,
-    url: redisEnv.UPSTASH_REDIS_REST_URL,
-  });
-
-  if (!parsed.success) throw parsed.error;
-  if (!parsed.data.token || !parsed.data.url) return null;
-
-  return parsed.data;
-};
-
 export const getRedisConfig = (): RedisConfig => {
-  const prefix = redisEnv.REDIS_PREFIX;
-
-  if (redisEnv.REDIS_URL) {
-    return {
-      database: redisEnv.REDIS_DATABASE,
-      enabled: true,
-      password: redisEnv.REDIS_PASSWORD,
-      prefix,
-      provider: 'redis',
-      tls: redisEnv.REDIS_TLS,
-      url: redisEnv.REDIS_URL,
-      username: redisEnv.REDIS_USERNAME,
-    };
-  }
-
-  const upstashConfig = getUpstashRedisConfig();
-  if (upstashConfig) {
+  if (!redisEnv.REDIS_URL) {
     return {
-      enabled: true,
-      prefix,
-      provider: 'upstash',
-      token: upstashConfig.token,
-      url: upstashConfig.url,
+      enabled: false,
+      prefix: redisEnv.REDIS_PREFIX,
+      tls: false,
+      url: '',
     };
   }
 
   return {
-    enabled: false,
-    prefix,
-    provider: false,
+    database: redisEnv.REDIS_DATABASE,
+    enabled: true,
+    password: redisEnv.REDIS_PASSWORD,
+    prefix: redisEnv.REDIS_PREFIX,
+    tls: redisEnv.REDIS_TLS,
+    url: redisEnv.REDIS_URL,
+    username: redisEnv.REDIS_USERNAME,
   };
 };