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

package/src/store/chat/slices/builtinTool/actions/interpreter.ts

@@ -3,6 +3,7 @@ import {
   CodeInterpreterParams,
   CodeInterpreterResponse,
 } from '@lobechat/types';
+import debug from 'debug';
 import { produce } from 'immer';
 import pMap from 'p-map';
 import { SWRResponse } from 'swr';
@@ -18,12 +19,12 @@ import { CodeInterpreterIdentifier } from '@/tools/code-interpreter';
 import { setNamespace } from '@/utils/storeDebug';
 
 const n = setNamespace('codeInterpreter');
+const log = debug('lobe-store:builtin-tool');
 
 const SWR_FETCH_INTERPRETER_FILE_KEY = 'FetchCodeInterpreterFileItem';
 
 export interface ChatCodeInterpreterAction {
   python: (id: string, params: CodeInterpreterParams) => Promise<boolean | undefined>;
-  toggleInterpreterExecuting: (id: string, loading: boolean) => void;
   updateInterpreterFileItem: (
     id: string,
     updater: (data: CodeInterpreterResponse) => void,
@@ -39,66 +40,100 @@ export const codeInterpreterSlice: StateCreator<
   ChatCodeInterpreterAction
 > = (set, get) => ({
   python: async (id: string, params: CodeInterpreterParams) => {
-    const {
-      toggleInterpreterExecuting,
-      optimisticUpdatePluginState,
-      optimisticUpdateMessageContent,
-      uploadInterpreterFiles,
-    } = get();
-
-    toggleInterpreterExecuting(id, true);
-
-    // TODO: 应该只下载 AI 用到的文件
-    const files: File[] = [];
-    for (const message of dbMessageSelectors.dbUserMessages(get())) {
-      for (const file of message.fileList ?? []) {
-        const blob = await fetch(file.url).then((res) => res.blob());
-        files.push(new File([blob], file.name));
-      }
-      for (const image of message.imageList ?? []) {
-        const blob = await fetch(image.url).then((res) => res.blob());
-        files.push(new File([blob], image.alt));
-      }
-      for (const tool of message.tools ?? []) {
-        if (tool.identifier === CodeInterpreterIdentifier) {
-          const message = dbMessageSelectors.getDbMessageByToolCallId(tool.id)(get());
-          if (message?.content) {
-            const content = JSON.parse(message.content) as CodeInterpreterResponse;
-            for (const file of content.files ?? []) {
-              const item = await fileService.getFile(file.fileId!);
-              const blob = await fetch(item.url).then((res) => res.blob());
-              files.push(new File([blob], file.filename));
+    // Get parent operationId from messageOperationMap (should be executeToolCall)
+    const parentOperationId = get().messageOperationMap[id];
+
+    // Create child operation for interpreter execution
+    // Auto-associates message with this operation via messageId in context
+    const { operationId: interpreterOpId, abortController } = get().startOperation({
+      context: {
+        messageId: id,
+      },
+      metadata: {
+        startTime: Date.now(),
+      },
+      parentOperationId,
+      type: 'builtinToolInterpreter',
+    });
+
+    log(
+      '[python] messageId=%s, parentOpId=%s, interpreterOpId=%s, aborted=%s',
+      id,
+      parentOperationId,
+      interpreterOpId,
+      abortController.signal.aborted,
+    );
+
+    const context = { operationId: interpreterOpId };
+
+    try {
+      // TODO: 应该只下载 AI 用到的文件
+      const files: File[] = [];
+      for (const message of dbMessageSelectors.dbUserMessages(get())) {
+        for (const file of message.fileList ?? []) {
+          const blob = await fetch(file.url).then((res) => res.blob());
+          files.push(new File([blob], file.name));
+        }
+        for (const image of message.imageList ?? []) {
+          const blob = await fetch(image.url).then((res) => res.blob());
+          files.push(new File([blob], image.alt));
+        }
+        for (const tool of message.tools ?? []) {
+          if (tool.identifier === CodeInterpreterIdentifier) {
+            const message = dbMessageSelectors.getDbMessageByToolCallId(tool.id)(get());
+            if (message?.content) {
+              const content = JSON.parse(message.content) as CodeInterpreterResponse;
+              for (const file of content.files ?? []) {
+                const item = await fileService.getFile(file.fileId!);
+                const blob = await fetch(item.url).then((res) => res.blob());
+                files.push(new File([blob], file.filename));
+              }
             }
           }
         }
       }
-    }
 
-    try {
       const result = await pythonService.runPython(params.code, params.packages, files);
+
+      // Complete interpreter operation
+      get().completeOperation(interpreterOpId);
+
       if (result?.files) {
-        await optimisticUpdateMessageContent(id, JSON.stringify(result));
-        await uploadInterpreterFiles(id, result.files);
+        await get().optimisticUpdateMessageContent(id, JSON.stringify(result), undefined, context);
+        await get().uploadInterpreterFiles(id, result.files);
       } else {
-        await optimisticUpdateMessageContent(id, JSON.stringify(result));
+        await get().optimisticUpdateMessageContent(id, JSON.stringify(result), undefined, context);
       }
+
+      return true;
     } catch (error) {
-      optimisticUpdatePluginState(id, { error });
+      const err = error as Error;
+
+      log('[python] Error: messageId=%s, error=%s', id, err.message);
+
+      // Check if it's an abort error
+      if (err.message.includes('The user aborted a request.') || err.name === 'AbortError') {
+        log('[python] Request aborted: messageId=%s', id);
+        // Fail interpreter operation for abort
+        get().failOperation(interpreterOpId, {
+          message: 'User cancelled the request',
+          type: 'UserAborted',
+        });
+        // Don't update error message for user aborts
+        return;
+      }
+
+      // Fail interpreter operation for other errors
+      get().failOperation(interpreterOpId, {
+        message: err.message,
+        type: 'PluginServerError',
+      });
+
+      // For other errors, update message
+      await get().optimisticUpdatePluginState(id, { error }, context);
       // 如果调用过程中出现了错误，不要触发 AI 消息
       return;
-    } finally {
-      toggleInterpreterExecuting(id, false);
     }
-
-    return true;
-  },
-
-  toggleInterpreterExecuting: (id: string, executing: boolean) => {
-    set(
-      { codeInterpreterExecuting: { ...get().codeInterpreterExecuting, [id]: executing } },
-      false,
-      n('toggleInterpreterExecuting'),
-    );
   },
 
   updateInterpreterFileItem: async (

package/src/store/chat/slices/builtinTool/actions/localSystem.ts

@@ -13,11 +13,14 @@ import {
   RunCommandParams,
   WriteLocalFileParams,
 } from '@lobechat/electron-client-ipc';
+import debug from 'debug';
 import { StateCreator } from 'zustand/vanilla';
 
 import { ChatStore } from '@/store/chat/store';
 import { LocalSystemExecutionRuntime } from '@/tools/local-system/ExecutionRuntime';
 
+const log = debug('lobe-store:builtin-tool');
+
 /* eslint-disable typescript-sort-keys/interface */
 export interface LocalFileAction {
   internal_triggerLocalFileToolCalling: (
@@ -33,7 +36,6 @@ export interface LocalFileAction {
   renameLocalFile: (id: string, params: RenameLocalFileParams) => Promise<boolean>;
   reSearchLocalFiles: (id: string, params: LocalSearchFilesParams) => Promise<boolean>;
   searchLocalFiles: (id: string, params: LocalSearchFilesParams) => Promise<boolean>;
-  toggleLocalFileLoading: (id: string, loading: boolean) => void;
   writeLocalFile: (id: string, params: WriteLocalFileParams) => Promise<boolean>;
 
   // Shell Commands
@@ -106,8 +108,6 @@ export const localSystemSlice: StateCreator<
   },
 
   reSearchLocalFiles: async (id, params) => {
-    get().toggleLocalFileLoading(id, true);
-
     await get().optimisticUpdatePluginArguments(id, params);
 
     return get().searchLocalFiles(id, params);
@@ -144,44 +144,94 @@ export const localSystemSlice: StateCreator<
 
   // ==================== utils ====================
 
-  toggleLocalFileLoading: (id, loading) => {
-    // Assuming a loading state structure similar to searchLoading
-    set(
-      (state) => ({
-        localFileLoading: { ...state.localFileLoading, [id]: loading },
-      }),
-      false,
-      `toggleLocalFileLoading/${loading ? 'start' : 'end'}`,
-    );
-  },
   internal_triggerLocalFileToolCalling: async (id, callingService) => {
-    get().toggleLocalFileLoading(id, true);
+    // Get parent operationId from messageOperationMap (should be executeToolCall)
+    const parentOperationId = get().messageOperationMap[id];
+
+    // Create child operation for local system execution
+    // Auto-associates message with this operation via messageId in context
+    const { operationId: localSystemOpId, abortController } = get().startOperation({
+      type: 'builtinToolLocalSystem',
+      context: {
+        messageId: id,
+      },
+      parentOperationId,
+      metadata: {
+        startTime: Date.now(),
+      },
+    });
+
+    log(
+      '[localSystem] messageId=%s, parentOpId=%s, localSystemOpId=%s, aborted=%s',
+      id,
+      parentOperationId,
+      localSystemOpId,
+      abortController.signal.aborted,
+    );
+
+    const context = { operationId: localSystemOpId };
+
     try {
       const { state, content, success, error } = await callingService();
 
+      // Complete local system operation
+      get().completeOperation(localSystemOpId);
+
       if (success) {
         if (state) {
-          await get().optimisticUpdatePluginState(id, state);
+          await get().optimisticUpdatePluginState(id, state, context);
         }
-        await get().optimisticUpdateMessageContent(id, content);
+        await get().optimisticUpdateMessageContent(id, content, undefined, context);
       } else {
-        await get().optimisticUpdateMessagePluginError(id, {
-          body: error,
-          message: error?.message || 'Operation failed',
-          type: 'PluginServerError',
-        });
+        await get().optimisticUpdateMessagePluginError(
+          id,
+          {
+            body: error,
+            message: error?.message || 'Operation failed',
+            type: 'PluginServerError',
+          },
+          context,
+        );
         // Still update content even if failed, to show error message
-        await get().optimisticUpdateMessageContent(id, content);
+        await get().optimisticUpdateMessageContent(id, content, undefined, context);
       }
+
+      return true;
     } catch (error) {
-      await get().optimisticUpdateMessagePluginError(id, {
-        body: error,
-        message: (error as Error).message,
+      const err = error as Error;
+
+      log('[localSystem] Error: messageId=%s, error=%s', id, err.message);
+
+      // Check if it's an abort error
+      if (err.message.includes('The user aborted a request.') || err.name === 'AbortError') {
+        log('[localSystem] Request aborted: messageId=%s', id);
+        // Fail local system operation for abort
+        get().failOperation(localSystemOpId, {
+          message: 'User cancelled the request',
+          type: 'UserAborted',
+        });
+        // Don't update error message for user aborts
+        return false;
+      }
+
+      // Fail local system operation for other errors
+      get().failOperation(localSystemOpId, {
+        message: err.message,
         type: 'PluginServerError',
       });
-    }
-    get().toggleLocalFileLoading(id, false);
 
-    return true;
+      // For other errors, update message
+      await get().optimisticUpdateMessagePluginError(
+        id,
+        {
+          body: error,
+          message: err.message,
+          type: 'PluginServerError',
+        },
+        context,
+      );
+
+      return false;
+    }
   },
 });

package/src/store/chat/slices/builtinTool/actions/search.ts

@@ -1,6 +1,7 @@
 import { crawlResultsPrompt } from '@lobechat/prompts';
 import { CreateMessageParams, SEARCH_SEARXNG_NOT_CONFIG, SearchQuery } from '@lobechat/types';
 import { nanoid } from '@lobechat/utils';
+import debug from 'debug';
 import { StateCreator } from 'zustand/vanilla';
 
 import { searchService } from '@/services/search';
@@ -8,6 +9,8 @@ import { dbMessageSelectors } from '@/store/chat/selectors';
 import { ChatStore } from '@/store/chat/store';
 import { WebBrowsingExecutionRuntime } from '@/tools/web-browsing/ExecutionRuntime';
 
+const log = debug('lobe-store:builtin-tool');
+
 export interface SearchAction {
   crawlMultiPages: (
     id: string,
@@ -22,7 +25,6 @@ export interface SearchAction {
   saveSearchResult: (id: string) => Promise<void>;
   search: (id: string, data: SearchQuery, aiSummary?: boolean) => Promise<void | boolean>;
   togglePageContent: (url: string) => void;
-  toggleSearchLoading: (id: string, loading: boolean) => void;
   /**
    * 重新发起搜索
    * @description 会更新插件的 arguments 参数，然后再次搜索
@@ -43,36 +45,79 @@ export const searchSlice: StateCreator<
   SearchAction
 > = (set, get) => ({
   crawlMultiPages: async (id, params, aiSummary = true) => {
-    const { optimisticUpdateMessageContent } = get();
-    get().toggleSearchLoading(id, true);
+    // Get parent operationId from messageOperationMap (should be executeToolCall)
+    const parentOperationId = get().messageOperationMap[id];
+
+    // Create child operation for crawl execution
+    // Auto-associates message with this operation via messageId in context
+    const { operationId: crawlOpId, abortController } = get().startOperation({
+      context: {
+        messageId: id,
+      },
+      metadata: {
+        startTime: Date.now(),
+        urls: params.urls,
+      },
+      parentOperationId,
+      type: 'builtinToolSearch',
+    });
+
+    log(
+      '[crawlMultiPages] messageId=%s, parentOpId=%s, crawlOpId=%s, urls=%o, aborted=%s',
+      id,
+      parentOperationId,
+      crawlOpId,
+      params.urls,
+      abortController.signal.aborted,
+    );
 
-    // Get message to extract sessionId/topicId
-    const message = dbMessageSelectors.getDbMessageById(id)(get());
-    const context = { sessionId: message?.sessionId, topicId: message?.topicId };
+    const context = { operationId: crawlOpId };
 
     try {
       const { content, success, error, state } = await runtime.crawlMultiPages(params);
 
-      await optimisticUpdateMessageContent(id, content, undefined, context);
+      // Complete crawl operation
+      get().completeOperation(crawlOpId);
+
+      await get().optimisticUpdateMessageContent(id, content, undefined, context);
 
       if (success) {
         await get().optimisticUpdatePluginState(id, state, context);
       } else {
         await get().optimisticUpdatePluginError(id, error, context);
       }
-      get().toggleSearchLoading(id, false);
-
-      // Convert to XML format to save tokens
 
       // if aiSummary is true, then trigger ai message
       return aiSummary;
     } catch (e) {
       const err = e as Error;
+
+      log('[crawlMultiPages] Error: messageId=%s, error=%s', id, err.message);
+
+      // Check if it's an abort error
+      if (err.message.includes('The user aborted a request.') || err.name === 'AbortError') {
+        log('[crawlMultiPages] Request aborted: messageId=%s', id);
+        // Fail crawl operation for abort
+        get().failOperation(crawlOpId, {
+          message: 'User cancelled the request',
+          type: 'UserAborted',
+        });
+        // Don't update error message for user aborts
+        return;
+      }
+
+      // Fail crawl operation for other errors
+      get().failOperation(crawlOpId, {
+        message: err.message,
+        type: 'PluginServerError',
+      });
+
+      // For other errors, update message
       console.error(e);
       const content = [{ errorMessage: err.message, errorType: err.name }];
 
       const xmlContent = crawlResultsPrompt(content);
-      await optimisticUpdateMessageContent(id, xmlContent, undefined, context);
+      await get().optimisticUpdateMessageContent(id, xmlContent, undefined, context);
     }
   },
 
@@ -88,7 +133,9 @@ export const searchSlice: StateCreator<
 
     const { optimisticAddToolToAssistantMessage, optimisticCreateMessage, openToolUI } = get();
 
-    const context = { sessionId: message.sessionId, topicId: message.topicId };
+    // Get operationId from messageOperationMap
+    const operationId = get().messageOperationMap[id];
+    const context = operationId ? { operationId } : undefined;
 
     // 1. 创建一个新的 tool call message
     const newToolCallId = `tool_call_${nanoid()}`;
@@ -120,10 +167,7 @@ export const searchSlice: StateCreator<
 
     const [result] = await Promise.all([
       // 1. 添加 tool message
-      optimisticCreateMessage(toolMessage, {
-        sessionId: toolMessage.sessionId,
-        topicId: toolMessage.topicId,
-      }),
+      optimisticCreateMessage(toolMessage, context),
       // 2. 将这条 tool call message 插入到 ai 消息的 tools 中
       addToolItem(),
     ]);
@@ -134,61 +178,104 @@ export const searchSlice: StateCreator<
   },
 
   search: async (id, params, aiSummary = true) => {
-    get().toggleSearchLoading(id, true);
+    // Get parent operationId from messageOperationMap (should be executeToolCall)
+    const parentOperationId = get().messageOperationMap[id];
+
+    // Create child operation for search execution
+    // Auto-associates message with this operation via messageId in context
+    const { operationId: searchOpId, abortController } = get().startOperation({
+      context: {
+        messageId: id,
+      },
+      metadata: {
+        query: params.query,
+        startTime: Date.now(),
+      },
+      parentOperationId,
+      type: 'builtinToolSearch',
+    });
+
+    log(
+      '[search] messageId=%s, parentOpId=%s, searchOpId=%s, aborted=%s',
+      id,
+      parentOperationId,
+      searchOpId,
+      abortController.signal.aborted,
+    );
 
-    // Get message to extract sessionId/topicId
-    const message = dbMessageSelectors.getDbMessageById(id)(get());
-    const context = { sessionId: message?.sessionId, topicId: message?.topicId };
-
-    const { content, success, error, state } = await runtime.search(params);
-
-    if (success) {
-      await get().optimisticUpdatePluginState(id, state, context);
-    } else {
-      if ((error as Error).message === SEARCH_SEARXNG_NOT_CONFIG) {
-        await get().optimisticUpdateMessagePluginError(
-          id,
-          {
-            body: { provider: 'searxng' },
-            message: 'SearXNG is not configured',
-            type: 'PluginSettingsInvalid',
-          },
-          context,
-        );
+    const context = { operationId: searchOpId };
+
+    try {
+      const { content, success, error, state } = await runtime.search(params, {
+        signal: abortController.signal,
+      });
+
+      // Complete search operation
+      get().completeOperation(searchOpId);
+
+      if (success) {
+        await get().optimisticUpdatePluginState(id, state, context);
       } else {
-        await get().optimisticUpdateMessagePluginError(
-          id,
-          {
-            body: error,
-            message: (error as Error).message,
-            type: 'PluginServerError',
-          },
-          context,
-        );
+        if ((error as Error).message === SEARCH_SEARXNG_NOT_CONFIG) {
+          await get().optimisticUpdateMessagePluginError(
+            id,
+            {
+              body: { provider: 'searxng' },
+              message: 'SearXNG is not configured',
+              type: 'PluginSettingsInvalid',
+            },
+            context,
+          );
+        } else {
+          await get().optimisticUpdateMessagePluginError(
+            id,
+            {
+              body: error,
+              message: (error as Error).message,
+              type: 'PluginServerError',
+            },
+            context,
+          );
+        }
       }
-    }
 
-    get().toggleSearchLoading(id, false);
+      await get().optimisticUpdateMessageContent(id, content, undefined, context);
+
+      // 如果 aiSummary 为 true，则会自动触发总结
+      return aiSummary;
+    } catch (error) {
+      const err = error as Error;
+
+      log('[search] Error: messageId=%s, error=%s', id, err.message);
+
+      // Check if it's an abort error
+      if (err.message.includes('The user aborted a request.') || err.name === 'AbortError') {
+        log('[search] Request aborted: messageId=%s', id);
+        // Fail search operation for abort
+        get().failOperation(searchOpId, {
+          message: 'User cancelled the request',
+          type: 'UserAborted',
+        });
+        // Don't update error message for user aborts
+        return;
+      }
 
-    await get().optimisticUpdateMessageContent(id, content, undefined, context);
+      // Fail search operation for other errors
+      get().failOperation(searchOpId, { message: err.message, type: 'PluginServerError' });
 
-    // 如果 aiSummary 为 true，则会自动触发总结
-    return aiSummary;
+      // For other errors, update message
+      await get().optimisticUpdateMessagePluginError(
+        id,
+        { body: error, message: err.message, type: 'PluginServerError' },
+        context,
+      );
+    }
   },
   togglePageContent: (url) => {
     set({ activePageContentUrl: url });
   },
 
-  toggleSearchLoading: (id, loading) => {
-    set(
-      { searchLoading: { ...get().searchLoading, [id]: loading } },
-      false,
-      `toggleSearchLoading/${loading ? 'start' : 'end'}`,
-    );
-  },
-
   triggerSearchAgain: async (id, data, options) => {
-    get().toggleSearchLoading(id, true);
     await get().optimisticUpdatePluginArguments(id, data);
 
     await get().search(id, data, options?.aiSummary);