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

package/src/store/chat/slices/plugin/actions/pluginTypes.ts

@@ -1,6 +1,7 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix, typescript-sort-keys/interface */
 import { ChatToolPayload } from '@lobechat/types';
 import { PluginErrorType } from '@lobehub/chat-plugin-sdk';
+import debug from 'debug';
 import { t } from 'i18next';
 import { StateCreator } from 'zustand/vanilla';
 
@@ -11,11 +12,10 @@ import { messageService } from '@/services/message';
 import { ChatStore } from '@/store/chat/store';
 import { useToolStore } from '@/store/tool';
 import { safeParseJSON } from '@/utils/safeParseJSON';
-import { setNamespace } from '@/utils/storeDebug';
 
 import { dbMessageSelectors } from '../../message/selectors';
 
-const n = setNamespace('plugin');
+const log = debug('lobe-store:plugin-types');
 
 /**
  * Plugin type-specific implementations
@@ -125,7 +125,6 @@ export const pluginTypes: StateCreator<
   invokeMCPTypePlugin: async (id, payload) => {
     const {
       optimisticUpdateMessageContent,
-      internal_togglePluginApiCalling,
       internal_constructToolsCallingContext,
       optimisticUpdatePluginState,
       optimisticUpdateMessagePluginError,
@@ -135,13 +134,20 @@ export const pluginTypes: StateCreator<
     // Get message to extract sessionId/topicId
     const message = dbMessageSelectors.getDbMessageById(id)(get());
 
-    try {
-      const abortController = internal_togglePluginApiCalling(
-        true,
-        id,
-        n('fetchPlugin/start') as string,
-      );
+    // Get abort controller from operation
+    const operationId = get().messageOperationMap[id];
+    const operation = operationId ? get().operations[operationId] : undefined;
+    const abortController = operation?.abortController;
+
+    log(
+      '[invokeMCPTypePlugin] messageId=%s, tool=%s, operationId=%s, aborted=%s',
+      id,
+      payload.apiName,
+      operationId,
+      abortController?.signal.aborted,
+    );
 
+    try {
       const context = internal_constructToolsCallingContext(id);
       const result = await mcpService.invokeMcpToolCall(payload, {
         signal: abortController?.signal,
@@ -154,7 +160,9 @@ export const pluginTypes: StateCreator<
       const err = error as Error;
 
       // ignore the aborted request error
-      if (!err.message.includes('The user aborted a request.')) {
+      if (err.message.includes('The user aborted a request.')) {
+        log('[invokeMCPTypePlugin] Request aborted: messageId=%s, tool=%s', id, payload.apiName);
+      } else {
         const result = await messageService.updateMessageError(id, error as any, {
           sessionId: message?.sessionId,
           topicId: message?.topicId,
@@ -168,13 +176,12 @@ export const pluginTypes: StateCreator<
       }
     }
 
-    internal_togglePluginApiCalling(false, id, n('fetchPlugin/end') as string);
-
     // 如果报错则结束了
 
     if (!data) return;
 
-    const context = { sessionId: message?.sessionId, topicId: message?.topicId };
+    // operationId already declared above, reuse it
+    const context = operationId ? { operationId } : undefined;
 
     await Promise.all([
       optimisticUpdateMessageContent(id, data.content, undefined, context),
@@ -188,19 +195,26 @@ export const pluginTypes: StateCreator<
   },
 
   internal_callPluginApi: async (id, payload) => {
-    const { optimisticUpdateMessageContent, internal_togglePluginApiCalling } = get();
+    const { optimisticUpdateMessageContent } = get();
     let data: string;
 
     // Get message to extract sessionId/topicId
     const message = dbMessageSelectors.getDbMessageById(id)(get());
 
-    try {
-      const abortController = internal_togglePluginApiCalling(
-        true,
-        id,
-        n('fetchPlugin/start') as string,
-      );
+    // Get abort controller from operation
+    const operationId = get().messageOperationMap[id];
+    const operation = operationId ? get().operations[operationId] : undefined;
+    const abortController = operation?.abortController;
+
+    log(
+      '[internal_callPluginApi] messageId=%s, plugin=%s, operationId=%s, aborted=%s',
+      id,
+      payload.identifier,
+      operationId,
+      abortController?.signal.aborted,
+    );
 
+    try {
       const res = await chatService.runPluginApi(payload, {
         signal: abortController?.signal,
         trace: { observationId: message?.observationId, traceId: message?.traceId },
@@ -216,7 +230,13 @@ export const pluginTypes: StateCreator<
       const err = error as Error;
 
       // ignore the aborted request error
-      if (!err.message.includes('The user aborted a request.')) {
+      if (err.message.includes('The user aborted a request.')) {
+        log(
+          '[internal_callPluginApi] Request aborted: messageId=%s, plugin=%s',
+          id,
+          payload.identifier,
+        );
+      } else {
         const result = await messageService.updateMessageError(id, error as any, {
           sessionId: message?.sessionId,
           topicId: message?.topicId,
@@ -231,15 +251,13 @@ export const pluginTypes: StateCreator<
 
       data = '';
     }
-
-    internal_togglePluginApiCalling(false, id, n('fetchPlugin/end') as string);
     // 如果报错则结束了
     if (!data) return;
 
-    await optimisticUpdateMessageContent(id, data, undefined, {
-      sessionId: message?.sessionId,
-      topicId: message?.topicId,
-    });
+    // operationId already declared above, reuse it
+    const context = operationId ? { operationId } : undefined;
+
+    await optimisticUpdateMessageContent(id, data, undefined, context);
 
     return data;
   },

package/src/store/chat/slices/plugin/actions/publicApi.ts

@@ -55,10 +55,9 @@ export const pluginPublicApi: StateCreator<
     const message = displayMessageSelectors.getDisplayMessageById(id)(get());
     if (!message || message.role !== 'tool' || !message.plugin) return;
 
-    const context = {
-      sessionId: message.sessionId,
-      topicId: message.topicId,
-    };
+    // Get operationId from messageOperationMap
+    const operationId = get().messageOperationMap[id];
+    const context = operationId ? { operationId } : undefined;
 
     // if there is error content, then clear the error
     if (!!message.pluginError) {

package/src/store/chat/slices/plugin/actions/workflow.ts

@@ -28,15 +28,6 @@ export interface PluginWorkflowAction {
     inPortalThread?: boolean;
     inSearchWorkflow?: boolean;
   }) => Promise<void>;
-
-  /**
-   * Trigger tool calls (V1 deprecated method)
-   * @deprecated
-   */
-  triggerToolCalls: (
-    id: string,
-    params?: { threadId?: string; inPortalThread?: boolean; inSearchWorkflow?: boolean },
-  ) => Promise<void>;
 }
 
 export const pluginWorkflow: StateCreator<
