Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/constants/tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ import {
CRON_DELETE_TOOL_NAME,
CRON_LIST_TOOL_NAME,
} from '../tools/ScheduleCronTool/prompt.js'
import { TEST_RUNNER_TOOL_NAME } from '../tools/TestRunnerTool/constants.js'
import { GIT_ANALYSIS_TOOL_NAME } from '../tools/GitAnalysisTool/constants.js'
import { DEPENDENCY_TOOL_NAME } from '../tools/DependencyTool/constants.js'
import { CODE_ANALYSIS_TOOL_NAME } from '../tools/CodeAnalysisTool/constants.js'

export const ALL_AGENT_DISALLOWED_TOOLS = new Set([
TASK_OUTPUT_TOOL_NAME,
Expand Down Expand Up @@ -66,6 +70,8 @@ export const ASYNC_AGENT_ALLOWED_TOOLS = new Set([
TOOL_SEARCH_TOOL_NAME,
ENTER_WORKTREE_TOOL_NAME,
EXIT_WORKTREE_TOOL_NAME,
GIT_ANALYSIS_TOOL_NAME,
CODE_ANALYSIS_TOOL_NAME,
])
/**
* Tools allowed only for in-process teammates (not general async agents).
Expand Down
18 changes: 13 additions & 5 deletions src/tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ import { TaskCreateTool } from './tools/TaskCreateTool/TaskCreateTool.js'
import { TaskGetTool } from './tools/TaskGetTool/TaskGetTool.js'
import { TaskUpdateTool } from './tools/TaskUpdateTool/TaskUpdateTool.js'
import { TaskListTool } from './tools/TaskListTool/TaskListTool.js'
import { TestRunnerTool } from './tools/TestRunnerTool/TestRunnerTool.js'
import { GitAnalysisTool } from './tools/GitAnalysisTool/GitAnalysisTool.js'
import { DependencyTool } from './tools/DependencyTool/DependencyTool.js'
import { CodeAnalysisTool } from './tools/CodeAnalysisTool/CodeAnalysisTool.js'
import uniqBy from 'lodash-es/uniqBy.js'
import { isToolSearchEnabledOptimistic } from './utils/toolSearch.js'
import { isTodoV2Enabled } from './utils/tasks.js'
Expand Down Expand Up @@ -210,11 +214,11 @@ export function getAllBaseTools(): Tools {
...(TerminalCaptureTool ? [TerminalCaptureTool] : []),
LSPTool,
...(isWorktreeModeEnabled() ? [EnterWorktreeTool, ExitWorktreeTool] : []),
// Use filter(Boolean) to handle case where getter might return null/undefined
...(getSendMessageTool() ? [getSendMessageTool()] : []),
// Cache getter results to avoid double-invocation of lazy require()
...(() => { const smt = getSendMessageTool(); return smt ? [smt] : [] })(),
...(ListPeersTool ? [ListPeersTool] : []),
...(isAgentSwarmsEnabled()
? [getTeamCreateTool(), getTeamDeleteTool()].filter(Boolean)
? (() => { const tct = getTeamCreateTool(); const tdt = getTeamDeleteTool(); return [tct, tdt].filter(Boolean) })()
: []),
...(VerifyPlanExecutionTool ? [VerifyPlanExecutionTool] : []),
...(process.env.USER_TYPE === 'ant' && REPLTool ? [REPLTool] : []),
Expand All @@ -224,10 +228,14 @@ export function getAllBaseTools(): Tools {
...(RemoteTriggerTool ? [RemoteTriggerTool] : []),
...(MonitorTool ? [MonitorTool] : []),
BriefTool,
TestRunnerTool,
GitAnalysisTool,
DependencyTool,
CodeAnalysisTool,
...(SendUserFileTool ? [SendUserFileTool] : []),
...(PushNotificationTool ? [PushNotificationTool] : []),
...(SubscribePRTool ? [SubscribePRTool] : []),
...(getPowerShellTool() ? [getPowerShellTool()] : []),
...(() => { const pst = getPowerShellTool(); return pst ? [pst] : [] })(),
...(SnipTool ? [SnipTool] : []),
...(process.env.NODE_ENV === 'test' ? [TestingPermissionTool] : []),
ListMcpResourcesTool,
Expand Down Expand Up @@ -382,5 +390,5 @@ export function getMergedTools(
mcpTools: Tools,
): Tools {
const builtInTools = getTools(permissionContext)
return [...builtInTools, ...mcpTools]
return uniqBy([...builtInTools, ...mcpTools], 'name')
}
Loading