@myun/gimi-chat 0.9.44 → 0.9.46

package/dist/components/message-list/index.js

@@ -24,6 +24,8 @@ import { FileStatus } from "../../interfaces/fileInterface";
 import useChatActions from "../../hooks/useChatActions";
 import CopyButton from "../message-actions/CopyButton";
 import { Virtuoso } from 'react-virtuoso';
+import { MMarkdown } from '@myun/gimi-design';
+import SkillTag from "./skill-tag";
 var MessageItem = /*#__PURE__*/React.memo(function (props) {
   var _v$quoteTeachModelLis, _v$quoteProductList, _v$messageFilesList;
   var v = props.v,
@@ -41,6 +43,7 @@ var MessageItem = /*#__PURE__*/React.memo(function (props) {
     handleClickPromptWord = props.handleClickPromptWord,
     handleShowCourse = props.handleShowCourse,
     handleClickAskList = props.handleClickAskList,
+    handleClickConfirm = props.handleClickConfirm,
     playTTSByText = props.playTTSByText,
     stopTTSByText = props.stopTTSByText,
     isPlaying = props.isPlaying,
@@ -73,7 +76,13 @@ var MessageItem = /*#__PURE__*/React.memo(function (props) {
     quoteTeachModelList: v.quoteTeachModelList
   }), v.content && /*#__PURE__*/React.createElement("div", {
     className: styles.title
-  }, replaceBraces(v.content)), v.messageFiles && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(MMarkdown, {
+    content: replaceBraces(v.content) || '',
+    customRender: [{
+      type: 'skilltool',
+      component: SkillTag
+    }]
+  })), v.messageFiles && /*#__PURE__*/React.createElement("div", {
     className: styles.listBox
   }, /*#__PURE__*/React.createElement(UploadList, {
     isMessage: true,
@@ -102,6 +111,7 @@ var MessageItem = /*#__PURE__*/React.memo(function (props) {
     handleClickPromptWord: handleClickPromptWord,
     handleShowCourse: handleShowCourse,
     handleClickAskList: handleClickAskList,
+    handleClickConfirm: handleClickConfirm,
     playTTSByText: playTTSByText,
     stopTTSByText: stopTTSByText,
     isVoicePlaying: isPlaying,
@@ -170,7 +180,8 @@ var MessageList = function MessageList(_ref) {
   // 使用 chatActions hook 提供的函数
   var showOpera = chatActions.showOpera,
     showCommend = chatActions.showCommend,
-    handleClickAskList = chatActions.handleClickAskList;
+    handleClickAskList = chatActions.handleClickAskList,
+    handleClickConfirm = chatActions.handleClickConfirm;
   var handleClickPromptWord = React.useCallback(function (prompt) {
     handleSend(prompt);
   }, [handleSend]);
@@ -279,6 +290,7 @@ var MessageList = function MessageList(_ref) {
       handleClickPromptWord: handleClickPromptWord,
       handleShowCourse: handleShowCourse,
       handleClickAskList: handleClickAskList,
+      handleClickConfirm: handleClickConfirm,
       playTTSByText: playTTSByText,
       stopTTSByText: stopTTSByText,
       isPlaying: isPlaying,
@@ -294,7 +306,7 @@ var MessageList = function MessageList(_ref) {
       onCurrentTraceVideoClick: onCurrentTraceVideoClick,
       curPlayer: curPlayer
     });
-  }, [chatUI, hideUserMessage, showOpera, onCopyCallback, onSucessExcel, onFailureExcel, onRetryExcel, showCommend, handleClickPromptWord, handleShowCourse, handleClickAskList, playTTSByText, stopTTSByText, isPlaying, onRegenerateClick, enableCopy, enableLike, enableUnLike, enableRegenerate, enableVoicePlay, onDownloadCallback, reasoningTitle, model, handleReTry, onLikeCallback, onUnLikeCallback]);
+  }, [chatUI, hideUserMessage, showOpera, onCopyCallback, onSucessExcel, onFailureExcel, onRetryExcel, showCommend, handleClickPromptWord, handleShowCourse, handleClickAskList, handleClickConfirm, playTTSByText, stopTTSByText, isPlaying, onRegenerateClick, enableCopy, enableLike, enableUnLike, enableRegenerate, enableVoicePlay, onDownloadCallback, reasoningTitle, model, handleReTry, onLikeCallback, onUnLikeCallback]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(styles.main),
     style: buildStyle()

package/dist/components/message-list/index.module.css

@@ -54,6 +54,9 @@
   align-self: flex-end;
   overflow-x: auto;
 }
+.main .textWrap .textItem.question .title p {
+  margin: 0 !important;
+}
 .main .textWrap .textItem.question .listBox {
   display: flex;
   flex-direction: row-reverse;

package/dist/components/message-list/skill-tag/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+declare const SkillTag: ({ value }: {
+    value: string;
+}) => React.JSX.Element;
+export default SkillTag;

package/dist/components/message-list/skill-tag/index.js

@@ -0,0 +1,24 @@
+import React, { useMemo } from 'react';
+import styles from "./index.module.css";
+var SkillTag = function SkillTag(_ref) {
+  var value = _ref.value;
+  console.log(value);
+  var item = useMemo(function () {
+    try {
+      return JSON.parse(value);
+    } catch (e) {
+      console.error('[skill-tag] parse value error:', e);
+      return {};
+    }
+  }, [value]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.skillItem
+  }, /*#__PURE__*/React.createElement("img", {
+    src: item.imageUrl || '',
+    className: styles.icon,
+    alt: ""
+  }), /*#__PURE__*/React.createElement("span", {
+    className: styles.name
+  }, item.toolName || ''));
+};
+export default SkillTag;

package/dist/components/message-list/skill-tag/index.module.css

@@ -0,0 +1,22 @@
+.skillItem {
+  display: inline-block;
+  height: 24px;
+  padding: 0 8px;
+  height: 24px;
+  border-radius: 10px;
+  margin-right: 6px;
+  background-color: #E3E3E1;
+  line-height: 20px;
+}
+.skillItem .icon {
+  width: 14px;
+  height: 14px;
+  margin-right: 4px;
+  vertical-align: middle;
+}
+.skillItem .name {
+  font-size: 14px;
+  color: var(--theme-deepNeutral, #221813);
+  font-weight: 500;
+  vertical-align: middle;
+}

package/dist/components/templates/CommonChat.js

@@ -261,7 +261,9 @@ var CommonChat = /*#__PURE__*/React.forwardRef(function (props, ref) {
       width: '100%'
     }
   }, /*#__PURE__*/React.createElement(AiLoading, null)), /*#__PURE__*/React.createElement(MessageList, _extends({
-    chatList: messageList || defaultMessages,
+    chatList: messageList || defaultMessages
+    // chatList={defaultMessages}
+    ,
     handleSend: handleSend,
     platform: platform,
     inputModelRef: inputModelRef,

package/dist/hooks/useChatActions.d.ts

@@ -7,6 +7,7 @@ export declare const usePureChatActions: () => {
 declare const useChatActions: (showCopyId: number | null, inputModelRef: React.MutableRefObject<any>, handleSend: (val: string, agent?: any, isSystemAuto?: boolean) => void) => {
     showOpera: (id: number) => boolean;
     showCommend: (id: number) => boolean;
-    handleClickAskList: (item: any, operation: string, key: string, value?: string | undefined) => void;
+    handleClickAskList: (item: any, operation: string, key: string, value?: string | undefined, inputModel?: any) => void;
+    handleClickConfirm: (item: any, confirmed: boolean) => void;
 };
 export default useChatActions;

package/dist/hooks/useChatActions.js

@@ -187,13 +187,13 @@ var useChatActions = function useChatActions(showCopyId, inputModelRef, handleSe
    * 点击问询列表
    */
   var handleClickAskList = React.useMemo(function () {
-    return debounce(function (item, operation, key, value) {
+    return debounce(function (item, operation, key, value, inputModel) {
       var _messageList8;
       var messageList = messageListRef.current;
       if ((_messageList8 = messageList[messageList.length - 1]) !== null && _messageList8 !== void 0 && _messageList8.selectValue) {
         return;
       }
-      var _inputModel = _defineProperty({}, "".concat(item.id, ".").concat(operation), key);
+      var _inputModel = inputModel || _defineProperty({}, "".concat(item.id, ".").concat(operation), key);
       inputModelRef.current = _inputModel;
       var newMessageList = updateLastMessage(messageList, function (lastMessage) {
         return _objectSpread(_objectSpread({}, lastMessage), {}, {
@@ -206,10 +206,48 @@ var useChatActions = function useChatActions(showCopyId, inputModelRef, handleSe
       handleSend(value || '');
     }, 100);
   }, [handleSend, inputModelRef, dispatch]);
+
+  /**
+   * 确认/拒绝工具调用
+   * 绕开 ask 的 selectValue 防重逻辑，直接组装 user_confirm inputModel 发送
+   */
+  var handleClickConfirm = React.useCallback(function (item, confirmed) {
+    var _lastMessage$toolList, _item$data, _item$data2;
+    // 1. 更新最后一条消息的 toolList，把这条 user_confirm 改成已确认/已拒绝
+    var currentMessageList = messageListRef.current;
+    var lastMessage = currentMessageList[currentMessageList.length - 1];
+    var updatedToolList = (_lastMessage$toolList = lastMessage.toolList) === null || _lastMessage$toolList === void 0 ? void 0 : _lastMessage$toolList.map(function (tool) {
+      return tool.id === item.id ? _objectSpread(_objectSpread({}, tool), {}, {
+        moduleType: "user_confirm",
+        status: 'COMPLETED',
+        confirmStatus: confirmed ? "CONFIRMED" : "REJECTED"
+      }) : tool;
+    });
+    var updatedMessageList = [].concat(_toConsumableArray(currentMessageList.slice(0, -1)), [_objectSpread(_objectSpread({}, lastMessage), {}, {
+      toolList: updatedToolList
+    })]);
+    dispatch(setMessageList({
+      messageList: updatedMessageList
+    }));
+
+    // 2. 组装 inputModel 并发送
+    var inputModel = {
+      user_confirm: {
+        askingEventId: (_item$data = item.data) === null || _item$data === void 0 ? void 0 : _item$data.askingEventId,
+        confirmResults: [{
+          toolCallId: ((_item$data2 = item.data) === null || _item$data2 === void 0 || (_item$data2 = _item$data2.toolCalls) === null || _item$data2 === void 0 || (_item$data2 = _item$data2[0]) === null || _item$data2 === void 0 ? void 0 : _item$data2.id) || '',
+          confirmed: confirmed
+        }]
+      }
+    };
+    inputModelRef.current = inputModel;
+    handleSend('', undefined, true, undefined, true); // skipCreateNewMessage: true 复用当前消息
+  }, [handleSend, inputModelRef, dispatch]);
   return {
     showOpera: showOpera,
     showCommend: showCommend,
-    handleClickAskList: handleClickAskList
+    handleClickAskList: handleClickAskList,
+    handleClickConfirm: handleClickConfirm
   };
 };
 export default useChatActions;

package/dist/hooks/useChatStream.d.ts

@@ -1,10 +1,15 @@
 /// <reference types="react" />
+export declare const TOOL_MODULE_TYPES: string[];
+export declare const MODULE_TYPE_NAMES: Record<string, string>;
+export declare const getToolNameByStatus: (moduleType: string, status?: string) => string;
 interface StreamChatCallbacks {
     onSseOpen?: (response: Response) => void;
     onDataReceived?: (response: string, type: 'content' | 'reasoningContent') => void;
-    onComplete?: (response: any, type: string, reasoningResponse?: string) => void;
+    onComplete?: (response: any, type: string, reasoningResponse?: string, dataObj?: any) => void;
     onErrorComplete?: () => void;
     onMCPToolsStream?: (dataObj: any) => void;
+    onToolStream?: (dataObj: any) => void;
+    onArtifactStream?: (dataObj: any) => void;
 }
 /**
  * 处理流式聊天逻辑

package/dist/hooks/useChatStream.js

@@ -15,6 +15,76 @@ import { useLastEventId } from "./useLastEventId";
 import { useAppSelector, useAppDispatch } from "../store/hooks";
 import { setIsMsgRecieving } from "../store/slices/gimiMenuSlice";
 import { getTimeZone } from "../utils/tools";
+
+// 需要展示为工具调用的模块类型
+export var TOOL_MODULE_TYPES = ['tool_invocation', 'tool_result', "thinking"
+// 'start', 'llm', 'knowledge', 'video', 'image-text',
+// 'input', 'if-select', 'intent', 'talk', 'text',
+// 'video-caption', 'summary', 'loop', 'skillBase',
+// 'break', 'http', 'esKnowledge', 'mcp'
+];
+
+// 所有需要进入处理流程的模块类型（包括工具类型 + 特殊处理类型）
+var PROCESSABLE_MODULE_TYPES = [].concat(TOOL_MODULE_TYPES, ['end', 'ask', 'skill', 'tool_call', 'artifact', 'user_confirm', 'COMPLETED']);
+
+// 模块类型到工具名称的映射
+export var MODULE_TYPE_NAMES = {
+  'start': '开始节点',
+  'end': '结束节点',
+  'llm': '模型节点',
+  'knowledge': '知识库节点',
+  'video': '视频节点',
+  'image-text': '图文节点',
+  'input': '输入节点',
+  'if-select': '选择节点',
+  'intent': '意图识别节点',
+  'talk': '讨论节点',
+  'ask': '问答节点',
+  'text': '文本处理节点',
+  'video-caption': '视频字幕节点',
+  'summary': '章节总结节点',
+  'loop': '循环节点',
+  'skill': '技能节点',
+  'skillBase': '通用技能节点',
+  'break': '终止循环节点',
+  'http': 'HTTP节点',
+  'esKnowledge': '知识库节点',
+  'mcp': 'MCP节点'
+};
+
+// 根据 moduleType 和 status 生成 toolName
+export var getToolNameByStatus = function getToolNameByStatus(moduleType, status) {
+  // thinking 类型定制文案
+  if (moduleType === 'thinking') {
+    if (status === 'STARTED') {
+      return '开始分析问题';
+    } else if (status === 'RUNNING') {
+      return '正在分析问题';
+    } else if (status === 'COMPLETED') {
+      return '已完成分析';
+    }
+    return '深度思考';
+  }
+  var baseName = MODULE_TYPE_NAMES[moduleType] || moduleType;
+  if (!status) {
+    return baseName;
+  }
+
+  // 根据状态生成描述
+  if (status === 'STARTED') {
+    return "\u5F00\u59CB\u8FD0\u884C".concat(baseName);
+  } else if (status === 'COMPLETED') {
+    return "".concat(baseName, "\u8FD0\u884C\u5B8C\u6210");
+  } else if (status === 'RUNNING') {
+    return "".concat(baseName, "\u8FD0\u884C\u4E2D");
+  } else if (status === 'PENDING') {
+    return "".concat(baseName, "\u7B49\u5F85\u4E2D");
+  } else if (status === 'FAILED') {
+    return "".concat(baseName, "\u8FD0\u884C\u5931\u8D25");
+  } else {
+    return baseName;
+  }
+};
 /**
  * 处理流式聊天逻辑
  */
@@ -65,6 +135,8 @@ export var useChatStream = function useChatStream(platform) {
         onComplete,
         onErrorComplete,
         onMCPToolsStream,
+        onToolStream,
+        onArtifactStream,
         signal,
         currentLastEventId,
         url,
@@ -78,7 +150,7 @@ export var useChatStream = function useChatStream(platform) {
             callbacks = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
             method = _args.length > 3 ? _args[3] : undefined;
             requestUrl = _args.length > 4 ? _args[4] : undefined;
-            onSseOpen = callbacks.onSseOpen, onDataReceived = callbacks.onDataReceived, onComplete = callbacks.onComplete, onErrorComplete = callbacks.onErrorComplete, onMCPToolsStream = callbacks.onMCPToolsStream; // 中止之前的请求
+            onSseOpen = callbacks.onSseOpen, onDataReceived = callbacks.onDataReceived, onComplete = callbacks.onComplete, onErrorComplete = callbacks.onErrorComplete, onMCPToolsStream = callbacks.onMCPToolsStream, onToolStream = callbacks.onToolStream, onArtifactStream = callbacks.onArtifactStream; // 中止之前的请求
             if (esAbortRef.current) {
               esAbortRef.current.abort();
             }
@@ -131,6 +203,7 @@ export var useChatStream = function useChatStream(platform) {
                 dispatch(setIsMsgRecieving({
                   isMsgRecieving: true
                 }));
+                console.log('[onmessage] 收到消息:', event.data);
                 if (!(event !== null && event !== void 0 && event.data) || ignoreOnMessageRef.current) {
                   return;
                 }
@@ -142,7 +215,7 @@ export var useChatStream = function useChatStream(platform) {
                   if (messageId && event.id) {
                     saveLastEventId(messageId, event.id);
                   }
-                  if (data.status === 0 && data.result && ['end', 'ask', 'skill', 'tool_call', 'COMPLETED'].includes(_dataObj.moduleType) && !_dataObj.ERROR) {
+                  if (data.status === 0 && data.result && PROCESSABLE_MODULE_TYPES.includes(_dataObj.moduleType) && !_dataObj.ERROR) {
                     if (_dataObj.status === 'RUNNING' && _dataObj.moduleType === 'end') {
                       if (_dataObj.content && !_dataObj.reasoningContent) {
                         fullResponse += _dataObj.content;
@@ -155,15 +228,32 @@ export var useChatStream = function useChatStream(platform) {
                     if (_dataObj.moduleType === 'tool_call') {
                       onMCPToolsStream === null || onMCPToolsStream === void 0 || onMCPToolsStream(_dataObj);
                     }
+
+                    // 工具调用
+                    if (TOOL_MODULE_TYPES.includes(_dataObj.moduleType)) {
+                      onToolStream === null || onToolStream === void 0 || onToolStream(_dataObj);
+                    }
+                    // 生成产物
+                    if (_dataObj.moduleType === 'artifact' && _dataObj.status === 'COMPLETED') {
+                      onArtifactStream === null || onArtifactStream === void 0 || onArtifactStream(_dataObj);
+                    }
+
+                    // 问答确认
                     if ((_dataObj.moduleType === 'ask' || _dataObj.moduleType === 'skill') && _dataObj.status === 'PENDING') {
                       onComplete === null || onComplete === void 0 || onComplete(_dataObj, _dataObj.moduleType);
                       return;
                     }
-                    if (_dataObj.status === 'COMPLETED' && _dataObj.moduleType === 'end' || _dataObj.moduleType === 'COMPLETED') {
-                      removeLastEventId(messageId);
-                      onComplete === null || onComplete === void 0 || onComplete(fullResponse, _dataObj.moduleType, reasoningResponse);
+                    // 确认模式
+                    if (_dataObj.moduleType === 'user_confirm' && _dataObj.status === 'ASKING') {
+                      onComplete === null || onComplete === void 0 || onComplete(_dataObj, _dataObj.moduleType);
                       return;
                     }
+                  } else if (_dataObj.moduleType === 'agent' && _dataObj.status === 'STARTED') {
+                    onToolStream === null || onToolStream === void 0 || onToolStream(_dataObj);
+                  } else if (_dataObj.moduleType === 'agent' && _dataObj.status === 'COMPLETED' || _dataObj.type === 'WORKFLOW_COMPLETED') {
+                    removeLastEventId(messageId);
+                    onComplete === null || onComplete === void 0 || onComplete(fullResponse, 'end', reasoningResponse, _dataObj);
+                    return;
                   } else if (_dataObj.ERROR || _dataObj.moduleType === 'FAILED') {
                     var isRefresh = parseInt(_dataObj.status, 10) === 10002026;
                     if (isRefresh) {
@@ -207,6 +297,7 @@ export var useChatStream = function useChatStream(platform) {
                 dispatch(setIsMsgRecieving({
                   isMsgRecieving: false
                 }));
+                esAbortRef.current = null; // 清空，避免残留
                 console.log('流式结束');
               }
             }));

package/dist/hooks/useCommonChatAPI.d.ts

@@ -33,7 +33,7 @@ declare const useCommonChatAPI: (props: IHookProps) => {
     getContentMessageList: (pageIndex?: number, curPageSize?: number) => Promise<void>;
     hasMore: React.MutableRefObject<boolean>;
     loadMore: () => void;
-    handleSend: (val: string, agent?: any, isSystemAuto?: boolean, conversationId?: number) => Promise<void>;
+    handleSend: (val: string, agent?: any, isSystemAuto?: boolean, conversationId?: number, skipCreateNewMessage?: boolean) => Promise<void>;
     scrollBottomForce: (animate?: boolean | undefined) => void;
     showBackBottom: boolean;
     isScrolling: boolean;