@@ -83,50 +74,4 @@ export const pluginWorkflow: StateCreator<
       inSearchWorkflow,
     });
   },
-
-  triggerToolCalls: async (assistantId, { threadId, inPortalThread, inSearchWorkflow } = {}) => {
-    const message = displayMessageSelectors.getDisplayMessageById(assistantId)(get());
-    if (!message || !message.tools) return;
-
-    let shouldCreateMessage = false;
-    let latestToolId = '';
-    const messagePools = message.tools.map(async (payload) => {
-      const toolMessage: CreateMessageParams = {
-        content: '',
-        parentId: assistantId,
-        plugin: payload,
-        role: 'tool',
-        sessionId: message.sessionId ?? get().activeId,
-        tool_call_id: payload.id,
-        threadId,
-        topicId: message.topicId !== undefined ? message.topicId : get().activeTopicId,
-        groupId: message.groupId, // Propagate groupId from parent message for group chat
-      };
-
-      const result = await get().optimisticCreateMessage(toolMessage, {
-        sessionId: toolMessage.sessionId,
-        topicId: toolMessage.topicId,
-      });
-      if (!result) return;
-
-      // trigger the plugin call
-      const data = await get().internal_invokeDifferentTypePlugin(result.id, payload);
-
-      if (data && !['markdown', 'standalone'].includes(payload.type)) {
-        shouldCreateMessage = true;
-        latestToolId = result.id;
-      }
-    });
-
-    await Promise.all(messagePools);
-
-    await get().internal_toggleMessageInToolsCalling(false, assistantId);
-
-    // only default type tool calls should trigger AI message
-    if (!shouldCreateMessage) return;
-
-    const traceId = dbMessageSelectors.getTraceIdByDbMessageId(latestToolId)(get());
-
-    await get().triggerAIMessage({ traceId, threadId, inPortalThread, inSearchWorkflow });
-  },
 });

