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:
144
packages/mcp-client/src/__tests__/execution.test.ts
Normal file
144
packages/mcp-client/src/__tests__/execution.test.ts
Normal file
@@ -0,0 +1,144 @@
|
||||
import { describe, expect, test, mock } from 'bun:test'
|
||||
import { callMcpTool } from '../execution.js'
|
||||
import type { ConnectedMCPServer } from '../types.js'
|
||||
import type { McpClientDependencies } from '../interfaces.js'
|
||||
import { McpAuthError, McpToolCallError } from '../errors.js'
|
||||
|
||||
function createMockDeps(): McpClientDependencies {
|
||||
return {
|
||||
logger: {
|
||||
debug: mock(() => {}),
|
||||
info: mock(() => {}),
|
||||
warn: mock(() => {}),
|
||||
error: mock(() => {}),
|
||||
},
|
||||
httpConfig: {
|
||||
getUserAgent: () => 'test-agent/1.0',
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
describe('callMcpTool', () => {
|
||||
test('calls tool and returns result', async () => {
|
||||
const mockResult = {
|
||||
content: [{ type: 'text', text: 'result data' }],
|
||||
_meta: { requestId: '123' },
|
||||
}
|
||||
|
||||
const mockConn = {
|
||||
name: 'test-server',
|
||||
client: {
|
||||
callTool: mock(() => Promise.resolve(mockResult)),
|
||||
},
|
||||
type: 'connected' as const,
|
||||
} as unknown as ConnectedMCPServer
|
||||
|
||||
const result = await callMcpTool(
|
||||
{
|
||||
client: mockConn,
|
||||
tool: 'search',
|
||||
args: { query: 'test' },
|
||||
signal: new AbortController().signal,
|
||||
},
|
||||
createMockDeps(),
|
||||
)
|
||||
|
||||
expect(result.content).toBeDefined()
|
||||
})
|
||||
|
||||
test('throws McpToolCallError when result has isError=true', async () => {
|
||||
const mockResult = {
|
||||
isError: true,
|
||||
content: [{ type: 'text', text: 'Something went wrong' }],
|
||||
}
|
||||
|
||||
const mockConn = {
|
||||
name: 'test-server',
|
||||
client: {
|
||||
callTool: mock(() => Promise.resolve(mockResult)),
|
||||
},
|
||||
type: 'connected' as const,
|
||||
} as unknown as ConnectedMCPServer
|
||||
|
||||
await expect(
|
||||
callMcpTool(
|
||||
{
|
||||
client: mockConn,
|
||||
tool: 'fail-tool',
|
||||
args: {},
|
||||
signal: new AbortController().signal,
|
||||
},
|
||||
createMockDeps(),
|
||||
),
|
||||
).rejects.toThrow()
|
||||
|
||||
try {
|
||||
await callMcpTool(
|
||||
{
|
||||
client: mockConn,
|
||||
tool: 'fail-tool',
|
||||
args: {},
|
||||
signal: new AbortController().signal,
|
||||
},
|
||||
createMockDeps(),
|
||||
)
|
||||
} catch (e) {
|
||||
expect(e).toBeInstanceOf(McpToolCallError)
|
||||
expect((e as McpToolCallError).serverName).toBe('test-server')
|
||||
expect((e as McpToolCallError).toolName).toBe('fail-tool')
|
||||
}
|
||||
})
|
||||
|
||||
test('throws McpAuthError on 401 response', async () => {
|
||||
const error = new Error('Unauthorized')
|
||||
Object.assign(error, { code: 401 })
|
||||
|
||||
const mockConn = {
|
||||
name: 'auth-server',
|
||||
client: {
|
||||
callTool: mock(() => Promise.reject(error)),
|
||||
},
|
||||
type: 'connected' as const,
|
||||
} as unknown as ConnectedMCPServer
|
||||
|
||||
await expect(
|
||||
callMcpTool(
|
||||
{
|
||||
client: mockConn,
|
||||
tool: 'protected-tool',
|
||||
args: {},
|
||||
signal: new AbortController().signal,
|
||||
},
|
||||
createMockDeps(),
|
||||
),
|
||||
).rejects.toThrow(McpAuthError)
|
||||
})
|
||||
|
||||
test('passes metadata to the client', async () => {
|
||||
const mockResult = { content: [{ type: 'text', text: 'ok' }] }
|
||||
const callToolMock = mock(() => Promise.resolve(mockResult))
|
||||
|
||||
const mockConn = {
|
||||
name: 'test-server',
|
||||
client: {
|
||||
callTool: callToolMock,
|
||||
},
|
||||
type: 'connected' as const,
|
||||
} as unknown as ConnectedMCPServer
|
||||
|
||||
await callMcpTool(
|
||||
{
|
||||
client: mockConn,
|
||||
tool: 'my-tool',
|
||||
args: { key: 'value' },
|
||||
meta: { 'custom-key': 'custom-value' },
|
||||
signal: new AbortController().signal,
|
||||
},
|
||||
createMockDeps(),
|
||||
)
|
||||
|
||||
expect(callToolMock).toHaveBeenCalled()
|
||||
const callArgs = callToolMock.mock.calls[0] as any[]
|
||||
expect(callArgs[0]._meta).toEqual({ 'custom-key': 'custom-value' })
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user