@ai-group/chat-sdk 3.6.7 → 3.6.9

package/dist/esm/hooks/useADKChat.js

@@ -45,6 +45,47 @@ var combineTextParts = function combineTextParts(parts) {
   return result;
 };
 var DEFAULT_SESSION_EVENTS_POLLING_INTERVAL = 10000;
+
+/**
+ * 从 event + part 构建非文本 IMessage（functionCall / functionResponse / executableCode 等）。
+ */
+var buildNonTextMessage = function buildNonTextMessage(event, part) {
+  var role = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "bot";
+  var msg = {
+    id: v4(),
+    author: event.author,
+    invocationId: event.invocationId,
+    eventId: event.id,
+    timestamp: event.timestamp,
+    isLike: event.isLike || 0,
+    role: role,
+    modelCode: event.modelCode,
+    usageMetadata: event.usageMetadata,
+    finishReason: event.finishReason,
+    raw: event
+  };
+  if (part.inlineData) {
+    msg.inlineData = {
+      displayName: part.inlineData.displayName,
+      data: part.inlineData.data,
+      mimeType: part.inlineData.mimeType
+    };
+  } else if (part.fileData) {
+    msg.fileData = [part.fileData];
+  } else if (part.functionCall) {
+    msg.functionCall = part.functionCall;
+  } else if (part.functionResponse) {
+    msg.functionResponse = part.functionResponse;
+  } else if (part.executableCode) {
+    msg.executableCode = part.executableCode;
+  } else if (part.codeExecutionResult) {
+    msg.codeExecutionResult = part.codeExecutionResult;
+  } else if (part.text) {
+    msg.text = part.text;
+    msg.thought = part.thought;
+  }
+  return msg;
+};
 var getMessageEventId = function getMessageEventId(messageItem) {
   var _messageItem$raw;
   return messageItem.eventId || ((_messageItem$raw = messageItem.raw) === null || _messageItem$raw === void 0 ? void 0 : _messageItem$raw.id);
@@ -60,16 +101,19 @@ var deduplicateMessages = function deduplicateMessages(messageItems) {
     seenMessageIds.add(messageItem.id);
     return true;
   });
