fix: resolve Promise mapping bug in loadMcpTools and loadWorkFlowTools to correctly load and connect configured MCP servers

src/app/api/chat/route.ts

@@ -202,25 +202,13 @@ export async function POST(request: Request) {
 
     const stream = createUIMessageStream({
       execute: async ({ writer: dataStream }) => {
-        const MCP_TOOLS = await safe()
-          .map(errorIf(() => !isToolCallAllowed && "Not allowed"))
-          .map(() =>
-            loadMcpTools({
-              mentions,
-              allowedMcpServers,
-            }),
-          )
-          .orElse({});
+        const MCP_TOOLS = isToolCallAllowed
+          ? await loadMcpTools({ mentions, allowedMcpServers })
+          : {};
 
-        const WORKFLOW_TOOLS = await safe()
-          .map(errorIf(() => !isToolCallAllowed && "Not allowed"))
-          .map(() =>
-            loadWorkFlowTools({
-              mentions,
-              dataStream,
-            }),
-          )
-          .orElse({});
+        const WORKFLOW_TOOLS = isToolCallAllowed
+          ? await loadWorkFlowTools({ mentions, dataStream })
+          : {};
 
         const APP_DEFAULT_TOOLS = await safe()
           .map(errorIf(() => !isToolCallAllowed && "Not allowed"))

src/app/api/chat/shared.chat.ts

@@ -393,26 +393,28 @@ export const workflowToVercelAITools = (
     );
 };
 
-export const loadMcpTools = (opt?: {
+export const loadMcpTools = async (opt?: {
   mentions?: ChatMention[];
   allowedMcpServers?: Record<string, AllowedMCPServer>;
-}) =>
-  safe(() => mcpClientsManager.tools())
-    .map((tools) => {
-      if (opt?.mentions?.length) {
-        return filterMCPToolsByMentions(tools, opt.mentions);
-      }
-      return filterMCPToolsByAllowedMCPServers(tools, opt?.allowedMcpServers);
-    })
-    .orElse({} as Record<string, VercelAIMcpTool>);
+}) => {
+  try {
+    const tools = await mcpClientsManager.tools();
+    if (opt?.mentions?.length) {
+      return filterMCPToolsByMentions(tools, opt.mentions);
+    }
+    return filterMCPToolsByAllowedMCPServers(tools, opt?.allowedMcpServers);
+  } catch (e) {
+    return {} as Record<string, VercelAIMcpTool>;
+  }
+};
 
-export const loadWorkFlowTools = (opt: {
+export const loadWorkFlowTools = async (opt: {
   mentions?: ChatMention[];
   dataStream: UIMessageStreamWriter;
-}) =>
-  safe(() =>
-    opt?.mentions?.length
-      ? workflowRepository.selectToolByIds(
+}) => {
+  try {
+    const tools = opt?.mentions?.length
+      ? await workflowRepository.selectToolByIds(
           opt?.mentions
             ?.filter((m) => m.type == "workflow")
             .map(
@@ -420,10 +422,12 @@ export const loadWorkFlowTools = (opt: {
                 (v as Extract<ChatMention, { type: "workflow" }>).workflowId,
             ),
         )
-      : [],
-  )
-    .map((tools) => workflowToVercelAITools(tools, opt.dataStream))
-    .orElse({} as Record<string, VercelAIWorkflowTool>);
+      : [];
+    return workflowToVercelAITools(tools, opt.dataStream);
+  } catch (e) {
+    return {} as Record<string, VercelAIWorkflowTool>;
+  }
+};
 
 export const loadAppDefaultTools = (opt?: {
   mentions?: ChatMention[];