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

package/src/services/user/index.ts

@@ -27,10 +27,6 @@ export class UserService {
     return lambdaClient.user.getUserSSOProviders.query();
   };
 
-  unlinkSSOProvider = async (provider: string, providerAccountId: string) => {
-    return lambdaClient.user.unlinkSSOProvider.mutate({ provider, providerAccountId });
-  };
-
   makeUserOnboarded = async () => {
     return lambdaClient.user.makeUserOnboarded.mutate();
   };

package/src/store/chat/agents/createAgentExecutors.ts

@@ -22,10 +22,9 @@ import type { ChatToolPayload, ConversationContext, CreateMessageParams } from '
 import debug from 'debug';
 import pMap from 'p-map';
 
-import type { ResolvedAgentConfig } from '@/services/chat/mecha';
-
 import { LOADING_FLAT } from '@/const/message';
 import { aiAgentService } from '@/services/aiAgent';
+import type { ResolvedAgentConfig } from '@/services/chat/mecha';
 import { agentByIdSelectors } from '@/store/agent/selectors';
 import { getAgentStoreState } from '@/store/agent/store';
 import type { ChatStore } from '@/store/chat/store';
@@ -96,7 +95,12 @@ export const createAgentExecutors = (context: {
       const llmPayload = (instruction as AgentInstructionCallLlm)
         .payload as GeneralAgentCallLLMInstructionPayload;
 
-      log(`${stagePrefix} Starting session`);
+      log(
+        `${stagePrefix} Starting session. Input: state.messages=%d, llmPayload.messages=%d, messageKey=%s`,
+        state.messages.length,
+        llmPayload.messages.length,
+        context.messageKey,
+      );
 
       let assistantMessageId: string;
 
@@ -184,6 +188,12 @@ export const createAgentExecutors = (context: {
       // Get latest messages from store (already updated by internal_fetchAIChatMessage)
       const latestMessages = context.get().dbMessagesMap[context.messageKey] || [];
 
+      log(
+        `${stagePrefix} After fetch: dbMessagesMap[${context.messageKey}]=%d messages, available keys=%o`,
+        latestMessages.length,
+        Object.keys(context.get().dbMessagesMap),
+      );
+
       // Get updated assistant message to extract usage/cost information
       const assistantMessage = latestMessages.find((m) => m.id === assistantMessageId);
 
@@ -206,10 +216,11 @@ export const createAgentExecutors = (context: {
       }
 
       log(
-        '[%s:%d] call_llm completed, finishType: %s',
+        '[%s:%d] call_llm completed, finishType: %s, outputMessages: %d',
         state.operationId,
         state.stepCount,
         finishType,
+        latestMessages.length,
       );
 
       // Accumulate usage and cost to state

package/src/store/chat/slices/aiChat/actions/conversationLifecycle.ts

@@ -259,6 +259,7 @@ export const conversationLifecycle: StateCreator<
       if (data?.topics) {
         const pageSize = systemStatusSelectors.topicPageSize(useGlobalStore.getState());
         get().internal_updateTopics(operationContext.agentId, {
+          groupId: operationContext.groupId,
           items: data.topics.items,
           pageSize,
           total: data.topics.total,

package/src/store/chat/slices/aiChat/actions/streamingExecutor.ts

@@ -757,20 +757,24 @@ export const streamingExecutor: StateCreator<
       nextContext = { ...nextContext, stepContext };
 
       log(
-        '[internal_execAgentRuntime][step-%d]: phase=%s, status=%s, stepContext=%O',
+        '[internal_execAgentRuntime][step-%d]: phase=%s, status=%s, state.messages=%d, dbMessagesMap[%s]=%d, stepContext=%O',
         stepCount,
         nextContext.phase,
         state.status,
+        state.messages.length,
+        messageKey,
+        currentDBMessages.length,
         stepContext,
       );
 
       const result = await runtime.step(state, nextContext);
 
       log(
-        '[internal_execAgentRuntime] Step %d completed, events: %d, newStatus=%s',
+        '[internal_execAgentRuntime] Step %d completed, events: %d, newStatus=%s, newState.messages=%d',
         stepCount,
         result.events.length,
         result.newState.status,
+        result.newState.messages.length,
       );
 
       // After parallel tool batch completes, refresh messages to ensure all tool results are synced

package/src/store/user/slices/auth/action.test.ts

@@ -15,29 +15,6 @@ vi.mock('@/libs/swr', async () => {
   };
 });
 
-// Use vi.hoisted to ensure variables exist before vi.mock factory executes
-const { enableNextAuth, enableBetterAuth } = vi.hoisted(() => ({
-  enableNextAuth: { value: false },
-  enableBetterAuth: { value: false },
-}));
-
-vi.mock('@/envs/auth', () => ({
-  get enableNextAuth() {
-    return enableNextAuth.value;
-  },
-  get enableBetterAuth() {
-    return enableBetterAuth.value;
-  },
-}));
-
-const mockUserService = vi.hoisted(() => ({
-  getUserSSOProviders: vi.fn().mockResolvedValue([]),
-}));
-
-vi.mock('@/services/user', () => ({
-  userService: mockUserService,
-}));
-
 const mockBetterAuthClient = vi.hoisted(() => ({
   listAccounts: vi.fn().mockResolvedValue({ data: [] }),
   accountInfo: vi.fn().mockResolvedValue({ data: { user: {} } }),
@@ -50,9 +27,6 @@ afterEach(() => {
   vi.restoreAllMocks();
   vi.clearAllMocks();
 
-  enableNextAuth.value = false;
-  enableBetterAuth.value = false;
-
   // Reset store state
   useUserStore.setState({
     isLoadedAuthProviders: false,
@@ -61,16 +35,6 @@ afterEach(() => {
   });
 });
 
-/**
- * Mock nextauth 库相关方法
- */
-vi.mock('next-auth/react', async () => {
-  return {
-    signIn: vi.fn(),
-    signOut: vi.fn(),
-  };
-});
-
 describe('createAuthSlice', () => {
   describe('refreshUserState', () => {
     it('should refresh user config', async () => {
@@ -85,64 +49,19 @@ describe('createAuthSlice', () => {
   });
 
   describe('logout', () => {
-    it('should call next-auth signOut when NextAuth is enabled', async () => {
-      enableNextAuth.value = true;
-
-      const { result } = renderHook(() => useUserStore());
-
-      await act(async () => {
-        await result.current.logout();
-      });
-
-      const { signOut } = await import('next-auth/react');
-
-      expect(signOut).toHaveBeenCalled();
-      enableNextAuth.value = false;
-    });
-
-    it('should not call next-auth signOut when NextAuth is disabled', async () => {
+    it('should call better-auth signOut', async () => {
       const { result } = renderHook(() => useUserStore());
 
       await act(async () => {
         await result.current.logout();
       });
 
-      const { signOut } = await import('next-auth/react');
-
-      expect(signOut).not.toHaveBeenCalled();
+      expect(mockBetterAuthClient.signOut).toHaveBeenCalled();
     });
   });
 
   describe('openLogin', () => {
-    it('should call next-auth signIn when NextAuth is enabled', async () => {
-      enableNextAuth.value = true;
-
-      const { result } = renderHook(() => useUserStore());
-
-      await act(async () => {
-        await result.current.openLogin();
-      });
-
-      const { signIn } = await import('next-auth/react');
-
-      expect(signIn).toHaveBeenCalled();
-      enableNextAuth.value = false;
-    });
-    it('should not call next-auth signIn when NextAuth is disabled', async () => {
-      const { result } = renderHook(() => useUserStore());
-
-      await act(async () => {
-        await result.current.openLogin();
-      });
-
-      const { signIn } = await import('next-auth/react');
-
-      expect(signIn).not.toHaveBeenCalled();
-    });
-
-    it('should redirect to signin page when BetterAuth is enabled', async () => {
-      enableBetterAuth.value = true;
-
+    it('should redirect to signin page', async () => {
       const originalLocation = window.location;
       Object.defineProperty(window, 'location', {
         configurable: true,
@@ -171,18 +90,15 @@ describe('createAuthSlice', () => {
       });
     });
 
-    it('should call signIn with single provider when only one OAuth provider available', async () => {
-      enableNextAuth.value = true;
-      useUserStore.setState({ oAuthSSOProviders: ['github'] });
-
+    it('should not redirect when already on signin page', async () => {
       const originalLocation = window.location;
       Object.defineProperty(window, 'location', {
         configurable: true,
         value: {
           ...originalLocation,
           href: '',
-          pathname: '/chat',
-          toString: () => 'http://localhost/chat',
+          pathname: '/signin',
+          toString: () => 'http://localhost/signin',
         },
         writable: true,
       });
@@ -193,9 +109,7 @@ describe('createAuthSlice', () => {
         await result.current.openLogin();
       });
 
-      const { signIn } = await import('next-auth/react');
-
-      expect(signIn).toHaveBeenCalledWith('github');
+      expect(window.location.href).toBe('');
 
       Object.defineProperty(window, 'location', {
         configurable: true,
@@ -215,29 +129,10 @@ describe('createAuthSlice', () => {
         await result.current.fetchAuthProviders();
       });
 
-      expect(mockUserService.getUserSSOProviders).not.toHaveBeenCalled();
-    });
-
-    it('should fetch providers from NextAuth when BetterAuth is disabled', async () => {
-      enableBetterAuth.value = false;
-      const mockProviders = [
-        { provider: 'github', email: 'test@example.com', providerAccountId: '123' },
-      ];
-      mockUserService.getUserSSOProviders.mockResolvedValueOnce(mockProviders);
-
-      const { result } = renderHook(() => useUserStore());
-
-      await act(async () => {
-        await result.current.fetchAuthProviders();
-      });
-
-      expect(mockUserService.getUserSSOProviders).toHaveBeenCalled();
-      expect(result.current.isLoadedAuthProviders).toBe(true);
-      expect(result.current.authProviders).toEqual(mockProviders);
+      expect(mockBetterAuthClient.listAccounts).not.toHaveBeenCalled();
     });
 
-    it('should fetch providers from BetterAuth when enabled', async () => {
-      enableBetterAuth.value = true;
+    it('should fetch providers from BetterAuth', async () => {
       mockBetterAuthClient.listAccounts.mockResolvedValueOnce({
         data: [
           { providerId: 'github', accountId: 'gh-123' },
@@ -260,8 +155,7 @@ describe('createAuthSlice', () => {
     });
 
     it('should handle fetch error gracefully', async () => {
-      enableBetterAuth.value = false;
-      mockUserService.getUserSSOProviders.mockRejectedValueOnce(new Error('Network error'));
+      mockBetterAuthClient.listAccounts.mockRejectedValueOnce(new Error('Network error'));
 
       const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 
@@ -277,12 +171,13 @@ describe('createAuthSlice', () => {
   });
 
   describe('refreshAuthProviders', () => {
-    it('should refresh providers from NextAuth', async () => {
-      enableBetterAuth.value = false;
-      const mockProviders = [
-        { provider: 'google', email: 'user@gmail.com', providerAccountId: 'g-1' },
-      ];
-      mockUserService.getUserSSOProviders.mockResolvedValueOnce(mockProviders);
+    it('should refresh providers from BetterAuth', async () => {
+      mockBetterAuthClient.listAccounts.mockResolvedValueOnce({
+        data: [{ providerId: 'google', accountId: 'g-1' }],
+      });
+      mockBetterAuthClient.accountInfo.mockResolvedValueOnce({
+        data: { user: { email: 'user@gmail.com' } },
+      });
 
       const { result } = renderHook(() => useUserStore());
 
@@ -290,13 +185,14 @@ describe('createAuthSlice', () => {
         await result.current.refreshAuthProviders();
       });
 
-      expect(mockUserService.getUserSSOProviders).toHaveBeenCalled();
-      expect(result.current.authProviders).toEqual(mockProviders);
+      expect(mockBetterAuthClient.listAccounts).toHaveBeenCalled();
+      expect(result.current.authProviders).toEqual([
+        { provider: 'google', email: 'user@gmail.com', providerAccountId: 'g-1' },
+      ]);
     });
 
     it('should handle refresh error gracefully', async () => {
-      enableBetterAuth.value = false;
-      mockUserService.getUserSSOProviders.mockRejectedValueOnce(new Error('Refresh failed'));
+      mockBetterAuthClient.listAccounts.mockRejectedValueOnce(new Error('Refresh failed'));
 
       const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 

package/src/store/user/slices/auth/action.ts

@@ -1,9 +1,6 @@
 import { type SSOProvider } from '@lobechat/types';
 import { type StateCreator } from 'zustand/vanilla';
 
-import { enableBetterAuth, enableNextAuth } from '@/envs/auth';
-import { userService } from '@/services/user';
-
 import type { UserStore } from '../../store';
 
 interface AuthProvidersData {
@@ -31,32 +28,26 @@ export interface UserAuthAction {
 }
 
 const fetchAuthProvidersData = async (): Promise<AuthProvidersData> => {
-  if (enableBetterAuth) {
-    const { accountInfo, listAccounts } = await import('@/libs/better-auth/auth-client');
-    const result = await listAccounts();
-    const accounts = result.data || [];
-    const hasPasswordAccount = accounts.some((account) => account.providerId === 'credential');
-    const providers = await Promise.all(
-      accounts
-        .filter((account) => account.providerId !== 'credential')
-        .map(async (account) => {
-          // In theory, the id_token could be decrypted from the accounts table, but I found that better-auth on GitHub does not save the id_token
-          const info = await accountInfo({
-            query: { accountId: account.accountId },
-          });
-          return {
-            email: info.data?.user?.email ?? undefined,
-            provider: account.providerId,
-            providerAccountId: account.accountId,
-          };
-        }),
-    );
-    return { hasPasswordAccount, providers };
-  }
-
-  // Fallback for NextAuth
-  const providers = await userService.getUserSSOProviders();
-  return { hasPasswordAccount: false, providers };
+  const { accountInfo, listAccounts } = await import('@/libs/better-auth/auth-client');
+  const result = await listAccounts();
+  const accounts = result.data || [];
+  const hasPasswordAccount = accounts.some((account) => account.providerId === 'credential');
+  const providers = await Promise.all(
+    accounts
+      .filter((account) => account.providerId !== 'credential')
+      .map(async (account) => {
+        // In theory, the id_token could be decrypted from the accounts table, but I found that better-auth on GitHub does not save the id_token
+        const info = await accountInfo({
+          query: { accountId: account.accountId },
+        });
+        return {
+          email: info.data?.user?.email ?? undefined,
+          provider: account.providerId,
+          providerAccountId: account.accountId,
+        };
+      }),
+  );
+  return { hasPasswordAccount, providers };
 };
 
 export const createAuthSlice: StateCreator<
@@ -78,50 +69,26 @@ export const createAuthSlice: StateCreator<
     }
   },
   logout: async () => {
-    if (enableBetterAuth) {
-      const { signOut } = await import('@/libs/better-auth/auth-client');
-      await signOut({
-        fetchOptions: {
-          onSuccess: () => {
-            // Use window.location.href to trigger a full page reload
-            // This ensures all client-side state (React, Zustand, cache) is cleared
-            window.location.href = '/signin';
-          },
+    const { signOut } = await import('@/libs/better-auth/auth-client');
+    await signOut({
+      fetchOptions: {
+        onSuccess: () => {
+          // Use window.location.href to trigger a full page reload
+          // This ensures all client-side state (React, Zustand, cache) is cleared
+          window.location.href = '/signin';
         },
-      });
-
-      return;
-    }
-
-    if (enableNextAuth) {
-      const { signOut } = await import('next-auth/react');
-      signOut();
-    }
+      },
+    });
   },
   openLogin: async () => {
-    // Skip if already on a Better Auth login page (/signin, /signup)
+    // Skip if already on a login page (/signin, /signup)
     const pathname = location.pathname;
     if (pathname.startsWith('/signin') || pathname.startsWith('/signup')) {
       return;
     }
 
-    if (enableBetterAuth) {
-      const currentUrl = location.toString();
-      window.location.href = `/signin?callbackUrl=${encodeURIComponent(currentUrl)}`;
-
-      return;
-    }
-
-    if (enableNextAuth) {
-      const { signIn } = await import('next-auth/react');
-      // Check if only one provider is available
-      const providers = get()?.oAuthSSOProviders;
-      if (providers && providers.length === 1) {
-        signIn(providers[0]);
-        return;
-      }
-      signIn();
-    }
+    const currentUrl = location.toString();
+    window.location.href = `/signin?callbackUrl=${encodeURIComponent(currentUrl)}`;
   },
   refreshAuthProviders: async () => {
     try {

package/src/store/user/slices/auth/initialState.ts

@@ -1,4 +1,3 @@
-import { type Session, type User } from '@auth/core/types';
 import { type SSOProvider } from '@lobechat/types';
 
 import { type LobeUser } from '@/types/user';
@@ -13,8 +12,6 @@ export interface UserAuthState {
   isLoadedAuthProviders?: boolean;
 
   isSignedIn?: boolean;
-  nextSession?: Session;
-  nextUser?: User;
   oAuthSSOProviders?: string[];
   user?: LobeUser;
 }

package/src/store/user/slices/auth/selectors.ts

@@ -1,7 +1,6 @@
 import { type LobeUser, type SSOProvider } from '@lobechat/types';
 import { t } from 'i18next';
 
-import { enableBetterAuth, enableNextAuth } from '@/envs/auth';
 import type { UserStore } from '@/store/user';
 
 const nickName = (s: UserStore) => {
@@ -37,6 +36,4 @@ export const authSelectors = {
   isLoadedAuthProviders: (s: UserStore) => s.isLoadedAuthProviders ?? false,
   isLogin: (s: UserStore) => s.isSignedIn,
   isLoginWithAuth: (s: UserStore) => s.isSignedIn,
-  isLoginWithBetterAuth: (s: UserStore): boolean => (s.isSignedIn && enableBetterAuth) || false,
-  isLoginWithNextAuth: (s: UserStore): boolean => (s.isSignedIn && !!enableNextAuth) || false,
 };

package/tests/setup.ts

@@ -24,6 +24,16 @@ vi.mock('@lobehub/analytics/react', () => ({
   }),
 }));
 
+// Global mock for @/auth to avoid better-auth validator module issue in tests
+// The validator package has ESM resolution issues in Vitest environment
+vi.mock('@/auth', () => ({
+  auth: {
+    api: {
+      getSession: vi.fn().mockResolvedValue(null),
+    },
+  },
+}));
+
 // node runtime
 if (typeof window === 'undefined') {
   // test with polyfill crypto

package/scripts/_shared/checkDeprecatedClerkEnv.js

@@ -1,42 +0,0 @@
-/**
- * Shared utility to check for deprecated Clerk environment variables.
- * Used by both prebuild.mts (build time) and startServer.js (Docker runtime).
- *
- * IMPORTANT: Keep this file as CommonJS (.js) for compatibility with startServer.js
- */
-
-const CLERK_MIGRATION_DOC_URL =
-  'https://lobehub.com/docs/self-hosting/advanced/auth/clerk-to-betterauth';
-
-const CLERK_ENV_VARS = [
-  'NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY',
-  'CLERK_SECRET_KEY',
-  'CLERK_WEBHOOK_SECRET',
-];
-
-/**
- * Check for deprecated Clerk environment variables and exit if found
- * @param {object} options
- * @param {string} [options.action='redeploy'] - Action hint in error message ('redeploy' or 'restart')
- */
-function checkDeprecatedClerkEnv(options = {}) {
-  const { action = 'redeploy' } = options;
-  const foundClerkEnvVars = CLERK_ENV_VARS.filter((envVar) => process.env[envVar]);
-
-  if (foundClerkEnvVars.length > 0) {
-    console.error('\n' + '═'.repeat(70));
-    console.error('❌ ERROR: Clerk authentication is no longer supported!');
-    console.error('═'.repeat(70));
-    console.error('\nDetected deprecated Clerk environment variables:');
-    for (const envVar of foundClerkEnvVars) {
-      console.error(`  • ${envVar}`);
-    }
-    console.error('\nClerk has been removed from LobeChat. Please migrate to Better Auth.');
-    console.error(`\n📖 Migration guide: ${CLERK_MIGRATION_DOC_URL}`);
-    console.error(`\nAfter migration, remove the Clerk environment variables and ${action}.`);
-    console.error('═'.repeat(70) + '\n');
-    process.exit(1);
-  }
-}
-
-module.exports = { checkDeprecatedClerkEnv };