+
+  // 机器人文本消息去重：同一 invocationId + 思考类型的文本消息，
+  // 如果文本内容存在包含关系，保留最长的（sessionDetails 完整消息），去掉被包含的短文本（SSE 流式增量）。
+  // 使用 invocationId 分组，同一轮对话的 invocationId 始终一致， SSE 后续 chunk 的 首个id 与 sessionDetails 的 id 相同，其余不同，
   var botTextGroups = new Map();
   uniqueIdMessages.forEach(function (messageItem) {
-    var eventId = getMessageEventId(messageItem);
-    if (messageItem.role !== "bot" || !eventId || typeof messageItem.text !== "string") return;
+    if (messageItem.role !== "bot" || !messageItem.invocationId || typeof messageItem.text !== "string") return;
     var normalizedText = messageItem.text.replace(/\s+/g, " ").trim();
     if (!normalizedText) return;
     var fileKey = (messageItem.fileData || []).map(function (file) {
       return file.fileUri;
     }).join("|");
-    var groupKey = "".concat(eventId, "\0").concat(Boolean(messageItem.thought), "\0").concat(fileKey);
+    var groupKey = "".concat(messageItem.invocationId, "\0").concat(Boolean(messageItem.thought), "\0").concat(fileKey);
     var group = botTextGroups.get(groupKey) || [];
     group.push({
       messageItem: messageItem,
@@ -79,6 +123,7 @@ var deduplicateMessages = function deduplicateMessages(messageItems) {
   });
   var redundantMessageIds = new Set();
   botTextGroups.forEach(function (group) {
+    if (group.length <= 1) return;
     var completeTexts = [];
     _toConsumableArray(group).sort(function (a, b) {
       return b.normalizedText.length - a.normalizedText.length;
@@ -107,6 +152,10 @@ var mapSessionMessages = function mapSessionMessages(sessionEvents) {
     if (item.author === "user" && item.content.parts.some(function (part) {
       return part.task;
     })) return;
+    // functionResponse 的 user 事件仅用于配对 functionCall，不作为独立消息展示
+    if (item.content.role === "user" && item.content.parts.every(function (part) {
+      return !part || part.functionResponse;
+    })) return;
     var role = (item.content.role || "").toLowerCase() === "user" ? "user" : "bot";
     var parts = item.content.parts.filter(function (part) {
       if (!part) return false;
@@ -122,9 +171,13 @@ var mapSessionMessages = function mapSessionMessages(sessionEvents) {
     var otherParts = parts.filter(function (part) {
       return !part.text && !part.errorMessage && !part.inlineData && !part.fileData;
     });
+
+    // 使用确定性 ID：同一服务端事件 + 同一 part 类型始终生成相同 ID，
+    // 确保多次 mapSessionMessages 调用产生的消息可以被 id 去重正确识别。
+    var partCounter = 0;
     if (textParts.length > 0 || fileDataParts.length > 0) {
       var messageItem = {
-        id: v4(),
+        id: "session-event:".concat(item.id, ":").concat(partCounter++),
         author: item.author,
         invocationId: item.invocationId,
         eventId: item.id,
@@ -165,7 +218,7 @@ var mapSessionMessages = function mapSessionMessages(sessionEvents) {
     }
     otherParts.forEach(function (part) {
       var messageItem = {
-        id: v4(),
+        id: "session-event:".concat(item.id, ":").concat(partCounter++),
         author: item.author,
         invocationId: item.invocationId,
         eventId: item.id,
@@ -195,62 +248,54 @@ var mapSessionMessages = function mapSessionMessages(sessionEvents) {
   });
   return mapped;
 };
-var getComparableMessageContent = function getComparableMessageContent(messageItem) {
-  var _messageItem$text;
-  return JSON.stringify({
-    role: messageItem.role,
-    text: ((_messageItem$text = messageItem.text) === null || _messageItem$text === void 0 ? void 0 : _messageItem$text.replace(/\r\n/g, "\n").trim()) || "",
-    thought: Boolean(messageItem.thought),
-    inlineData: messageItem.inlineData || null,
-    fileData: messageItem.fileData || null,
-    functionCall: messageItem.functionCall || null,
-    functionResponse: messageItem.functionResponse || null,
-    executableCode: messageItem.executableCode || null,
-    codeExecutionResult: messageItem.codeExecutionResult || null
-  });
-};
-var isStreamMessageWithoutServerEventId = function isStreamMessageWithoutServerEventId(messageItem) {
-  var eventId = getMessageEventId(messageItem);
-  return Boolean(messageItem.invocationId) && (!eventId || eventId === messageItem.invocationId);
-};
-var insertMissingSessionEvents = function insertMissingSessionEvents(currentMessages, sessionEvents) {
+var insertMissingSessionEvents = function insertMissingSessionEvents(currentMessages, sessionEvents, removedInvocationIds) {
   var renderedEventIds = new Set(currentMessages.map(getMessageEventId).filter(Boolean));
-  var unmatchedStreamMessageIndexes = new Set(currentMessages.map(function (messageItem, index) {
-    return isStreamMessageWithoutServerEventId(messageItem) ? index : -1;
-  }).filter(function (index) {
-    return index >= 0;
-  }));
-  var missingEvents = sessionEvents.filter(function (event) {
+
+  // 从所有 sessionEvents 中提取 functionResponse，配对到 currentMessages 中缺少响应的 functionCall
+  // （functionResponse 事件的 role 为 user，不应作为独立消息展示，仅用于补齐工具调用状态）
+  var nextMessages = _toConsumableArray(currentMessages);
+  var fnResMap = new Map();
+  sessionEvents.forEach(function (event) {
     var _event$content, _event$content2;
-    var parts = (_event$content = event.content) === null || _event$content === void 0 ? void 0 : _event$content.parts;
-    var canRender = Boolean(event.id) && ((_event$content2 = event.content) === null || _event$content2 === void 0 ? void 0 : _event$content2.role) === "model" && Array.isArray(parts) && parts.length > 0;
+    if (((_event$content = event.content) === null || _event$content === void 0 ? void 0 : _event$content.role) !== "user" || !Array.isArray((_event$content2 = event.content) === null || _event$content2 === void 0 ? void 0 : _event$content2.parts)) return;
+    event.content.parts.forEach(function (p) {
+      var _p$functionResponse;
+      if ((_p$functionResponse = p.functionResponse) !== null && _p$functionResponse !== void 0 && _p$functionResponse.id) {
+        fnResMap.set(p.functionResponse.id, p.functionResponse);
+      }
+    });
+  });
+  if (fnResMap.size > 0) {
+    var paired = false;
+    nextMessages = nextMessages.map(function (msg) {
+      if (msg.functionCall && !msg.functionResponse) {
+        var callId = msg.functionCall.id;
+        if (callId && fnResMap.has(callId)) {
+          paired = true;
+          return _objectSpread(_objectSpread({}, msg), {}, {
+            functionResponse: fnResMap.get(callId)
+          });
+        }
+      }
+      return msg;
+    });
+    if (!paired) nextMessages = currentMessages;
+  }
+  var missingEvents = sessionEvents.filter(function (event) {
+    var _event$content3, _event$content4;
+    var parts = (_event$content3 = event.content) === null || _event$content3 === void 0 ? void 0 : _event$content3.parts;
+    var canRender = Boolean(event.id) && ((_event$content4 = event.content) === null || _event$content4 === void 0 ? void 0 : _event$content4.role) === "model" && Array.isArray(parts) && parts.length > 0;
     if (!canRender || renderedEventIds.has(event.id)) return false;
 
-    // 新版 SSE 包装数据没有事件 id，只能临时使用 invocationId。
-    // 用 invocationId + 完整渲染内容做一次性身份对齐，避免会话轮询重复插入；
-    // 同 invocation 下内容不同或后续出现的事件，仍然按独立 event.id 补入。
-    var eventMessages = mapSessionMessages([event]);
-    var matchedIndexes = [];
-    var isRenderedByStream = eventMessages.length > 0 && eventMessages.every(function (eventMessage) {
-      var comparableContent = getComparableMessageContent(eventMessage);
-      var matchedIndex = currentMessages.findIndex(function (currentMessage, index) {
-        return unmatchedStreamMessageIndexes.has(index) && !matchedIndexes.includes(index) && currentMessage.invocationId === eventMessage.invocationId && getComparableMessageContent(currentMessage) === comparableContent;
-      });
-      if (matchedIndex < 0) return false;
-      matchedIndexes.push(matchedIndex);
-      return true;
-    });
-    if (isRenderedByStream) {
-      matchedIndexes.forEach(function (index) {
-        return unmatchedStreamMessageIndexes.delete(index);
-      });
+    // reChat 截断后，忽略被删除的 invocationId 对应的旧 bot 消息
+    if (removedInvocationIds && removedInvocationIds.size > 0 && event.invocationId && removedInvocationIds.has(event.invocationId)) {
       return false;
     }
     return true;
   });
-  if (missingEvents.length === 0) return currentMessages;
+  if (missingEvents.length === 0) return nextMessages;
   var missingMessages = mapSessionMessages(missingEvents);
-  if (missingMessages.length === 0) return currentMessages;
+  if (missingMessages.length === 0) return nextMessages;
   var eventOrder = new Map(sessionEvents.map(function (event, index) {
     return [event.id, index];
   }));
@@ -267,7 +312,8 @@ var insertMissingSessionEvents = function insertMissingSessionEvents(currentMess
     }
     return Number.POSITIVE_INFINITY;
   };
-  var nextMessages = _toConsumableArray(currentMessages);
+
+  // nextMessages 已在上方 functionResponse 配对阶段创建，此处直接复用
   missingMessages.forEach(function (messageItem) {
     var targetOrder = getMessageOrder(messageItem);
     var insertIndex = nextMessages.findIndex(function (currentMessage) {
@@ -290,7 +336,7 @@ function useADKChat(_ref2) {
     _ref2$config = _ref2.config,
     config = _ref2$config === void 0 ? {} : _ref2$config,
     _ref2$type = _ref2.type,
-    type = _ref2$type === void 0 ? "agentDebug" : _ref2$type,
+    _type = _ref2$type === void 0 ? "agentDebug" : _ref2$type,
     _ref2$enabled = _ref2.enabled,
     enabled = _ref2$enabled === void 0 ? true : _ref2$enabled,
     strategies = _ref2.strategies,
@@ -366,11 +412,11 @@ function useADKChat(_ref2) {
     messages = _useState20[0],
     setMessages = _useState20[1];
   var pendingSessionEventsRef = useRef(null);
-  var sessionEventsFlushTimerRef = useRef(null);
-  var sessionEventsSyncingRef = useRef(false);
   var sessionDetailLoadingRef = useRef(false);
   // 用户自定义业务参数 (stateDelta)，每次发送请求时携带
   var stateDeltaRef = useRef(undefined);
+  // reChat 截断消息时记录被删除的 invocationId，防止轮询把旧 bot 回复补回
+  var reChatRemovedInvocationIdsRef = useRef(new Set());
 
   // ===== 多会话后台连接管理 =====
   var backgroundRef = useRef(new Map());
@@ -378,6 +424,7 @@ function useADKChat(_ref2) {
   messagesRef.current = messages;
   var currentSessionIdRef = useRef(currentSessionId);
   currentSessionIdRef.current = currentSessionId;
+  // 合并消息
   var mergedMessages = useMemo(function () {
     var fnResMap = {};
     var uniqueMessages = deduplicateMessages(messages);
@@ -399,33 +446,23 @@ function useADKChat(_ref2) {
   }, [messages]);
   var textMsgRef = useRef(null);
   var eventDataRef = useRef(new Map());
-  var cancelSessionEventsFlush = useCallback(function () {
-    if (sessionEventsFlushTimerRef.current === null) return;
-    clearTimeout(sessionEventsFlushTimerRef.current);
-    sessionEventsFlushTimerRef.current = null;
-  }, []);
   var flushPendingSessionEvents = useCallback(function () {
     var pending = pendingSessionEventsRef.current;
-    var replyInProgress = loadingRef.current || sendingRef.current || textMsgRef.current !== null;
+    // 仅在用户正在发送或流式文本拼接时跳过 flush，
+    // loading 状态不应阻塞轮询补入（异步任务完成的消息需要在 loading 期间也能补入）
+    var replyInProgress = sendingRef.current || textMsgRef.current !== null;
     if (!pending || replyInProgress || pending.sessionId !== currentSessionIdRef.current) return;
-    var previewMessages = insertMissingSessionEvents(messagesRef.current, pending.events);
     pendingSessionEventsRef.current = null;
-    if (previewMessages === messagesRef.current) return;
-    sessionEventsSyncingRef.current = true;
-    setLoading(true);
-    sessionEventsFlushTimerRef.current = setTimeout(function () {
-      sessionEventsFlushTimerRef.current = null;
-      if (pending.sessionId === currentSessionIdRef.current) {
-        setMessages(function (prev) {
-          var nextMessages = insertMissingSessionEvents(prev, pending.events);
-          messagesRef.current = nextMessages;
-          return nextMessages;
-        });
-      }
-      sessionEventsSyncingRef.current = false;
-      setLoading(false);
-    }, 0);
-  }, [setLoading]);
+
+    // 使用 functional update 在同一个 setMessages 回调中完成 diff + 写入，
+    // 避免双重调用和 loading 闪烁。仅在有实际新消息时才触发 loading 状态。
+    setMessages(function (prev) {
+      var nextMessages = insertMissingSessionEvents(prev, pending.events, reChatRemovedInvocationIdsRef.current);
+      if (nextMessages === prev) return prev; // 无变化，不触发 re-render
+      messagesRef.current = nextMessages;
+      return nextMessages;
+    });
+  }, []);
   var syncSessionEvents = useCallback(function (events, targetSessionId) {
     if (targetSessionId !== currentSessionIdRef.current) return;
     pendingSessionEventsRef.current = {
@@ -436,12 +473,7 @@ function useADKChat(_ref2) {
   }, [flushPendingSessionEvents]);
   useEffect(function () {
     pendingSessionEventsRef.current = null;
-    cancelSessionEventsFlush();
-    if (sessionEventsSyncingRef.current) {
-      sessionEventsSyncingRef.current = false;
-      setLoading(false);
-    }
-  }, [cancelSessionEventsFlush, currentSessionId, setLoading]);
+  }, [currentSessionId]);
   useEffect(function () {
     if (!loading) flushPendingSessionEvents();
   }, [flushPendingSessionEvents, loading]);
@@ -458,21 +490,21 @@ function useADKChat(_ref2) {
   }, []);
 
   // 初始化开场白预设置问题
-  var insertSuggestedQuestions = function insertSuggestedQuestions() {
+  var insertSuggestedQuestions = useCallback(function () {
     var suggested_questions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     if (!(suggested_questions !== null && suggested_questions !== void 0 && suggested_questions.length)) return;
     // 无消息内容 且 有建议问题时
-    if (messages.length === 0 && suggested_questions.length) {
-      setSuggestedQuestions(suggested_questions);
-    }
-  };
+    setSuggestedQuestions(function (prev) {
+      return messages.length === 0 ? suggested_questions : prev;
+    });
+  }, [messages.length]);
 
   // 初始化开场白
-  var insertPrologue = function insertPrologue(prologue) {
-    if (prologue) {
-      setPrologue(prologue);
+  var insertPrologue = useCallback(function (prologueText) {
+    if (prologueText) {
+      setPrologue(prologueText);
     }
-  };
+  }, []);
 
   // 更新消息
   var updateMessage = useCallback(function (msg) {
@@ -539,48 +571,15 @@ function useADKChat(_ref2) {
 
   // 存储消息
   var storeMessage = useCallback(function (part, event, role) {
-    var msg = {
-      id: v4(),
-      author: event.author,
-      invocationId: event.invocationId,
-      eventId: event.id,
-      timestamp: event.timestamp,
-      isLike: event.isLike || 0,
-      role: role,
-      modelCode: event.modelCode,
-      usageMetadata: event.usageMetadata,
-      finishReason: event.finishReason,
-      raw: event
-    };
-    if (part) {
-      if (part.inlineData) {
-        msg.inlineData = {
-          displayName: part.inlineData.displayName,
-          data: part.inlineData.data,
-          mimeType: part.inlineData.mimeType
-        };
-      } else if (part.text) {
-        var _event$groundingMetad;
-        msg.text = part.text;
-        msg.thought = part.thought;
-        if (event !== null && event !== void 0 && (_event$groundingMetad = event.groundingMetadata) !== null && _event$groundingMetad !== void 0 && (_event$groundingMetad = _event$groundingMetad.searchEntryPoint) !== null && _event$groundingMetad !== void 0 && _event$groundingMetad.renderedContent) {
-          msg.renderedContent = event.groundingMetadata.searchEntryPoint.renderedContent;
-        }
-      } else if (part.fileData) {
-        msg.fileData = [part.fileData];
-      } else if (part.functionCall) {
-        msg.functionCall = part.functionCall;
-      } else if (part.functionResponse) {
-        msg.functionResponse = part.functionResponse;
-      } else if (part.executableCode) {
-        msg.executableCode = part.executableCode;
-      } else if (part.codeExecutionResult) {
-        msg.codeExecutionResult = part.codeExecutionResult;
-      }
-    }
-    if (part && Object.keys(part).length > 0) {
-      insertMessage(msg);
+    var _event$groundingMetad;
+    if (!part || Object.keys(part).length === 0) return;
+    var msg = buildNonTextMessage(event, part, role);
+
+    // groundingMetadata 仅在前台 SSE 场景需要
+    if (part.text && event !== null && event !== void 0 && (_event$groundingMetad = event.groundingMetadata) !== null && _event$groundingMetad !== void 0 && (_event$groundingMetad = _event$groundingMetad.searchEntryPoint) !== null && _event$groundingMetad !== void 0 && _event$groundingMetad.renderedContent) {
+      msg.renderedContent = event.groundingMetadata.searchEntryPoint.renderedContent;
     }
+    insertMessage(msg);
   }, [insertMessage]);
 
   // 处理消息部分（关键更新）
@@ -639,9 +638,9 @@ function useADKChat(_ref2) {
 
   // 处理建议类消息
   var processFollowupPart = useCallback(function (event) {
-    var _event$content3;
+    var _event$content5;
     // 获取建议类消息的文本内容
-    var part = (event === null || event === void 0 || (_event$content3 = event.content) === null || _event$content3 === void 0 || (_event$content3 = _event$content3.parts) === null || _event$content3 === void 0 ? void 0 : _event$content3[0]) || null;
+    var part = (event === null || event === void 0 || (_event$content5 = event.content) === null || _event$content5 === void 0 || (_event$content5 = _event$content5.parts) === null || _event$content5 === void 0 ? void 0 : _event$content5[0]) || null;
     var text = (part === null || part === void 0 ? void 0 : part.text) || "";
     storeEvents(part, event);
     if (text) {
@@ -649,7 +648,7 @@ function useADKChat(_ref2) {
         return [].concat(_toConsumableArray(prev), [text]);
       });
     }
-  }, [storeEvents, insertMessage]);
+  }, [storeEvents]);
 
   // 处理错误消息
   var processErrorMessage = useCallback(function (chunkJson) {
@@ -795,20 +794,7 @@ function useADKChat(_ref2) {
                     }
                   } else {
                     bgTextMsg = null;
-                    var msg = {
-                      id: v4(),
-                      author: chunkJson.author,
-                      invocationId: chunkJson.invocationId,
-                      eventId: chunkJson.id,
-                      timestamp: chunkJson.timestamp,
-                      role: "bot"
-                    };
-                    if (part.functionCall) msg.functionCall = part.functionCall;else if (part.functionResponse) msg.functionResponse = part.functionResponse;else if (part.executableCode) msg.executableCode = part.executableCode;else if (part.codeExecutionResult) msg.codeExecutionResult = part.codeExecutionResult;else {
-                      msg.text = part.text;
-                      msg.thought = part.thought;
-                      if (part.fileData) msg.fileData = [part.fileData];
-                    }
-                    bg.messages = [].concat(_toConsumableArray(bg.messages), [msg]);
+                    bg.messages = [].concat(_toConsumableArray(bg.messages), [buildNonTextMessage(chunkJson, part)]);
                   }
                 }
               } catch (err) {
@@ -843,7 +829,7 @@ function useADKChat(_ref2) {
               for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
                 var _chunkJson2;
                 var _part = _step3.value;
-                // partial为 true 时忽略该条消息文本
+                // partial为 false 时忽略该条消息文本
                 processPart(chunkJson, _part, ((_chunkJson2 = chunkJson) === null || _chunkJson2 === void 0 ? void 0 : _chunkJson2.partial) === false);
               }
             } catch (err) {
@@ -865,6 +851,12 @@ function useADKChat(_ref2) {
               bg.loading = false;
               bg.textMsgRef = null;
             }
+            // 如果该后台会话已被恢复到前台（backgroundRef 中已删除），
+            // 需要更新前台 loading 状态
+            if (!backgroundRef.current.has(targetSessionId) && currentSessionIdRef.current === targetSessionId) {
+              setLoading(false);
+              textMsgRef.current = null;
+            }
           } else {
             setLoading(false);
             if (textMsgRef.current) {
@@ -872,6 +864,7 @@ function useADKChat(_ref2) {
               onMessage === null || onMessage === void 0 || onMessage(((_textMsgRef$current = textMsgRef.current) === null || _textMsgRef$current === void 0 ? void 0 : _textMsgRef$current.text) || "", textMsgRef.current);
             }
             textMsgRef.current = null;
+            ctrl.current = null;
           }
           resolve();
         },
@@ -880,8 +873,14 @@ function useADKChat(_ref2) {
           if (isBackground) {
             var bg = backgroundRef.current.get(targetSessionId);
             if (bg) bg.loading = false;
+            // 同上：后台会话已恢复到前台时同步 loading 状态
+            if (!backgroundRef.current.has(targetSessionId) && currentSessionIdRef.current === targetSessionId) {
+              setLoading(false);
+              ctrl.current = null;
+            }
           } else {
             setLoading(false);
+            ctrl.current = null;
           }
           resolve();
           console.error("EventSource failed:", error);
@@ -889,7 +888,7 @@ function useADKChat(_ref2) {
         }
       });
     });
-  }, [type, currentSessionId, processActionArtifact, processErrorMessage, processPart, updateLastBotEventMeta]);
+  }, [processActionArtifact, processErrorMessage, processPart, updateLastBotEventMeta]);
 
   // 发送会话
   var startChat = /*#__PURE__*/function () {
@@ -914,6 +913,8 @@ function useADKChat(_ref2) {
             sendingRef.current = true;
             // 清空建议问题
             setSuggestedQuestions([]);
+            // 正常发送时重置 reChat 删除标记
+            reChatRemovedInvocationIdsRef.current = new Set();
             // 发送消息
             setMessages(function (prev) {
               var temp = _toConsumableArray(prev);
@@ -950,8 +951,8 @@ function useADKChat(_ref2) {
               }
               return temp;
             });
-            _context2.prev = 8;
-            _context2.next = 11;
+            _context2.prev = 9;
+            _context2.next = 12;
             return sendMessageRequest(_objectSpread({
               stream: true,
               sessionId: currentSessionId,
@@ -976,18 +977,18 @@ function useADKChat(_ref2) {
             }, stateDeltaRef.current !== undefined && {
               stateDelta: stateDeltaRef.current
             }));
-          case 11:
-            _context2.prev = 11;
+          case 12:
+            _context2.prev = 12;
             sendingRef.current = false;
-            return _context2.finish(11);
-          case 14:
+            return _context2.finish(12);
+          case 15:
             // 获取聊天记录
             initAppConversations();
-          case 15:
+          case 16:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[8,, 11, 14]]);
+      }, _callee2, null, [[9,, 12, 15]]);
     }));
     return function startChat(_x) {
       return _ref5.apply(this, arguments);
@@ -997,7 +998,7 @@ function useADKChat(_ref2) {
   // 重新发送会话
   var reChat = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var lastUserIndex, newMessages, lastUserMessage, _lastUserMessage$text, text, _lastUserMessage$file, fileData;
+      var lastUserIndex, newMessages, removedInvocationIds, i, msg, lastUserMessage, _lastUserMessage$text, text, _lastUserMessage$file, fileData;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -1030,10 +1031,18 @@ function useADKChat(_ref2) {
           case 10:
             newMessages = messages.slice(0, lastUserIndex + 1);
             setMessages(newMessages);
+
+            // 收集被截断的 bot 消息的 invocationId，轮询时忽略这些旧回复
+            removedInvocationIds = new Set();
+            for (i = lastUserIndex + 1; i < messages.length; i++) {
+              msg = messages[i];
+              if (msg.invocationId) removedInvocationIds.add(msg.invocationId);
+            }
+            reChatRemovedInvocationIdsRef.current = removedInvocationIds;
             lastUserMessage = newMessages[lastUserIndex];
             _lastUserMessage$text = lastUserMessage.text, text = _lastUserMessage$text === void 0 ? "" : _lastUserMessage$text, _lastUserMessage$file = lastUserMessage.fileData, fileData = _lastUserMessage$file === void 0 ? [] : _lastUserMessage$file;
-            _context3.prev = 14;
-            _context3.next = 17;
+            _context3.prev = 17;
+            _context3.next = 20;
             return sendMessageRequest(_objectSpread({
               stream: true,
               sessionId: currentSessionId,
@@ -1053,15 +1062,15 @@ function useADKChat(_ref2) {
             }, stateDeltaRef.current !== undefined && {
               stateDelta: stateDeltaRef.current
             }));
-          case 17:
-            _context3.prev = 17;
-            sendingRef.current = false;
-            return _context3.finish(17);
           case 20:
+            _context3.prev = 20;
+            sendingRef.current = false;
+            return _context3.finish(20);
+          case 23:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[14,, 17, 20]]);
+      }, _callee3, null, [[17,, 20, 23]]);
     }));
     return function reChat() {
       return _ref6.apply(this, arguments);
@@ -1097,19 +1106,19 @@ function useADKChat(_ref2) {
   var stopChat = useCallback(function () {
     var _ctrl$current;
     pendingSessionEventsRef.current = null;
-    cancelSessionEventsFlush();
-    sessionEventsSyncingRef.current = false;
     (_ctrl$current = ctrl.current) === null || _ctrl$current === void 0 || _ctrl$current.abort();
     ctrl.current = null;
     setLoading(false);
     textMsgRef.current = null;
-  }, [cancelSessionEventsFlush, setLoading]);
+  }, [setLoading]);
 
   // 清除/重置会话
   var clearChat = function clearChat() {
     var _appInfo$onboardingIn, _appInfo$onboardingIn2;
     var newSessionId = v4();
     setCurrentSessionId(newSessionId);
+    // 清除 reChat 删除标记
+    reChatRemovedInvocationIdsRef.current = new Set();
     // 重置聊天内容
     stopChat();
     setPrologue((appInfo === null || appInfo === void 0 || (_appInfo$onboardingIn = appInfo.onboardingInfo) === null || _appInfo$onboardingIn === void 0 ? void 0 : _appInfo$onboardingIn.prologue) || "");
@@ -1129,12 +1138,12 @@ function useADKChat(_ref2) {
   // 设置当前会话详情
   var setCurrentSession = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(sessionId) {
-      var prevSessionId, bg, _yield$fetchSessionDe, data, result, _appInfo$onboardingIn3, _appInfo$onboardingIn4;
+      var prevSessionId, bg, isSseStillActive, _yield$fetchSessionDe, data, result, _appInfo$onboardingIn3, _appInfo$onboardingIn4;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (!sessionId) {
-              _context4.next = 34;
+              _context4.next = 35;
               break;
             }
             if (!(sessionId === currentSessionId)) {
@@ -1144,11 +1153,8 @@ function useADKChat(_ref2) {
             return _context4.abrupt("return");
           case 3:
             pendingSessionEventsRef.current = null;
-            cancelSessionEventsFlush();
-            if (sessionEventsSyncingRef.current) {
-              sessionEventsSyncingRef.current = false;
-              setLoading(false);
-            }
+            // 切换会话时重置 reChat 删除标记
+            reChatRemovedInvocationIdsRef.current = new Set();
 
             // 1. 将当前会话挂起到后台（不中断 SSE 连接）
             prevSessionId = currentSessionId;
@@ -1176,31 +1182,35 @@ function useADKChat(_ref2) {
             // 2. 尝试从后台恢复目标会话
             bg = backgroundRef.current.get(sessionId);
             if (!bg) {
-              _context4.next = 18;
+              _context4.next = 19;
               break;
             }
             setMessages(bg.messages);
-            setLoading(bg.loading);
+            messagesRef.current = bg.messages;
             textMsgRef.current = bg.textMsgRef;
-            ctrl.current = bg.loading ? bg.ctrl : null;
+            // 仅当 SSE 连接还在运行时才恢复 loading 状态，
+            // 避免 SSE 已关闭但 bg 快照中 loading 仍为 true 导致 sender 永久卡住
+            isSseStillActive = bg.loading && !bg.ctrl.signal.aborted;
+            setLoading(isSseStillActive);
+            ctrl.current = isSseStillActive ? bg.ctrl : null;
             setCurrentSessionId(sessionId);
             setInitialized(true);
             backgroundRef.current.delete(sessionId);
             return _context4.abrupt("return");
-          case 18:
+          case 19:
             // 3. 后台没有目标 session，走 API 加载（原有逻辑）
             setInitialized(false);
             setCurrentSessionId(sessionId);
             sessionDetailLoadingRef.current = true;
-            _context4.prev = 21;
-            _context4.next = 24;
+            _context4.prev = 22;
+            _context4.next = 25;
             return fetchSessionDetail({
               url: url,
               appNo: appNo,
               sessionId: sessionId,
               token: tokenRef.current
             });
-          case 24:
+          case 25:
             _yield$fetchSessionDe = _context4.sent;
             data = _yield$fetchSessionDe.data;
             result = _yield$fetchSessionDe.result;
@@ -1212,21 +1222,21 @@ function useADKChat(_ref2) {
                 setSuggestedQuestions((appInfo === null || appInfo === void 0 || (_appInfo$onboardingIn4 = appInfo.onboardingInfo) === null || _appInfo$onboardingIn4 === void 0 ? void 0 : _appInfo$onboardingIn4.suggested_questions) || []);
               }
             }
-          case 28:
-            _context4.prev = 28;
+          case 29:
+            _context4.prev = 29;
             sessionDetailLoadingRef.current = false;
             setInitialized(true);
-            return _context4.finish(28);
-          case 32:
-            _context4.next = 35;
+            return _context4.finish(29);
+          case 33:
+            _context4.next = 36;
             break;
-          case 34:
-            setCurrentSessionId(v4());
           case 35:
+            setCurrentSessionId(v4());
+          case 36:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[21,, 28, 32]]);
+      }, _callee4, null, [[22,, 29, 33]]);
     }));
     return function setCurrentSession(_x2) {
       return _ref7.apply(this, arguments);
@@ -1561,7 +1571,7 @@ function useADKChat(_ref2) {
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              if (!(requesting || sessionDetailLoadingRef.current)) {
+              if (!(disposed || requesting || sessionDetailLoadingRef.current)) {
                 _context10.next = 2;
                 break;
               }
@@ -1602,7 +1612,8 @@ function useADKChat(_ref2) {
         return _ref13.apply(this, arguments);
       };
     }();
-    void poll();
+
+    // 不立即执行首次 poll，避免与 initAppConversations / setCurrentSession / fetchSessionDetail 竞争。首次数据由初始化流程加载，轮询仅负责后续增量同步。
     var timer = window.setInterval(poll, sessionEventsPollingInterval);
     return function () {
       disposed = true;
@@ -1614,7 +1625,6 @@ function useADKChat(_ref2) {
   useEffect(function () {
     return function () {
       var _ctrl$current2;
-      cancelSessionEventsFlush();
       (_ctrl$current2 = ctrl.current) === null || _ctrl$current2 === void 0 || _ctrl$current2.abort();
       backgroundRef.current.forEach(function (bg) {
         var _bg$ctrl;
@@ -1622,7 +1632,7 @@ function useADKChat(_ref2) {
       });
       backgroundRef.current.clear();
     };
-  }, [cancelSessionEventsFlush]);
+  }, []);
   return {
     appInfo: appInfo,
     startChat: startChat,