@myun/gimi-chat 0.9.65 → 0.9.66

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();
             }
@@ -142,7 +214,8 @@ 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) {
+                    console.log('dataObj-----', _dataObj);
                     if (_dataObj.status === 'RUNNING' && _dataObj.moduleType === 'end') {
                       if (_dataObj.content && !_dataObj.reasoningContent) {
                         fullResponse += _dataObj.content;
@@ -155,15 +228,33 @@ 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) && !["execute", "notifyWorkflowStart"].includes(_dataObj.name)) {
+                      // console.log('dataObj',dataObj);
+                      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 +298,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;