@myun/gimi-chat 0.9.48 → 0.9.49

package/dist/components/answer-item/component/tool-list/index.js

@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState } from "react";
+import React, { useMemo, useState } from "react";
 import { MMarkdown } from '@myun/gimi-design';
 import IconFont from "../../../iconfont-com";
 import styles from "./index.module.css";
@@ -19,6 +19,23 @@ var ToolItemCom = function ToolItemCom(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     showContent = _useState2[0],
     setShowContent = _useState2[1];
+  var content = useMemo(function () {
+    // item.content 可能是：普通文本 / 单层 JSON / 双层 JSON 字符串
+    // 逐层 parse，直到结果不是字符串或 parse 失败为止
+    var result = item.content || '';
+    for (var depth = 0; depth < 2 && typeof result === 'string'; depth++) {
+      try {
+        result = JSON.parse(result);
+      } catch (_unused) {
+        break;
+      }
+    }
+    // parse 到底是字符串直接用；如果是对象，取里面的文本字段渲染
+    if (typeof result === 'string') return result;
+    if (result && typeof result.content === 'string') return result.content;
+    // 兜底：对象序列化
+    return JSON.stringify(result, null, 2);
+  }, [item.content]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.toolItem
   }, /*#__PURE__*/React.createElement("div", {
@@ -38,7 +55,7 @@ var ToolItemCom = function ToolItemCom(_ref) {
   })), item.content && showContent && /*#__PURE__*/React.createElement("div", {
     className: styles.toolItemContent
   }, /*#__PURE__*/React.createElement(MMarkdown, {
-    content: item.content || ''
+    content: content
   })));
 };
 var ConfirmToolItem = function ConfirmToolItem(_ref2) {

package/dist/components/answer-item/index.js

@@ -232,25 +232,25 @@ var AnswerItem = function AnswerItem(_ref) {
             // 组装tool数据
             toolList = [];
             list.forEach(function (item) {
-              if ([].concat(_toConsumableArray(TOOL_MODULE_TYPES), ["user_confirm"]).includes(item.moduleType)) {
-                var _data;
-                var data = null;
-                try {
-                  data = JSON.parse(item.eventData || '{}');
-                } catch (error) {}
-
+              var _data;
+              var data = null;
+              try {
+                data = JSON.parse(item.eventData || '{}');
+              } catch (error) {}
+              if ([].concat(_toConsumableArray(TOOL_MODULE_TYPES), ["user_confirm", "stream"]).includes(item.moduleType) && !["execute", "notifyWorkflowStart"].includes((_data = data) === null || _data === void 0 ? void 0 : _data.name)) {
+                var _data2;
                 // 为新节点类型根据 status 生成 toolName
                 var isNewNodeType = !['tool_invocation', 'tool_result', "user_confirm"].includes(item.moduleType);
-                var toolName = isNewNodeType ? getToolNameByStatus(item.moduleType, 'COMPLETED') : (_data = data) === null || _data === void 0 ? void 0 : _data.toolName;
+                var toolName = isNewNodeType ? getToolNameByStatus(item.moduleType, 'COMPLETED') : (_data2 = data) === null || _data2 === void 0 ? void 0 : _data2.toolName;
                 var index = toolList.findIndex(function (v) {
-                  var _data2;
-                  return v.id === ((_data2 = data) === null || _data2 === void 0 ? void 0 : _data2.id);
+                  var _data3;
+                  return v.id === ((_data3 = data) === null || _data3 === void 0 ? void 0 : _data3.id);
                 });
                 if (index < 0) {
                   toolList.push(_objectSpread(_objectSpread({}, data), {}, {
                     status: 'COMPLETED',
                     content: data.content || '',
-                    toolName: toolName,
+                    toolName: item.moduleType === 'stream' && item.status === 'TERMINATED' ? '技能调用已停止' : toolName,
                     confirmStatus: item.confirmStatus
                   }));
                 } else {

package/dist/components/chat-input/extension/skill/index.less

@@ -81,14 +81,13 @@
     border-radius: 10px;
     background:#E3E3E1;
     padding: 0 8px;
-    height: 24px;
     line-height: 24px;
     margin-right: 6px;
     .ai-chat-input-refer-slot {
         font-size: 14px;
         color: var(--theme-deepNeutral, #221813);
         font-weight: 500;
-        vertical-align: text-bottom;
+        vertical-align: middle;
 
     }
     .ai-chat-input-refer-slot-image {
@@ -96,5 +95,7 @@
         height: 14px;
         margin-right: 4px;
         flex-shrink: 0;
+        vertical-align: middle;
+
     }
 }

package/dist/components/chat-input/index.module.css

@@ -214,4 +214,5 @@
   bottom: -24px;
   left: 50%;
   transform: translateX(-50%);
+  white-space: nowrap;
 }

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

@@ -2,7 +2,6 @@ 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);

package/dist/hooks/useChatActions.js

@@ -79,22 +79,24 @@ export var usePureChatActions = function usePureChatActions() {
             replaceTags.forEach(function (tag) {
               text = text.replace(new RegExp("<".concat(tag, ">(.*?)</").concat(tag, ">"), 'g'), '');
             });
-            _context.prev = 4;
-            _context.next = 7;
+            // 过滤 <skilltool>...</skilltool> 标签及内容（含多行）
+            text = text.replace(/<skilltool>[\s\S]*?<\/skilltool>/gi, '');
+            _context.prev = 5;
+            _context.next = 8;
             return navigator.clipboard.writeText(text);
-          case 7:
+          case 8:
             Toast.success(t('action.copySuccess'));
-            _context.next = 13;
+            _context.next = 14;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](4);
+          case 11:
+            _context.prev = 11;
+            _context.t0 = _context["catch"](5);
             Toast.error(t('action.copyFailed'));
-          case 13:
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 10]]);
+      }, _callee, null, [[5, 11]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);

package/dist/hooks/useChatStream.js

@@ -203,7 +203,6 @@ 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;
                 }
@@ -230,7 +229,8 @@ export var useChatStream = function useChatStream(platform) {
                     }
 
                     // 工具调用
-                    if (TOOL_MODULE_TYPES.includes(_dataObj.moduleType)) {
+                    if (TOOL_MODULE_TYPES.includes(_dataObj.moduleType) && !["execute", "notifyWorkflowStart"].includes(_dataObj.name)) {
+                      // console.log('dataObj',dataObj);
                       onToolStream === null || onToolStream === void 0 || onToolStream(_dataObj);
                     }
                     // 生成产物

package/dist/hooks/useCommonChatAPI.js

@@ -360,7 +360,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
     });
 
     // 为新节点类型根据 status 生成 toolName
-    var isNewNodeType = !['tool_invocation', 'tool_result'].includes(dataObj.moduleType);
+    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]), {}, {
@@ -372,7 +372,8 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
     } else {
       // 新增工具时，为新节点类型补充 toolName
       // agent 类类型，保持只有一个 agent
-      if (dataObj.moduleType === 'agent' && curToolList.length > 0) return;
+      // tool_result只是工具的结果，不能新增
+      if (dataObj.moduleType === 'agent' && curToolList.length > 0 || dataObj.moduleType === 'tool_result') return;
       curToolList = curToolList.filter(function (tool) {
         return tool.moduleType !== 'agent';
       });