@lobehub/lobehub 2.0.0-next.85 → 2.0.0-next.86

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatInput/useSend.ts

@@ -7,8 +7,9 @@ import { agentSelectors } from '@/store/agent/selectors';
 import { getChatStoreState, useChatStore } from '@/store/chat';
 import {
   aiChatSelectors,
-  chatSelectors,
+  displayMessageSelectors,
   messageStateSelectors,
+  operationSelectors,
   topicSelectors,
 } from '@/store/chat/selectors';
 import { fileChatSelectors, useFileStore } from '@/store/file';
@@ -34,7 +35,7 @@ export const useSend = () => {
     addAIMessage,
     stopGenerateMessage,
     cancelSendMessageInServer,
-    generating,
+    isAgentRuntimeRunning,
     isSendButtonDisabledByMessage,
     isSendingMessage,
   ] = useChatStore((s) => [
@@ -43,7 +44,7 @@ export const useSend = () => {
     s.addAIMessage,
     s.stopGenerateMessage,
     s.cancelSendMessageInServer,
-    messageStateSelectors.isAIGenerating(s),
+    operationSelectors.isMainWindowAgentRuntimeRunning(s),
     messageStateSelectors.isSendButtonDisabledByMessage(s),
     aiChatSelectors.isCurrentSendMessageLoading(s),
   ]);
@@ -73,7 +74,7 @@ export const useSend = () => {
       return;
     }
 
-    if (messageStateSelectors.isAIGenerating(store)) return;
+    if (operationSelectors.isMainWindowAgentRuntimeRunning(store)) return;
 
     const inputMessage = store.inputMessage;
     // 发送时再取一次最新的文件列表，防止闭包拿到旧值
@@ -119,7 +120,7 @@ export const useSend = () => {
         chat_id: store.activeId || 'unknown',
         current_topic: topicSelectors.currentActiveTopic(store)?.title || null,
         has_attachments: fileList.length > 0,
-        history_message_count: chatSelectors.activeBaseChats(store).length,
+        history_message_count: displayMessageSelectors.activeDisplayMessages(store).length,
         message: inputMessage,
         message_length: inputMessage.length,
         message_type: messageType,
@@ -132,9 +133,9 @@ export const useSend = () => {
 
   const stop = () => {
     const store = getChatStoreState();
-    const generating = messageStateSelectors.isAIGenerating(store);
+    const isRunning = operationSelectors.isMainWindowAgentRuntimeRunning(store);
 
-    if (generating) {
+    if (isRunning) {
       stopGenerateMessage();
       return;
     }
@@ -149,11 +150,11 @@ export const useSend = () => {
   return useMemo(
     () => ({
       disabled: canNotSend,
-      generating: generating || isSendingMessage,
+      generating: isAgentRuntimeRunning || isSendingMessage,
       send: handleSend,
       stop,
     }),
-    [canNotSend, generating, isSendingMessage, stop, handleSend],
+    [canNotSend, isAgentRuntimeRunning, isSendingMessage, stop, handleSend],
   );
 };
 
@@ -175,7 +176,7 @@ export const useSendGroupMessage = () => {
   ]);
 
   const isSupervisorThinking = useChatStore((s) =>
-    chatSelectors.isSupervisorLoading(s.activeId)(s),
+    displayMessageSelectors.isSupervisorLoading(s.activeId)(s),
   );
   const { analytics } = useAnalytics();
   const checkGeminiChineseWarning = useGeminiChineseWarning();
@@ -209,7 +210,7 @@ export const useSendGroupMessage = () => {
       }
 
       if (
-        chatSelectors.isSupervisorLoading(store.activeId)(store) ||
+        displayMessageSelectors.isSupervisorLoading(store.activeId)(store) ||
         messageStateSelectors.isCreatingMessage(store)
       )
         return;
@@ -270,7 +271,7 @@ export const useSendGroupMessage = () => {
           chat_id: store.activeId || 'unknown',
           current_topic: topicSelectors.currentActiveTopic(store)?.title || null,
           has_attachments: fileList.length > 0,
-          history_message_count: chatSelectors.activeBaseChats(store).length,
+          history_message_count: displayMessageSelectors.activeDisplayMessages(store).length,
           message: inputMessage,
           message_length: inputMessage.length,
           message_type: messageType,
@@ -292,10 +293,10 @@ export const useSendGroupMessage = () => {
 
   const stop = useCallback(() => {
     const store = getChatStoreState();
-    const isAgentGenerating = messageStateSelectors.isAIGenerating(store);
+    const isAgentRunning = operationSelectors.isMainWindowAgentRuntimeRunning(store);
     const isCreating = messageStateSelectors.isCreatingMessage(store);
 
-    if (isAgentGenerating) {
+    if (isAgentRunning) {
       stopGenerateMessage();
       return;
     }

package/src/app/[variants]/(main)/chat/session/features/SessionListContent/List/Item/index.tsx

@@ -7,7 +7,7 @@ import { DEFAULT_AVATAR } from '@/const/meta';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { isDesktop } from '@/const/version';
 import { useChatStore } from '@/store/chat';
-import { messageStateSelectors } from '@/store/chat/selectors';
+import { operationSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { useSessionStore } from '@/store/session';
 import { sessionHelpers } from '@/store/session/helpers';
@@ -32,7 +32,7 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
 
   const [active] = useSessionStore((s) => [s.activeId === id]);
   const [loading] = useChatStore((s) => [
-    messageStateSelectors.isAIGenerating(s) && id === s.activeId,
+    operationSelectors.isAgentRuntimeRunning(s) && id === s.activeId,
   ]);
 
   const [pin, title, avatar, avatarBackground, updateAt, members, model, group, sessionType] =

package/src/features/ChatInput/ActionBar/STT/browser.tsx

@@ -9,7 +9,7 @@ import { SWRConfiguration } from 'swr';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/slices/chat';
 import { useChatStore } from '@/store/chat';
-import { messageStateSelectors } from '@/store/chat/selectors';
+import { operationSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { globalGeneralSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
@@ -43,7 +43,7 @@ const BrowserSTT = memo<{ mobile?: boolean }>(({ mobile }) => {
   const { t } = useTranslation('chat');
 
   const [loading, updateMessageInput] = useChatStore((s) => [
-    messageStateSelectors.isAIGenerating(s),
+    operationSelectors.isAgentRuntimeRunning(s),
     s.updateMessageInput,
   ]);
 

package/src/features/ChatInput/ActionBar/STT/openai.tsx

@@ -12,7 +12,7 @@ import { API_ENDPOINTS } from '@/services/_url';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
-import { messageStateSelectors } from '@/store/chat/slices/message/selectors';
+import { operationSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { globalGeneralSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
@@ -54,7 +54,7 @@ const OpenaiSTT = memo<{ mobile?: boolean }>(({ mobile }) => {
   const { t } = useTranslation('chat');
 
   const [loading, updateMessageInput] = useChatStore((s) => [
-    messageStateSelectors.isAIGenerating(s),
+    operationSelectors.isAgentRuntimeRunning(s),
     s.updateMessageInput,
   ]);
 

package/src/features/Conversation/Messages/Group/Tool/Inspector/index.tsx

@@ -119,7 +119,7 @@ const Inspectors = memo<InspectorProps>(
     const hasResult = hasSuccessResult || hasError;
 
     const isPending = intervention?.status === 'pending';
-    const isReject = intervention?.status === 'rejected';
+    const isReject = intervention?.status === 'rejected' || intervention?.status === 'aborted';
     const isTitleLoading = !hasResult && !isPending;
 
     // Compute actual render state based on pinned or hovered

package/src/features/Conversation/Messages/User/index.tsx

@@ -60,13 +60,13 @@ const UserMessage = memo<UserMessageProps>(({ id, disableEditing, index }) => {
 
   const displayMode = useAgentStore(agentChatConfigSelectors.displayMode);
 
-  const [editing, generating, isInRAGFlow] = useChatStore((s) => [
+  const [editing, creating, isInRAGFlow] = useChatStore((s) => [
     messageStateSelectors.isMessageEditing(id)(s),
-    messageStateSelectors.isMessageGenerating(id)(s),
+    messageStateSelectors.isMessageCreating(id)(s), // User message only cares about creation (sendMessage)
     messageStateSelectors.isMessageInRAGFlow(id)(s),
   ]);
 
-  const loading = isInRAGFlow || generating;
+  const loading = isInRAGFlow || creating;
 
   // Get target name for DM indicator
   const userName = useUserStore(userProfileSelectors.nickName) || 'User';

package/src/features/Conversation/Messages/index.tsx

@@ -59,9 +59,9 @@ const Item = memo<ChatListItemProps>(
     const { styles, cx } = useStyles();
     const containerRef = useRef<HTMLDivElement | null>(null);
 
-    const [isMessageLoading, role] = useChatStore((s) => [
-      messageStateSelectors.isMessageLoading(id)(s),
+    const [role, isMessageCreating] = useChatStore((s) => [
       displayMessageSelectors.getDisplayMessageById(id)(s)?.role,
+      messageStateSelectors.isMessageCreating(id)(s),
     ]);
 
     // ======================= Performance Optimization ======================= //
@@ -168,7 +168,7 @@ const Item = memo<ChatListItemProps>(
       <InPortalThreadContext.Provider value={inPortalThread}>
         {enableHistoryDivider && <History />}
         <Flexbox
-          className={cx(styles.message, className, isMessageLoading && styles.loading)}
+          className={cx(styles.message, className, isMessageCreating && styles.loading)}
           data-index={index}
           onContextMenu={onContextMenu}
           ref={containerRef}

package/src/features/Conversation/components/AutoScroll.tsx

@@ -1,7 +1,7 @@
 import { memo, useEffect } from 'react';
 
 import { useChatStore } from '@/store/chat';
-import { displayMessageSelectors, messageStateSelectors } from '@/store/chat/selectors';
+import { displayMessageSelectors, operationSelectors } from '@/store/chat/selectors';
 
 import BackBottom from './BackBottom';
 
@@ -11,7 +11,7 @@ interface AutoScrollProps {
   onScrollToBottom: (type: 'auto' | 'click') => void;
 }
 const AutoScroll = memo<AutoScrollProps>(({ atBottom, isScrolling, onScrollToBottom }) => {
-  const trackVisibility = useChatStore(messageStateSelectors.isAIGenerating);
+  const trackVisibility = useChatStore(operationSelectors.isAgentRuntimeRunning);
   const str = useChatStore(displayMessageSelectors.mainAIChatsMessageString);
   const reasoningStr = useChatStore(displayMessageSelectors.mainAILatestMessageReasoningContent);
 

package/src/services/search.ts

@@ -15,8 +15,8 @@ class SearchService {
     return toolsClient.search.crawlPages.mutate(params);
   }
 
-  async webSearch(params: SearchQuery) {
-    return toolsClient.search.webSearch.query(params);
+  async webSearch(params: SearchQuery, options?: { signal?: AbortSignal }) {
+    return toolsClient.search.webSearch.query(params, { signal: options?.signal });
   }
 }
 

package/src/store/chat/agents/GeneralChatAgent.ts

@@ -9,6 +9,7 @@ import {
   GeneralAgentCallToolsBatchInstructionPayload,
   GeneralAgentCallingToolInstructionPayload,
   GeneralAgentConfig,
+  HumanAbortPayload,
   InterventionChecker,
 } from '@lobechat/agent-runtime';
 import type { ChatToolPayload, HumanInterventionConfig } from '@lobechat/types';
@@ -115,10 +116,90 @@ export class GeneralChatAgent implements Agent {
     return [toolsNeedingIntervention, toolsToExecute];
   }
 
+  /**
+   * Extract abort information from current context and state
+   * Returns the necessary data to handle abort scenario
+   */
+  private extractAbortInfo(context: AgentRuntimeContext, state: AgentState) {
+    let hasToolsCalling = false;
+    let toolsCalling: ChatToolPayload[] = [];
+    let parentMessageId = '';
+
+    // Extract abort info based on current phase
+    switch (context.phase) {
+      case 'llm_result': {
+        const payload = context.payload as GeneralAgentCallLLMResultPayload;
+        hasToolsCalling = payload.hasToolsCalling || false;
+        toolsCalling = payload.toolsCalling || [];
+        parentMessageId = payload.parentMessageId;
+        break;
+      }
+      case 'human_abort': {
+        // When user cancels during LLM streaming, we enter human_abort phase
+        // The payload contains tool calls info if LLM had started returning them
+        const payload = context.payload as any;
+        hasToolsCalling = payload.hasToolsCalling || false;
+        toolsCalling = payload.toolsCalling || [];
+        parentMessageId = payload.parentMessageId;
+        break;
+      }
+      case 'tool_result':
+      case 'tools_batch_result': {
+        const payload = context.payload as GeneralAgentCallToolResultPayload;
+        parentMessageId = payload.parentMessageId;
+        // Check if there are pending tool messages
+        const pendingToolMessages = state.messages.filter(
+          (m: any) => m.role === 'tool' && m.pluginIntervention?.status === 'pending',
+        );
+        if (pendingToolMessages.length > 0) {
+          hasToolsCalling = true;
+          toolsCalling = pendingToolMessages.map((m: any) => m.plugin).filter(Boolean);
+        }
+        break;
+      }
+    }
+
+    return { hasToolsCalling, parentMessageId, toolsCalling };
+  }
+
+  /**
+   * Handle abort scenario - unified abort handling logic
+   */
+  private handleAbort(
+    context: AgentRuntimeContext,
+    state: AgentState,
+  ): AgentInstruction | AgentInstruction[] {
+    const { hasToolsCalling, parentMessageId, toolsCalling } = this.extractAbortInfo(
+      context,
+      state,
+    );
+
+    // If there are pending tool calls, resolve them
+    if (hasToolsCalling && toolsCalling.length > 0) {
+      return {
+        payload: { parentMessageId, toolsCalling },
+        type: 'resolve_aborted_tools',
+      };
+    }
+
+    // No tools to resolve, directly finish
+    return {
+      reason: 'user_requested',
+      reasonDetail: 'Operation cancelled by user',
+      type: 'finish',
+    };
+  }
+
   async runner(
     context: AgentRuntimeContext,
     state: AgentState,
   ): Promise<AgentInstruction | AgentInstruction[]> {
+    // Unified abort check: if operation is interrupted, handle abort scenario
+    // This check is placed before phase handling to ensure consistent abort behavior
+    if (state.status === 'interrupted') {
+      return this.handleAbort(context, state);
+    }
+
     switch (context.phase) {
       case 'init':
       case 'user_input': {
@@ -256,6 +337,23 @@ export class GeneralChatAgent implements Agent {
         };
       }
 
+      case 'human_abort': {
+        // User aborted the operation
+        const { hasToolsCalling, parentMessageId, toolsCalling, reason } =
+          context.payload as HumanAbortPayload;
+
+        // If there are pending tool calls, resolve them
+        if (hasToolsCalling && toolsCalling && toolsCalling.length > 0) {
+          return {
+            payload: { parentMessageId, toolsCalling },
+            type: 'resolve_aborted_tools',
+          };
+        }
+
+        // No tools to resolve, directly finish
+        return { reason: 'user_requested', reasonDetail: reason, type: 'finish' };
+      }
+
       case 'error': {
         // Error occurred, finish execution
         const { error } = context.payload as { error: any };