@lobehub/lobehub 2.0.0-next.27 → 2.0.0-next.29

package/src/server/routers/lambda/__tests__/integration/message.integration.test.ts

@@ -72,7 +72,7 @@ describe('Message Router Integration Tests', () => {
     it('should create message with correct sessionId and topicId', async () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
-      const messageId = await caller.createMessage({
+      const result = await caller.createNewMessage({
         content: 'Test message',
         role: 'user',
         sessionId: testSessionId,
@@ -83,11 +83,11 @@ describe('Message Router Integration Tests', () => {
       const [createdMessage] = await serverDB
         .select()
         .from(messages)
-        .where(eq(messages.id, messageId));
+        .where(eq(messages.id, result.id));
 
       expect(createdMessage).toBeDefined();
       expect(createdMessage).toMatchObject({
-        id: messageId,
+        id: result.id,
         sessionId: testSessionId,
         topicId: testTopicId,
         userId: userId,
@@ -111,7 +111,7 @@ describe('Message Router Integration Tests', () => {
         })
         .returning();
 
-      const messageId = await caller.createMessage({
+      const result = await caller.createNewMessage({
         content: 'Test message in thread',
         role: 'user',
         sessionId: testSessionId,
@@ -123,12 +123,12 @@ describe('Message Router Integration Tests', () => {
       const [createdMessage] = await serverDB
         .select()
         .from(messages)
-        .where(eq(messages.id, messageId));
+        .where(eq(messages.id, result.id));
 
       expect(createdMessage).toBeDefined();
       expect(createdMessage.threadId).toBe(thread.id);
       expect(createdMessage).toMatchObject({
-        id: messageId,
+        id: result.id,
         sessionId: testSessionId,
         topicId: testTopicId,
         threadId: thread.id,
@@ -140,7 +140,7 @@ describe('Message Router Integration Tests', () => {
     it('should create message without topicId', async () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
-      const messageId = await caller.createMessage({
+      const result = await caller.createNewMessage({
         content: 'Test message without topic',
         role: 'user',
         sessionId: testSessionId,
@@ -150,7 +150,7 @@ describe('Message Router Integration Tests', () => {
       const [createdMessage] = await serverDB
         .select()
         .from(messages)
-        .where(eq(messages.id, messageId));
+        .where(eq(messages.id, result.id));
 
       expect(createdMessage.topicId).toBeNull();
       expect(createdMessage.sessionId).toBe(testSessionId);
@@ -160,7 +160,7 @@ describe('Message Router Integration Tests', () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
       await expect(
-        caller.createMessage({
+        caller.createNewMessage({
           content: 'Test message',
           role: 'user',
           sessionId: 'non-existent-session',
@@ -192,7 +192,7 @@ describe('Message Router Integration Tests', () => {
 
       // 尝试在 testSessionId 下创建消息，但使用 anotherTopic 的 ID
       await expect(
-        caller.createMessage({
+        caller.createNewMessage({
           content: 'Test message',
           role: 'user',
           sessionId: testSessionId,
@@ -207,13 +207,13 @@ describe('Message Router Integration Tests', () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
       // 创建多个消息
-      const msg1Id = await caller.createMessage({
+      const msg1Result = await caller.createNewMessage({
         content: 'Message 1',
         role: 'user',
         sessionId: testSessionId,
       });
 
-      const msg2Id = await caller.createMessage({
+      const msg2Result = await caller.createNewMessage({
         content: 'Message 2',
         role: 'assistant',
         sessionId: testSessionId,
@@ -228,7 +228,7 @@ describe('Message Router Integration Tests', () => {
         })
         .returning();
 
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Message in another session',
         role: 'user',
         sessionId: anotherSession.id,
@@ -240,15 +240,15 @@ describe('Message Router Integration Tests', () => {
       });
 
       expect(result).toHaveLength(2);
-      expect(result.map((m) => m.id)).toContain(msg1Id);
-      expect(result.map((m) => m.id)).toContain(msg2Id);
+      expect(result.map((m) => m.id)).toContain(msg1Result.id);
+      expect(result.map((m) => m.id)).toContain(msg2Result.id);
     });
 
     it('should return messages filtered by topicId', async () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
       // 在 topic 中创建消息
-      const msgInTopicId = await caller.createMessage({
+      const msgInTopicResult = await caller.createNewMessage({
         content: 'Message in topic',
         role: 'user',
         sessionId: testSessionId,
@@ -256,7 +256,7 @@ describe('Message Router Integration Tests', () => {
       });
 
       // 在 session 中创建消息（不在 topic 中）
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Message without topic',
         role: 'user',
         sessionId: testSessionId,
@@ -269,7 +269,7 @@ describe('Message Router Integration Tests', () => {
       });
 
       expect(result).toHaveLength(1);
-      expect(result[0].id).toBe(msgInTopicId);
+      expect(result[0].id).toBe(msgInTopicResult.id);
       expect(result[0].topicId).toBe(testTopicId);
     });
 
@@ -278,7 +278,7 @@ describe('Message Router Integration Tests', () => {
 
       // 创建多个消息
       for (let i = 0; i < 5; i++) {
-        await caller.createMessage({
+        await caller.createNewMessage({
           content: `Pagination test message ${i}`,
           role: 'user',
           sessionId: testSessionId,
@@ -323,20 +323,20 @@ describe('Message Router Integration Tests', () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
       // 创建消息
-      const msg1Id = await caller.createMessage({
+      const msg1Result = await caller.createNewMessage({
         content: 'Message 1',
         role: 'user',
         sessionId: testSessionId,
       });
 
-      const msg2Id = await caller.createMessage({
+      const msg2Result = await caller.createNewMessage({
         content: 'Message 2',
         role: 'user',
         sessionId: testSessionId,
       });
 
       // 删除消息
-      await caller.removeMessages({ ids: [msg1Id, msg2Id] });
+      await caller.removeMessages({ ids: [msg1Result.id, msg2Result.id] });
 
       // 验证消息已删除
       const remainingMessages = await serverDB
@@ -353,13 +353,13 @@ describe('Message Router Integration Tests', () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
       // 创建多个消息
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Message 1',
         role: 'user',
         sessionId: testSessionId,
       });
 
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Message 2',
         role: 'assistant',
         sessionId: testSessionId,
@@ -383,7 +383,7 @@ describe('Message Router Integration Tests', () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
       // 在 topic 中创建消息
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Message in topic',
         role: 'user',
         sessionId: testSessionId,
@@ -391,7 +391,7 @@ describe('Message Router Integration Tests', () => {
       });
 
       // 在 session 中创建消息（不在 topic 中）
-      const msgOutsideTopicId = await caller.createMessage({
+      const msgOutsideTopicResult = await caller.createNewMessage({
         content: 'Message outside topic',
         role: 'user',
         sessionId: testSessionId,
@@ -410,7 +410,7 @@ describe('Message Router Integration Tests', () => {
         .where(eq(messages.sessionId, testSessionId));
 
       expect(remainingMessages).toHaveLength(1);
-      expect(remainingMessages[0].id).toBe(msgOutsideTopicId);
+      expect(remainingMessages[0].id).toBe(msgOutsideTopicResult.id);
     });
   });
 
@@ -418,14 +418,14 @@ describe('Message Router Integration Tests', () => {
     it('should update message content', async () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
-      const messageId = await caller.createMessage({
+      const result = await caller.createNewMessage({
         content: 'Original content',
         role: 'user',
         sessionId: testSessionId,
       });
 
       await caller.update({
-        id: messageId,
+        id: result.id,
         value: {
           content: 'Updated content',
         },
@@ -434,7 +434,7 @@ describe('Message Router Integration Tests', () => {
       const [updatedMessage] = await serverDB
         .select()
         .from(messages)
-        .where(eq(messages.id, messageId));
+        .where(eq(messages.id, result.id));
 
       expect(updatedMessage.content).toBe('Updated content');
     });
@@ -444,13 +444,13 @@ describe('Message Router Integration Tests', () => {
     it('should search messages by keyword', async () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'This is a test message about TypeScript',
         role: 'user',
         sessionId: testSessionId,
       });
 
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Another message about JavaScript',
         role: 'user',
         sessionId: testSessionId,
@@ -470,13 +470,13 @@ describe('Message Router Integration Tests', () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
       // 创建消息
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Message 1',
         role: 'user',
         sessionId: testSessionId,
       });
 
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Message 2',
         role: 'assistant',
         sessionId: testSessionId,
@@ -490,7 +490,7 @@ describe('Message Router Integration Tests', () => {
     it('should count words', async () => {
       const caller = messageRouter.createCaller(createTestContext(userId));
 
-      await caller.createMessage({
+      await caller.createNewMessage({
         content: 'Hello world',
         role: 'user',
         sessionId: testSessionId,

package/src/server/routers/lambda/market/index.ts

@@ -3,10 +3,10 @@ import { serialize } from 'cookie';
 import debug from 'debug';
 import { z } from 'zod';
 
-import { isDesktop } from '@/const/version';
+import { isDesktop } from '@lobechat/const';
 import { publicProcedure, router } from '@/libs/trpc/lambda';
 import { DiscoverService } from '@/server/services/discover';
-import { AssistantSorts, McpSorts, ModelSorts, PluginSorts, ProviderSorts } from '@/types/discover';
+import { AssistantSorts, McpConnectionType, McpSorts, ModelSorts, PluginSorts, ProviderSorts } from '@/types/discover';
 
 const log = debug('lambda-router:market');
 
@@ -83,6 +83,7 @@ export const marketRouter = router({
       z
         .object({
           category: z.string().optional(),
+          connectionType: z.nativeEnum(McpConnectionType).optional(),
           locale: z.string().optional(),
           order: z.enum(['asc', 'desc']).optional(),
           page: z.number().optional(),
@@ -178,6 +179,7 @@ export const marketRouter = router({
       z
         .object({
           category: z.string().optional(),
+          connectionType: z.nativeEnum(McpConnectionType).optional(),
           locale: z.string().optional(),
           order: z.enum(['asc', 'desc']).optional(),
           page: z.number().optional(),

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

@@ -1,5 +1,4 @@
 import {
-  CreateMessageParamsSchema,
   CreateNewMessageParamsSchema,
   UpdateMessageParamsSchema,
   UpdateMessageRAGParamsSchema,
@@ -53,14 +52,6 @@ export const messageRouter = router({
       return ctx.messageModel.countWords(input);
     }),
 
-  createMessage: messageProcedure
-    .input(CreateMessageParamsSchema)
-    .mutation(async ({ input, ctx }) => {
-      const data = await ctx.messageModel.create(input as any);
-
-      return data.id;
-    }),
-
   createNewMessage: messageProcedure
     .input(CreateNewMessageParamsSchema)
     .mutation(async ({ input, ctx }) => {
@@ -109,9 +100,32 @@ export const messageRouter = router({
   }),
 
   removeMessage: messageProcedure
-    .input(z.object({ id: z.string() }))
+    .input(
+      z.object({
+        id: z.string(),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
+      }),
+    )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.deleteMessage(input.id);
+      await ctx.messageModel.deleteMessage(input.id);
+
+      // If sessionId or topicId is provided, return the full message list
+      if (input.sessionId !== undefined || input.topicId !== undefined) {
+        const messageList = await ctx.messageModel.query(
+          {
+            sessionId: input.sessionId,
+            topicId: input.topicId,
+          },
+          {
+            groupAssistantMessages: input.useGroup ?? false,
+            postProcessUrl: (path) => ctx.fileService.getFullFileUrl(path),
+          },
+        );
+        return { messages: messageList, success: true };
+      }
+      return { success: true };
     }),
 
   removeMessageQuery: messageProcedure
@@ -121,9 +135,32 @@ export const messageRouter = router({
     }),
 
   removeMessages: messageProcedure
-    .input(z.object({ ids: z.array(z.string()) }))
+    .input(
+      z.object({
+        ids: z.array(z.string()),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
+      }),
+    )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.deleteMessages(input.ids);
+      await ctx.messageModel.deleteMessages(input.ids);
+
+      // If sessionId or topicId is provided, return the full message list
+      if (input.sessionId !== undefined || input.topicId !== undefined) {
+        const messageList = await ctx.messageModel.query(
+          {
+            sessionId: input.sessionId,
+            topicId: input.topicId,
+          },
+          {
+            groupAssistantMessages: input.useGroup ?? false,
+            postProcessUrl: (path) => ctx.fileService.getFullFileUrl(path),
+          },
+        );
+        return { messages: messageList, success: true };
+      }
+      return { success: true };
     }),
 
   removeMessagesByAssistant: messageProcedure
@@ -165,11 +202,13 @@ export const messageRouter = router({
         id: z.string(),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
         value: UpdateMessageParamsSchema,
       }),
     )
     .mutation(async ({ input, ctx }) => {
       return ctx.messageModel.update(input.id, input.value as any, {
+        groupAssistantMessages: input.useGroup ?? false,
         postProcessUrl: (path) => ctx.fileService.getFullFileUrl(path),
         sessionId: input.sessionId,
         topicId: input.topicId,
@@ -188,9 +227,31 @@ export const messageRouter = router({
     }),
 
   updateMessageRAG: messageProcedure
-    .input(UpdateMessageRAGParamsSchema)
+    .input(
+      UpdateMessageRAGParamsSchema.extend({
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
+      }),
+    )
     .mutation(async ({ input, ctx }) => {
       await ctx.messageModel.updateMessageRAG(input.id, input.value);
+
+      // If sessionId or topicId is provided, return the full message list
+      if (input.sessionId !== undefined || input.topicId !== undefined) {
+        const messageList = await ctx.messageModel.query(
+          {
+            sessionId: input.sessionId,
+            topicId: input.topicId,
+          },
+          {
+            groupAssistantMessages: input.useGroup ?? false,
+            postProcessUrl: (path) => ctx.fileService.getFullFileUrl(path),
+          },
+        );
+        return { messages: messageList, success: true };
+      }
+      return { success: true };
     }),
 
   updateMetadata: messageProcedure
@@ -208,22 +269,49 @@ export const messageRouter = router({
     .input(
       z.object({
         id: z.string(),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
         value: z.object({}).passthrough().nullable(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.updateMessagePlugin(input.id, { error: input.value });
+      // If sessionId or topicId is provided, we need to return the full message list
+      if (input.sessionId !== undefined || input.topicId !== undefined) {
+        await ctx.messageModel.updateMessagePlugin(input.id, { error: input.value });
+        const messageList = await ctx.messageModel.query(
+          {
+            sessionId: input.sessionId,
+            topicId: input.topicId,
+          },
+          {
+            groupAssistantMessages: input.useGroup ?? false,
+            postProcessUrl: (path) => ctx.fileService.getFullFileUrl(path),
+          },
+        );
+        return { messages: messageList, success: true };
+      }
+      await ctx.messageModel.updateMessagePlugin(input.id, { error: input.value });
+      return { success: true };
     }),
 
   updatePluginState: messageProcedure
     .input(
       z.object({
         id: z.string(),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
         value: z.object({}).passthrough(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.updatePluginState(input.id, input.value);
+      return ctx.messageModel.updatePluginState(input.id, input.value, {
+        groupAssistantMessages: input.useGroup ?? false,
+        postProcessUrl: (path) => ctx.fileService.getFullFileUrl(path),
+        sessionId: input.sessionId,
+        topicId: input.topicId,
+      });
     }),
 
   updateTTS: messageProcedure

package/src/services/mcp.ts

@@ -41,10 +41,44 @@ class MCPService {
 
     if (!plugin) return;
 
+    const connection = plugin.customParams?.mcp;
+    const settingsEntries = plugin.settings
+      ? Object.entries(plugin.settings as Record<string, any>).filter(
+        ([, value]) => value !== undefined && value !== null,
+      )
+      : [];
+    const pluginSettings =
+      settingsEntries.length > 0
+        ? settingsEntries.reduce<Record<string, unknown>>((acc, [key, value]) => {
+          acc[key] = value;
+
+          return acc;
+        }, {})
+        : undefined;
+
+    const params = {
+      ...connection,
+      name: identifier,
+    } as any;
+
+    if (connection?.type === 'http') {
+      params.headers = {
+        ...connection.headers,
+        ...pluginSettings,
+      };
+    }
+
+    if (connection?.type === 'stdio') {
+      params.env = {
+        ...connection?.env,
+        ...pluginSettings,
+      };
+    }
+
     const data = {
       args,
-      env: plugin.settings || plugin.customParams?.mcp?.env,
-      params: { ...plugin.customParams?.mcp, name: identifier } as any,
+      env: connection?.type === 'stdio' ? params.env : pluginSettings ?? connection?.env,
+      params,
       toolName: apiName,
     };
 
@@ -93,10 +127,10 @@ class MCPService {
         callDurationMs,
         customPluginInfo: isCustomPlugin
           ? {
-              avatar: plugin.manifest?.meta.avatar,
-              description: plugin.manifest?.meta.description,
-              name: plugin.manifest?.meta.title,
-            }
+            avatar: plugin.manifest?.meta.avatar,
+            description: plugin.manifest?.meta.description,
+            name: plugin.manifest?.meta.title,
+          }
           : undefined,
         errorCode,
         errorMessage,