@myun/gimi-chat 0.9.72 → 0.9.74

package/dist/hooks/useCommonChatAPI.js

@@ -370,13 +370,22 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
     var curToolIndex = curToolList.findIndex(function (item) {
       return (item === null || item === void 0 ? void 0 : item.id) === dataObj.id;
     });
-    var curThinkingContent = ((_curToolList$curToolI = curToolList[curToolIndex]) === null || _curToolList$curToolI === void 0 ? void 0 : _curToolList$curToolI.content) || '';
+    // 记录当前思考内容
+    var curContent = ((_curToolList$curToolI = curToolList[curToolIndex]) === null || _curToolList$curToolI === void 0 ? void 0 : _curToolList$curToolI.content) || '';
+    if (dataObj.moduleType === 'thinking') {
+      curContent = curContent + (dataObj.reasoningContent || '');
+    } else if (dataObj.moduleType === 'llm') {
+      var _dataObj$outputs;
+      curContent = curContent + ((dataObj === null || dataObj === void 0 || (_dataObj$outputs = dataObj.outputs) === null || _dataObj$outputs === void 0 || (_dataObj$outputs = _dataObj$outputs.result) === null || _dataObj$outputs === void 0 ? void 0 : _dataObj$outputs.reasoning_content) || '');
+    } else {
+      curContent = curContent + (dataObj.content || '');
+    }
     // 为新节点类型根据 status 生成 toolName
     var isNewNodeType = !['tool_invocation', 'tool_result', "agent"].includes(dataObj.moduleType);
     var toolName = isNewNodeType ? getToolNameByStatus(dataObj.moduleType, dataObj.status) : dataObj.toolName;
     if (curToolIndex >= 0) {
       curToolList[curToolIndex] = _objectSpread(_objectSpread({}, curToolList[curToolIndex]), {}, {
-        content: dataObj.moduleType === 'thinking' ? curThinkingContent + (dataObj.reasoningContent || '') : dataObj.content || '',
+        content: curContent,
         // tool_invocation 更新 toolName 和 status，新节点类型也更新
         toolName: dataObj.moduleType === 'tool_invocation' ? dataObj.toolName || '' : isNewNodeType ? toolName : curToolList[curToolIndex].toolName,
         status: dataObj.moduleType === 'tool_invocation' || isNewNodeType ? dataObj.status : curToolList[curToolIndex].status
@@ -572,7 +581,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
                       currentMessageList = messageListRef.current;
                       lastToolList = _toConsumableArray(currentMessageList[currentMessageList.length - 1].toolList || []);
                       newMessageList = [];
-                      if (type === 'user_confirm') {
+                      if (type === 'user_confirm' || type === 'ask') {
                         newMessageList = [].concat(_toConsumableArray(currentMessageList.slice(0, -1)), [_objectSpread(_objectSpread({}, currentMessageList[currentMessageList.length - 1]), {}, {
                           moduleType: type,
                           moduleInfo: Response,
@@ -589,11 +598,11 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
                           toolList: [].concat(_toConsumableArray(lastToolList), [{
                             moduleType: type,
                             content: '',
-                            data: Response,
+                            data: type === 'ask' ? Response.data : Response,
                             status: "RUNNING",
                             toolName: t('chatApi.waitingForConfirmation'),
                             confirmStatus: "PENDING",
-                            id: "".concat(new Date().getTime())
+                            id: Response.id || "".concat(new Date().getTime())
                           }])
                         })]);
                       } else {
@@ -994,9 +1003,12 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
         cleanVal,
         userChat,
         prevChatList,
-        _prevChatList,
-        lastItem,
         newChatList,
+        lastItem,
+        _lastItem$toolList,
+        _lastItem$toolList2,
+        lastAskTool,
+        updatedToolList,
         _args10 = arguments;
       return _regeneratorRuntime().wrap(function _callee10$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
@@ -1048,27 +1060,55 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
 
             // 根据isSystemAuto决定是否添加用户消息到列表
             prevChatList = messageListRef.current.slice();
-            if (!isSystemAuto) {
-              setMsgLoading(true);
-              if (((_prevChatList = prevChatList) === null || _prevChatList === void 0 ? void 0 : _prevChatList.length) > 1) {
-                lastItem = prevChatList[prevChatList.length - 1];
-                if (lastItem.moduleType === 'ask') {
-                  prevChatList = [].concat(_toConsumableArray(prevChatList.slice(0, -1)), [_objectSpread(_objectSpread({}, prevChatList[prevChatList.length - 1]), {}, {
-                    disableUploadFile: true
-                  })]);
-                }
-              }
-              newChatList = [].concat(_toConsumableArray(prevChatList), [userChat]);
-              dispatch(setMessageList({
-                messageList: newChatList
-              }));
-              startChat(newChatList, isSystemAuto, conversationId, undefined, skipCreateNewMessage);
-            } else {
-              setMsgLoading(true);
-              // 系统自动上传，直接开始会话，不更新列表
-              startChat(_toConsumableArray(prevChatList), isSystemAuto, conversationId, undefined, skipCreateNewMessage);
+            newChatList = [].concat(_toConsumableArray(prevChatList), [userChat]);
+            if (isSystemAuto) {
+              _context10.next = 40;
+              break;
             }
-          case 25:
+            setMsgLoading(true);
+            if (!((prevChatList === null || prevChatList === void 0 ? void 0 : prevChatList.length) > 1)) {
+              _context10.next = 36;
+              break;
+            }
+            lastItem = prevChatList[prevChatList.length - 1];
+            if (!(lastItem.moduleType === 'ask')) {
+              _context10.next = 36;
+              break;
+            }
+            lastAskTool = (_lastItem$toolList = lastItem.toolList) === null || _lastItem$toolList === void 0 ? void 0 : _lastItem$toolList.find(function (tool) {
+              return tool.moduleType === 'ask';
+            });
+            if (lastAskTool) {
+              _context10.next = 33;
+              break;
+            }
+            return _context10.abrupt("return");
+          case 33:
+            updatedToolList = (_lastItem$toolList2 = lastItem.toolList) === null || _lastItem$toolList2 === void 0 ? void 0 : _lastItem$toolList2.map(function (tool) {
+              return tool.id === lastAskTool.id ? _objectSpread(_objectSpread({}, tool), {}, {
+                moduleType: "ask",
+                status: 'COMPLETED',
+                confirmStatus: "CONFIRMED",
+                content: value
+              }) : tool;
+            });
+            skipCreateNewMessage = true;
+            newChatList = [].concat(_toConsumableArray(prevChatList.slice(0, -1)), [_objectSpread(_objectSpread({}, prevChatList[prevChatList.length - 1]), {}, {
+              disableUploadFile: true,
+              toolList: updatedToolList
+            })]);
+          case 36:
+            dispatch(setMessageList({
+              messageList: newChatList
+            }));
+            startChat(newChatList, isSystemAuto, conversationId, undefined, skipCreateNewMessage);
+            _context10.next = 42;
+            break;
+          case 40:
+            setMsgLoading(true);
+            // 系统自动上传，直接开始会话，不更新列表
+            startChat(_toConsumableArray(prevChatList), isSystemAuto, conversationId, undefined, skipCreateNewMessage);
+          case 42:
           case "end":
             return _context10.stop();
         }
@@ -1317,6 +1357,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
       var uploadFile = fileList[0];
       var isLastMessageEmptyUserChat = (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleType) === 'ask'; // 空内容
       if (!isLastMessageEmptyUserChat) {
+        console.log('isLastMessageEmptyUserChat', isLastMessageEmptyUserChat);
         var shouldEnableUpload = uploadFile.status === FileStatus.UPLOAD_FAILED || uploadFile.status === FileStatus.ANALYSE_FAILED;
         var newMessageList = [].concat(_toConsumableArray(messageList.slice(0, -2)), [_objectSpread(_objectSpread({}, messageList[messageList.length - 2]), {}, {
           disableUploadFile: !shouldEnableUpload

package/dist/interfaces/chatMessage.d.ts

@@ -24,6 +24,7 @@ export interface ToolItem {
    * PARTIAL：部分同意;
   */
   confirmStatus?: "PENDING" | "CONFIRMED" | "REJECTED" | "PARTIAL";  
+  workflowAskResult?: any;
 }
 /**
  * 聊天消息主接口