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

package/packages/context-engine/src/providers/__tests__/GroupContextInjector.test.ts

@@ -12,7 +12,7 @@ describe('GroupContextInjector', () => {
   });
 
   describe('Basic Scenarios', () => {
-    it('should inject group context into system message', async () => {
+    it('should inject group context before first user message', async () => {
       const injector = new GroupContextInjector({
         currentAgentId: 'agt_editor',
         currentAgentName: 'Editor',
@@ -35,31 +35,39 @@ describe('GroupContextInjector', () => {
       const context = createContext(input);
       const result = await injector.process(context);
 
-      const systemContent = result.messages[0].content;
+      // System message should be unchanged
+      expect(result.messages[0].content).toBe('You are a helpful editor.');
+
+      // Should have 3 messages now (system, injected, user)
+      expect(result.messages).toHaveLength(3);
 
-      // Original content should be preserved
-      expect(systemContent).toContain('You are a helpful editor.');
+      // Check injected message (second message)
+      const injectedContent = result.messages[1].content;
+      expect(result.messages[1].role).toBe('user');
 
       // Agent identity (plain text, no wrapper)
-      expect(systemContent).toContain('You are "Editor"');
-      expect(systemContent).toContain('acting as a participant');
-      expect(systemContent).toContain('"Writing Team"');
-      expect(systemContent).toContain('agt_editor');
-      expect(systemContent).not.toContain('<agent_identity>');
+      expect(injectedContent).toContain('You are "Editor"');
+      expect(injectedContent).toContain('acting as a participant');
+      expect(injectedContent).toContain('"Writing Team"');
+      expect(injectedContent).toContain('agt_editor');
+      expect(injectedContent).not.toContain('<agent_identity>');
 
       // Group context section with system prompt
-      expect(systemContent).toContain('<group_context>');
-      expect(systemContent).toContain('A team for collaborative writing');
+      expect(injectedContent).toContain('<group_context>');
+      expect(injectedContent).toContain('A team for collaborative writing');
 
       // Participants section with XML format
-      expect(systemContent).toContain('<group_participants>');
-      expect(systemContent).toContain('<member name="Supervisor" id="agt_supervisor" />');
-      expect(systemContent).toContain('<member name="Writer" id="agt_writer" />');
-      expect(systemContent).toContain('<member name="Editor" id="agt_editor" you="true" />');
+      expect(injectedContent).toContain('<group_participants>');
+      expect(injectedContent).toContain('<member name="Supervisor" id="agt_supervisor" />');
+      expect(injectedContent).toContain('<member name="Writer" id="agt_writer" />');
+      expect(injectedContent).toContain('<member name="Editor" id="agt_editor" you="true" />');
 
       // Identity rules
-      expect(systemContent).toContain('<identity_rules>');
-      expect(systemContent).toContain('NEVER expose or display agent IDs');
+      expect(injectedContent).toContain('<identity_rules>');
+      expect(injectedContent).toContain('NEVER expose or display agent IDs');
+
+      // Original user message should be third
+      expect(result.messages[2].content).toBe('Please review this.');
 
       // Metadata should be updated
       expect(result.metadata.groupContextInjected).toBe(true);
@@ -72,35 +80,37 @@ describe('GroupContextInjector', () => {
         enabled: false, // Disabled
       });
 
-      const input: any[] = [{ role: 'system', content: 'You are a helpful editor.' }];
+      const input: any[] = [
+        { role: 'system', content: 'You are a helpful editor.' },
+        { role: 'user', content: 'Hello' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      // Should be unchanged
+      // Should be unchanged - no injection
+      expect(result.messages).toHaveLength(2);
       expect(result.messages[0].content).toBe('You are a helpful editor.');
+      expect(result.messages[1].content).toBe('Hello');
       expect(result.metadata.groupContextInjected).toBeUndefined();
     });
 
-    it('should skip injection when no system message exists', async () => {
+    it('should skip injection when no user message exists', async () => {
       const injector = new GroupContextInjector({
         currentAgentId: 'agt_editor',
         currentAgentName: 'Editor',
         enabled: true,
       });
 
-      const input: any[] = [
-        { role: 'user', content: 'Hello' },
-        { role: 'assistant', content: 'Hi there!' },
-      ];
+      const input: any[] = [{ role: 'system', content: 'You are a helpful editor.' }];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      // Messages should be unchanged
-      expect(result.messages[0].content).toBe('Hello');
-      expect(result.messages[1].content).toBe('Hi there!');
-      expect(result.metadata.groupContextInjected).toBeUndefined();
+      // Messages should be unchanged - no user message to inject before
+      expect(result.messages).toHaveLength(1);
+      expect(result.messages[0].content).toBe('You are a helpful editor.');
+      expect(result.metadata.groupContextInjected).toBe(true);
     });
   });
 
@@ -113,12 +123,16 @@ describe('GroupContextInjector', () => {
         enabled: true,
       });
 
-      const input: any[] = [{ content: 'You are an editor.', role: 'system' }];
+      const input: any[] = [
+        { content: 'You are an editor.', role: 'system' },
+        { content: 'Hello', role: 'user' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      expect(result.messages[0].content).toMatchSnapshot();
+      // Check injected message content
+      expect(result.messages[1].content).toMatchSnapshot();
     });
 
     it('should handle config with only group info', async () => {
@@ -129,12 +143,16 @@ describe('GroupContextInjector', () => {
         systemPrompt: 'Test group description',
       });
 
-      const input: any[] = [{ content: 'System prompt.', role: 'system' }];
+      const input: any[] = [
+        { content: 'System prompt.', role: 'system' },
+        { content: 'Hello', role: 'user' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      expect(result.messages[0].content).toMatchSnapshot();
+      // Check injected message content
+      expect(result.messages[1].content).toMatchSnapshot();
     });
 
     it('should handle empty config', async () => {
@@ -142,12 +160,16 @@ describe('GroupContextInjector', () => {
         enabled: true,
       });
 
-      const input: any[] = [{ content: 'Base prompt.', role: 'system' }];
+      const input: any[] = [
+        { content: 'Base prompt.', role: 'system' },
+        { content: 'Hello', role: 'user' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      expect(result.messages[0].content).toMatchSnapshot();
+      // Check injected message content
+      expect(result.messages[1].content).toMatchSnapshot();
     });
   });
 
@@ -158,15 +180,19 @@ describe('GroupContextInjector', () => {
         // Minimal config
       });
 
-      const input: any[] = [{ role: 'system', content: 'Base prompt.' }];
+      const input: any[] = [
+        { role: 'system', content: 'Base prompt.' },
+        { role: 'user', content: 'Hello' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      const systemContent = result.messages[0].content;
+      // Check injected message content
+      const injectedContent = result.messages[1].content;
 
       // Even with minimal config, identity rules should be present
-      expect(systemContent).toMatchSnapshot();
+      expect(injectedContent).toMatchSnapshot();
     });
   });
 
@@ -179,12 +205,16 @@ describe('GroupContextInjector', () => {
         systemPrompt: 'Empty group description',
       });
 
-      const input: any[] = [{ content: 'Prompt.', role: 'system' }];
+      const input: any[] = [
+        { content: 'Prompt.', role: 'system' },
+        { content: 'Hello', role: 'user' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      expect(result.messages[0].content).toMatchSnapshot();
+      // Check injected message content
+      expect(result.messages[1].content).toMatchSnapshot();
     });
 
     it('should preserve other messages unchanged', async () => {
@@ -204,10 +234,16 @@ describe('GroupContextInjector', () => {
       const context = createContext(input);
       const result = await injector.process(context);
 
-      // Only system message should be modified
-      expect(result.messages[0].content).toContain('<group_context>');
-      expect(result.messages[1].content).toBe('User message.');
-      expect(result.messages[2].content).toBe('Assistant response.');
+      // System message should be unchanged
+      expect(result.messages[0].content).toBe('System prompt.');
+
+      // Injected message should be second
+      expect(result.messages[1].role).toBe('user');
+      expect(result.messages[1].content).toContain('<group_context>');
+
+      // Original messages should be preserved
+      expect(result.messages[2].content).toBe('User message.');
+      expect(result.messages[3].content).toBe('Assistant response.');
     });
   });
 });

package/packages/context-engine/src/providers/__tests__/__snapshots__/GroupContextInjector.test.ts.snap

@@ -1,9 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`GroupContextInjector > Edge Cases > should handle empty members array 1`] = `
-"Prompt.
-
-<group_context>
+"<group_context>
 You are "", acting as a  in the multi-agent group "Empty Group".
 Your internal agent ID is  (for system use only, never expose to users).
 
@@ -24,9 +22,7 @@ Empty group description
 `;
 
 exports[`GroupContextInjector > Identity Rules Section > should always include identity rules 1`] = `
-"Base prompt.
-
-<group_context>
+"<group_context>
 You are "", acting as a  in the multi-agent group "".
 Your internal agent ID is  (for system use only, never expose to users).
 
@@ -47,9 +43,7 @@ Your internal agent ID is  (for system use only, never expose to users).
 `;
 
 exports[`GroupContextInjector > Variable Replacement > should handle config with only group info 1`] = `
-"System prompt.
-
-<group_context>
+"<group_context>
 You are "", acting as a  in the multi-agent group "Test Group".
 Your internal agent ID is  (for system use only, never expose to users).
 
@@ -70,9 +64,7 @@ Test group description
 `;
 
 exports[`GroupContextInjector > Variable Replacement > should handle config with only identity info 1`] = `
-"You are an editor.
-
-<group_context>
+"<group_context>
 You are "Editor", acting as a participant in the multi-agent group "".
 Your internal agent ID is agt_editor (for system use only, never expose to users).
 
@@ -93,9 +85,7 @@ Your internal agent ID is agt_editor (for system use only, never expose to users
 `;
 
 exports[`GroupContextInjector > Variable Replacement > should handle empty config 1`] = `
-"Base prompt.
-
-<group_context>
+"<group_context>
 You are "", acting as a  in the multi-agent group "".
 Your internal agent ID is  (for system use only, never expose to users).
 

package/packages/database/src/repositories/userMemory/__tests__/UserMemoryTopicRepository.test.ts

@@ -50,9 +50,30 @@ describe('UserMemoryTopicRepository', () => {
 
     it('should return concatenated user message content', async () => {
       await serverDB.insert(messages).values([
-        { id: 'msg-1', content: 'Hello', role: 'user', topicId, userId },
-        { id: 'msg-2', content: 'Hi there!', role: 'assistant', topicId, userId },
-        { id: 'msg-3', content: 'How are you?', role: 'user', topicId, userId },
+        {
+          id: 'msg-1',
+          content: 'Hello',
+          role: 'user',
+          topicId,
+          userId,
+          createdAt: new Date('2024-01-01'),
+        },
+        {
+          id: 'msg-2',
+          content: 'Hi there!',
+          role: 'assistant',
+          topicId,
+          userId,
+          createdAt: new Date('2024-01-02'),
+        },
+        {
+          id: 'msg-3',
+          content: 'How are you?',
+          role: 'user',
+          topicId,
+          userId,
+          createdAt: new Date('2024-01-03'),
+        },
       ]);
 
       const result = await repo.getUserMessagesQueryForTopic(topicId);

package/packages/model-bank/src/modelProviders/comfyui.ts

@@ -12,7 +12,6 @@ const ComfyUI: ModelProviderCard = {
   chatModels: [],
   description:
     'A powerful open-source workflow engine for image, video, and audio generation, supporting models like SD, FLUX, Qwen, Hunyuan, and WAN with node-based editing and private deployment.',
-  enabled: true,
   id: 'comfyui',
   name: 'ComfyUI',
   settings: {

package/packages/model-bank/src/modelProviders/fal.ts

@@ -6,7 +6,6 @@ import { type ModelProviderCard } from '@/types/llm';
 const Fal: ModelProviderCard = {
   chatModels: [],
   description: 'A generative media platform built for developers.',
-  enabled: true,
   id: 'fal',
   name: 'Fal',
   settings: {

package/packages/types/src/fetch.ts

@@ -5,8 +5,7 @@ export const ChatErrorType = {
   // ******* Business Error Semantics ******* //
 
   InvalidAccessCode: 'InvalidAccessCode', // is in valid password
-  InvalidClerkUser: 'InvalidClerkUser', // is not Clerk User
-  FreePlanLimit: 'FreePlanLimit', // is not Clerk User
+  FreePlanLimit: 'FreePlanLimit', // Free plan usage limit
   SubscriptionPlanLimit: 'SubscriptionPlanLimit', // Subscription user limit exceeded
   SubscriptionKeyMismatch: 'SubscriptionKeyMismatch', // Subscription key mismatch
 

package/packages/utils/src/server/__tests__/auth.test.ts

@@ -4,34 +4,17 @@ import { extractBearerToken, getUserAuth } from '../auth';
 
 // Mock auth constants
 let mockEnableBetterAuth = false;
-let mockEnableClerk = false;
 let mockEnableNextAuth = false;
 
 vi.mock('@/envs/auth', () => ({
   get enableBetterAuth() {
     return mockEnableBetterAuth;
   },
-  get enableClerk() {
-    return mockEnableClerk;
-  },
   get enableNextAuth() {
     return mockEnableNextAuth;
   },
 }));
 
-vi.mock('@/libs/clerk-auth', () => ({
-  ClerkAuth: class {
-    async getAuth() {
-      return {
-        clerkAuth: {
-          redirectToSignIn: vi.fn(),
-        },
-        userId: 'clerk-user-id',
-      };
-    }
-  },
-}));
-
 vi.mock('@/libs/next-auth', () => ({
   default: {
     auth: vi.fn().mockResolvedValue({
@@ -62,7 +45,6 @@ describe('getUserAuth', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockEnableBetterAuth = false;
-    mockEnableClerk = false;
     mockEnableNextAuth = false;
   });
 
@@ -70,22 +52,7 @@ describe('getUserAuth', () => {
     await expect(getUserAuth()).rejects.toThrow('Auth method is not enabled');
   });
 
-  it('should return clerk auth when clerk is enabled', async () => {
-    mockEnableClerk = true;
-    mockEnableNextAuth = false;
-
-    const auth = await getUserAuth();
-
-    expect(auth).toEqual({
-      clerkAuth: {
-        redirectToSignIn: expect.any(Function),
-      },
-      userId: 'clerk-user-id',
-    });
-  });
-
   it('should return next auth when next auth is enabled', async () => {
-    mockEnableClerk = false;
     mockEnableNextAuth = true;
 
     const auth = await getUserAuth();
@@ -100,20 +67,6 @@ describe('getUserAuth', () => {
     });
   });
 
-  it('should prioritize clerk auth over next auth when both are enabled', async () => {
-    mockEnableClerk = true;
-    mockEnableNextAuth = true;
-
-    const auth = await getUserAuth();
-
-    expect(auth).toEqual({
-      clerkAuth: {
-        redirectToSignIn: expect.any(Function),
-      },
-      userId: 'clerk-user-id',
-    });
-  });
-
   it('should return better auth when better auth is enabled', async () => {
     mockEnableBetterAuth = true;
 

package/packages/utils/src/server/auth.ts

@@ -1,16 +1,8 @@
 import { headers } from 'next/headers';
 
-import { enableBetterAuth, enableClerk, enableNextAuth } from '@/envs/auth';
+import { enableBetterAuth, enableNextAuth } from '@/envs/auth';
 
 export const getUserAuth = async () => {
-  if (enableClerk) {
-    const { ClerkAuth } = await import('@/libs/clerk-auth');
-
-    const clerkAuth = new ClerkAuth();
-
-    return await clerkAuth.getAuth();
-  }
-
   if (enableBetterAuth) {
     const { auth: betterAuth } = await import('@/auth');
 

package/scripts/_shared/checkDeprecatedClerkEnv.js

@@ -0,0 +1,42 @@
+/**
+ * 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 };

package/scripts/changelogWorkflow/buildStaticChangelog.ts

@@ -1,10 +1,11 @@
 import { consola } from 'consola';
 import { readJsonSync, writeJSONSync } from 'fs-extra';
-import { markdownToTxt } from 'markdown-to-txt';
 import { existsSync, readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import semver from 'semver';
 
+import { markdownToTxt } from '@/utils/markdownToTxt';
+
 import { CHANGELOG_DIR, CHANGELOG_FILE } from './const';
 
 export interface ChangelogStaticItem {

package/scripts/clerk-to-betterauth/_internal/types.ts

@@ -1,5 +1,3 @@
-import type { ExternalAccountJSON, UserJSON } from '@clerk/backend';
-
 export type ClerkToBetterAuthMode = 'test' | 'prod';
 export type DatabaseDriver = 'neon' | 'node';
 
@@ -19,27 +17,62 @@ export type CSVUserRow = {
   verified_phone_numbers: string;
 };
 
-export type ClerkExternalAccount = Pick<
-  ExternalAccountJSON,
-  'id' | 'provider' | 'provider_user_id' | 'approved_scopes'
-> & {
+// Clerk API response types (no SDK dependency)
+export interface ClerkApiExternalAccount {
+  approved_scopes: string;
+  created_at?: number;
+  id: string;
+  provider: string;
+  provider_user_id: string;
+  updated_at?: number;
+  verification?: { status: string };
+}
+
+export interface ClerkApiEmailAddress {
+  email_address: string;
+  id: string;
+}
+
+export interface ClerkApiUser {
+  banned: boolean;
+  created_at: number;
+  email_addresses?: ClerkApiEmailAddress[];
+  external_accounts?: ClerkApiExternalAccount[];
+  id: string;
+  image_url: string;
+  lockout_expires_in_seconds: number | null;
+  password_enabled: boolean;
+  password_last_updated_at: number | null;
+  primary_email_address_id: string | null;
+  two_factor_enabled: boolean;
+  updated_at: number;
+}
+
+export interface ClerkApiUserListResponse {
+  data: ClerkApiUser[];
+  total_count: number;
+}
+
+export interface ClerkExternalAccount {
+  approved_scopes: string;
   created_at?: number;
+  id: string;
+  provider: string;
+  provider_user_id: string;
   updated_at?: number;
   verificationStatus?: boolean;
-};
+}
 
-export type ClerkUser = Pick<
-  UserJSON,
-  | 'id'
-  | 'image_url'
-  | 'created_at'
-  | 'updated_at'
-  | 'password_last_updated_at'
-  | 'password_enabled'
-  | 'banned'
-  | 'two_factor_enabled'
-  | 'lockout_expires_in_seconds'
-> & {
+export interface ClerkUser {
+  banned: boolean;
+  created_at: number;
   external_accounts: ClerkExternalAccount[];
+  id: string;
+  image_url: string;
+  lockout_expires_in_seconds: number | null;
+  password_enabled: boolean;
+  password_last_updated_at: number | null;
   primaryEmail?: string;
-};
+  two_factor_enabled: boolean;
+  updated_at: number;
+}