Files
claude-code/packages/builtin-tools/src/tools/ExecuteTool/__tests__/ExecuteTool.runner.ts
claude-code-best b4e52d0c9e fix: 拦截 ExecuteExtraTool 直接调用未搜索的延迟工具
模型在未通过 SearchExtraTools 发现工具的情况下直接调用 ExecuteExtraTool,
因不知道工具 schema 导致参数错误(如 libraryName: undefined)。

双重修复:
1. ExecuteTool.call() 添加服务端拦截:检查目标 deferred 工具是否已被发现
2. 更新 <available-deferred-tools> 系统提示:要求先搜索再执行

Co-Authored-By: glm-5-turbo <zai-org@claude-code-best.win>
2026-05-12 16:28:34 +08:00

186 lines
5.7 KiB
TypeScript

import { describe, test, expect } from 'bun:test'
import { mock } from 'bun:test'
import { logMock } from '../../../../../../tests/mocks/log'
import { debugMock } from '../../../../../../tests/mocks/debug'
mock.module('src/utils/log.ts', logMock)
mock.module('src/utils/debug.ts', debugMock)
// Mock all heavy dependencies before importing ExecuteTool
mock.module('src/services/analytics/growthbook.js', () => ({
getFeatureValue_CACHED_MAY_BE_STALE: () => false,
checkStatsigFeatureGate_CACHED_MAY_BE_STALE: () => false,
getFeatureValue_DEPRECATED: async () => undefined,
getFeatureValue_CACHED_WITH_REFRESH: async () => undefined,
hasGrowthBookEnvOverride: () => false,
getAllGrowthBookFeatures: () => ({}),
getGrowthBookConfigOverrides: () => ({}),
setGrowthBookConfigOverride: () => {},
clearGrowthBookConfigOverrides: () => {},
getApiBaseUrlHost: () => undefined,
onGrowthBookRefresh: () => {},
initializeGrowthBook: async () => {},
checkSecurityRestrictionGate: async () => false,
checkGate_CACHED_OR_BLOCKING: async () => false,
refreshGrowthBookAfterAuthChange: () => {},
resetGrowthBook: () => {},
refreshGrowthBookFeatures: async () => {},
setupPeriodicGrowthBookRefresh: () => {},
stopPeriodicGrowthBookRefresh: () => {},
}))
mock.module('src/utils/searchExtraTools.js', () => ({
isSearchExtraToolsEnabledOptimistic: () => true,
getAutoSearchExtraToolsCharThreshold: () => 100,
getSearchExtraToolsMode: () => 'tst' as const,
isSearchExtraToolsToolAvailable: () => true,
isSearchExtraToolsEnabled: async () => true,
isToolReferenceBlock: () => false,
extractDiscoveredToolNames: () => new Set(['TestTool', 'SecretTool']),
isDeferredToolsDeltaEnabled: () => false,
getDeferredToolsDelta: () => null,
}))
mock.module('src/constants/tools.js', () => ({
CORE_TOOLS: new Set(['ExecuteExtraTool', 'SearchExtraTools']),
}))
// Mock messages module
mock.module('src/utils/messages.js', () => ({
createUserMessage: ({ content }: { content: string }) => ({
type: 'user' as const,
content,
uuid: 'test-uuid',
}),
}))
const { ExecuteTool } = await import('../ExecuteTool.js')
const { EXECUTE_TOOL_NAME } = await import('../constants.js')
function makeContext(tools: unknown[] = []) {
return {
options: {
tools,
},
cwd: '/tmp',
sessionId: 'test',
} as never
}
function makeMockTool(name: string, callResult: unknown = 'ok') {
return {
name,
call: async () => ({ data: callResult }),
checkPermissions: async () => ({ behavior: 'allow' as const }),
prompt: async () => `Description for ${name}`,
description: async () => `Description for ${name}`,
inputSchema: {},
isEnabled: () => true,
isConcurrencySafe: () => true,
isReadOnly: () => false,
isMcp: false,
alwaysLoad: undefined,
shouldDefer: undefined,
searchHint: '',
userFacingName: () => name,
renderToolUseMessage: () => `Running ${name}`,
mapToolResultToToolResultBlockParam: (content: unknown, id: string) => ({
tool_use_id: id,
type: 'tool_result',
content,
}),
}
}
describe('ExecuteTool', () => {
test('executes a target tool by name', async () => {
const mockTarget = makeMockTool('TestTool', { result: 'success' })
const ctx = makeContext([mockTarget])
const result = await ExecuteTool.call(
{ tool_name: 'TestTool', params: {} },
ctx,
async () => ({ behavior: 'allow' }),
{ type: 'assistant', content: [], uuid: 'msg1' } as never,
undefined,
)
expect(result.data).toEqual({
result: { result: 'success' },
tool_name: 'TestTool',
})
})
test('returns error when tool not found', async () => {
const ctx = makeContext([])
const result = await ExecuteTool.call(
{ tool_name: 'NonexistentTool', params: {} },
ctx,
async () => ({ behavior: 'allow' }),
{ type: 'assistant', content: [], uuid: 'msg1' } as never,
undefined,
)
expect(result.data).toEqual({
result: null,
tool_name: 'NonexistentTool',
})
expect(result.newMessages).toBeDefined()
expect(result.newMessages!.length).toBeGreaterThan(0)
})
test('returns permission denied when target denies', async () => {
const mockTarget = makeMockTool('SecretTool', 'secret')
mockTarget.checkPermissions = async () =>
({
behavior: 'deny' as const,
message: 'Access denied',
}) as never
const ctx = makeContext([mockTarget])
const result = await ExecuteTool.call(
{ tool_name: 'SecretTool', params: {} },
ctx,
async () => ({ behavior: 'allow' }),
{ type: 'assistant', content: [], uuid: 'msg1' } as never,
undefined,
)
expect(result.data).toEqual({
result: null,
tool_name: 'SecretTool',
})
expect(result.newMessages).toBeDefined()
})
test('returns error when deferred tool has not been discovered via SearchExtraTools', async () => {
const mockTarget = makeMockTool('UndiscoveredTool', 'result')
const ctx = makeContext([mockTarget])
const result = await ExecuteTool.call(
{ tool_name: 'UndiscoveredTool', params: {} },
ctx,
async () => ({ behavior: 'allow' }),
{ type: 'assistant', content: [], uuid: 'msg1' } as never,
undefined,
)
expect(result.data).toEqual({
result: null,
tool_name: 'UndiscoveredTool',
})
expect(result.newMessages).toBeDefined()
expect(result.newMessages![0].content).toContain('has not been discovered')
})
test('has correct name', () => {
expect(ExecuteTool.name).toBe(EXECUTE_TOOL_NAME)
})
test('searchHint contains keywords', () => {
expect(ExecuteTool.searchHint).toContain('execute')
expect(ExecuteTool.searchHint).toContain('tool')
})
})