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

package/src/libs/redis/manager.ts

@@ -1,32 +1,18 @@
 import { IoRedisRedisProvider } from './redis';
 import { type BaseRedisProvider, type RedisConfig } from './types';
-import { UpstashRedisProvider } from './upstash';
 
 /**
  * Create a Redis provider instance based on config
  *
  * @param config - Redis config
  * @param prefix - Optional custom prefix to override config.prefix
- * @returns Provider instance or null if disabled/unsupported
+ * @returns Provider instance or null if disabled
  */
 const createProvider = (config: RedisConfig, prefix?: string): BaseRedisProvider | null => {
   if (!config.enabled) return null;
 
   const actualPrefix = prefix ?? config.prefix;
-
-  if (config.provider === 'redis') {
-    return new IoRedisRedisProvider({ ...config, prefix: actualPrefix });
-  }
-
-  if (config.provider === 'upstash') {
-    return new UpstashRedisProvider({
-      prefix: actualPrefix,
-      token: config.token,
-      url: config.url,
-    });
-  }
-
-  return null;
+  return new IoRedisRedisProvider({ ...config, prefix: actualPrefix });
 };
 
 class RedisManager {

package/src/libs/redis/redis.test.ts

@@ -1,8 +1,8 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
-import { IoRedisConfig } from './types';
+import { RedisConfig } from './types';
 
-const buildRedisConfig = (): IoRedisConfig | null => {
+const buildRedisConfig = (): RedisConfig | null => {
   const url = process.env.REDIS_URL;
 
   if (!url) return null;
@@ -14,7 +14,6 @@ const buildRedisConfig = (): IoRedisConfig | null => {
     enabled: true,
     password: process.env.REDIS_PASSWORD,
     prefix: process.env.REDIS_PREFIX ?? 'lobe-chat-test',
-    provider: 'redis',
     tls: process.env.REDIS_TLS === 'true',
     url,
     username: process.env.REDIS_USERNAME,
@@ -79,7 +78,6 @@ const createMockedProvider = async () => {
   const provider = new IoRedisRedisProvider({
     enabled: true,
     prefix: 'mock',
-    provider: 'redis',
     tls: false,
     url: 'redis://localhost:6379',
   });

package/src/libs/redis/redis.ts

@@ -3,10 +3,9 @@ import type { Redis } from 'ioredis';
 
 import {
   type BaseRedisProvider,
-  type IoRedisConfig,
+  type RedisConfig,
   type RedisKey,
   type RedisMSetArgument,
-  type RedisProviderName,
   type RedisSetResult,
   type RedisValue,
   type SetOptions,
@@ -16,10 +15,9 @@ import { buildIORedisSetArgs, normalizeMsetValues } from './utils';
 const log = debug('lobe:redis');
 
 export class IoRedisRedisProvider implements BaseRedisProvider {
-  provider: RedisProviderName = 'redis';
   private client: Redis | null = null;
 
-  constructor(private config: IoRedisConfig) {}
+  constructor(private config: RedisConfig) {}
 
   async initialize() {
     const IORedis = await import('ioredis');

package/src/libs/redis/types.ts

@@ -1,35 +1,16 @@
 export type RedisKey = string | Buffer;
 export type RedisValue = string | Buffer | number;
-export type RedisProvider = false | 'redis' | 'upstash';
-export type RedisProviderName = Exclude<RedisProvider, false>;
 
-export type IoRedisConfig = {
+export type RedisConfig = {
   database?: number;
   enabled: boolean;
   password?: string;
   prefix: string;
-  provider: 'redis';
   tls: boolean;
   url: string;
   username?: string;
 };
 
-export type UpstashConfig = {
-  enabled: boolean;
-  prefix: string;
-  provider: 'upstash';
-  token: string;
-  url: string;
-};
-
-export type DisabledRedisConfig = {
-  enabled: false;
-  prefix: string;
-  provider: false;
-};
-
-export type RedisConfig = IoRedisConfig | UpstashConfig | DisabledRedisConfig;
-
 export interface SetOptions {
   ex?: number;
   exat?: number;
@@ -41,8 +22,7 @@ export interface SetOptions {
   xx?: boolean;
 }
 
-// NOTICE: number comes from upstash
-export type RedisSetResult = 'OK' | null | string | number;
+export type RedisSetResult = 'OK' | null | string;
 export type RedisMSetArgument = Record<string, RedisValue> | Map<RedisKey, RedisValue>;
 
 export interface RedisClient {
@@ -65,7 +45,5 @@ export interface RedisClient {
 
 export interface BaseRedisProvider extends RedisClient {
   disconnect(): Promise<void>;
-
   initialize(): Promise<void>;
-  provider: RedisProviderName;
 }

package/src/libs/redis/utils.test.ts

@@ -2,7 +2,6 @@ import { describe, expect, it } from 'vitest';
 
 import {
   buildIORedisSetArgs,
-  buildUpstashSetOptions,
   normalizeMsetValues,
   normalizeRedisKey,
   normalizeRedisKeys,
@@ -34,13 +33,4 @@ describe('redis utils', () => {
 
     expect(args).toEqual(['EX', 1, 'NX', 'GET']);
   });
-
-  it('builds upstash set options', () => {
-    expect(buildUpstashSetOptions()).toBeUndefined();
-    expect(buildUpstashSetOptions({ ex: 10, nx: true, get: true })).toEqual({
-      ex: 10,
-      nx: true,
-      get: true,
-    });
-  });
 });

package/src/libs/redis/utils.ts

@@ -1,5 +1,3 @@
-import type { SetCommandOptions } from '@upstash/redis';
-
 import { type RedisKey, type RedisMSetArgument, type RedisValue, type SetOptions } from './types';
 
 export const normalizeRedisKey = (key: RedisKey) =>
@@ -34,20 +32,3 @@ export const buildIORedisSetArgs = (options?: SetOptions): Array<string | number
 
   return args;
 };
-
-export const buildUpstashSetOptions = (options?: SetOptions): SetCommandOptions | undefined => {
-  if (!options) return undefined;
-
-  const mapped: Partial<SetCommandOptions> = {};
-
-  if (options.ex !== undefined) mapped.ex = options.ex;
-  if (options.px !== undefined) mapped.px = options.px;
-  if (options.exat !== undefined) mapped.exat = options.exat;
-  if (options.pxat !== undefined) mapped.pxat = options.pxat;
-  if (options.keepTtl) mapped.keepTtl = true;
-  if (options.nx) mapped.nx = true;
-  if (options.xx) mapped.xx = true;
-  if (options.get) mapped.get = true;
-
-  return Object.keys(mapped).length ? (mapped as SetCommandOptions) : undefined;
-};

package/src/libs/trpc/lambda/context.test.ts

@@ -9,7 +9,6 @@ describe('createContextInner', () => {
     expect(context).toMatchObject({
       authorizationHeader: undefined,
       marketAccessToken: undefined,
-      nextAuth: undefined,
       oidcAuth: undefined,
       userAgent: undefined,
       userId: undefined,
@@ -58,18 +57,6 @@ describe('createContextInner', () => {
     expect(context.oidcAuth).toEqual(oidcAuth);
   });
 
-  it('should create context with NextAuth user data', async () => {
-    const nextAuth = {
-      id: 'next-auth-user-id',
-      name: 'Test User',
-      email: 'test@example.com',
-    };
-
-    const context = await createContextInner({ nextAuth });
-
-    expect(context.nextAuth).toEqual(nextAuth);
-  });
-
   it('should create context with all parameters combined', async () => {
     const params = {
       authorizationHeader: 'Bearer token',

package/src/libs/trpc/lambda/context.ts

@@ -1,16 +1,10 @@
 import { type ClientSecretPayload } from '@lobechat/types';
 import { parse } from 'cookie';
 import debug from 'debug';
-import { type User } from 'next-auth';
 import { type NextRequest } from 'next/server';
 
-import {
-  LOBE_CHAT_AUTH_HEADER,
-  LOBE_CHAT_OIDC_AUTH_HEADER,
-  authEnv,
-  enableBetterAuth,
-  enableNextAuth,
-} from '@/envs/auth';
+import { auth } from '@/auth';
+import { LOBE_CHAT_AUTH_HEADER, LOBE_CHAT_OIDC_AUTH_HEADER, authEnv } from '@/envs/auth';
 import { validateOIDCJWT } from '@/libs/oidc-provider/jwt';
 
 // Create context logger namespace
@@ -43,7 +37,6 @@ export interface AuthContext {
   clientIp?: string | null;
   jwtPayload?: ClientSecretPayload | null;
   marketAccessToken?: string;
-  nextAuth?: User;
   // Add OIDC authentication information
   oidcAuth?: OIDCAuth | null;
   resHeaders?: Headers;
@@ -59,7 +52,6 @@ export const createContextInner = async (params?: {
   authorizationHeader?: string | null;
   clientIp?: string | null;
   marketAccessToken?: string;
-  nextAuth?: User;
   oidcAuth?: OIDCAuth | null;
   userAgent?: string;
   userId?: string | null;
@@ -71,7 +63,6 @@ export const createContextInner = async (params?: {
     authorizationHeader: params?.authorizationHeader,
     clientIp: params?.clientIp,
     marketAccessToken: params?.marketAccessToken,
-    nextAuth: params?.nextAuth,
     oidcAuth: params?.oidcAuth,
     resHeaders: responseHeaders,
     userAgent: params?.userAgent,
@@ -120,7 +111,6 @@ export const createLambdaContext = async (request: NextRequest): Promise<LambdaC
   log('LobeChat Authorization header: %s', authorization ? 'exists' : 'not found');
 
   let userId;
-  let auth;
   let oidcAuth = null;
 
   // Prioritize checking for OIDC authentication (both standard Authorization and custom Oidc-Auth headers)
@@ -159,55 +149,27 @@ export const createLambdaContext = async (request: NextRequest): Promise<LambdaC
     }
   }
 
-  // If OIDC is not enabled or validation fails, try other authentication methods
-  if (enableBetterAuth) {
-    log('Attempting Better Auth authentication');
-    try {
-      const { auth: betterAuth } = await import('@/auth');
-
-      const session = await betterAuth.api.getSession({
-        headers: request.headers,
-      });
-
-      if (session && session?.user?.id) {
-        userId = session.user.id;
-        log('Better Auth authentication successful, userId: %s', userId);
-      } else {
-        log('Better Auth authentication failed, no valid session');
-      }
-
-      return createContextInner({
-        ...commonContext,
-        userId,
-      });
-    } catch (e) {
-      log('Better Auth authentication error: %O', e);
-      console.error('better auth err', e);
+  // If OIDC is not enabled or validation fails, try Better Auth authentication
+  log('Attempting Better Auth authentication');
+  try {
+    const session = await auth.api.getSession({
+      headers: request.headers,
+    });
+
+    if (session && session?.user?.id) {
+      userId = session.user.id;
+      log('Better Auth authentication successful, userId: %s', userId);
+    } else {
+      log('Better Auth authentication failed, no valid session');
     }
-  }
 
-  if (enableNextAuth) {
-    log('Attempting NextAuth authentication');
-    try {
-      const { default: NextAuth } = await import('@/libs/next-auth');
-
-      const session = await NextAuth.auth();
-      if (session && session?.user?.id) {
-        auth = session.user;
-        userId = session.user.id;
-        log('NextAuth authentication successful, userId: %s', userId);
-      } else {
-        log('NextAuth authentication failed, no valid session');
-      }
-      return createContextInner({
-        nextAuth: auth,
-        ...commonContext,
-        userId,
-      });
-    } catch (e) {
-      log('NextAuth authentication error: %O', e);
-      console.error('next auth err', e);
-    }
+    return createContextInner({
+      ...commonContext,
+      userId,
+    });
+  } catch (e) {
+    log('Better Auth authentication error: %O', e);
+    console.error('better auth err', e);
   }
 
   // Final return, userId may be undefined

package/src/libs/trpc/middleware/userAuth.ts

@@ -1,7 +1,5 @@
 import { TRPCError } from '@trpc/server';
 
-import { enableBetterAuth, enableNextAuth } from '@/envs/auth';
-
 import { trpc } from '../lambda/init';
 
 export const userAuth = trpc.middleware(async (opts) => {
@@ -9,11 +7,7 @@ export const userAuth = trpc.middleware(async (opts) => {
 
   // `ctx.user` is nullable
   if (!ctx.userId) {
-    if (enableBetterAuth) {
-      console.log('better auth: no session found in context');
-    } else if (enableNextAuth) {
-      console.log('next auth:', ctx.nextAuth);
-    }
+    console.log('better auth: no session found in context');
     throw new TRPCError({ code: 'UNAUTHORIZED' });
   }
 

package/src/libs/trusted-client/getSessionUser.ts

@@ -1,50 +1,30 @@
-import { enableBetterAuth, enableNextAuth } from '@/envs/auth';
+import { headers } from 'next/headers';
 
 import type { TrustedClientUserInfo } from './index';
 
 /**
  * Get user info from the current session for trusted client authentication
- * This works with different authentication providers (BetterAuth, NextAuth)
  *
  * @returns User info or undefined if not authenticated
  */
 export const getSessionUser = async (): Promise<TrustedClientUserInfo | undefined> => {
   try {
-    if (enableBetterAuth) {
-      const { headers } = await import('next/headers');
-      const { auth } = await import('@/auth');
-      const headersList = await headers();
-      const session = await auth.api.getSession({
-        headers: headersList,
-      });
-
-      if (!session?.user?.id || !session?.user?.email) {
-        return undefined;
-      }
-
-      return {
-        email: session.user.email,
-        name: session.user.name || undefined,
-        userId: session.user.id,
-      };
+    // Dynamic import to avoid validator ESM/CJS issue during sitemap generation
+    const { auth } = await import('@/auth');
+    const headersList = await headers();
+    const session = await auth.api.getSession({
+      headers: headersList,
+    });
+
+    if (!session?.user?.id || !session?.user?.email) {
+      return undefined;
     }
 
-    if (enableNextAuth) {
-      const { default: NextAuth } = await import('@/libs/next-auth');
-      const session = await NextAuth.auth();
-
-      if (!session?.user?.id || !session?.user?.email) {
-        return undefined;
-      }
-
-      return {
-        email: session.user.email,
-        name: session.user.name || undefined,
-        userId: session.user.id,
-      };
-    }
-
-    return undefined;
+    return {
+      email: session.user.email,
+      name: session.user.name || undefined,
+      userId: session.user.id,
+    };
   } catch {
     return undefined;
   }

package/src/locales/default/plugin.ts

@@ -178,6 +178,9 @@ export default {
   'builtins.lobe-user-memory.apiName.searchUserMemory': 'Search memory',
   'builtins.lobe-user-memory.apiName.updateIdentityMemory': 'Update identity memory',
   'builtins.lobe-user-memory.inspector.noResults': 'No results',
+  'builtins.lobe-user-memory.render.contexts': 'Contexts',
+  'builtins.lobe-user-memory.render.experiences': 'Experiences',
+  'builtins.lobe-user-memory.render.preferences': 'Preferences',
   'builtins.lobe-user-memory.title': 'Memory',
   'builtins.lobe-web-browsing.apiName.crawlMultiPages': 'Read multiple pages',
   'builtins.lobe-web-browsing.apiName.crawlSinglePage': 'Read page content',

package/src/server/globalConfig/index.ts

@@ -90,9 +90,7 @@ export const getServerGlobalConfig = async () => {
     memory: {
       userMemory: cleanObject(getPublicMemoryExtractionConfig()),
     },
-    oAuthSSOProviders: authEnv.NEXT_PUBLIC_ENABLE_BETTER_AUTH
-      ? getBetterAuthSSOProviders()
-      : authEnv.NEXT_AUTH_SSO_PROVIDERS.trim().split(/[,，]/),
+    oAuthSSOProviders: getBetterAuthSSOProviders(),
     systemAgent: parseSystemAgent(appEnv.SYSTEM_AGENT),
     telemetry: {
       langfuse: langfuseEnv.ENABLE_LANGFUSE,

package/src/server/modules/Mecha/ContextEngineering/__tests__/serverMessagesEngine.test.ts

@@ -68,31 +68,6 @@ describe('serverMessagesEngine', () => {
     });
   });
 
-  describe('history truncation', () => {
-    it('should truncate history when enabled', async () => {
-      const messages: UIChatMessage[] = [];
-      for (let i = 0; i < 20; i++) {
-        messages.push({
-          content: `Message ${i}`,
-          createdAt: Date.now(),
-          id: `msg-${i}`,
-          role: i % 2 === 0 ? 'user' : 'assistant',
-          updatedAt: Date.now(),
-        } as UIChatMessage);
-      }
-
-      const result = await serverMessagesEngine({
-        enableHistoryCount: true,
-        historyCount: 5,
-        messages,
-        model: 'gpt-4',
-        provider: 'openai',
-      });
-
-      expect(result.length).toBeLessThanOrEqual(5);
-    });
-  });
-
   describe('knowledge injection', () => {
     it('should inject file contents', async () => {
       const messages = createBasicMessages();

package/src/server/routers/lambda/__tests__/user.test.ts

@@ -6,7 +6,6 @@ import { SessionModel } from '@/database/models/session';
 import { UserModel, UserNotFoundError } from '@/database/models/user';
 import { serverDB } from '@/database/server';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
-import { NextAuthUserService } from '@/server/services/nextAuthUser';
 import { UserService } from '@/server/services/user';
 
 import { userRouter } from '../user';
@@ -22,11 +21,6 @@ vi.mock('@/database/models/user');
 vi.mock('@/server/modules/KeyVaultsEncrypt');
 vi.mock('@/server/modules/S3');
 vi.mock('@/server/services/user');
-vi.mock('@/server/services/nextAuthUser');
-vi.mock('@/envs/auth', () => ({
-  enableBetterAuth: false,
-  enableNextAuth: false,
-}));
 
 describe('userRouter', () => {
   const mockUserId = 'test-user-id';
@@ -122,7 +116,6 @@ describe('userRouter', () => {
         userId: mockUserId,
       });
     });
-
   });
 
   describe('makeUserOnboarded', () => {
@@ -140,47 +133,6 @@ describe('userRouter', () => {
     });
   });
 
-  describe('unlinkSSOProvider', () => {
-    it('should unlink SSO provider successfully', async () => {
-      const mockInput = {
-        provider: 'google',
-        providerAccountId: '123',
-      };
-
-      const mockAccount = {
-        userId: mockUserId,
-        provider: 'google',
-        providerAccountId: '123',
-        type: 'oauth',
-      };
-
-      vi.mocked(NextAuthUserService).mockReturnValue({
-        getAccount: vi.fn().mockResolvedValue(mockAccount),
-        unlinkAccount: vi.fn().mockResolvedValue(undefined),
-      } as any);
-
-      await expect(
-        userRouter.createCaller({ ...mockCtx }).unlinkSSOProvider(mockInput),
-      ).resolves.not.toThrow();
-    });
-
-    it('should throw error if account does not exist', async () => {
-      const mockInput = {
-        provider: 'google',
-        providerAccountId: '123',
-      };
-
-      vi.mocked(NextAuthUserService).mockReturnValue({
-        getAccount: vi.fn().mockResolvedValue(null),
-        unlinkAccount: vi.fn(),
-      } as any);
-
-      await expect(
-        userRouter.createCaller({ ...mockCtx }).unlinkSSOProvider(mockInput),
-      ).rejects.toThrow('The account does not exist');
-    });
-  });
-
   describe('updateSettings', () => {
     it('should update settings with encrypted key vaults', async () => {
       const mockSettings = {

package/src/server/routers/lambda/user.ts

@@ -1,6 +1,5 @@
 import { isDesktop } from '@lobechat/const';
 import {
-  NextAuthAccountSchame,
   Plans,
   UserGuideSchema,
   type UserInitializationState,
@@ -16,8 +15,8 @@ import { v4 as uuidv4 } from 'uuid';
 import { z } from 'zod';
 
 import {
-  getIsInviteCodeRequired,
   getIsInWaitList,
+  getIsInviteCodeRequired,
   getReferralStatus,
   getSubscriptionPlan,
 } from '@/business/server/user';
@@ -29,7 +28,6 @@ import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { FileS3 } from '@/server/modules/S3';
 import { FileService } from '@/server/services/file';
-import { NextAuthUserService } from '@/server/services/nextAuthUser';
 
 const usernameSchema = z
   .string()
@@ -42,7 +40,6 @@ const userProcedure = authedProcedure.use(serverDatabase).use(async ({ ctx, next
     ctx: {
       fileService: new FileService(ctx.serverDB, ctx.userId),
       messageModel: new MessageModel(ctx.serverDB, ctx.userId),
-      nextAuthUserService: new NextAuthUserService(ctx.serverDB),
       sessionModel: new SessionModel(ctx.serverDB, ctx.userId),
       userModel: new UserModel(ctx.serverDB, ctx.userId),
     },
@@ -138,14 +135,6 @@ export const userRouter = router({
     return ctx.userModel.deleteSetting();
   }),
 
-  unlinkSSOProvider: userProcedure.input(NextAuthAccountSchame).mutation(async ({ ctx, input }) => {
-    const { provider, providerAccountId } = input;
-    const account = await ctx.nextAuthUserService.getAccount(providerAccountId, provider);
-    // The userId can either get from ctx.nextAuth?.id or ctx.userId
-    if (!account || account.userId !== ctx.userId) throw new Error('The account does not exist');
-    await ctx.nextAuthUserService.unlinkAccount({ provider, providerAccountId });
-  }),
-
   updateAvatar: userProcedure.input(z.string()).mutation(async ({ ctx, input }) => {
     // If it's Base64 data, need to upload to S3
     if (input.startsWith('data:image')) {

package/src/server/services/email/impls/nodemailer/index.ts

@@ -49,8 +49,8 @@ export class NodemailerImpl implements EmailServiceImpl {
   }
 
   async sendMail(payload: EmailPayload): Promise<EmailResponse> {
-    // Use SMTP_USER as default sender if not provided
-    const from = payload.from ?? emailEnv.SMTP_USER!;
+    // Use SMTP_FROM as default sender, fallback to SMTP_USER for backward compatibility
+    const from = payload.from ?? emailEnv.SMTP_FROM ?? emailEnv.SMTP_USER!;
 
     log('Sending email with payload: %o', {
       from,