abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-20 08:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Ensure MCP tools are discovered from slow-starting servers (#717)

Browse Source
This commit is contained in:
N. Taylor Mullen
2025-06-03 00:40:51 -07:00
committed by GitHub
parent 5f6f6a95a2
commit c71d6ddc3b
5 changed files with 95 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/core/src/tools/mcp-client.ts
View File

@@ -8,15 +8,18 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
import { parse } from 'shell-quote';
import { Config, MCPServerConfig } from '../config/config.js';
import { MCPServerConfig } from '../config/config.js';
import { DiscoveredMCPTool } from './mcp-tool.js';
import { CallableTool, FunctionDeclaration, mcpToTool } from '@google/genai';
import { ToolRegistry } from './tool-registry.js';
export async function discoverMcpTools(config: Config): Promise<void> {
const mcpServers = config.getMcpServers() || {};
if (config.getMcpServerCommand()) {
const cmd = config.getMcpServerCommand()!;
export async function discoverMcpTools(
mcpServers: Record<string, MCPServerConfig>,
mcpServerCommand: string | undefined,
toolRegistry: ToolRegistry,
): Promise<void> {
if (mcpServerCommand) {
const cmd = mcpServerCommand;
const args = parse(cmd, process.env) as string[];
if (args.some((arg) => typeof arg !== 'string')) {
throw new Error('failed to parse mcpServerCommand: ' + cmd);
@@ -30,7 +33,7 @@ export async function discoverMcpTools(config: Config): Promise<void> {
const discoveryPromises = Object.entries(mcpServers).map(
([mcpServerName, mcpServerConfig]) =>
connectAndDiscover(mcpServerName, mcpServerConfig, config),
connectAndDiscover(mcpServerName, mcpServerConfig, toolRegistry),
);
await Promise.all(discoveryPromises);
}
@@ -38,7 +41,7 @@ export async function discoverMcpTools(config: Config): Promise<void> {
async function connectAndDiscover(
mcpServerName: string,
mcpServerConfig: MCPServerConfig,
config: Config,
toolRegistry: ToolRegistry,
): Promise<void> {
let transport;
if (mcpServerConfig.url) {
@@ -90,7 +93,6 @@ async function connectAndDiscover(
});
}
const toolRegistry = await config.getToolRegistry();
try {
const mcpCallableTool: CallableTool = mcpToTool(mcpClient);
const discoveredToolFunctions = await mcpCallableTool.tool();