package/src/store/chat/slices/thread/selectors/index.ts

@@ -164,8 +164,10 @@ const hasThreadBySourceMsgId = (id: string) => (s: ChatStoreState) => {
   return threads.some((t) => t.sourceMessageId === id);
 };
 
-const isThreadAIGenerating = (s: ChatStoreState) =>
-  s.chatLoadingIds.some((id) => portalDisplayChatIDs(s).includes(id));
+const isThreadAIGenerating = (s: ChatStoreState) => {
+  const { operationSelectors } = require('../../operation/selectors');
+  return operationSelectors.isAnyMessageLoading(portalDisplayChatIDs(s))(s);
+};
 
 const isInRAGFlow = (s: ChatStoreState) =>
   s.messageRAGLoadingIds.some((id) => portalDisplayChatIDs(s).includes(id));

package/src/store/chat/slices/translate/action.ts

@@ -1,7 +1,6 @@
 import { chainLangDetect, chainTranslate } from '@lobechat/prompts';
 import { ChatTranslate, TraceNameMap, TracePayload } from '@lobechat/types';
 import { merge } from '@lobechat/utils';
-import { produce } from 'immer';
 import { StateCreator } from 'zustand/vanilla';
 
 import { supportLocales } from '@/locales/resources';
@@ -11,9 +10,6 @@ import { dbMessageSelectors } from '@/store/chat/selectors';
 import { ChatStore } from '@/store/chat/store';
 import { useUserStore } from '@/store/user';
 import { systemAgentSelectors } from '@/store/user/selectors';
