@lobehub/chat 0.151.0 → 0.151.2

package/src/store/chat/slices/message/action.ts

@@ -29,10 +29,20 @@ const n = setNamespace('message');
 
 const SWR_USE_FETCH_MESSAGES = 'SWR_USE_FETCH_MESSAGES';
 
-interface SendMessageParams {
+export interface SendMessageParams {
   message: string;
   files?: { id: string; url: string }[];
   onlyAddUserMessage?: boolean;
+  /**
+   *
+   * https://github.com/lobehub/lobe-chat/pull/2086
+   */
+  isWelcomeQuestion?: boolean;
+}
+
+interface ProcessMessageParams {
+  traceId?: string;
+  isWelcomeQuestion?: boolean;
 }
 
 export interface ChatMessageAction {
@@ -77,7 +87,7 @@ export interface ChatMessageAction {
   coreProcessMessage: (
     messages: ChatMessage[],
     parentId: string,
-    traceId?: string,
+    params?: ProcessMessageParams,
   ) => Promise<void>;
   /**
    * 实际获取 AI 响应
@@ -87,7 +97,7 @@ export interface ChatMessageAction {
   fetchAIChatMessage: (
     messages: ChatMessage[],
     assistantMessageId: string,
-    traceId?: string,
+    params?: ProcessMessageParams,
   ) => Promise<{
     content: string;
     functionCallAtEnd: boolean;
@@ -173,7 +183,7 @@ export const chatMessage: StateCreator<
     await messageService.removeAllMessages();
     await refreshMessages();
   },
-  sendMessage: async ({ message, files, onlyAddUserMessage }) => {
+  sendMessage: async ({ message, files, onlyAddUserMessage, isWelcomeQuestion }) => {
     const { coreProcessMessage, activeTopicId, activeId } = get();
     if (!activeId) return;
 
@@ -200,7 +210,7 @@ export const chatMessage: StateCreator<
     // Get the current messages to generate AI response
     const messages = chatSelectors.currentChats(get());
 
-    await coreProcessMessage(messages, id);
+    await coreProcessMessage(messages, id, { isWelcomeQuestion });
 
     // check activeTopic and then auto create topic
     const chats = chatSelectors.currentChats(get());
@@ -263,6 +273,8 @@ export const chatMessage: StateCreator<
       async ([, sessionId, topicId]: [string, string, string | undefined]) =>
         messageService.getMessages(sessionId, topicId),
       {
+        suspense: true,
+        fallbackData: [],
         onSuccess: (messages, key) => {
           set(
             { activeId: sessionId, messages, messagesInit: true },
@@ -280,7 +292,7 @@ export const chatMessage: StateCreator<
   },
 
   // the internal process method of the AI message
-  coreProcessMessage: async (messages, userMessageId, trace) => {
+  coreProcessMessage: async (messages, userMessageId, params) => {
     const { fetchAIChatMessage, triggerFunctionCall, refreshMessages, activeTopicId } = get();
 
     const { model, provider } = getAgentConfig();
@@ -301,7 +313,7 @@ export const chatMessage: StateCreator<
 
     // 2. fetch the AI response
     const { isFunctionCall, content, functionCallAtEnd, functionCallContent, traceId } =
-      await fetchAIChatMessage(messages, mid, trace);
+      await fetchAIChatMessage(messages, mid, params);
 
     // 3. if it's the function call message, trigger the function method
     if (isFunctionCall) {
@@ -341,7 +353,7 @@ export const chatMessage: StateCreator<
 
     set({ messages }, false, n(`dispatchMessage/${payload.type}`, payload));
   },
-  fetchAIChatMessage: async (messages, assistantId, traceId) => {
+  fetchAIChatMessage: async (messages, assistantId, params) => {
     const {
       toggleChatLoading,
       refreshMessages,
@@ -421,11 +433,12 @@ export const chatMessage: StateCreator<
         plugins: config.plugins,
       },
       trace: {
-        traceId,
+        traceId: params?.traceId,
         sessionId: get().activeId,
         topicId: get().activeTopicId,
         traceName: TraceNameMap.Conversation,
       },
+      isWelcomeQuestion: params?.isWelcomeQuestion,
       onErrorHandle: async (error) => {
         await messageService.updateMessageError(assistantId, error);
         await refreshMessages();
@@ -567,7 +580,7 @@ export const chatMessage: StateCreator<
 
     if (!latestMsg) return;
 
-    await coreProcessMessage(contextMessages, latestMsg.id, traceId);
+    await coreProcessMessage(contextMessages, latestMsg.id, { traceId });
   },
 
   internalUpdateMessageContent: async (id, content) => {

package/src/store/chat/slices/message/selectors.test.ts

@@ -225,7 +225,7 @@ describe('chatSelectors', () => {
 
       const chats = chatSelectors.currentChatsWithGuideMessage(metaData)(state);
 
-      expect(chats[0].content).toEqual('inbox.defaultMessage'); // Assuming translation returns a string containing this
+      expect(chats[0].content).toEqual(''); // Assuming translation returns a string containing this
     });
 
     it('should use agent default message for non-inbox sessions', () => {
@@ -260,4 +260,30 @@ describe('chatSelectors', () => {
       vi.restoreAllMocks();
     });
   });
+
+  describe('showInboxWelcome', () => {
+    it('should return false if the active session is not the inbox session', () => {
+      const state = merge(initialStore, { activeId: 'someActiveId' });
+      const result = chatSelectors.showInboxWelcome(state);
+      expect(result).toBe(false);
+    });
+
+    it('should return false if there are existing messages in the inbox session', () => {
+      const state = merge(initialStore, {
+        activeId: INBOX_SESSION_ID,
+        messages: mockMessages,
+      });
+      const result = chatSelectors.showInboxWelcome(state);
+      expect(result).toBe(false);
+    });
+
+    it('should return true if the active session is the inbox session and there are no existing messages', () => {
+      const state = merge(initialStore, {
+        activeId: INBOX_SESSION_ID,
+        messages: [],
+      });
+      const result = chatSelectors.showInboxWelcome(state);
+      expect(result).toBe(true);
+    });
+  });
 });

package/src/store/chat/slices/message/selectors.ts

@@ -52,6 +52,15 @@ const currentChats = (s: ChatStore): ChatMessage[] => {
 };
 
 const initTime = Date.now();
+
+const showInboxWelcome = (s: ChatStore): boolean => {
+  const isInbox = s.activeId === INBOX_SESSION_ID;
+  if (!isInbox) return false;
+  const data = currentChats(s);
+  const isBrandNewChat = data.length === 0;
+  return isBrandNewChat;
+};
+
 // 针对新助手添加初始化时的自定义消息
 const currentChatsWithGuideMessage =
   (meta: MetaData) =>
@@ -64,7 +73,7 @@ const currentChatsWithGuideMessage =
 
     const [activeId, isInbox] = [s.activeId, s.activeId === INBOX_SESSION_ID];
 
-    const inboxMsg = t('inbox.defaultMessage', { ns: 'chat' });
+    const inboxMsg = '';
     const agentSystemRoleMsg = t('agentDefaultMessageWithSystemRole', {
       name: meta.title || t('defaultAgent'),
       ns: 'chat',
@@ -137,4 +146,5 @@ export const chatSelectors = {
   getMessageById,
   getTraceIdByMessageId,
   latestMessage,
+  showInboxWelcome,
 };

package/src/store/chat/slices/plugin/action.test.ts

@@ -61,7 +61,7 @@ describe('ChatPluginAction', () => {
       expect(result.current.coreProcessMessage).toHaveBeenCalledWith(
         mockCurrentChats,
         messageId,
-        undefined,
+        {},
       );
     });
     it('should update message content and not trigger ai message', async () => {

package/src/store/chat/slices/plugin/action.ts

@@ -174,7 +174,7 @@ export const chatPlugin: StateCreator<
   triggerAIMessage: async (id, traceId) => {
     const { coreProcessMessage } = get();
     const chats = chatSelectors.currentChats(get());
-    await coreProcessMessage(chats, id, traceId);
+    await coreProcessMessage(chats, id, { traceId });
   },
 
   triggerFunctionCall: async (id) => {