mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-23 00:35:51 +00:00
feat: 工具层及 mcp 大重构 (#252)
* feat: 第一版大重构 * fix: 修复类型问题 * chore: 更新版本到 1.3.2 * Add brave as alternative WebSearchTool * fix: 修正顺序 * fix: 修复对穷鬼模式的 auto dream 和 session memory 越过 * feat: 穷鬼模式去除 session-summary * feat: 创建 builtin-tools 包,搬运所有工具实现 将 src/tools/ 下的全部 60 个工具目录迁移至 packages/builtin-tools/src/tools/, 内部导入路径已更新为 src/ alias 模式。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: 更新 src/ 中所有工具引用至 builtin-tools 包,删除 src/tools/ - src/tools.ts 及 178 个 src/ 文件的 import 路径从 ./tools/ 改为 builtin-tools/tools/ - 删除 src/tools/ 整个目录(已迁移至 packages/builtin-tools/) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: 添加 builtin-tools 路径别名至 tsconfig,更新 bun.lock - tsconfig.json 新增 builtin-tools/* 和 builtin-tools 路径映射 - 新增 packages/builtin-tools/src 至 include Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: 为 builtin-tools、mcp-client、agent-tools 添加 @claude-code-best 作用域前缀 所有包名及 import 路径统一添加 @claude-code-best/ 前缀: - builtin-tools → @claude-code-best/builtin-tools - mcp-client → @claude-code-best/mcp-client - agent-tools → @claude-code-best/agent-tools Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 修复 node 环境没有 bun 的问题 --------- Co-authored-by: Eric-Guo <eric.guocz@gmail.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
143
packages/mcp-client/src/discovery.ts
Normal file
143
packages/mcp-client/src/discovery.ts
Normal file
@@ -0,0 +1,143 @@
|
||||
// MCP tool discovery — fetch and process tools from connected MCP servers
|
||||
// Extracted from src/services/mcp/client.ts (fetchToolsForClient)
|
||||
|
||||
import type { Client } from '@modelcontextprotocol/sdk/client/index.js'
|
||||
import {
|
||||
ListToolsResultSchema,
|
||||
type ListToolsResult,
|
||||
} from '@modelcontextprotocol/sdk/types.js'
|
||||
import type { CoreTool } from '@claude-code-best/agent-tools'
|
||||
import type { ConnectedMCPServer } from './types.js'
|
||||
import type { McpClientDependencies } from './interfaces.js'
|
||||
import { buildMcpToolName } from './strings.js'
|
||||
import { memoizeWithLRU } from './cache.js'
|
||||
import { recursivelySanitizeUnicode } from './sanitization.js'
|
||||
|
||||
// ============================================================================
|
||||
// Constants
|
||||
// ============================================================================
|
||||
|
||||
/** Default max cache size for tool discovery (keyed by server name) */
|
||||
export const MCP_FETCH_CACHE_SIZE = 20
|
||||
|
||||
/** Maximum description length before truncation */
|
||||
const MAX_MCP_DESCRIPTION_LENGTH = 2048
|
||||
|
||||
// ============================================================================
|
||||
// Tool discovery
|
||||
// ============================================================================
|
||||
|
||||
export interface DiscoveryOptions {
|
||||
/** Server name for logging and tool naming */
|
||||
serverName: string
|
||||
/** Connected MCP server client */
|
||||
client: Client
|
||||
/** Server capabilities (checked before fetching) */
|
||||
capabilities: Record<string, unknown>
|
||||
/** Whether to skip the mcp__ prefix for tool names */
|
||||
skipPrefix?: boolean
|
||||
/** Host dependencies for logging */
|
||||
deps: McpClientDependencies
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches tools from a connected MCP server and converts them to CoreTool format.
|
||||
* Returns empty array if the server doesn't support tools or if fetching fails.
|
||||
*/
|
||||
export async function discoverTools(options: DiscoveryOptions): Promise<CoreTool[]> {
|
||||
const { serverName, client, capabilities, skipPrefix, deps } = options
|
||||
|
||||
if (!capabilities?.tools) {
|
||||
return []
|
||||
}
|
||||
|
||||
try {
|
||||
const result = (await client.request(
|
||||
{ method: 'tools/list' },
|
||||
ListToolsResultSchema,
|
||||
)) as ListToolsResult
|
||||
|
||||
// Sanitize tool data from MCP server
|
||||
const toolsToProcess = recursivelySanitizeUnicode(result.tools)
|
||||
|
||||
return toolsToProcess.map((tool): CoreTool => {
|
||||
const fullyQualifiedName = buildMcpToolName(serverName, tool.name)
|
||||
const effectiveName = skipPrefix ? tool.name : fullyQualifiedName
|
||||
|
||||
return {
|
||||
name: effectiveName,
|
||||
mcpInfo: { serverName, toolName: tool.name },
|
||||
isMcp: true,
|
||||
inputJSONSchema: tool.inputSchema as CoreTool['inputJSONSchema'],
|
||||
async description() {
|
||||
return tool.description ?? ''
|
||||
},
|
||||
async prompt() {
|
||||
const desc = tool.description ?? ''
|
||||
return desc.length > MAX_MCP_DESCRIPTION_LENGTH
|
||||
? desc.slice(0, MAX_MCP_DESCRIPTION_LENGTH) + '… [truncated]'
|
||||
: desc
|
||||
},
|
||||
isConcurrencySafe: () => tool.annotations?.readOnlyHint ?? false,
|
||||
isReadOnly: () => tool.annotations?.readOnlyHint ?? false,
|
||||
isDestructive: () => tool.annotations?.destructiveHint ?? false,
|
||||
isOpenWorld: () => tool.annotations?.openWorldHint ?? false,
|
||||
isEnabled: () => true,
|
||||
async checkPermissions() {
|
||||
return { behavior: 'passthrough' as const }
|
||||
},
|
||||
toAutoClassifierInput: () => '',
|
||||
userFacingName: () => tool.annotations?.title ?? tool.name,
|
||||
maxResultSizeChars: 100_000,
|
||||
mapToolResultToToolResultBlockParam: (content: unknown, id: string) => ({
|
||||
type: 'tool_result' as const,
|
||||
tool_use_id: id,
|
||||
content,
|
||||
}),
|
||||
async call() {
|
||||
throw new Error('Use manager.callTool() instead')
|
||||
},
|
||||
inputSchema: {} as CoreTool['inputSchema'],
|
||||
} satisfies CoreTool
|
||||
})
|
||||
} catch (error) {
|
||||
deps.logger.warn(`Failed to fetch tools for ${serverName}:`, error)
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Cached tool discovery (LRU by server name)
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* Creates a memoized tool discovery function with LRU caching.
|
||||
* Cache is keyed by server name (stable across reconnects).
|
||||
*/
|
||||
export function createCachedToolDiscovery(
|
||||
deps: McpClientDependencies,
|
||||
cacheSize: number = MCP_FETCH_CACHE_SIZE,
|
||||
): {
|
||||
discover: (server: ConnectedMCPServer, skipPrefix?: boolean) => Promise<CoreTool[]>
|
||||
cache: { delete(key: string): void; clear(): void }
|
||||
} {
|
||||
const discover = memoizeWithLRU(
|
||||
async (server: ConnectedMCPServer, skipPrefix?: boolean): Promise<CoreTool[]> => {
|
||||
if (server.type !== 'connected') return []
|
||||
return discoverTools({
|
||||
serverName: server.name,
|
||||
client: server.client,
|
||||
capabilities: server.capabilities ?? {},
|
||||
skipPrefix,
|
||||
deps,
|
||||
})
|
||||
},
|
||||
(server: ConnectedMCPServer) => server.name,
|
||||
cacheSize,
|
||||
)
|
||||
|
||||
return {
|
||||
discover,
|
||||
cache: discover.cache,
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user