@lobehub/lobehub 2.0.0-next.344 → 2.0.0-next.346

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

@@ -446,18 +446,20 @@ describe('StreamingExecutor actions', () => {
     });
 
     describe('effectiveAgentId for group orchestration', () => {
-      it('should pass pre-resolved config for sub-agent when subAgentId is set in operation context', async () => {
+      it('should use subAgentId as agentId when groupId is present (group orchestration)', async () => {
         const { result } = renderHook(() => useChatStore());
         const messages = [createMockMessage({ role: 'user' })];
         const supervisorAgentId = 'supervisor-agent-id';
         const subAgentId = 'sub-agent-id';
+        const groupId = 'test-group-id';
 
-        // Create operation with subAgentId in context (simulating group orchestration)
+        // Create operation with groupId and subAgentId (group orchestration scenario)
         const { operationId } = result.current.startOperation({
           type: 'execAgentRuntime',
           context: {
             agentId: supervisorAgentId,
             subAgentId: subAgentId,
+            groupId: groupId, // groupId present = group orchestration
             topicId: TEST_IDS.TOPIC_ID,
             messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
           },
@@ -484,14 +486,12 @@ describe('StreamingExecutor actions', () => {
           });
         });
 
-        // With the new architecture:
-        // - agentId param is for context/tracing (supervisor ID)
-        // - resolvedAgentConfig contains the sub-agent's config (passed in by caller)
+        // In group orchestration (groupId present), subAgentId should be used as agentId
         expect(streamSpy).toHaveBeenCalledWith(
           expect.objectContaining({
             params: expect.objectContaining({
-              agentId: supervisorAgentId, // For context/tracing purposes
-              resolvedAgentConfig: subAgentConfig, // Pre-resolved sub-agent config
+              agentId: subAgentId, // subAgentId used for context injection in group orchestration
+              resolvedAgentConfig: subAgentConfig,
             }),
           }),
         );
@@ -499,6 +499,52 @@ describe('StreamingExecutor actions', () => {
         streamSpy.mockRestore();
       });
 
+      it('should use agentId when subAgentId is present but groupId is not (non-group scenario)', async () => {
+        const { result } = renderHook(() => useChatStore());
+        const messages = [createMockMessage({ role: 'user' })];
+        const agentId = 'normal-agent-id';
+        const subAgentId = 'sub-agent-id';
+
+        // Create operation with subAgentId but NO groupId (not a group orchestration scenario)
+        const { operationId } = result.current.startOperation({
+          type: 'execAgentRuntime',
+          context: {
+            agentId: agentId,
+            subAgentId: subAgentId, // subAgentId present but no groupId
+            topicId: TEST_IDS.TOPIC_ID,
+            messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
+          },
+          label: 'Test Non-Group with SubAgentId',
+        });
+
+        const streamSpy = vi
+          .spyOn(chatService, 'createAssistantMessageStream')
+          .mockImplementation(async ({ onFinish }) => {
+            await onFinish?.(TEST_CONTENT.AI_RESPONSE, {});
+          });
+
+        await act(async () => {
+          await result.current.internal_fetchAIChatMessage({
+            messages,
+            messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
+            model: 'gpt-4o-mini',
+            provider: 'openai',
+            operationId,
+            agentConfig: createMockResolvedAgentConfig(),
+          });
+        });
+
+        // Without groupId, should use agentId even if subAgentId is present
+        expect(streamSpy).toHaveBeenCalledWith(
+          expect.objectContaining({
+            // agentId used since no groupId
+            params: expect.objectContaining({ agentId }),
+          }),
+        );
+
+        streamSpy.mockRestore();
+      });
+
       it('should pass agentId to chatService when no subAgentId is set (normal chat)', async () => {
         const { result } = renderHook(() => useChatStore());
         const messages = [createMockMessage({ role: 'user' })];
@@ -545,7 +591,7 @@ describe('StreamingExecutor actions', () => {
         streamSpy.mockRestore();
       });
 
-      it('should pass resolvedAgentConfig through chatService when subAgentId is present', async () => {
+      it('should pass resolvedAgentConfig through chatService in group orchestration speak scenario', async () => {
         const { result } = renderHook(() => useChatStore());
         const messages = [createMockMessage({ role: 'user' })];
         const supervisorAgentId = 'supervisor-agent-id';
@@ -588,15 +634,13 @@ describe('StreamingExecutor actions', () => {
           });
         });
 
-        // With the new architecture, config is pre-resolved and passed via resolvedAgentConfig.
-        // The agentId param is for context/tracing only.
-        // The speaking agent's config is ensured by the caller (internal_createAgentState)
-        // resolving config with subAgentId and passing it as agentConfig param.
+        // In group orchestration (groupId present), subAgentId is used as agentId for context injection
+        // The speaking agent's config is passed via resolvedAgentConfig
         expect(streamSpy).toHaveBeenCalledWith(
           expect.objectContaining({
             params: expect.objectContaining({
-              // agentId is supervisor for context purposes
-              agentId: supervisorAgentId,
+              // subAgentId used as agentId in group orchestration
+              agentId: subAgentId,
               // resolvedAgentConfig contains the speaking agent's config
               resolvedAgentConfig: speakingAgentConfig,
             }),

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

@@ -344,13 +344,21 @@ export const streamingExecutor: StateCreator<
         log('[internal_fetchAIChatMessage] ERROR: Operation not found: %s', operationId);
         throw new Error(`Operation not found: ${operationId}`);
       }
-      agentId = operation.context.agentId!;
-      subAgentId = operation.context.subAgentId;
       topicId = operation.context.topicId;
       threadId = operation.context.threadId ?? undefined;
       groupId = operation.context.groupId;
       scope = operation.context.scope;
+      subAgentId = operation.context.subAgentId;
       abortController = operation.abortController; // 👈 Use operation's abortController
+
+      // In group orchestration scenarios (has groupId), subAgentId is the actual responding agent
+      // Use it for context injection instead of the session agentId
+      if (groupId && subAgentId) {
+        agentId = subAgentId;
+      } else {
+        agentId = operation.context.agentId!;
+      }
+
       log(
         '[internal_fetchAIChatMessage] get context from operation %s: agentId=%s, subAgentId=%s, topicId=%s, groupId=%s, aborted=%s',
         operationId,

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

@@ -16,26 +16,18 @@ vi.mock('@/libs/swr', async () => {
 });
 
 // Use vi.hoisted to ensure variables exist before vi.mock factory executes
-const { enableClerk, enableNextAuth, enableBetterAuth, enableAuth } = vi.hoisted(() => ({
-  enableClerk: { value: false },
+const { enableNextAuth, enableBetterAuth } = vi.hoisted(() => ({
   enableNextAuth: { value: false },
   enableBetterAuth: { value: false },
-  enableAuth: { value: true },
 }));
 
 vi.mock('@/envs/auth', () => ({
-  get enableClerk() {
-    return enableClerk.value;
-  },
   get enableNextAuth() {
     return enableNextAuth.value;
   },
   get enableBetterAuth() {
     return enableBetterAuth.value;
   },
-  get enableAuth() {
-    return enableAuth.value;
-  },
 }));
 
 const mockUserService = vi.hoisted(() => ({
@@ -59,9 +51,7 @@ afterEach(() => {
   vi.clearAllMocks();
 
   enableNextAuth.value = false;
-  enableClerk.value = false;
   enableBetterAuth.value = false;
-  enableAuth.value = true;
 
   // Reset store state
   useUserStore.setState({
@@ -95,34 +85,6 @@ describe('createAuthSlice', () => {
   });
 
   describe('logout', () => {
-    it('should call clerkSignOut when Clerk is enabled', async () => {
-      enableClerk.value = true;
-
-      const clerkSignOutMock = vi.fn();
-      useUserStore.setState({ clerkSignOut: clerkSignOutMock });
-
-      const { result } = renderHook(() => useUserStore());
-
-      await act(async () => {
-        await result.current.logout();
-      });
-
-      expect(clerkSignOutMock).toHaveBeenCalled();
-    });
-
-    it('should not call clerkSignOut when Clerk is disabled', async () => {
-      const clerkSignOutMock = vi.fn();
-      useUserStore.setState({ clerkSignOut: clerkSignOutMock });
-
-      const { result } = renderHook(() => useUserStore());
-
-      await act(async () => {
-        await result.current.logout();
-      });
-
-      expect(clerkSignOutMock).not.toHaveBeenCalled();
-    });
-
     it('should call next-auth signOut when NextAuth is enabled', async () => {
       enableNextAuth.value = true;
 
@@ -152,32 +114,6 @@ describe('createAuthSlice', () => {
   });
 
   describe('openLogin', () => {
-    it('should call clerkSignIn when Clerk is enabled', async () => {
-      enableClerk.value = true;
-      const clerkSignInMock = vi.fn();
-      useUserStore.setState({ clerkSignIn: clerkSignInMock });
-
-      const { result } = renderHook(() => useUserStore());
-
-      await act(async () => {
-        await result.current.openLogin();
-      });
-
-      expect(clerkSignInMock).toHaveBeenCalled();
-    });
-    it('should not call clerkSignIn when Clerk is disabled', async () => {
-      const clerkSignInMock = vi.fn();
-      useUserStore.setState({ clerkSignIn: clerkSignInMock });
-
-      const { result } = renderHook(() => useUserStore());
-
-      await act(async () => {
-        await result.current.openLogin();
-      });
-
-      expect(clerkSignInMock).not.toHaveBeenCalled();
-    });
-
     it('should call next-auth signIn when NextAuth is enabled', async () => {
       enableNextAuth.value = true;
 
@@ -269,22 +205,6 @@ describe('createAuthSlice', () => {
     });
   });
 
-  describe('enableAuth', () => {
-    it('should return true when auth is enabled', () => {
-      enableAuth.value = true;
-      const { result } = renderHook(() => useUserStore());
-
-      expect(result.current.enableAuth()).toBe(true);
-    });
-
-    it('should return false when auth is disabled', () => {
-      enableAuth.value = false;
-      const { result } = renderHook(() => useUserStore());
-
-      expect(result.current.enableAuth()).toBe(false);
-    });
-  });
-
   describe('fetchAuthProviders', () => {
     it('should skip fetching if already loaded', async () => {
       useUserStore.setState({ isLoadedAuthProviders: true });

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

@@ -1,7 +1,7 @@
 import { type SSOProvider } from '@lobechat/types';
 import { type StateCreator } from 'zustand/vanilla';
 
-import { enableAuth, enableBetterAuth, enableClerk, enableNextAuth } from '@/envs/auth';
+import { enableBetterAuth, enableNextAuth } from '@/envs/auth';
 import { userService } from '@/services/user';
 
 import type { UserStore } from '../../store';
@@ -12,7 +12,6 @@ interface AuthProvidersData {
 }
 
 export interface UserAuthAction {
-  enableAuth: () => boolean;
   /**
    * Fetch auth providers (SSO accounts) for the current user
    */
@@ -66,9 +65,6 @@ export const createAuthSlice: StateCreator<
   [],
   UserAuthAction
 > = (set, get) => ({
-  enableAuth: () => {
-    return enableAuth;
-  },
   fetchAuthProviders: async () => {
     // Skip if already loaded
     if (get().isLoadedAuthProviders) return;
@@ -82,12 +78,6 @@ export const createAuthSlice: StateCreator<
     }
   },
   logout: async () => {
-    if (enableClerk) {
-      get().clerkSignOut?.({ redirectUrl: location.toString() });
-
-      return;
-    }
-
     if (enableBetterAuth) {
       const { signOut } = await import('@/libs/better-auth/auth-client');
       await signOut({
@@ -109,24 +99,9 @@ export const createAuthSlice: StateCreator<
     }
   },
   openLogin: async () => {
-    // Skip if already on a login page
+    // Skip if already on a Better Auth login page (/signin, /signup)
     const pathname = location.pathname;
-    if (
-      pathname.startsWith('/signin') ||
-      pathname.startsWith('/signup') ||
-      pathname.startsWith('/login')
-    ) {
-      return;
-    }
-
-    if (enableClerk) {
-      const redirectUrl = location.toString();
-      get().clerkSignIn?.({
-        fallbackRedirectUrl: redirectUrl,
-        signUpForceRedirectUrl: redirectUrl,
-        signUpUrl: '/signup',
-      });
-
+    if (pathname.startsWith('/signin') || pathname.startsWith('/signup')) {
       return;
     }
 

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

@@ -1,24 +1,10 @@
 import { type Session, type User } from '@auth/core/types';
-import {
-  type SignInProps,
-  type SignOut,
-  type SignedInSessionResource,
-  type UserProfileProps,
-  type UserResource,
-} from '@clerk/types';
 import { type SSOProvider } from '@lobechat/types';
 
-import { enableClerk } from '@/envs/auth';
 import { type LobeUser } from '@/types/user';
 
 export interface UserAuthState {
   authProviders?: SSOProvider[];
-  clerkOpenUserProfile?: (props?: UserProfileProps) => void;
-  clerkSession?: SignedInSessionResource;
-
-  clerkSignIn?: (props?: SignInProps) => void;
-  clerkSignOut?: SignOut;
-  clerkUser?: UserResource;
   /**
    * Whether user registered with email/password (credential login)
    */
@@ -33,7 +19,4 @@ export interface UserAuthState {
   user?: LobeUser;
 }
 
-export const initialAuthState: UserAuthState = {
-  // Clerk doesn't need to fetch auth providers
-  isLoadedAuthProviders: enableClerk ? true : undefined,
-};
+export const initialAuthState: UserAuthState = {};

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

@@ -1,4 +1,3 @@
-import { BRANDING_NAME } from '@lobechat/business-const';
 import { t } from 'i18next';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
@@ -10,62 +9,16 @@ vi.mock('i18next', () => ({
   t: vi.fn((key) => key),
 }));
 
-// 定义一个变量来存储 enableAuth 的值
-let enableAuth = true;
-let isDesktop = false;
-
-// 模拟 @/const/auth 模块
-vi.mock('@/envs/auth', () => ({
-  get enableAuth() {
-    return enableAuth;
-  },
-}));
-
-// 模拟 @/const/version 模块
-vi.mock('@/const/version', () => ({
-  get isDesktop() {
-    return isDesktop;
-  },
-}));
-
 afterEach(() => {
-  enableAuth = true;
-  isDesktop = false;
+  vi.clearAllMocks();
 });
 
 describe('userProfileSelectors', () => {
   describe('displayUserName', () => {
-    it('should return default username when auth is disabled and not desktop', () => {
-      enableAuth = false;
-      isDesktop = false;
-
-      const store: UserStore = {
-        isSignedIn: false,
-        user: null,
-        enableAuth: () => false,
-      } as unknown as UserStore;
-
-      expect(userProfileSelectors.displayUserName(store)).toBe(BRANDING_NAME);
-    });
-
-    it('should return user username when auth is disabled and is desktop', () => {
-      enableAuth = false;
-      isDesktop = true;
-
-      const store: UserStore = {
-        isSignedIn: false,
-        user: { username: 'johndoe' },
-        enableAuth: () => false,
-      } as unknown as UserStore;
-
-      expect(userProfileSelectors.displayUserName(store)).toBe('johndoe');
-    });
-
     it('should return user username when signed in', () => {
       const store: UserStore = {
         isSignedIn: true,
         user: { username: 'johndoe' },
-        enableAuth: () => true,
       } as UserStore;
 
       expect(userProfileSelectors.displayUserName(store)).toBe('johndoe');
@@ -75,7 +28,6 @@ describe('userProfileSelectors', () => {
       const store: UserStore = {
         isSignedIn: true,
         user: { email: 'demo@lobehub.com' },
-        enableAuth: () => true,
       } as UserStore;
 
       expect(userProfileSelectors.displayUserName(store)).toBe('demo@lobehub.com');
@@ -83,7 +35,6 @@ describe('userProfileSelectors', () => {
 
     it('should return "anonymous" when not signed in', () => {
       const store: UserStore = {
-        enableAuth: () => true,
         isSignedIn: false,
         user: null,
       } as unknown as UserStore;
@@ -129,40 +80,10 @@ describe('userProfileSelectors', () => {
   });
 
   describe('nickName', () => {
-    it('should return default nickname when auth is disabled and not desktop', () => {
-      enableAuth = false;
-      isDesktop = false;
-
-      const store: UserStore = {
-        isSignedIn: false,
-        user: null,
-        enableAuth: () => false,
-      } as unknown as UserStore;
-
-      expect(userProfileSelectors.nickName(store)).toBe('userPanel.defaultNickname');
-      expect(t).toHaveBeenCalledWith('userPanel.defaultNickname', { ns: 'common' });
-    });
-
-    it('should return user fullName when auth is disabled and is desktop', () => {
-      enableAuth = false;
-      isDesktop = true;
-
-      const store: UserStore = {
-        isSignedIn: false,
-        user: { fullName: 'John Doe' },
-        enableAuth: () => false,
-      } as unknown as UserStore;
-
-      expect(userProfileSelectors.nickName(store)).toBe('John Doe');
-    });
-
     it('should return user fullName when signed in', () => {
-      enableAuth = true;
-
       const store: UserStore = {
         isSignedIn: true,
         user: { fullName: 'John Doe' },
-        enableAuth: () => true,
       } as UserStore;
 
       expect(userProfileSelectors.nickName(store)).toBe('John Doe');
@@ -172,17 +93,13 @@ describe('userProfileSelectors', () => {
       const store: UserStore = {
         isSignedIn: true,
         user: { username: 'johndoe' },
-        enableAuth: () => true,
       } as UserStore;
 
       expect(userProfileSelectors.nickName(store)).toBe('johndoe');
     });
 
     it('should return anonymous nickname when not signed in', () => {
-      enableAuth = true;
-
       const store: UserStore = {
-        enableAuth: () => true,
         isSignedIn: false,
         user: null,
       } as unknown as UserStore;
@@ -193,37 +110,10 @@ describe('userProfileSelectors', () => {
   });
 
   describe('username', () => {
-    it('should return default username when auth is disabled and not desktop', () => {
-      enableAuth = false;
-      isDesktop = false;
-
-      const store: UserStore = {
-        isSignedIn: false,
-        user: null,
-        enableAuth: () => false,
-      } as unknown as UserStore;
-
-      expect(userProfileSelectors.username(store)).toBe(BRANDING_NAME);
-    });
-
-    it('should return user username when auth is disabled and is desktop', () => {
-      enableAuth = false;
-      isDesktop = true;
-
-      const store: UserStore = {
-        isSignedIn: false,
-        user: { username: 'johndoe' },
-        enableAuth: () => false,
-      } as unknown as UserStore;
-
-      expect(userProfileSelectors.username(store)).toBe('johndoe');
-    });
-
     it('should return user username when signed in', () => {
       const store: UserStore = {
         isSignedIn: true,
         user: { username: 'johndoe' },
-        enableAuth: () => true,
       } as UserStore;
 
       expect(userProfileSelectors.username(store)).toBe('johndoe');
@@ -231,7 +121,6 @@ describe('userProfileSelectors', () => {
 
     it('should return "anonymous" when not signed in', () => {
       const store: UserStore = {
-        enableAuth: () => true,
         isSignedIn: false,
         user: null,
       } as unknown as UserStore;
@@ -243,31 +132,17 @@ describe('userProfileSelectors', () => {
 
 describe('authSelectors', () => {
   describe('isLogin', () => {
-    it('should return false when not signed in (regardless of auth enabled state)', () => {
-      enableAuth = false;
-
-      const store: UserStore = {
-        isSignedIn: false,
-        enableAuth: () => false,
-      } as UserStore;
-
-      // isLogin now only checks isSignedIn, not enableAuth
-      expect(authSelectors.isLogin(store)).toBe(false);
-    });
-
     it('should return true when signed in', () => {
       const store: UserStore = {
         isSignedIn: true,
-        enableAuth: () => true,
       } as UserStore;
 
       expect(authSelectors.isLogin(store)).toBe(true);
     });
 
-    it('should return false when not signed in and auth is enabled', () => {
+    it('should return false when not signed in', () => {
       const store: UserStore = {
         isSignedIn: false,
-        enableAuth: () => true,
       } as UserStore;
 
       expect(authSelectors.isLogin(store)).toBe(false);

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

@@ -1,36 +1,17 @@
-import { BRANDING_NAME } from '@lobechat/business-const';
-import { isDesktop } from '@lobechat/const';
 import { type LobeUser, type SSOProvider } from '@lobechat/types';
 import { t } from 'i18next';
 
-import { enableAuth, enableBetterAuth, enableClerk, enableNextAuth } from '@/envs/auth';
+import { enableBetterAuth, enableNextAuth } from '@/envs/auth';
 import type { UserStore } from '@/store/user';
 
-const DEFAULT_USERNAME = BRANDING_NAME;
-
 const nickName = (s: UserStore) => {
   const defaultNickName = s.user?.fullName || s.user?.username;
-  if (!enableAuth) {
-    if (isDesktop) {
-      return defaultNickName;
-    }
-    return t('userPanel.defaultNickname', { ns: 'common' });
-  }
-
   if (s.isSignedIn) return defaultNickName;
 
   return t('userPanel.anonymousNickName', { ns: 'common' });
 };
 
 const username = (s: UserStore) => {
-  if (!enableAuth) {
-    if (isDesktop) {
-      return s.user?.username;
-    }
-
-    return DEFAULT_USERNAME;
-  }
-
   if (s.isSignedIn) return s.user?.username;
 
   return 'anonymous';
@@ -57,6 +38,5 @@ export const authSelectors = {
   isLogin: (s: UserStore) => s.isSignedIn,
   isLoginWithAuth: (s: UserStore) => s.isSignedIn,
   isLoginWithBetterAuth: (s: UserStore): boolean => (s.isSignedIn && enableBetterAuth) || false,
-  isLoginWithClerk: (s: UserStore): boolean => (s.isSignedIn && enableClerk) || false,
   isLoginWithNextAuth: (s: UserStore): boolean => (s.isSignedIn && !!enableNextAuth) || false,
 };

package/src/utils/errorResponse.ts

@@ -6,10 +6,7 @@ import { ChatErrorType, type ErrorResponse, type ErrorType } from '@lobechat/typ
  * When these errors occur, the response will include X-Auth-Required header
  * to signal the client that re-authentication is needed.
  */
-const AUTH_REQUIRED_ERROR_TYPES = new Set<ErrorType>([
-  ChatErrorType.Unauthorized,
-  ChatErrorType.InvalidClerkUser,
-]);
+const AUTH_REQUIRED_ERROR_TYPES = new Set<ErrorType>([ChatErrorType.Unauthorized]);
 
 const getStatus = (errorType: ILobeAgentRuntimeErrorType | ErrorType) => {
   // InvalidAccessCode / InvalidAzureAPIKey / InvalidOpenAIAPIKey / InvalidZhipuAPIKey ....

package/src/utils/markdownToTxt.ts

@@ -0,0 +1,20 @@
+import removeMarkdown from 'remove-markdown';
+
+/**
+ * Convert markdown into plain text.
+ *
+ * This is a local wrapper to avoid importing third-party markdown-to-txt directly.
+ * It uses `remark` + `strip-markdown` under the hood.
+ */
+export const markdownToTxt = (markdown: string): string => {
+  if (!markdown) return '';
+
+  try {
+    return removeMarkdown(markdown).trimEnd();
+  } catch {
+    // Best-effort: fall back to raw input when parsing fails.
+    return markdown;
+  }
+};
+
+export default markdownToTxt;