@lobehub/chat 0.44.1 → 0.44.2

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.44.2](https://github.com/lobehub/lobe-chat/compare/v0.44.1...v0.44.2)
+
+<sup>Released on **2023-08-13**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: 修正重新生成时切分历史消息的逻辑.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: 修正重新生成时切分历史消息的逻辑, closes [#50](https://github.com/lobehub/lobe-chat/issues/50) ([de5141f](https://github.com/lobehub/lobe-chat/commit/de5141f))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.44.1](https://github.com/lobehub/lobe-chat/compare/v0.44.0...v0.44.1)
 
 <sup>Released on **2023-08-12**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.44.1",
+  "version": "0.44.2",
   "description": "Lobe Chat is an open-source chatbot client using LangChain, Typescript and Next.js",
   "keywords": [
     "chatbot",

package/src/store/session/slices/chat/actions/message.ts

@@ -223,22 +223,34 @@ export const chatMessage: StateCreator<
     const chats = chatSelectors.currentChats(get());
 
     const currentIndex = chats.findIndex((c) => c.id === messageId);
+    const currentMessage = chats[currentIndex];
+    let contextMessages: ChatMessage[] = [];
+
+    switch (currentMessage.role) {
+      case 'function':
+      case 'user': {
+        contextMessages = chats.slice(0, currentIndex + 1);
+        break;
+      }
+      case 'assistant': {
+        // 消息是 AI 发出的因此需要找到它的 user 消息
+        const userId = currentMessage.parentId;
+        const userIndex = chats.findIndex((c) => c.id === userId);
+        // 如果消息没有 parentId，那么同 user/function 模式
+        contextMessages = chats.slice(0, userIndex < 0 ? currentIndex + 1 : userIndex + 1);
+        break;
+      }
+    }
 
-    const histories = chats
-      .slice(0, currentIndex + 1)
-      // 如果点击重新发送的 message 其 role 是 assistant 或者 function，那么需要移除
-      // 如果点击重新发送的 message 其 role 是 user，则不需要移除
-      .filter((c) => !(c.role === 'assistant' && c.id === messageId));
-
-    if (histories.length <= 0) return;
+    if (contextMessages.length <= 0) return;
 
     const { realFetchAIResponse } = get();
 
-    const latestMsg = histories.filter((s) => s.role === 'user').at(-1);
+    const latestMsg = contextMessages.filter((s) => s.role === 'user').at(-1);
 
     if (!latestMsg) return;
 
-    await realFetchAIResponse(histories, latestMsg.id);
+    await realFetchAIResponse(contextMessages, latestMsg.id);
   },
 
   sendMessage: async (message) => {