V4.9.6 feature (#4565)

* Dashboard submenu (#4545) * add app submenu (#4452) * add app submenu * fix * width & i18n * optimize submenu code (#4515) * optimize submenu code * fix * fix * fix * fix ts * perf: dashboard sub menu * doc --------- Co-authored-by: heheer <heheer@sealos.io> * feat: value format test * doc * Mcp export (#4555) * feat: mcp server * feat: mcp server * feat: mcp server build * update doc * perf: path selector (#4556) * perf: path selector * fix: docker file path * perf: add image endpoint to dataset search (#4557) * perf: add image endpoint to dataset search * fix: mcp_server url * human in loop (#4558) * Support interactive nodes for loops, and enhance the function of merging nested and loop node history messages. (#4552) * feat: add LoopInteractive definition * feat: Support LoopInteractive type and update related logic * fix: Refactor loop handling logic and improve output value initialization * feat: Add mergeSignId to dispatchLoop and dispatchRunAppNode responses * feat: Enhance mergeChatResponseData to recursively merge plugin details and improve response handling * refactor: Remove redundant comments in mergeChatResponseData for clarity * perf: loop interactive * perf: human in loop --------- Co-authored-by: Theresa <63280168+sd0ric4@users.noreply.github.com> * mcp server ui * integrate mcp (#4549) * integrate mcp * delete unused code * fix ts * bug fix * fix * support whole mcp tools * add try catch * fix * fix * fix ts * fix test * fix ts * fix: interactive in v1 completions * doc * fix: router path * fix mcp integrate (#4563) * fix mcp integrate * fix ui * fix: mcp ux * feat: mcp call title * remove repeat loading * fix mcp tools avatar (#4564) * fix * fix avatar * fix update version * update doc * fix: value format * close server and remove cache * perf: avatar --------- Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Theresa <63280168+sd0ric4@users.noreply.github.com>
2025-07-27 00:17:31 +00:00 · 2025-04-16 22:18:51 +08:00
parent ab799e13cd
commit 952412f648
166 changed files with 6318 additions and 1263 deletions
--- a/packages/global/core/chat/utils.ts
+++ b/packages/global/core/chat/utils.ts
@@ -154,25 +154,55 @@ export const getChatSourceByPublishChannel = (publishChannel: PublishChannelEnum
 /* 
  Merge chat responseData
  1. Same tool mergeSignId (Interactive tool node)
+  2. Recursively merge plugin details with same mergeSignId
 */
-export const mergeChatResponseData = (responseDataList: ChatHistoryItemResType[]) => {
-  let lastResponse: ChatHistoryItemResType | undefined = undefined;
-
-  return responseDataList.reduce<ChatHistoryItemResType[]>((acc, curr) => {
-    if (lastResponse && lastResponse.mergeSignId && curr.mergeSignId === lastResponse.mergeSignId) {
-      // 替换 lastResponse
-      const concatResponse: ChatHistoryItemResType = {
-        ...curr,
-        runningTime: +((lastResponse.runningTime || 0) + (curr.runningTime || 0)).toFixed(2),
-        totalPoints: (lastResponse.totalPoints || 0) + (curr.totalPoints || 0),
-        childTotalPoints: (lastResponse.childTotalPoints || 0) + (curr.childTotalPoints || 0),
-        toolCallTokens: (lastResponse.toolCallTokens || 0) + (curr.toolCallTokens || 0),
-        toolDetail: [...(lastResponse.toolDetail || []), ...(curr.toolDetail || [])]
+export const mergeChatResponseData = (
+  responseDataList: ChatHistoryItemResType[]
+): ChatHistoryItemResType[] => {
+  // Merge children reponse data(Children has interactive response)
+  const responseWithMergedPlugins = responseDataList.map((item) => {
+    if (item.pluginDetail && item.pluginDetail.length > 1) {
+      return {
+        ...item,
+        pluginDetail: mergeChatResponseData(item.pluginDetail)
      };
-      return [...acc.slice(0, -1), concatResponse];
-    } else {
-      lastResponse = curr;
-      return [...acc, curr];
    }
-  }, []);
+    return item;
+  });
+
+  let lastResponse: ChatHistoryItemResType | undefined = undefined;
+  let hasMerged = false;
+
+  const firstPassResult = responseWithMergedPlugins.reduce<ChatHistoryItemResType[]>(
+    (acc, curr) => {
+      if (
+        lastResponse &&
+        lastResponse.mergeSignId &&
+        curr.mergeSignId === lastResponse.mergeSignId
+      ) {
+        const concatResponse: ChatHistoryItemResType = {
+          ...curr,
+          runningTime: +((lastResponse.runningTime || 0) + (curr.runningTime || 0)).toFixed(2),
+          totalPoints: (lastResponse.totalPoints || 0) + (curr.totalPoints || 0),
+          childTotalPoints: (lastResponse.childTotalPoints || 0) + (curr.childTotalPoints || 0),
+          toolCallTokens: (lastResponse.toolCallTokens || 0) + (curr.toolCallTokens || 0),
+          toolDetail: [...(lastResponse.toolDetail || []), ...(curr.toolDetail || [])],
+          loopDetail: [...(lastResponse.loopDetail || []), ...(curr.loopDetail || [])],
+          pluginDetail: [...(lastResponse.pluginDetail || []), ...(curr.pluginDetail || [])]
+        };
+        hasMerged = true;
+        return [...acc.slice(0, -1), concatResponse];
+      } else {
+        lastResponse = curr;
+        return [...acc, curr];
+      }
+    },
+    []
+  );
+
+  if (hasMerged && firstPassResult.length > 1) {
+    return mergeChatResponseData(firstPassResult);
+  }
+
+  return firstPassResult;
 };