@agentscope-ai/chat 1.1.66 → 1.1.67

package/lib/AgentScopeRuntimeWebUI/core/Chat/hooks/useChatController.js

@@ -11,11 +11,12 @@ import useChatAnywhereEventEmitter from "../../Context/useChatAnywhereEventEmitt
 import useChatMessageHandler from "./useChatMessageHandler";
 import useChatRequest from "./useChatRequest";
 import useChatSessionHandler from "./useChatSessionHandler";
+import { useChatAnywhereOptions } from "../../Context/ChatAnywhereOptionsContext";
 import ReactDOM from "react-dom";
 // import mockdata from '../../mock/mock.json'
 
 /**
- * 聊天控制器 Hook - 协调所有聊天相关操作
+ * Chat controller hook — coordinates all chat-related operations.
  */
 export default function useChatController() {
   var setLoading = useContextSelector(ChatAnywhereInputContext, function (v) {
@@ -24,18 +25,27 @@ export default function useChatController() {
   var currentSessionId = useContextSelector(ChatAnywhereSessionsContext, function (v) {
     return v.currentSessionId;
   });
-  var currentQARef = useRef({});
+  var apiOptions = useChatAnywhereOptions(function (v) {
+    return v.api;
+  });
+  var apiOptionsRef = useRef(apiOptions);
+  useEffect(function () {
+    apiOptionsRef.current = apiOptions;
+  }, [apiOptions]);
+  var currentQARef = useRef({
+    activeRequestId: 0
+  });
 
-  // 消息处理
+  // Message handler
   var messageHandler = useChatMessageHandler({
     currentQARef: currentQARef
   });
 
-  // 会话处理
+  // Session handler
   var sessionHandler = useChatSessionHandler();
 
   /**
-   * 完成响应
+   * Finalize the current response and reset UI loading state.
    */
   var finishResponse = useCallback(function () {
     var status = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'finished';
@@ -48,7 +58,7 @@ export default function useChatController() {
     sessionHandler.syncSessionMessages(messageHandler.getMessages());
   }, [setLoading, messageHandler, sessionHandler]);
 
-  // API 请求处理
+  // API request handling
   var _useChatRequest = useChatRequest({
       currentQARef: currentQARef,
       updateMessage: messageHandler.updateMessage,
@@ -61,43 +71,65 @@ export default function useChatController() {
     reconnect = _useChatRequest.reconnect;
 
   /**
-   * 处理用户提交
+   * Handle user message submission.
    */
   var handleSubmit = useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-      var messages, historyMessages;
+      var _currentQARef$current;
+      var myRequestId, messages, historyMessages;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
+            // 0. Abort any previous in-flight SSE. We do NOT call the cancel API here
+            //    — the user is sending a new message, not explicitly cancelling.
+            //    Cancel is only invoked from handleCancel.
+            (_currentQARef$current = currentQARef.current.abortController) === null || _currentQARef$current === void 0 || _currentQARef$current.abort();
+
+            // 1. Ensure session exists FIRST. Bumping activeRequestId before this can
+            //    race with the [currentSessionId] effect below: ensureSession may set
+            //    a new sessionId, that effect then bumps activeRequestId again, and
+            //    our own myRequestId becomes stale → the guard after sleep(100) bails
+            //    out and the request is silently dropped. Establishing the session
+            //    first guarantees the effect (if any) has flushed before we snapshot
+            //    myRequestId.
+            _context.next = 3;
             return sessionHandler.ensureSession(data.query);
-          case 2:
-            // 2. 更新会话名称（如果是第一条消息）
+          case 3:
+            myRequestId = ++currentQARef.current.activeRequestId; // Snapshot current session id for downstream SSE guard checks
+            currentQARef.current.activeSessionId = sessionHandler.getCurrentSessionId();
+
+            // 2. Update session name (only for the first message)
             messages = messageHandler.getMessages();
             if (!sessionHandler.getCurrentSessionId()) {
-              _context.next = 6;
+              _context.next = 9;
               break;
             }
-            _context.next = 6;
+            _context.next = 9;
             return sessionHandler.updateSessionName(data.query, messages);
-          case 6:
-            // 3. 创建用户请求消息
+          case 9:
+            // 3. Create user request message
             messageHandler.createRequestMessage(data);
             setLoading(true);
-            _context.next = 10;
+            _context.next = 13;
             return sleep(100);
-          case 10:
-            // 4. 创建助手响应消息
+          case 13:
+            if (!(myRequestId !== currentQARef.current.activeRequestId)) {
+              _context.next = 15;
+              break;
+            }
+            return _context.abrupt("return");
+          case 15:
+            // 4. Create assistant response placeholder
             messageHandler.createResponseMessage();
 
-            // 5. 获取历史消息并发起请求
+            // 5. Gather history messages and fire the request
             historyMessages = messageHandler.getHistoryMessages();
-            _context.next = 14;
+            _context.next = 19;
             return sessionHandler.syncSessionMessages(messageHandler.getMessages());
-          case 14:
-            _context.next = 16;
-            return request(historyMessages, data.biz_params);
-          case 16:
+          case 19:
+            _context.next = 21;
+            return request(historyMessages, data.biz_params, myRequestId);
+          case 21:
           case "end":
             return _context.stop();
         }
@@ -106,27 +138,40 @@ export default function useChatController() {
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [messageHandler, sessionHandler, request]);
+  }(), [messageHandler, sessionHandler, request, setLoading]);
   var handleApproval = useCallback( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-      var input, historyMessages;
+      var _currentQARef$current2;
+      var input, myRequestId, historyMessages;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             input = _ref2.input;
+            (_currentQARef$current2 = currentQARef.current.abortController) === null || _currentQARef$current2 === void 0 || _currentQARef$current2.abort();
+            // Snapshot the current session id BEFORE bumping requestId, then bump.
+            // Order matches handleSubmit so a concurrent session-change effect cannot
+            // invalidate myRequestId between the bump and the sleep guard below.
+            currentQARef.current.activeSessionId = sessionHandler.getCurrentSessionId();
+            myRequestId = ++currentQARef.current.activeRequestId;
             messageHandler.createApprovalMessage(input);
             setLoading(true);
-            _context2.next = 5;
+            _context2.next = 8;
             return sleep(100);
-          case 5:
+          case 8:
+            if (!(myRequestId !== currentQARef.current.activeRequestId)) {
+              _context2.next = 10;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 10:
             messageHandler.createResponseMessage();
             historyMessages = messageHandler.getHistoryMessages();
-            _context2.next = 9;
+            _context2.next = 14;
             return sessionHandler.syncSessionMessages(messageHandler.getMessages());
-          case 9:
-            _context2.next = 11;
-            return request(historyMessages);
-          case 11:
+          case 14:
+            _context2.next = 16;
+            return request(historyMessages, undefined, myRequestId);
+          case 16:
           case "end":
             return _context2.stop();
         }
@@ -135,43 +180,71 @@ export default function useChatController() {
     return function (_x2) {
       return _ref3.apply(this, arguments);
     };
-  }(), [messageHandler, sessionHandler, request]);
+  }(), [messageHandler, sessionHandler, request, setLoading]);
 
   /**
-   * 处理取消
-   * 1. 标记 interrupted 并重置 UI（finishResponse）
-   * 2. abort SSE 连接 —— Stream 内部的 Promise.race 会立即 reject AbortError，
-   *    processSSEResponse 的 catch 会检测 interrupted 状态并调用 cancel API
+   * Handle cancel / stop.
+   * 1. Mark response as interrupted and reset UI (finishResponse).
+   * 2. Invoke the cancel API immediately — do NOT wait for the next SSE
+   *    chunk to deliver the cancellation (fixes "backend keeps running
+   *    after stop" issue).
+   * 3. Abort the SSE connection — its catch branch will see
+   *    msgStatus === 'interrupted' and call builder.cancel() to flip the
+   *    in-progress TEXT content to Canceled, so the trailing Markdown
+   *    cursor ("...") disappears.
+   *
+   * NOTE: we intentionally do NOT bump activeRequestId here. Doing so
+   * would make isStillActive() in processSSEResponse return false for
+   * this very cancel, which would short-circuit the catch branch before
+   * builder.cancel() runs and leave the trailing cursor blinking forever.
+   * Stale-chunk protection still holds: abort() breaks the SSE loop
+   * immediately, and the next submit / session switch will bump
+   * activeRequestId on its own.
    */
   var handleCancel = useCallback(function () {
-    var _currentQARef$current;
+    var _currentQARef$current3;
     finishResponse('interrupted');
-    (_currentQARef$current = currentQARef.current.abortController) === null || _currentQARef$current === void 0 || _currentQARef$current.abort();
-  }, [finishResponse]);
+    var sessionId = sessionHandler.getCurrentSessionId();
+    var cancelFn = apiOptionsRef.current.cancel;
+    if (cancelFn && sessionId) {
+      try {
+        cancelFn({
+          session_id: sessionId
+        });
+      } catch (e) {
+        console.error('cancel api failed:', e);
+      }
+    }
+    (_currentQARef$current3 = currentQARef.current.abortController) === null || _currentQARef$current3 === void 0 || _currentQARef$current3.abort();
+  }, [finishResponse, sessionHandler]);
 
   /**
-   * 处理重新生成
+   * Handle regenerate (retry the last assistant response).
    */
   var handleRegenerate = useCallback( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(messageId) {
-      var historyMessages;
+      var _currentQARef$current4;
+      var myRequestId, historyMessages;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
+            (_currentQARef$current4 = currentQARef.current.abortController) === null || _currentQARef$current4 === void 0 || _currentQARef$current4.abort();
+            currentQARef.current.activeSessionId = sessionHandler.getCurrentSessionId();
+            myRequestId = ++currentQARef.current.activeRequestId;
             setLoading(true);
 
-            // 1. 移除旧消息
+            // 1. Remove old message
             messageHandler.removeMessageById(messageId);
 
-            // 2. 创建新的响应消息
+            // 2. Create new response placeholder
             currentQARef.current.abortController = new AbortController();
             messageHandler.createResponseMessage();
 
-            // 3. 发起请求
+            // 3. Fire the request
             historyMessages = messageHandler.getHistoryMessages();
-            _context3.next = 7;
-            return request(historyMessages);
-          case 7:
+            _context3.next = 10;
+            return request(historyMessages, undefined, myRequestId);
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -180,40 +253,48 @@ export default function useChatController() {
     return function (_x3) {
       return _ref4.apply(this, arguments);
     };
-  }(), [messageHandler, request]);
+  }(), [messageHandler, request, sessionHandler, setLoading]);
 
   /**
-   * 处理 SSE 重连（切回未完成的对话时）
+   * Handle SSE reconnection (when switching back to an unfinished conversation).
    * If the reconnect API returns no body or the stream ends without a completion event,
    * treat it as idle: remove the empty placeholder and reset loading.
    */
   var handleReconnect = useCallback( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(sessionId) {
-      var _currentQARef$current2, _currentQARef$current3;
-      var _currentQARef$current4;
+      var _currentQARef$current5, _currentQARef$current6;
+      var myRequestId, _currentQARef$current7;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            (_currentQARef$current2 = currentQARef.current.abortController) === null || _currentQARef$current2 === void 0 || _currentQARef$current2.abort();
+            (_currentQARef$current5 = currentQARef.current.abortController) === null || _currentQARef$current5 === void 0 || _currentQARef$current5.abort();
             currentQARef.current.abortController = new AbortController();
+            myRequestId = ++currentQARef.current.activeRequestId;
+            currentQARef.current.activeSessionId = sessionId;
             setLoading(true);
             messageHandler.createResponseMessage();
-            _context4.next = 6;
-            return reconnect(sessionId);
-          case 6:
+            _context4.next = 8;
+            return reconnect(sessionId, myRequestId);
+          case 8:
+            if (!(myRequestId !== currentQARef.current.activeRequestId)) {
+              _context4.next = 10;
+              break;
+            }
+            return _context4.abrupt("return");
+          case 10:
             // If the response is still in 'generating' state after reconnect completes,
             // onFinish() was never called (no response body, or stream closed without a completion event).
             // Treat as idle: remove the empty placeholder and reset loading.
             // HTTP errors and normal SSE completions both call onFinish() → msgStatus becomes 'finished',
             // so they are correctly excluded from this cleanup.
-            if (((_currentQARef$current3 = currentQARef.current.response) === null || _currentQARef$current3 === void 0 ? void 0 : _currentQARef$current3.msgStatus) === 'generating') {
+            if (((_currentQARef$current6 = currentQARef.current.response) === null || _currentQARef$current6 === void 0 ? void 0 : _currentQARef$current6.msgStatus) === 'generating') {
               setLoading(false);
-              if ((_currentQARef$current4 = currentQARef.current.response) !== null && _currentQARef$current4 !== void 0 && _currentQARef$current4.id) {
+              if ((_currentQARef$current7 = currentQARef.current.response) !== null && _currentQARef$current7 !== void 0 && _currentQARef$current7.id) {
                 messageHandler.removeMessageById(currentQARef.current.response.id);
               }
               currentQARef.current.response = undefined;
             }
-          case 7:
+          case 11:
           case "end":
             return _context4.stop();
         }
@@ -224,22 +305,40 @@ export default function useChatController() {
     };
   }(), [messageHandler, reconnect, setLoading]);
 
-  // 监听会话切换，断开当前 SSE 连接（不通知后端取消）并重置状态
+  // On session switch: abort current SSE (without notifying backend cancel)
+  // and reset state. Also increment activeRequestId so any residual SSE
+  // chunks from the old session are discarded, preventing cross-session leakage.
+  //
+  // IMPORTANT: only bump on a real session change. Running this on initial
+  // mount or when sessionId merely transitions from undefined → <same id>
+  // (e.g. after route navigate / refreshKey churn) would invalidate the
+  // myRequestId taken by an in-flight handleSubmit and silently drop the
+  // outgoing chat request — that was the regression that made existing
+  // sessions unable to send messages until a new chat was created.
   useEffect(function () {
-    var _currentQARef$current5;
-    (_currentQARef$current5 = currentQARef.current.abortController) === null || _currentQARef$current5 === void 0 || _currentQARef$current5.abort();
+    var _currentQARef$current8;
+    var prevSessionId = currentQARef.current.activeSessionId;
+    if (!prevSessionId || prevSessionId === currentSessionId) {
+      // First mount, or no real switch: just sync the snapshot, do not bump.
+      currentQARef.current.activeSessionId = currentSessionId;
+      return;
+    }
+    (_currentQARef$current8 = currentQARef.current.abortController) === null || _currentQARef$current8 === void 0 || _currentQARef$current8.abort();
     currentQARef.current = {
       request: undefined,
       response: undefined,
-      abortController: undefined
+      abortController: undefined,
+      activeRequestId: currentQARef.current.activeRequestId + 1,
+      activeSessionId: currentSessionId
     };
     return function () {
-      var _currentQARef$current6;
-      (_currentQARef$current6 = currentQARef.current.abortController) === null || _currentQARef$current6 === void 0 || _currentQARef$current6.abort();
+      var _currentQARef$current9;
+      (_currentQARef$current9 = currentQARef.current.abortController) === null || _currentQARef$current9 === void 0 || _currentQARef$current9.abort();
+      currentQARef.current.activeRequestId += 1;
     };
   }, [currentSessionId]);
 
-  // 监听重连事件
+  // Listen for reconnect events
   useChatAnywhereEventEmitter({
     type: 'handleReconnect',
     callback: function () {
@@ -262,7 +361,7 @@ export default function useChatController() {
     }()
   }, [handleReconnect]);
 
-  // 监听重新生成事件
+  // Listen for regenerate events
   useChatAnywhereEventEmitter({
     type: 'handleReplace',
     callback: function () {

package/lib/AgentScopeRuntimeWebUI/core/Chat/hooks/useChatRequest.d.ts

@@ -6,17 +6,21 @@ interface UseChatRequestOptions {
         request?: IAgentScopeRuntimeWebUIMessage;
         response?: IAgentScopeRuntimeWebUIMessage;
         abortController?: AbortController;
+        /** Active request id, maintained by the controller. Incrementing it invalidates any in-flight SSE. */
+        activeRequestId: number;
+        /** Session id snapshot for the active request. */
+        activeSessionId?: string;
     }>;
     updateMessage: (message: IAgentScopeRuntimeWebUIMessage) => void;
     getCurrentSessionId: () => string;
     onFinish: () => void;
 }
 /**
- * 处理 API 请求和流式响应的 Hook
+ * Hook for handling API requests and streaming SSE responses.
  */
 export default function useChatRequest(options: UseChatRequestOptions): {
-    request: (historyMessages: any[], biz_params?: IAgentScopeRuntimeWebUIInputData['biz_params']) => Promise<void>;
-    reconnect: (sessionId: string) => Promise<void>;
+    request: (historyMessages: any[], biz_params?: IAgentScopeRuntimeWebUIInputData['biz_params'], myRequestId?: number) => Promise<void>;
+    reconnect: (sessionId: string, myRequestId?: number) => Promise<void>;
     mockRequest: (mockdata: any) => Promise<void>;
 };
 export {};