-import { setNamespace } from '@/utils/storeDebug';
-
-const n = setNamespace('enhance');
 
 /**
  * chat translate
@@ -41,7 +37,7 @@ export const chatTranslate: StateCreator<
   }),
 
   translateMessage: async (id, targetLang) => {
-    const { internal_toggleChatLoading, updateMessageTranslate, internal_dispatchMessage } = get();
+    const { updateMessageTranslate, internal_dispatchMessage } = get();
 
     const message = dbMessageSelectors.getDbMessageById(id)(get());
     if (!message) return;
@@ -52,47 +48,64 @@ export const chatTranslate: StateCreator<
     // create translate extra
     await updateMessageTranslate(id, { content: '', from: '', to: targetLang });
 
-    internal_toggleChatLoading(true, id, n('translateMessage(start)', { id }));
+    // Create translate operation
+    const { operationId } = get().startOperation({
+      context: { messageId: id, sessionId: message.sessionId, topicId: message.topicId },
+      label: 'Translating message',
+      type: 'translate',
+    });
 
-    let content = '';
-    let from = '';
+    // Associate message with operation
+    get().associateMessageWithOperation(id, operationId);
 
-    // detect from language
-    chatService.fetchPresetTaskResult({
-      onFinish: async (data) => {
-        if (data && supportLocales.includes(data)) from = data;
+    try {
+      let content = '';
+      let from = '';
 
-        await updateMessageTranslate(id, { content, from, to: targetLang });
-      },
-      params: merge(translationSetting, chainLangDetect(message.content)),
-      trace: get().getCurrentTracePayload({ traceName: TraceNameMap.LanguageDetect }),
-    });
+      // detect from language
+      chatService.fetchPresetTaskResult({
+        onFinish: async (data) => {
+          if (data && supportLocales.includes(data)) from = data;
 
-    // translate to target language
-    await chatService.fetchPresetTaskResult({
-      onFinish: async (content) => {
-        await updateMessageTranslate(id, { content, from, to: targetLang });
-        internal_toggleChatLoading(false, id);
-      },
-      onMessageHandle: (chunk) => {
-        switch (chunk.type) {
-          case 'text': {
-            internal_dispatchMessage({
-              id,
-              key: 'translate',
-              type: 'updateMessageExtra',
-              value: produce({ content: '', from, to: targetLang }, (draft) => {
-                content += chunk.text;
-                draft.content += content;
-              }),
-            });
-            break;
+          await updateMessageTranslate(id, { content, from, to: targetLang });
+        },
+        params: merge(translationSetting, chainLangDetect(message.content)),
+        trace: get().getCurrentTracePayload({ traceName: TraceNameMap.LanguageDetect }),
+      });
+
+      // translate to target language
+      await chatService.fetchPresetTaskResult({
+        onFinish: async (translatedContent) => {
+          await updateMessageTranslate(id, { content: translatedContent, from, to: targetLang });
+          get().completeOperation(operationId);
+        },
+        onMessageHandle: (chunk) => {
+          switch (chunk.type) {
+            case 'text': {
+              content += chunk.text;
+              internal_dispatchMessage(
+                {
+                  id,
+                  key: 'translate',
+                  type: 'updateMessageExtra',
+                  value: { content, from, to: targetLang },
+                },
+                { operationId },
+              );
+              break;
+            }
           }
-        }
-      },
-      params: merge(translationSetting, chainTranslate(message.content, targetLang)),
-      trace: get().getCurrentTracePayload({ traceName: TraceNameMap.Translator }),
-    });
+        },
+        params: merge(translationSetting, chainTranslate(message.content, targetLang)),
+        trace: get().getCurrentTracePayload({ traceName: TraceNameMap.Translator }),
+      });
+    } catch (error) {
+      get().failOperation(operationId, {
+        message: error instanceof Error ? error.message : String(error),
+        type: 'TranslateError',
+      });
+      throw error;
+    }
   },
 
   updateMessageTranslate: async (id, data) => {

package/src/tools/web-browsing/ExecutionRuntime/index.ts

@@ -17,9 +17,12 @@ export class WebBrowsingExecutionRuntime {
     this.searchService = options.searchService;
   }
 
-  async search(args: SearchQuery): Promise<BuiltinServerRuntimeOutput> {
+  async search(
+    args: SearchQuery,
+    options?: { signal?: AbortSignal },
+  ): Promise<BuiltinServerRuntimeOutput> {
     try {
-      const data = await this.searchService.webSearch(args as SearchQuery);
+      const data = await this.searchService.webSearch(args as SearchQuery, options);
 
       // add LIMITED_COUNT search results to message content
       const searchContent: SearchContent[] = data.results

package/src/tools/web-browsing/Portal/Search/Footer.tsx

@@ -4,15 +4,17 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { chatPortalSelectors, messageStateSelectors } from '@/store/chat/selectors';
+import { chatPortalSelectors, operationSelectors } from '@/store/chat/selectors';
 
 const Footer = () => {
-  const [messageId, isAIGenerating, triggerAIMessage, saveSearchResult] = useChatStore((s) => [
-    chatPortalSelectors.toolMessageId(s),
-    messageStateSelectors.isAIGenerating(s),
-    s.triggerAIMessage,
-    s.saveSearchResult,
-  ]);
+  const [messageId, isAgentRuntimeRunning, triggerAIMessage, saveSearchResult] = useChatStore(
+    (s) => [
+      chatPortalSelectors.toolMessageId(s),
+      operationSelectors.isAgentRuntimeRunning(s),
+      s.triggerAIMessage,
+      s.saveSearchResult,
+    ],
+  );
 
   const { t } = useTranslation('tool');
 
@@ -20,7 +22,7 @@ const Footer = () => {
     <Flexbox gap={8} horizontal paddingBlock={12} paddingInline={12}>
       <Button
         icon={LucideNotepadText}
-        loading={isAIGenerating}
+        loading={isAgentRuntimeRunning}
         onClick={() => {
           if (!messageId) return;
 
@@ -31,7 +33,7 @@ const Footer = () => {
       </Button>
       <ActionIcon
         icon={PlusSquareIcon}
-        loading={isAIGenerating}
+        loading={isAgentRuntimeRunning}
         onClick={() => {
           if (!messageId) return;