@lobehub/lobehub 2.0.0-next.3 → 2.0.0-next.31

package/src/store/chat/slices/aiChat/actions/generateAIChatV2.ts

@@ -1,11 +1,17 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix, typescript-sort-keys/interface */
 // Disable the auto sort key eslint rule to make the code more logic and readable
-import { DEFAULT_AGENT_CHAT_CONFIG, INBOX_SESSION_ID, isDesktop } from '@lobechat/const';
+import {
+  DEFAULT_AGENT_CHAT_CONFIG,
+  INBOX_SESSION_ID,
+  LOADING_FLAT,
+  isDesktop,
+} from '@lobechat/const';
 import { knowledgeBaseQAPrompts } from '@lobechat/prompts';
 import {
   ChatImageItem,
   ChatTopic,
   ChatVideoItem,
+  CreateNewMessageParams,
   MessageSemanticSearchChunk,
   SendMessageParams,
   SendMessageServerResponse,
@@ -13,8 +19,10 @@ import {
   UIChatMessage,
 } from '@lobechat/types';
 import { TRPCClientError } from '@trpc/client';
+import debug from 'debug';
 import { t } from 'i18next';
 import { produce } from 'immer';
+import pMap from 'p-map';
 import { StateCreator } from 'zustand/vanilla';
 
 import { aiChatService } from '@/services/aiChat';
@@ -30,21 +38,36 @@ import { getSessionStoreState } from '@/store/session';
 import { WebBrowsingManifest } from '@/tools/web-browsing';
 import { setNamespace } from '@/utils/storeDebug';
 
-import { chatSelectors, topicSelectors } from '../../../selectors';
+import { chatSelectors, threadSelectors, topicSelectors } from '../../../selectors';
 import { messageMapKey } from '../../../utils/messageMapKey';
 
 const n = setNamespace('ai');
+const log = debug('lobe-store:ai-chat-v2');
 
 export interface AIGenerateV2Action {
   /**
    * Sends a new message to the AI chat system
    */
-  sendMessageInServer: (params: SendMessageParams) => Promise<void>;
+  sendMessage: (params: SendMessageParams) => Promise<void>;
   /**
-   * Cancels sendMessageInServer operation for a specific topic/session
+   * Cancels sendMessage operation for a specific topic/session
    */
   cancelSendMessageInServer: (topicId?: string) => void;
   clearSendMessageError: () => void;
+  /**
+   */
+  triggerToolsCalling: (
+    id: string,
+    params?: { threadId?: string; inPortalThread?: boolean; inSearchWorkflow?: boolean },
+  ) => Promise<void>;
+  callToolFollowAssistantMessage: (params: {
+    parentId: string;
+    traceId?: string;
+    threadId?: string;
+    inPortalThread?: boolean;
+    inSearchWorkflow?: boolean;
+  }) => Promise<void>;
+
   internal_refreshAiChat: (params: {
     topics?: ChatTopic[];
     messages: UIChatMessage[];
@@ -57,7 +80,7 @@ export interface AIGenerateV2Action {
    */
   internal_execAgentRuntime: (params: {
     messages: UIChatMessage[];
-    userMessageId: string;
+    userMessageId?: string;
     assistantMessageId: string;
     isWelcomeQuestion?: boolean;
     inSearchWorkflow?: boolean;
@@ -70,7 +93,7 @@ export interface AIGenerateV2Action {
     traceId?: string;
   }) => Promise<void>;
   /**
-   * Toggle sendMessageInServer operation state
+   * Toggle sendMessage operation state
    */
   internal_toggleSendMessageOperation: (
     key: string | { sessionId: string; topicId?: string | null },
@@ -90,7 +113,7 @@ export const generateAIChatV2: StateCreator<
   [],
   AIGenerateV2Action
 > = (set, get) => ({
-  sendMessageInServer: async ({ message, files, onlyAddUserMessage, isWelcomeQuestion }) => {
+  sendMessage: async ({ message, files, onlyAddUserMessage, isWelcomeQuestion }) => {
     const { activeTopicId, activeId, activeThreadId, internal_execAgentRuntime, mainInputEditor } =
       get();
     if (!activeId) return;
@@ -151,7 +174,7 @@ export const generateAIChatV2: StateCreator<
 
     const operationKey = messageMapKey(activeId, activeTopicId);
 
-    // Start tracking sendMessageInServer operation with AbortController
+    // Start tracking sendMessage operation with AbortController
     const abortController = get().internal_toggleSendMessageOperation(operationKey, true)!;
 
     const jsonState = mainInputEditor?.getJSONState();
@@ -205,7 +228,7 @@ export const generateAIChatV2: StateCreator<
         }
       }
     } finally {
-      // Stop tracking sendMessageInServer operation
+      // Stop tracking sendMessage operation
       get().internal_toggleSendMessageOperation(operationKey, false);
     }
 
@@ -290,7 +313,7 @@ export const generateAIChatV2: StateCreator<
     get().internal_toggleSendMessageOperation(
       operationKey,
       false,
-      'User cancelled sendMessageInServer operation',
+      'User cancelled sendMessage operation',
     );
 
     // Only clear creating message state if it's the active session
@@ -325,9 +348,16 @@ export const generateAIChatV2: StateCreator<
       ragQuery,
       messages: originalMessages,
     } = params;
+
+    log(
+      '[internal_execAgentRuntime] start, assistantId: %s, messages count: %d',
+      assistantId,
+      originalMessages.length,
+    );
+
     const {
       internal_fetchAIChatMessage,
-      triggerToolCalls,
+      triggerToolsCalling,
       refreshMessages,
       internal_updateMessageRAG,
     } = get();
@@ -338,11 +368,14 @@ export const generateAIChatV2: StateCreator<
     const agentStoreState = getAgentStoreState();
     const { model, provider, chatConfig } = agentSelectors.currentAgentConfig(agentStoreState);
 
+    log('[internal_execAgentRuntime] Agent config: model=%s, provider=%s', model, provider);
+
     let fileChunks: MessageSemanticSearchChunk[] | undefined;
     let ragQueryId;
 
     // go into RAG flow if there is ragQuery flag
-    if (ragQuery) {
+    if (ragQuery && userMessageId) {
+      log('[internal_execAgentRuntime] Entering RAG flow with query: %s', ragQuery);
       // 1. get the relative chunks from semantic search
       const { chunks, queryId, rewriteQuery } = await get().internal_retrieveChunks(
         userMessageId,
@@ -470,7 +503,7 @@ export const generateAIChatV2: StateCreator<
       if (isToolsCalling) {
         get().internal_toggleMessageInToolsCalling(true, assistantId);
         await refreshMessages();
-        await triggerToolCalls(assistantId, {
+        await triggerToolsCalling(assistantId, {
           threadId: params?.threadId,
           inPortalThread: params?.inPortalThread,
         });
@@ -481,6 +514,7 @@ export const generateAIChatV2: StateCreator<
     }
 
     // 4. fetch the AI response
+    log('[internal_execAgentRuntime] Fetching AI response for assistantId: %s', assistantId);
     const { isFunctionCall, content } = await internal_fetchAIChatMessage({
       messages,
       messageId: assistantId,
@@ -491,13 +525,18 @@ export const generateAIChatV2: StateCreator<
 
     // 5. if it's the function call message, trigger the function method
     if (isFunctionCall) {
+      log('[internal_execAgentRuntime] AI response is function call, triggering tools calling');
       get().internal_toggleMessageInToolsCalling(true, assistantId);
       await refreshMessages();
-      await triggerToolCalls(assistantId, {
+      await triggerToolsCalling(assistantId, {
         threadId: params?.threadId,
         inPortalThread: params?.inPortalThread,
       });
     } else {
+      log(
+        '[internal_execAgentRuntime] AI response completed, content length: %d',
+        content?.length || 0,
+      );
       // 显示桌面通知（仅在桌面端且窗口隐藏时）
       if (isDesktop) {
         try {
@@ -534,6 +573,225 @@ export const generateAIChatV2: StateCreator<
       await get().internal_summaryHistory(historyMessages);
     }
   },
+  triggerToolsCalling: async (assistantId, { threadId, inPortalThread, inSearchWorkflow } = {}) => {
+    log('[triggerToolsCalling] start, assistantId (block ID): %s', assistantId);
+
+    const foundMessage = chatSelectors.getMessageById(assistantId)(get());
+    if (!foundMessage) {
+      log('[triggerToolsCalling] Message not found, returning');
+      return;
+    }
+
+    // Determine if this is a group message or a block
+    let groupMessage: UIChatMessage;
+    let latestBlock: UIChatMessage;
+
+    if (foundMessage.role === 'group') {
+      // Case 1: assistantId matches a group message ID directly
+      // Find the block within children that matches assistantId
+      groupMessage = foundMessage;
+      const block = foundMessage.children?.find((item) => item.id === assistantId);
+
+      if (!block) {
+        log(
+          '[triggerToolsCalling] Block with id %s not found in group message children, returning',
+          assistantId,
+        );
+        return;
+      }
+      latestBlock = block as UIChatMessage;
+    } else if (foundMessage.parentId) {
+      // Case 2: assistantId is a block ID, need to get parent group message
+      const parentMsg = chatSelectors.getMessageById(foundMessage.parentId)(get());
+      if (!parentMsg || parentMsg.role !== 'group') {
+        log('[triggerToolsCalling] Parent group message not found, returning');
+        return;
+      }
+      groupMessage = parentMsg;
+      latestBlock = foundMessage;
+    } else {
+      log(
+        '[triggerToolsCalling] Message is neither a group message nor a block with parentId, returning',
+      );
+      return;
+    }
+
+    log('[triggerToolsCalling] Found group message: %O', {
+      id: groupMessage.id,
+      groupId: groupMessage.groupId,
+      childrenCount: groupMessage.children?.length,
+      latestBlockId: latestBlock.id,
+    });
+
+    if (!latestBlock.tools) {
+      log('[triggerToolsCalling] Latest block has no tools, returning');
+      return;
+    }
+
+    log(
+      '[triggerToolsCalling] Latest block found with %d tools: %O',
+      latestBlock.tools.length,
+      latestBlock.tools.map((t) => ({ id: t.id, type: t.type, identifier: t.identifier })),
+    );
+
+    let shouldCreateMessage = false;
+    let latestToolId = '';
+
+    await pMap(
+      latestBlock.tools,
+      async (payload) => {
+        log(
+          '[triggerToolsCalling] Processing tool: %s (type: %s)',
+          payload.identifier,
+          payload.type,
+        );
+
+        // 2. 使用 createNewMessage 创建 tool 消息
+        const toolMessage: CreateNewMessageParams = {
+          content: '',
+          parentId: assistantId,
+          plugin: payload,
+          role: 'tool',
+          sessionId: get().activeId,
+          tool_call_id: payload.id,
+          threadId,
+          topicId: get().activeTopicId, // if there is activeTopicId，then add it to topicId
+          groupId: groupMessage.groupId, // Propagate groupId from parent message for group chat
+        };
+
+        const result = await get().internal_createMessage(toolMessage);
+
+        if (!result) {
+          log('[triggerToolsCalling] Failed to create tool message for %s', payload.identifier);
+          return;
+        }
+
+        log('[triggerToolsCalling] Tool message created: %s', result.id);
+
+        // 3. 执行 tool（这时 tool 消息已经创建，且 UI 已更新）
+        const data = await get().internal_invokeDifferentTypePlugin(result.id, payload);
+
+        if (data && !['markdown', 'standalone'].includes(payload.type)) {
+          shouldCreateMessage = true;
+          latestToolId = result.id;
+          log(
+            '[triggerToolsCalling] Tool %s requires follow-up assistant message',
+            payload.identifier,
+          );
+        } else {
+          log('[triggerToolsCalling] Tool %s completed without follow-up', payload.identifier);
+        }
+      },
+      { concurrency: 5 },
+    );
+
+    await get().internal_toggleMessageInToolsCalling(false, assistantId);
+
+    if (!shouldCreateMessage) {
+      log('[triggerToolsCalling] No follow-up message needed, completed');
+      return;
+    }
+
+    const traceId = chatSelectors.getTraceIdByMessageId(latestToolId)(get());
+    log(
+      '[triggerToolsCalling] Calling follow-up assistant message with latestToolId: %s',
+      latestToolId,
+    );
+
+    await get().callToolFollowAssistantMessage({
+      traceId,
+      threadId,
+      inPortalThread,
+      inSearchWorkflow,
+      parentId: latestToolId,
+    });
+    log('[triggerToolsCalling] completed');
+  },
+
+  callToolFollowAssistantMessage: async ({
+    parentId,
+    traceId,
+    threadId,
+    inPortalThread,
+    inSearchWorkflow,
+  }) => {
+    log('[callToolFollowAssistantMessage] start, parentId: %s', parentId);
+
+    const chats = inPortalThread
+      ? threadSelectors.portalAIChatsWithHistoryConfig(get())
+      : chatSelectors.mainAIChatsWithHistoryConfig(get());
+
+    let assistantMessageId: string;
+
+    // 获取 agent 配置
+    const agentStoreState = getAgentStoreState();
+    const { model, provider } = agentSelectors.currentAgentConfig(agentStoreState);
+
+    // 查找包含 parentId 的 group message
+    // parentId 是 tool result message 的 id，它存储在 assistant block 的 tools[].result_msg_id 中
+    let groupMessageId: string | undefined;
+
+    // 遍历所有 group messages，找到包含该 tool result 的那个
+    for (const msg of chats) {
+      if (msg.role === 'group' && msg.children) {
+        for (const child of msg.children) {
+          // 检查 child 的 tools 中是否有 result_msg_id === parentId
+          if (child.tools?.some((tool) => tool.result_msg_id === parentId)) {
+            groupMessageId = msg.id;
+            log('[callToolFollowAssistantMessage] Found group message: %s', groupMessageId);
+            break;
+          }
+        }
+        if (groupMessageId) break;
+      }
+    }
+
+    // 创建新的 assistant message，作为 group message 的新 block
+    const assistantMessage: CreateNewMessageParams = {
+      role: 'assistant',
+      content: LOADING_FLAT,
+      parentId,
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
+      threadId,
+      traceId,
+      model,
+      provider,
+    };
+
+    log('[callToolFollowAssistantMessage] Creating new assistant message block with params: %O', {
+      parentId,
+      groupMessageId,
+      model,
+      provider,
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
+    });
+
+    const result = await get().internal_createMessage(assistantMessage, { groupMessageId });
+
+    if (!result) {
+      log('[callToolFollowAssistantMessage] Failed to create assistant message');
+      return;
+    }
+
+    assistantMessageId = result.id;
+    log(
+      '[callToolFollowAssistantMessage] Assistant message created successfully, id: %s',
+      assistantMessageId,
+    );
+
+    log('[callToolFollowAssistantMessage] Starting agent runtime with %d messages', chats.length);
+    await get().internal_execAgentRuntime({
+      messages: chats,
+      assistantMessageId,
+      traceId,
+      threadId,
+      inPortalThread,
+      inSearchWorkflow,
+    });
+    log('[callToolFollowAssistantMessage] completed');
+  },
 
   internal_updateSendMessageOperation: (key, value, actionName) => {
     const operationKey = typeof key === 'string' ? key : messageMapKey(key.sessionId, key.topicId);

package/src/store/chat/slices/aiChat/actions/generateAIGroupChat.ts

@@ -294,7 +294,7 @@ export const chatAiGroupChat: StateCreator<
           targetId: targetMemberId,
         };
 
-        const messageId = await internal_createMessage(userMessage);
+        const result = await internal_createMessage(userMessage);
 
         // if only add user message, then stop
         if (onlyAddUserMessage) {
@@ -302,6 +302,9 @@ export const chatAiGroupChat: StateCreator<
           return;
         }
 
+        if (!result) return;
+        const messageId = result.id;
+
         if (messageId) {
           // Use the specific group's config rather than relying on active session
           const groupConfig = selectGroupConfig(groupId);
@@ -668,7 +671,9 @@ export const chatAiGroupChat: StateCreator<
 
         console.log('DEBUG: Creating agent message with:', agentMessage);
 
-        const assistantId = await internal_createMessage(agentMessage);
+        const result = await internal_createMessage(agentMessage);
+        if (!result) return;
+        const assistantId = result.id;
 
         const systemMessage: UIChatMessage = {
           id: 'group-system',

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

@@ -2,14 +2,12 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { ChatStore } from '@/store/chat/store';
 
-import { ChatDallEAction, dalleSlice } from './dalle';
 import { ChatCodeInterpreterAction, codeInterpreterSlice } from './interpreter';
 import { LocalFileAction, localSystemSlice } from './localSystem';
 import { SearchAction, searchSlice } from './search';
 
 export interface ChatBuiltinToolAction
-  extends ChatDallEAction,
-    SearchAction,
+  extends SearchAction,
     LocalFileAction,
     ChatCodeInterpreterAction {}
 
@@ -19,7 +17,6 @@ export const chatToolSlice: StateCreator<
   [],
   ChatBuiltinToolAction
 > = (...params) => ({
-  ...dalleSlice(...params),
   ...searchSlice(...params),
   ...localSystemSlice(...params),
   ...codeInterpreterSlice(...params),

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

@@ -106,16 +106,16 @@ export const searchSlice: StateCreator<
       });
     };
 
-    const [newMessageId] = await Promise.all([
+    const [result] = await Promise.all([
       // 1. 添加 tool message
       internal_createMessage(toolMessage),
       // 2. 将这条 tool call message 插入到 ai 消息的 tools 中
       addToolItem(),
     ]);
-    if (!newMessageId) return;
+    if (!result) return;
 
     // 将新创建的 tool message 激活
-    openToolUI(newMessageId, message.plugin.identifier);
+    openToolUI(result.id, message.plugin.identifier);
   },
 
   search: async (id, params, aiSummary = true) => {