w

Author: mokeyish

app/components/mcp-market.tsx

@@ -22,7 +22,6 @@ import {
   resumeMcpServer,
 } from "../mcp/actions";
 import {
-  ListToolsResponse,
   ToolSchema,
   McpConfigData,
   PresetServer,
@@ -48,7 +47,7 @@ export function McpMarketPage() {
   const [searchText, setSearchText] = useState("");
   const [userConfig, setUserConfig] = useState<Record<string, any>>({});
   const [editingServerId, setEditingServerId] = useState<string | undefined>();
-  const [tools, setTools] = useState<ListToolsResponse | null>(null);
+  const [tools, setTools] = useState<ToolSchema[] | null>(null);
   const [viewingServerId, setViewingServerId] = useState<string | undefined>();
   const [isLoading, setIsLoading] = useState(false);
   const [config, setConfig] = useState<McpConfigData>();
@@ -232,7 +231,7 @@ export function McpMarketPage() {
     try {
       const result = await getClientTools(id);
       if (result) {
-        setTools(result);
+        setTools(result?.tools);
       } else {
         throw new Error("Failed to load tools");
       }
@@ -733,8 +732,8 @@ export function McpMarketPage() {
               <div className={styles["tools-list"]}>
                 {isLoading ? (
                   <div>Loading...</div>
-                ) : tools?.tools ? (
-                  tools.tools.map((tool: ToolSchema, index: number) => (
+                ) : tools ? (
+                  tools.map((tool: ToolSchema, index: number) => (
                     <div key={index} className={styles["tool-item"]}>
                       <div className={styles["tool-name"]}>{tool.name}</div>
                       <div className={styles["tool-description"]}>

app/mcp/actions.ts

@@ -17,6 +17,8 @@ import {
   ServerStatusResponse,
 } from "./types";
 
+const JSON_INDENT = 2;
+
 const logger = new MCPClientLogger("MCP Actions");
 
 const getConfigPath = async () => {
@@ -29,6 +31,7 @@ const getConfigPath = async () => {
 };
 
 const clientsMap = new Map<string, McpClientData>();
+const toolToClientMap = new Map<string, string>();
 
 // 获取客户端状态
 export async function getClientsStatus(): Promise<
@@ -133,6 +136,13 @@ async function initializeSingleClient(
         `Supported tools for [${clientId}]: ${JSON.stringify(tools, null, 2)}`,
       );
       clientsMap.set(clientId, { client, tools, errorMsg: null });
+      if (tools?.tools) {
+        for (const tool of tools.tools) {
+          if (tool.name) {
+            toolToClientMap.set(tool.name, clientId);
+          }
+        }
+      }
       logger.success(`Client [${clientId}] initialized successfully`);
     })
     .catch((error) => {
@@ -250,6 +260,13 @@ export async function resumeMcpServer(clientId: string): Promise<void> {
       const client = await createClient(clientId, serverConfig);
       const tools = await listTools(client);
       clientsMap.set(clientId, { client, tools, errorMsg: null });
+      if (tools?.tools) {
+        for (const tool of tools.tools) {
+          if (tool.name) {
+            toolToClientMap.set(tool.name, clientId);
+          }
+        }
+      }
       logger.success(`Client [${clientId}] initialized successfully`);
 
       // 初始化成功后更新配置
@@ -354,9 +371,10 @@ export async function executeMcpAction(
     ) {
       // Use a tool-to-client mapping that's maintained when tools are initialized
       const toolName = request.params.name;
-      client = [...clientsMap.values()].find(
-        (c) => c.tools?.tools && c.tools.tools.some((t) => t.name == toolName),
-      );
+      const toolClientId = toolToClientMap.get(toolName);
+      if (toolClientId) {
+        client = clientsMap.get(toolClientId);
+      }
     }
     if (!client?.client) {
       throw new Error(`Client ${clientId} not found`);
@@ -417,7 +435,10 @@ async function updateMcpConfig(config: McpConfigData): Promise<void> {
     const path = await import("path");
     // 确保目录存在
     await fs.mkdir(path.dirname(await getConfigPath()), { recursive: true });
-    await fs.writeFile(await getConfigPath(), JSON.stringify(config, null, 2));
+    await fs.writeFile(
+      await getConfigPath(),
+      JSON.stringify(config, null, JSON_INDENT),
+    );
   }
 }
 

app/mcp/client.ts

@@ -25,7 +25,9 @@ export async function createClient(
     transport = new SSEClientTransport(new URL(config.url));
   } else {
     if (EXPORT_MODE) {
-      throw new Error("Cannot use stdio transport in export mode");
+      throw new Error(
+        "Cannot use stdio transport in export mode. Please use SSE transport configuration instead.",
+      );
     } else {
       const { StdioClientTransport } = await import(
         "@modelcontextprotocol/sdk/client/stdio.js"