@lobehub/lobehub 2.0.0-next.35 → 2.0.0-next.36

package/src/features/Portal/Thread/Chat/ChatInput/useSend.ts

@@ -17,7 +17,7 @@ export const useSendThreadMessage = () => {
   const canNotSend = useChatStore(threadSelectors.isSendButtonDisabledByMessage);
   const generating = useChatStore((s) => threadSelectors.isThreadAIGenerating(s));
   const stop = useChatStore((s) => s.stopGenerateMessage);
-  const [sendMessage, updateInputMessage] = useChatStore((s) => [
+  const [sendMessage, updateMessageInput] = useChatStore((s) => [
     s.sendThreadMessage,
     s.updateThreadInputMessage,
   ]);
@@ -54,11 +54,11 @@ export const useSendThreadMessage = () => {
 
     if (!shouldContinue) return;
 
-    updateInputMessage(inputMessage);
+    updateMessageInput(inputMessage);
 
     sendMessage({ message: inputMessage, ...params });
 
-    updateInputMessage('');
+    updateMessageInput('');
     threadInputEditor.clearContent();
     threadInputEditor.focus();
   };

package/src/hooks/useHotkeys/chatScope.ts

@@ -7,7 +7,7 @@ import { useClearCurrentMessages } from '@/features/ChatInput/ActionBar/Clear';
 import { useOpenChatSettings } from '@/hooks/useInterceptingRoutes';
 import { useActionSWR } from '@/libs/swr';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { displayMessageSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { HotkeyEnum, HotkeyScopeEnum } from '@/types/hotkey';
@@ -32,14 +32,22 @@ export const useOpenChatSettingsHotkey = () => {
 };
 
 export const useRegenerateMessageHotkey = () => {
-  const regenerateMessage = useChatStore((s) => s.regenerateMessage);
-  const lastMessage = useChatStore(chatSelectors.latestMessage, isEqual);
+  const [regenerateUserMessage, regenerateAssistantMessage] = useChatStore((s) => [
+    s.regenerateUserMessage,
+    s.regenerateAssistantMessage,
+  ]);
+  const lastMessage = useChatStore((s) => displayMessageSelectors.mainAIChats(s).at(-1), isEqual);
 
-  const disable = !lastMessage || lastMessage.id === 'default' || lastMessage.role === 'system';
+  const disable = !lastMessage;
 
   return useHotkeyById(
     HotkeyEnum.RegenerateMessage,
-    () => !disable && regenerateMessage(lastMessage.id),
+    () => {
+      if (!lastMessage) return;
+      if (lastMessage.role === 'user') return regenerateUserMessage(lastMessage.id);
+
+      return regenerateAssistantMessage(lastMessage.id);
+    },
     {
       enableOnContentEditable: true,
       enabled: !disable,
@@ -49,7 +57,7 @@ export const useRegenerateMessageHotkey = () => {
 
 export const useDeleteAndRegenerateMessageHotkey = () => {
   const delAndRegenerateMessage = useChatStore((s) => s.delAndRegenerateMessage);
-  const lastMessage = useChatStore(chatSelectors.latestMessage, isEqual);
+  const lastMessage = useChatStore((s) => displayMessageSelectors.mainAIChats(s).at(-1), isEqual);
 
   const disable = !lastMessage || lastMessage.id === 'default' || lastMessage.role === 'system';
 
@@ -65,7 +73,7 @@ export const useDeleteAndRegenerateMessageHotkey = () => {
 
 export const useDeleteLastMessageHotkey = () => {
   const deleteMessage = useChatStore((s) => s.deleteMessage);
-  const lastMessage = useChatStore(chatSelectors.latestMessage, isEqual);
+  const lastMessage = useChatStore((s) => displayMessageSelectors.mainAIChats(s).at(-1), isEqual);
 
   const disable = !lastMessage || lastMessage.id === 'default' || lastMessage.role === 'system';
 

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

@@ -66,7 +66,7 @@ describe('aiChatRouter', () => {
       2,
       expect.objectContaining({
         content: expect.any(String),
-        fromModel: 'gpt-4o',
+        model: 'gpt-4o',
         parentId: 'm-user',
         role: 'assistant',
         sessionId: 's1',

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

@@ -358,32 +358,6 @@ describe('Message Router Integration Tests', () => {
       expect(result).toHaveLength(1);
       expect(result[0].id).toBe(msg1.id);
     });
-
-    it('should support useGroup parameter', async () => {
-      const caller = messageRouter.createCaller(createTestContext(userId));
-
-      // 创建多个消息
-      await caller.createMessage({
-        content: 'Message 1',
-        role: 'assistant',
-        sessionId: testSessionId,
-      });
-
-      await caller.createMessage({
-        content: 'Message 2',
-        role: 'assistant',
-        sessionId: testSessionId,
-      });
-
-      // useGroup 参数应该影响消息分组展示
-      const result = await caller.getMessages({
-        sessionId: testSessionId,
-        useGroup: true,
-      });
-
-      expect(result).toBeDefined();
-      expect(Array.isArray(result)).toBe(true);
-    });
   });
 
   describe('removeMessages', () => {

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

@@ -96,6 +96,7 @@ export const aiChatRouter = router({
       const userMessageItem = await ctx.messageModel.create({
         content: input.newUserMessage.content,
         files: input.newUserMessage.files,
+        parentId: input.newUserMessage.parentId,
         role: 'user',
         sessionId: input.sessionId!,
         threadId: input.threadId,
@@ -113,9 +114,9 @@ export const aiChatRouter = router({
       );
       const assistantMessageItem = await ctx.messageModel.create({
         content: LOADING_FLAT,
-        fromModel: input.newAssistantMessage.model,
-        fromProvider: input.newAssistantMessage.provider,
+        model: input.newAssistantMessage.model,
         parentId: messageId,
+        provider: input.newAssistantMessage.provider,
         role: 'assistant',
         sessionId: input.sessionId!,
         threadId: input.threadId,

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

@@ -55,10 +55,9 @@ export const messageRouter = router({
     }),
 
   createMessage: messageProcedure
-    .input(CreateNewMessageParamsSchema.extend({ useGroup: z.boolean().optional() }))
+    .input(CreateNewMessageParamsSchema)
     .mutation(async ({ input, ctx }) => {
-      const { useGroup, ...params } = input;
-      return ctx.messageService.createMessage(params as any, { useGroup });
+      return ctx.messageService.createMessage(input as any);
     }),
 
   getHeatmaps: messageProcedure.query(async ({ ctx }) => {
@@ -74,20 +73,17 @@ export const messageRouter = router({
         pageSize: z.number().optional(),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
-        useGroup: z.boolean().optional(),
       }),
     )
     .query(async ({ input, ctx }) => {
       if (!ctx.userId) return [];
       const serverDB = await getServerDB();
 
-      const { useGroup, ...queryParams } = input;
-
       const messageModel = new MessageModel(serverDB, ctx.userId);
       const fileService = new FileService(serverDB, ctx.userId);
 
-      return messageModel.query(queryParams, {
-        groupAssistantMessages: useGroup ?? false,
+      return messageModel.query(input, {
+        groupAssistantMessages: false,
         postProcessUrl: (path) => fileService.getFullFileUrl(path),
       });
     }),
@@ -106,7 +102,6 @@ export const messageRouter = router({
         id: z.string(),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
-        useGroup: z.boolean().optional(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
@@ -126,7 +121,6 @@ export const messageRouter = router({
         ids: z.array(z.string()),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
-        useGroup: z.boolean().optional(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
@@ -173,7 +167,6 @@ export const messageRouter = router({
         id: z.string(),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
-        useGroup: z.boolean().optional(),
         value: UpdateMessageParamsSchema,
       }),
     )
@@ -198,7 +191,6 @@ export const messageRouter = router({
       UpdateMessageRAGParamsSchema.extend({
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
-        useGroup: z.boolean().optional(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
@@ -210,11 +202,14 @@ export const messageRouter = router({
     .input(
       z.object({
         id: z.string(),
+        sessionId: z.string().nullable().optional(),
+        topicId: z.string().nullable().optional(),
         value: z.object({}).passthrough(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
-      return ctx.messageModel.updateMetadata(input.id, input.value);
+      const { id, value, ...options } = input;
+      return ctx.messageService.updateMetadata(id, value, options);
     }),
 
   updatePluginError: messageProcedure
@@ -223,7 +218,6 @@ export const messageRouter = router({
         id: z.string(),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
-        useGroup: z.boolean().optional(),
         value: z.object({}).passthrough().nullable(),
       }),
     )
@@ -238,7 +232,6 @@ export const messageRouter = router({
         id: z.string(),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
-        useGroup: z.boolean().optional(),
         value: z.object({}).passthrough(),
       }),
     )
@@ -267,7 +260,6 @@ export const messageRouter = router({
 
       return ctx.messageModel.updateTTS(input.id, input.value);
     }),
-
   updateTranslate: messageProcedure
     .input(
       z.object({

package/src/server/services/message/__tests__/index.test.ts

@@ -26,6 +26,7 @@ describe('MessageService', () => {
       update: vi.fn(),
       updateMessagePlugin: vi.fn(),
       updateMessageRAG: vi.fn(),
+      updateMetadata: vi.fn(),
       updatePluginState: vi.fn(),
     } as any;
 
@@ -222,36 +223,51 @@ describe('MessageService', () => {
     });
   });
 
-  describe('useGroup option', () => {
-    it('should pass useGroup option to query', async () => {
+  describe('updateMetadata', () => {
+    it('should update metadata and return { success: true } when no sessionId/topicId provided', async () => {
+      const messageId = 'msg-1';
+      const metadata = { someKey: 'someValue', count: 42 };
+
+      const result = await messageService.updateMetadata(messageId, metadata);
+
+      expect(mockMessageModel.updateMetadata).toHaveBeenCalledWith(messageId, metadata);
+      expect(result).toEqual({ success: true });
+      expect(mockMessageModel.query).not.toHaveBeenCalled();
+    });
+
+    it('should update metadata and return message list when sessionId provided', async () => {
+      const messageId = 'msg-1';
+      const metadata = { someKey: 'someValue', count: 42 };
       const mockMessages = [{ id: 'msg-1', content: 'test' }];
       vi.mocked(mockMessageModel.query).mockResolvedValue(mockMessages as any);
 
-      await messageService.removeMessage('msg-1', {
+      const result = await messageService.updateMetadata(messageId, metadata, {
         sessionId: 'session-1',
-        useGroup: true,
       });
 
-      expect(mockMessageModel.query).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({
-          groupAssistantMessages: true,
-        }),
-      );
+      expect(mockMessageModel.updateMetadata).toHaveBeenCalledWith(messageId, metadata);
+      expect(mockMessageModel.query).toHaveBeenCalled();
+      expect(result).toEqual({ messages: mockMessages, success: true });
     });
 
-    it('should default useGroup to false', async () => {
+    it('should update metadata and return message list when topicId provided', async () => {
+      const messageId = 'msg-1';
+      const metadata = { key: 'value' };
       const mockMessages = [{ id: 'msg-1', content: 'test' }];
       vi.mocked(mockMessageModel.query).mockResolvedValue(mockMessages as any);
 
-      await messageService.removeMessage('msg-1', { sessionId: 'session-1' });
+      const result = await messageService.updateMetadata(messageId, metadata, {
+        topicId: 'topic-1',
+      });
 
+      expect(mockMessageModel.updateMetadata).toHaveBeenCalledWith(messageId, metadata);
       expect(mockMessageModel.query).toHaveBeenCalledWith(
-        expect.anything(),
+        { groupId: undefined, sessionId: undefined, topicId: 'topic-1' },
         expect.objectContaining({
           groupAssistantMessages: false,
         }),
       );
+      expect(result).toEqual({ messages: mockMessages, success: true });
     });
   });
 
@@ -289,32 +305,6 @@ describe('MessageService', () => {
       });
     });
 
-    it('should create message with useGroup option', async () => {
-      const params = {
-        content: 'Hello',
-        role: 'assistant' as const,
-        sessionId: 'session-1',
-      };
-      const createdMessage = { id: 'msg-1', ...params };
-      const mockMessages = [createdMessage];
-
-      vi.mocked(mockMessageModel.create).mockResolvedValue(createdMessage as any);
-      vi.mocked(mockMessageModel.query).mockResolvedValue(mockMessages as any);
-
-      const result = await messageService.createMessage(params as any, { useGroup: true });
-
-      expect(mockMessageModel.query).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({
-          groupAssistantMessages: true,
-        }),
-      );
-      expect(result).toEqual({
-        id: 'msg-1',
-        messages: mockMessages,
-      });
-    });
-
     it('should create message with topicId and groupId', async () => {
       const params = {
         content: 'Hello',

package/src/server/services/message/index.ts

@@ -9,7 +9,6 @@ interface QueryOptions {
   groupId?: string | null;
   sessionId?: string | null;
   topicId?: string | null;
-  useGroup?: boolean;
 }
 
 interface CreateMessageResult {
@@ -42,9 +41,9 @@ export class MessageService {
   /**
    * Unified query options
    */
-  private getQueryOptions(options: QueryOptions) {
+  private getQueryOptions() {
     return {
-      groupAssistantMessages: options.useGroup ?? false,
+      groupAssistantMessages: false,
       postProcessUrl: this.postProcessUrl,
     };
   }
@@ -61,12 +60,45 @@ export class MessageService {
 
     const messages = await this.messageModel.query(
       { groupId, sessionId, topicId },
-      this.getQueryOptions(options),
+      this.getQueryOptions(),
     );
 
     return { messages, success: true };
   }
 
+  /**
+   * Create a new message and return the complete message list
+   * Pattern: create + query
+   *
+   * This method combines message creation and querying into a single operation,
+   * reducing the need for separate refresh calls and improving performance.
+   */
+  async createMessage(params: CreateMessageParams): Promise<CreateMessageResult> {
+    // 1. Create the message
+    const item = await this.messageModel.create(params);
+
+    // 2. Query all messages for this session/topic
+    const messages = await this.messageModel.query(
+      {
+        current: 0,
+        groupId: params.groupId,
+        pageSize: 9999,
+        sessionId: params.sessionId,
+        topicId: params.topicId,
+      },
+      {
+        groupAssistantMessages: false,
+        postProcessUrl: this.postProcessUrl,
+      },
+    );
+
+    // 3. Return the result
+    return {
+      id: item.id,
+      messages,
+    };
+  }
+
   /**
    * Remove messages with optional message list return
    * Pattern: delete + conditional query
@@ -122,38 +154,11 @@ export class MessageService {
   }
 
   /**
-   * Create a new message and return the complete message list
-   * Pattern: create + query
-   *
-   * This method combines message creation and querying into a single operation,
-   * reducing the need for separate refresh calls and improving performance.
+   * Update message metadata with optional message list return
+   * Pattern: update + conditional query
    */
-  async createMessage(
-    params: CreateMessageParams,
-    options?: QueryOptions,
-  ): Promise<CreateMessageResult> {
-    // 1. Create the message
-    const item = await this.messageModel.create(params);
-
-    // 2. Query all messages for this session/topic
-    const messages = await this.messageModel.query(
-      {
-        current: 0,
-        groupId: params.groupId,
-        pageSize: 9999,
-        sessionId: params.sessionId,
-        topicId: params.topicId,
-      },
-      {
-        groupAssistantMessages: options?.useGroup ?? false,
-        postProcessUrl: this.postProcessUrl,
-      },
-    );
-
-    // 3. Return the result
-    return {
-      id: item.id,
-      messages,
-    };
+  async updateMetadata(id: string, value: any, options?: QueryOptions) {
+    await this.messageModel.updateMetadata(id, value);
+    return this.queryWithSuccess(options);
   }
 }

package/src/services/electron/desktopNotification.ts

@@ -5,13 +5,13 @@ import {
 } from '@lobechat/electron-client-ipc';
 
 /**
- * 桌面通知服务
+ * Desktop notification service
  */
 export class DesktopNotificationService {
   /**
-   * 显示桌面通知（仅在窗口隐藏时）
-   * @param params 通知参数
-   * @returns 通知结果
+   * Show desktop notification (only when window is hidden)
+   * @param params Notification parameters
+   * @returns Notification result
    */
   async showNotification(
     params: ShowDesktopNotificationParams,
@@ -20,8 +20,8 @@ export class DesktopNotificationService {
   }
 
   /**
-   * 检查主窗口是否隐藏
-   * @returns 是否隐藏
+   * Check if main window is hidden
+   * @returns Whether it is hidden
    */
   async isMainWindowHidden(): Promise<boolean> {
     return dispatch('isMainWindowHidden');

package/src/services/electron/file.ts

@@ -2,15 +2,15 @@ import { dispatch } from '@lobechat/electron-client-ipc';
 import { FileMetadata } from '@lobechat/types';
 
 /**
- * 桌面应用文件API客户端服务
+ * Desktop application file API client service
  */
 class DesktopFileAPI {
   /**
-   * 上传文件到桌面应用
-   * @param file 文件对象
-   * @param hash 文件哈希
-   * @param path 文件存储路径
-   * @returns 上传结果
+   * Upload file to desktop application
+   * @param file File object
+   * @param hash File hash
+   * @param path File storage path
+   * @returns Upload result
    */
   async uploadFile(
     file: File,

package/src/services/file/ClientS3/index.ts

@@ -13,9 +13,9 @@ export class BrowserS3Storage {
   }
 
   /**
-   * 上传文件
-   * @param key 文件 hash
-   * @param file File 对象
+   * Upload file
+   * @param key File hash
+   * @param file File object
    */
   putObject = async (key: string, file: File): Promise<void> => {
     try {
@@ -27,9 +27,9 @@ export class BrowserS3Storage {
   };
 
   /**
-   * 获取文件
-   * @param key 文件 hash
-   * @returns File 对象
+   * Get file
+   * @param key File hash
+   * @returns File object
    */
   getObject = async (key: string): Promise<File | undefined> => {
     try {
@@ -44,8 +44,8 @@ export class BrowserS3Storage {
   };
 
   /**
-   * 删除文件
-   * @param key 文件 hash
+   * Delete file
+   * @param key File hash
    */
   deleteObject = async (key: string): Promise<void> => {
     try {