@myun/gimi-chat 0.9.52 → 0.9.53

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

@@ -105,8 +105,8 @@ var AnswerItem = function AnswerItem(_ref) {
   var messageList = useAppSelector(function (state) {
     return state.gimiMenu.messageList;
   });
-  var agentObj = useAppSelector(function (state) {
-    return state.gimiMenu.agentObj || {};
+  var conversationId = useAppSelector(function (state) {
+    return state.gimiMenu.conversationId || '';
   });
   var handleLinkClickCapture = React.useCallback(function (e) {
     if (platform !== 'preview') return;
@@ -216,8 +216,8 @@ var AnswerItem = function AnswerItem(_ref) {
             setToolLoading(true);
             _context.next = 5;
             return apiService.getAgentToolList({
-              conversationId: item.conversationId,
-              chatId: item.chatId,
+              conversationId: item.conversationId || conversationId.toString() || '',
+              chatId: item.chatId || '',
               pageSize: 200
             });
           case 5:

package/dist/components/answer-item/index.module.css

@@ -298,10 +298,10 @@
   border-radius: 16px;
 }
 :global(.markdown_container) ul {
-  list-style-type: disc;
+  list-style-type: disc !important;
 }
 :global(.markdown_container) ul > li::before {
-  content: "";
+  content: "" !important;
 }
 @media (min-width: 1920px) {
   :global(.markdown_container) {

package/dist/components/chat-input/extension/skill/MentionList.d.ts

@@ -25,6 +25,7 @@ interface MentionListProps {
     query?: string;
     agentId?: number;
     apiService?: IUseApi | null;
+    getCurrentTextLength?: () => number;
 }
 declare const MentionList: React.ForwardRefExoticComponent<MentionListProps & React.RefAttributes<MentionListRef>>;
 export default MentionList;

package/dist/components/chat-input/extension/skill/MentionList.js

@@ -5,6 +5,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
+import { Toast } from '@douyinfe/semi-ui';
 import AiLoading from "../../../../components/ai-loading";
 import "./index.less";
 import { useTranslation } from 'react-i18next';
@@ -12,7 +13,8 @@ var MentionList = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var command = _ref.command,
     query = _ref.query,
     agentId = _ref.agentId,
-    apiService = _ref.apiService;
+    apiService = _ref.apiService,
+    getCurrentTextLength = _ref.getCurrentTextLength;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     selectedIndex = _useState2[0],
@@ -98,6 +100,20 @@ var MentionList = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var selectItem = function selectItem(id) {
     var item = filterOptions[id];
     if (item) {
+      if (getCurrentTextLength) {
+        var _item$toolId, _item$toolCategoryDes, _item$imageUrl, _item$toolName;
+        var serialized = "<skilltool>".concat(JSON.stringify({
+          toolId: (_item$toolId = item.toolId) !== null && _item$toolId !== void 0 ? _item$toolId : '',
+          toolType: (_item$toolCategoryDes = item.toolCategoryDesc) !== null && _item$toolCategoryDes !== void 0 ? _item$toolCategoryDes : '',
+          imageUrl: (_item$imageUrl = item.imageUrl) !== null && _item$imageUrl !== void 0 ? _item$imageUrl : '',
+          toolName: (_item$toolName = item.toolName) !== null && _item$toolName !== void 0 ? _item$toolName : ''
+        }), "</skilltool>");
+        var currentLen = getCurrentTextLength();
+        if (currentLen + serialized.length > 1000) {
+          Toast.warning(t('common.skillExceedLimit'));
+          return;
+        }
+      }
       command({
         item: item
       });

package/dist/components/chat-input/extension/skill/suggestion.d.ts

@@ -8,6 +8,7 @@ declare let skillContext: {
     getAgentId?: () => number | undefined;
     getApiService?: () => IUseApi | null;
     getSkillDisplay?: () => number | undefined;
+    getCurrentTextLength?: () => number;
 };
 export declare const setSkillContext: (ctx: Partial<typeof skillContext>) => void;
 export declare const suggestion: any;

package/dist/components/chat-input/extension/skill/suggestion.js

@@ -100,6 +100,9 @@ export var suggestion = {
   render: function render() {
     var component;
     var reposition = null;
+    var outsideClickHandler = null;
+    var currentEditor = null;
+    var currentRange = null;
     return {
       onStart: function onStart(props) {
         var _skillContext$getSkil, _skillContext;
@@ -112,10 +115,14 @@ export var suggestion = {
           var _skillContext$getAgen, _skillContext2, _skillContext$getApiS, _skillContext$getApiS2, _skillContext3;
           var agentId = (_skillContext$getAgen = (_skillContext2 = skillContext).getAgentId) === null || _skillContext$getAgen === void 0 ? void 0 : _skillContext$getAgen.call(_skillContext2);
           var apiService = (_skillContext$getApiS = (_skillContext$getApiS2 = (_skillContext3 = skillContext).getApiService) === null || _skillContext$getApiS2 === void 0 ? void 0 : _skillContext$getApiS2.call(_skillContext3)) !== null && _skillContext$getApiS !== void 0 ? _skillContext$getApiS : null;
+          var getCurrentTextLength = skillContext.getCurrentTextLength;
+          currentEditor = props.editor;
+          currentRange = props.range;
           component = new ReactRenderer(MentionList, {
             props: _objectSpread(_objectSpread({}, props), {}, {
               agentId: agentId,
-              apiService: apiService
+              apiService: apiService,
+              getCurrentTextLength: getCurrentTextLength
             }),
             editor: props.editor
           });
@@ -133,34 +140,54 @@ export var suggestion = {
           };
           window.addEventListener('resize', reposition);
           window.addEventListener('scroll', reposition, true);
+          outsideClickHandler = function outsideClickHandler(e) {
+            var _component;
+            if (!((_component = component) !== null && _component !== void 0 && _component.element)) return;
+            if (component.element.contains(e.target)) return;
+            e.stopPropagation();
+            // 手动移除面板 DOM，再通过内容变更让 suggestion plugin 退出
+            component.element.remove();
+            if (currentEditor && currentRange) {
+              var insertPos = currentRange.from;
+              currentEditor.chain().focus().deleteRange(currentRange).insertContentAt(insertPos, '/').run();
+            }
+          };
+          document.addEventListener('mousedown', outsideClickHandler, true);
         } catch (e) {
           console.error('[skill] onStart render error:', e);
         }
       },
       onUpdate: function onUpdate(props) {
         if (!component) return;
+        currentRange = props.range;
         component.updateProps(props);
         // query 变化导致面板高度变化，重新判断上下翻转
         positionPanel(props.editor, component.element);
       },
       onKeyDown: function onKeyDown(props) {
-        var _component, _component$onKeyDown;
+        var _component2, _component2$onKeyDown;
         function onExit() {
           component.destroy();
         }
-        return (_component = component) === null || _component === void 0 || (_component = _component.ref) === null || _component === void 0 || (_component$onKeyDown = _component.onKeyDown) === null || _component$onKeyDown === void 0 ? void 0 : _component$onKeyDown.call(_component, _objectSpread(_objectSpread({}, props), {}, {
+        return (_component2 = component) === null || _component2 === void 0 || (_component2 = _component2.ref) === null || _component2 === void 0 || (_component2$onKeyDown = _component2.onKeyDown) === null || _component2$onKeyDown === void 0 ? void 0 : _component2$onKeyDown.call(_component2, _objectSpread(_objectSpread({}, props), {}, {
           exitCb: onExit
         }));
       },
       onExit: function onExit() {
-        var _component2, _component3;
+        var _component3, _component4;
         if (reposition) {
           window.removeEventListener('resize', reposition);
           window.removeEventListener('scroll', reposition, true);
           reposition = null;
         }
-        (_component2 = component) === null || _component2 === void 0 || (_component2 = _component2.element) === null || _component2 === void 0 || _component2.remove();
-        (_component3 = component) === null || _component3 === void 0 || _component3.destroy();
+        if (outsideClickHandler) {
+          document.removeEventListener('mousedown', outsideClickHandler, true);
+          outsideClickHandler = null;
+        }
+        currentEditor = null;
+        currentRange = null;
+        (_component3 = component) === null || _component3 === void 0 || (_component3 = _component3.element) === null || _component3 === void 0 || _component3.remove();
+        (_component4 = component) === null || _component4 === void 0 || _component4.destroy();
       },
       focusEditor: function focusEditor(props) {
         props.editor.commands.focus();

package/dist/components/chat-input/index.js

@@ -155,6 +155,9 @@ var ChatInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
       getSkillDisplay: function getSkillDisplay() {
         var _agentObjRef$current2;
         return (_agentObjRef$current2 = agentObjRef.current) === null || _agentObjRef$current2 === void 0 ? void 0 : _agentObjRef$current2.skillDisplay;
+      },
+      getCurrentTextLength: function getCurrentTextLength() {
+        return preInputValueRef.current.length;
       }
     });
   }, [apiService]);
@@ -189,9 +192,8 @@ var ChatInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
   var onContentChange = React.useCallback(function (content) {
     var _props$onValueChange;
-    var skipSkillVal = extractText(content, true);
     var value = extractText(content);
-    if (skipSkillVal.length > 10000) {
+    if (value.length > 10000) {
       var _inputRef$current4;
       Toast.warning(t('chatInput.maxLength'));
       value = value.slice(0, 10000);

package/dist/hooks/useCommonChatAPI.js

@@ -246,7 +246,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
 
   // 打断ai输出
   var handleInterrupt = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var uid, _parseMessageContent, content, _item, newMessageList, _newMessageList;
+    var uid, _parseMessageContent, content, _item, newMessageList, lastToolList, _newMessageList;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -296,6 +296,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
               }));
             }
           } else {
+            lastToolList = _toConsumableArray(messageList[messageList.length - 1].toolList || []);
             _newMessageList = [].concat(_toConsumableArray(messageList.slice(0, -1)), [_objectSpread(_objectSpread({}, messageList[messageList.length - 1]), {}, {
               loading: false,
               reasoningLoading: false,
@@ -306,10 +307,13 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
               mcp: null,
               thinkingInfo: {
                 status: "COMPLETED",
-                toolName: "已完成",
+                toolName: t('chatApi.completed'),
                 collapse: true,
                 loaded: false
-              }
+              },
+              toolList: _toConsumableArray(lastToolList.filter(function (v) {
+                return v.moduleType !== "agent" && v.moduleType !== 'end';
+              }))
             })]);
             dispatch(setMessageList({
               messageList: _newMessageList
@@ -542,7 +546,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
                   moduleType: 'end',
                   content: '',
                   status: "RUNNING",
-                  toolName: "正在整理答案",
+                  toolName: t('chatApi.organizingAnswer'),
                   id: "".concat(new Date().getTime())
                 });
               }
@@ -571,7 +575,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
                           mcp: null,
                           thinkingInfo: {
                             status: "RUNNING",
-                            toolName: "已完成",
+                            toolName: t('chatApi.completed'),
                             collapse: false,
                             loaded: true
                           },
@@ -580,7 +584,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
                             content: '',
                             data: Response,
                             status: "RUNNING",
-                            toolName: "等待人工确认",
+                            toolName: t('chatApi.waitingForConfirmation'),
                             confirmStatus: "PENDING",
                             id: "".concat(new Date().getTime())
                           }])
@@ -590,7 +594,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
                           moduleType: type
                         }, type === 'end' ? 'content' : 'moduleInfo', Response), "reasoningResponse", type === 'end' ? reasoningResponse : ''), "loading", false), "reasoningLoading", false), "mcp", null), "durationMs", (dataObj === null || dataObj === void 0 ? void 0 : dataObj.elapsed) || 0), "totalTokens", (dataObj === null || dataObj === void 0 ? void 0 : dataObj.totalTokens) || 0), "thinkingInfo", {
                           status: type === 'end' ? "COMPLETED" : "RUNNING",
-                          toolName: "已完成",
+                          toolName: t('chatApi.completed'),
                           collapse: true,
                           loaded: true
                         }), "toolList", _toConsumableArray(lastToolList.filter(function (v) {
@@ -636,13 +640,23 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
             }(), function () {
               setIgnoreOnMessage(true);
               var currentMessageList = messageListRef.current;
+              var lastToolList = [].concat(_toConsumableArray(currentMessageList[currentMessageList.length - 1].toolList || []), [{
+                moduleType: 'FAILED',
+                content: '',
+                status: "COMPLETED",
+                toolName: '服务异常',
+                id: "".concat(new Date().getTime())
+              }]);
               var newMessageList = [].concat(_toConsumableArray(currentMessageList.slice(0, -1)), [_objectSpread(_objectSpread({}, currentMessageList[currentMessageList.length - 1]), {}, {
                 loading: false,
                 reasoningLoading: false,
                 stop: 0,
                 reasoningStatus: 3,
                 msgLoading: false,
-                mcp: null
+                mcp: null,
+                toolList: _toConsumableArray(lastToolList.filter(function (v) {
+                  return v.moduleType !== "agent" && v.moduleType !== 'end';
+                }))
               })]);
               dispatch(setMessageList({
                 messageList: newMessageList

package/dist/i18n/locales/en-US.d.ts

@@ -98,6 +98,7 @@ declare const enUS: {
     'common.pleaseWait': string;
     'common.empty': string;
     'common.noSkill': string;
+    'common.skillExceedLimit': string;
     'common.delete': string;
     'common.cancel': string;
     'common.retry': string;
@@ -166,6 +167,9 @@ declare const enUS: {
     'chatApi.deleteSuccess': string;
     'chatApi.deleteFailed': string;
     'chatApi.noRequestToCancel': string;
+    'chatApi.completed': string;
+    'chatApi.organizingAnswer': string;
+    'chatApi.waitingForConfirmation': string;
     'messageAction.copy': string;
     'messageAction.likeDone': string;
     'messageAction.like': string;

package/dist/i18n/locales/en-US.js

@@ -98,6 +98,7 @@ var enUS = {
   'common.pleaseWait': 'Please wait...',
   'common.empty': 'No content',
   'common.noSkill': 'No Skill',
+  'common.skillExceedLimit': 'Adding this skill will exceed the 10000-character limit. Please shorten your input first.',
   'common.delete': 'Delete',
   'common.cancel': 'Cancel',
   'common.retry': 'Retry',
@@ -166,6 +167,9 @@ var enUS = {
   'chatApi.deleteSuccess': 'Conversation deleted successfully',
   'chatApi.deleteFailed': 'Failed to delete conversation',
   'chatApi.noRequestToCancel': 'No request to cancel',
+  'chatApi.completed': 'Completed',
+  'chatApi.organizingAnswer': 'Organizing answer',
+  'chatApi.waitingForConfirmation': 'Waiting for confirmation',
   'messageAction.copy': 'Copy',
   'messageAction.likeDone': 'Liked',
   'messageAction.like': 'Like',

package/dist/i18n/locales/zh-CN.d.ts

@@ -100,6 +100,7 @@ declare const zhCN: {
     'common.pleaseWait': string;
     'common.empty': string;
     'common.noSkill': string;
+    'common.skillExceedLimit': string;
     'common.delete': string;
     'common.cancel': string;
     'common.retry': string;
@@ -168,6 +169,9 @@ declare const zhCN: {
     'chatApi.deleteSuccess': string;
     'chatApi.deleteFailed': string;
     'chatApi.noRequestToCancel': string;
+    'chatApi.completed': string;
+    'chatApi.organizingAnswer': string;
+    'chatApi.waitingForConfirmation': string;
     'messageAction.copy': string;
     'messageAction.likeDone': string;
     'messageAction.like': string;

package/dist/i18n/locales/zh-CN.js

@@ -100,6 +100,7 @@ var zhCN = {
   'common.pleaseWait': '请稍等...',
   'common.empty': '暂无内容',
   'common.noSkill': '暂无技能',
+  'common.skillExceedLimit': '添加该技能后内容将超过10000字，请精简输入内容后再选择',
   'common.delete': '删除',
   'common.cancel': '取消',
   'common.retry': '重试',
@@ -168,6 +169,9 @@ var zhCN = {
   'chatApi.deleteSuccess': '删除会话成功',
   'chatApi.deleteFailed': '删除会话失败',
   'chatApi.noRequestToCancel': '没有可取消的请求',
+  'chatApi.completed': '已完成',
+  'chatApi.organizingAnswer': '正在整理答案',
+  'chatApi.waitingForConfirmation': '等待人工确认',
   'messageAction.copy': '复制',
   'messageAction.likeDone': '已点赞',
   'messageAction.like': '点赞',