@lobehub/chat 0.151.1 → 0.151.2

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.151.2](https://github.com/lobehub/lobe-chat/compare/v0.151.1...v0.151.2)
+
+<sup>Released on **2024-04-29**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix only inject welcome question in inbox.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix only inject welcome question in inbox, closes [#2289](https://github.com/lobehub/lobe-chat/issues/2289) ([cc8edd3](https://github.com/lobehub/lobe-chat/commit/cc8edd3))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.151.1](https://github.com/lobehub/lobe-chat/compare/v0.151.0...v0.151.1)
 
 <sup>Released on **2024-04-29**</sup>

package/next.config.mjs

@@ -23,6 +23,7 @@ const nextConfig = {
       '@lobehub/ui',
       'gpt-tokenizer',
       'chroma-js',
+      'shiki',
     ],
     webVitalsAttribution: ['CLS', 'LCP'],
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.151.1",
+  "version": "0.151.2",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",
@@ -126,7 +126,7 @@
     "lucide-react": "latest",
     "modern-screenshot": "^4.4.39",
     "nanoid": "^5.0.7",
-    "next": "14.1.4",
+    "next": "^14.2.1",
     "next-auth": "5.0.0-beta.15",
     "next-sitemap": "^4.2.3",
     "numeral": "^2.0.6",

package/src/app/chat/(desktop)/features/ChatInput/Footer/SendMore.tsx

@@ -45,7 +45,7 @@ const SendMore = memo(() => {
     hotKey,
     (keyboardEvent, hotkeysEvent) => {
       console.log(keyboardEvent, hotkeysEvent);
-      sendMessage(true);
+      sendMessage({ onlyAddUserMessage: true });
     },
     {
       enableOnFormTags: true,
@@ -94,7 +94,7 @@ const SendMore = memo(() => {
               </Flexbox>
             ),
             onClick: () => {
-              sendMessage(true);
+              sendMessage({ onlyAddUserMessage: true });
             },
           },
         ],

package/src/features/ChatInput/useSend.ts

@@ -1,15 +1,21 @@
 import { useCallback } from 'react';
 
 import { useChatStore } from '@/store/chat';
+import { SendMessageParams } from '@/store/chat/slices/message/action';
 import { filesSelectors, useFileStore } from '@/store/file';
 
+export type UseSendMessageParams = Pick<
+  SendMessageParams,
+  'onlyAddUserMessage' | 'isWelcomeQuestion'
+>;
+
 export const useSendMessage = () => {
   const [sendMessage, updateInputMessage] = useChatStore((s) => [
     s.sendMessage,
     s.updateInputMessage,
   ]);
 
-  return useCallback((onlyAddUserMessage?: boolean) => {
+  return useCallback((params: UseSendMessageParams = {}) => {
     const store = useChatStore.getState();
     if (!!store.chatLoadingId) return;
     if (!store.inputMessage) return;
@@ -19,7 +25,7 @@ export const useSendMessage = () => {
     sendMessage({
       files: imageList,
       message: store.inputMessage,
-      onlyAddUserMessage: onlyAddUserMessage,
+      ...params,
     });
 
     updateInputMessage('');

package/src/features/Conversation/components/InboxWelcome/QuestionSuggest.tsx

@@ -10,7 +10,8 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { USAGE_DOCUMENTS } from '@/const/url';
-import { useChatInput } from '@/features/ChatInput/useChatInput';
+import { useSendMessage } from '@/features/ChatInput/useSend';
+import { useChatStore } from '@/store/chat';
 
 const useStyles = createStyles(({ css, token }) => ({
   card: css`
@@ -54,14 +55,10 @@ const qa = shuffle([
 ]).slice(0, 5);
 
 const QuestionSuggest = memo(() => {
-  const { onInput, onSend } = useChatInput();
+  const [updateInputMessage] = useChatStore((s) => [s.updateInputMessage]);
   const { t } = useTranslation('welcome');
   const { styles } = useStyles();
-
-  const handoleSend = (qa: string) => {
-    onInput(qa);
-    onSend();
-  };
+  const sendMessage = useSendMessage();
 
   return (
     <Flexbox gap={8} width={'100%'}>
@@ -85,7 +82,10 @@ const QuestionSuggest = memo(() => {
               gap={8}
               horizontal
               key={item}
-              onClick={() => handoleSend(text)}
+              onClick={() => {
+                updateInputMessage(text);
+                sendMessage({ isWelcomeQuestion: true });
+              }}
             >
               {t(text)}
             </Flexbox>

package/src/features/Conversation/components/VirtualizedList/index.tsx

@@ -7,9 +7,11 @@ import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 import { isMobileScreen } from '@/utils/screen';
 
+import { useInitConversation } from '../../hooks/useInitConversation';
 import AutoScroll from '../AutoScroll';
 import Item from '../ChatItem';
 import InboxWelcome from '../InboxWelcome';
+import SkeletonList from '../SkeletonList';
 
 const WELCOME_ID = 'welcome';
 
@@ -29,6 +31,8 @@ interface VirtualizedListProps {
   mobile?: boolean;
 }
 const VirtualizedList = memo<VirtualizedListProps>(({ mobile }) => {
+  useInitConversation();
+
   const virtuosoRef = useRef<VirtuosoHandle>(null);
   const [atBottom, setAtBottom] = useState(true);
 
@@ -52,7 +56,9 @@ const VirtualizedList = memo<VirtualizedListProps>(({ mobile }) => {
   // overscan should be 1.5 times the height of the window
   const overscan = typeof window !== 'undefined' ? window.innerHeight * 1.5 : 0;
 
-  return chatLoading && data.length === 2 ? null : (
+  return chatLoading ? (
+    <SkeletonList mobile={mobile} />
+  ) : (
     <Flexbox height={'100%'}>
       <Virtuoso
         atBottomStateChange={setAtBottom}

package/src/features/Conversation/index.tsx

@@ -1,13 +1,12 @@
 import { createStyles } from 'antd-style';
-import { ReactNode, memo } from 'react';
+import { ReactNode, Suspense, lazy, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import ChatHydration from '@/components/StoreHydration/ChatHydration';
-import { useChatStore } from '@/store/chat';
 
 import SkeletonList from './components/SkeletonList';
-import ChatList from './components/VirtualizedList';
-import { useInitConversation } from './hooks/useInitConversation';
+
+const ChatList = lazy(() => import('./components/VirtualizedList'));
 
 const useStyles = createStyles(
   ({ css, responsive, stylish }) => css`
@@ -30,10 +29,6 @@ interface ConversationProps {
 const Conversation = memo<ConversationProps>(({ chatInput, mobile }) => {
   const { styles } = useStyles();
 
-  useInitConversation();
-
-  const [messagesInit] = useChatStore((s) => [s.messagesInit]);
-
   return (
     <Flexbox
       flex={1}
@@ -41,7 +36,9 @@ const Conversation = memo<ConversationProps>(({ chatInput, mobile }) => {
       style={{ position: 'relative' }}
     >
       <div className={styles}>
-        {messagesInit ? <ChatList mobile={mobile} /> : <SkeletonList mobile={mobile} />}
+        <Suspense fallback={<SkeletonList mobile={mobile} />}>
+          <ChatList mobile={mobile} />
+        </Suspense>
       </div>
       {chatInput}
       <ChatHydration />

package/src/services/chat.ts

@@ -31,6 +31,7 @@ import { createHeaderWithAuth, getProviderAuthPayload } from './_auth';
 import { API_ENDPOINTS } from './_url';
 
 interface FetchOptions {
+  isWelcomeQuestion?: boolean;
   signal?: AbortSignal | undefined;
   trace?: TracePayload;
 }
@@ -65,6 +66,7 @@ interface FetchAITaskResultParams {
 
 interface CreateAssistantMessageStream extends FetchSSEOptions {
   abortController?: AbortController;
+  isWelcomeQuestion?: boolean;
   params: GetChatCompletionPayload;
   trace?: TracePayload;
 }
@@ -220,10 +222,12 @@ class ChatService {
     onErrorHandle,
     onFinish,
     trace,
+    isWelcomeQuestion,
   }: CreateAssistantMessageStream) => {
     await fetchSSE(
       () =>
         this.createAssistantMessage(params, {
+          isWelcomeQuestion,
           signal: abortController?.signal,
           trace: this.mapTrace(trace, TraceTagMap.Chat),
         }),
@@ -432,9 +436,11 @@ class ChatService {
     });
 
     return produce(postMessages, (draft) => {
-      // Inject InboxGuide SystemRole
+      // if it's a welcome question, inject InboxGuide SystemRole
       const inboxGuideSystemRole =
-        options?.trace?.sessionId === INBOX_SESSION_ID && INBOX_GUIDE_SYSTEMROLE;
+        options?.isWelcomeQuestion &&
+        options?.trace?.sessionId === INBOX_SESSION_ID &&
+        INBOX_GUIDE_SYSTEMROLE;
 
       // Inject Tool SystemRole
       const hasTools = tools && tools?.length > 0;

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

@@ -385,11 +385,7 @@ describe('chatMessage actions', () => {
       });
 
       expect(messageService.removeMessage).not.toHaveBeenCalledWith(messageId);
-      expect(mockState.coreProcessMessage).toHaveBeenCalledWith(
-        expect.any(Array),
-        messageId,
-        undefined,
-      );
+      expect(mockState.coreProcessMessage).toHaveBeenCalledWith(expect.any(Array), messageId, {});
     });
 
     it('should not perform any action if the message id does not exist', async () => {

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/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) => {