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>
2026-06-18 14:25:51 +00:00 · 2026-04-13 09:52:05 +08:00
parent bbb8b613a9
commit 2fb1c9dcd8
559 changed files with 9346 additions and 1837 deletions
--- a/src/components/BashModeProgress.tsx
+++ b/src/components/BashModeProgress.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Box } from '@anthropic/ink'
-import { BashTool } from '../tools/BashTool/BashTool.js'
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
 import type { ShellProgress } from '../types/tools.js'
 import { UserBashInputMessage } from './messages/UserBashInputMessage.js'
 import { ShellProgressMessage } from './shell/ShellProgressMessage.js'
--- a/src/components/FeedbackSurvey/useMemorySurvey.tsx
+++ b/src/components/FeedbackSurvey/useMemorySurvey.tsx
@@ -7,7 +7,7 @@ import {
 } from 'src/services/analytics/index.js'
 import { isAutoMemoryEnabled } from '../../memdir/paths.js'
 import { isPolicyAllowed } from '../../services/policyLimits/index.js'
-import { FILE_READ_TOOL_NAME } from '../../tools/FileReadTool/prompt.js'
+import { FILE_READ_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/FileReadTool/prompt.js'
 import type { Message } from '../../types/message.js'
 import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
 import { isEnvTruthy } from '../../utils/envUtils.js'
--- a/src/components/FileEditToolDiff.tsx
+++ b/src/components/FileEditToolDiff.tsx
@@ -3,11 +3,11 @@ import * as React from 'react'
 import { Suspense, use, useState } from 'react'
 import { useTerminalSize } from '../hooks/useTerminalSize.js'
 import { Box, Text } from '@anthropic/ink'
-import type { FileEdit } from '../tools/FileEditTool/types.js'
+import type { FileEdit } from '@claude-code-best/builtin-tools/tools/FileEditTool/types.js'
 import {
  findActualString,
  preserveQuoteStyle,
-} from '../tools/FileEditTool/utils.js'
+} from '@claude-code-best/builtin-tools/tools/FileEditTool/utils.js'
 import {
  adjustHunkLineNumbers,
  CONTEXT_LINES,
--- a/src/components/MessageSelector.tsx
+++ b/src/components/MessageSelector.tsx
@@ -43,8 +43,8 @@ function isTextBlock(block: ContentBlockParam): block is TextBlockParam {

 import * as path from 'path'
 import { useTerminalSize } from 'src/hooks/useTerminalSize.js'
-import type { FileEditOutput } from 'src/tools/FileEditTool/types.js'
-import type { Output as FileWriteToolOutput } from 'src/tools/FileWriteTool/FileWriteTool.js'
+import type { FileEditOutput } from '@claude-code-best/builtin-tools/tools/FileEditTool/types.js'
+import type { Output as FileWriteToolOutput } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js'
 import {
  BASH_STDERR_TAG,
  BASH_STDOUT_TAG,
--- a/src/components/Messages.tsx
+++ b/src/components/Messages.tsx
@@ -16,7 +16,7 @@ import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js'
 import type { Screen } from '../screens/REPL.js'
 import type { Tools } from '../Tool.js'
 import { findToolByName } from '../Tool.js'
-import type { AgentDefinitionsResult } from '../tools/AgentTool/loadAgentsDir.js'
+import type { AgentDefinitionsResult } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import type {
  Message as MessageType,
  NormalizedMessage,
@@ -104,12 +104,12 @@ const proactiveModule =
 const BRIEF_TOOL_NAME: string | null =
  feature('KAIROS') || feature('KAIROS_BRIEF')
    ? (
-        require('../tools/BriefTool/prompt.js') as typeof import('../tools/BriefTool/prompt.js')
+        require('@claude-code-best/builtin-tools/tools/BriefTool/prompt.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/prompt.js')
      ).BRIEF_TOOL_NAME
    : null
 const SEND_USER_FILE_TOOL_NAME: string | null = feature('KAIROS')
  ? (
-      require('../tools/SendUserFileTool/prompt.js') as typeof import('../tools/SendUserFileTool/prompt.js')
+      require('@claude-code-best/builtin-tools/tools/SendUserFileTool/prompt.js') as typeof import('@claude-code-best/builtin-tools/tools/SendUserFileTool/prompt.js')
    ).SEND_USER_FILE_TOOL_NAME
  : null

--- a/src/components/PromptInput/PromptInput.tsx
+++ b/src/components/PromptInput/PromptInput.tsx
@@ -100,8 +100,8 @@ import {
  AGENT_COLOR_TO_THEME_COLOR,
  AGENT_COLORS,
  type AgentColorName,
-} from '../../tools/AgentTool/agentColorManager.js'
-import type { AgentDefinition } from '../../tools/AgentTool/loadAgentsDir.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import type { Message } from '../../types/message.js'
 import type { PermissionMode } from '../../types/permissions.js'
 import type {
--- a/src/components/PromptInput/PromptInputModeIndicator.tsx
+++ b/src/components/PromptInput/PromptInputModeIndicator.tsx
@@ -5,7 +5,7 @@ import {
  AGENT_COLOR_TO_THEME_COLOR,
  AGENT_COLORS,
  type AgentColorName,
-} from 'src/tools/AgentTool/agentColorManager.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
 import type { PromptInputMode } from 'src/types/textInputTypes.js'
 import { getTeammateColor } from 'src/utils/teammate.js'
 import type { Theme } from 'src/utils/theme.js'
--- a/src/components/PromptInput/useSwarmBanner.ts
+++ b/src/components/PromptInput/useSwarmBanner.ts
@@ -9,7 +9,7 @@ import {
  AGENT_COLORS,
  type AgentColorName,
  getAgentColor,
-} from '../../tools/AgentTool/agentColorManager.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
 import { getStandaloneAgentName } from '../../utils/standaloneAgent.js'
 import { isInsideTmux } from '../../utils/swarm/backends/detection.js'
 import {
--- a/src/components/Settings/Config.tsx
+++ b/src/components/Settings/Config.tsx
@@ -215,7 +215,7 @@ export function Config({
  const showDefaultViewPicker =
    feature('KAIROS') || feature('KAIROS_BRIEF')
      ? (
-          require('../../tools/BriefTool/BriefTool.js') as typeof import('../../tools/BriefTool/BriefTool.js')
+          require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js')
        ).isBriefEntitled()
      : false
  /* eslint-enable @typescript-eslint/no-require-imports */
--- a/src/components/StatusNotices.tsx
+++ b/src/components/StatusNotices.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { use } from 'react'
 import { Box } from '@anthropic/ink'
-import type { AgentDefinitionsResult } from '../tools/AgentTool/loadAgentsDir.js'
+import type { AgentDefinitionsResult } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { getMemoryFiles } from '../utils/claudemd.js'
 import { getGlobalConfig } from '../utils/config.js'
 import {
--- a/src/components/TaskListV2.tsx
+++ b/src/components/TaskListV2.tsx
@@ -7,7 +7,7 @@ import { isInProcessTeammateTask } from '../tasks/InProcessTeammateTask/types.js
 import {
  AGENT_COLOR_TO_THEME_COLOR,
  type AgentColorName,
-} from '../tools/AgentTool/agentColorManager.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
 import { isAgentSwarmsEnabled } from '../utils/agentSwarmsEnabled.js'
 import { count } from '../utils/array.js'
 import { summarizeRecentActivities } from '../utils/collapseReadSearch.js'
--- a/src/components/TrustDialog/TrustDialog.tsx
+++ b/src/components/TrustDialog/TrustDialog.tsx
@@ -7,7 +7,7 @@ import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithK
 import { Box, Link, Text } from '@anthropic/ink'
 import { useKeybinding } from '../../keybindings/useKeybinding.js'
 import { getMcpConfigsByScope } from '../../services/mcp/config.js'
-import { BASH_TOOL_NAME } from '../../tools/BashTool/toolName.js'
+import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js'
 import {
  checkHasTrustDialogAccepted,
  saveCurrentProjectConfig,
--- a/src/components/TrustDialog/utils.ts
+++ b/src/components/TrustDialog/utils.ts
@@ -1,7 +1,7 @@
 import type { PermissionRule } from 'src/utils/permissions/PermissionRule.js'
 import { getSettingsForSource } from 'src/utils/settings/settings.js'
 import type { SettingsJson } from 'src/utils/settings/types.js'
-import { BASH_TOOL_NAME } from '../../tools/BashTool/toolName.js'
+import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js'
 import { SAFE_ENV_VARS } from '../../utils/managedEnvConstants.js'
 import { getPermissionRulesForSource } from '../../utils/permissions/permissionsLoader.js'

--- a/src/components/agents/AgentDetail.tsx
+++ b/src/components/agents/AgentDetail.tsx
@@ -3,13 +3,13 @@ import * as React from 'react'
 import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
 import { useKeybinding } from '../../keybindings/useKeybinding.js'
 import type { Tools } from '../../Tool.js'
-import { getAgentColor } from '../../tools/AgentTool/agentColorManager.js'
-import { getMemoryScopeDisplay } from '../../tools/AgentTool/agentMemory.js'
-import { resolveAgentTools } from '../../tools/AgentTool/agentToolUtils.js'
+import { getAgentColor } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
+import { getMemoryScopeDisplay } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
+import { resolveAgentTools } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js'
 import {
  type AgentDefinition,
  isBuiltInAgent,
-} from '../../tools/AgentTool/loadAgentsDir.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { getAgentModelDisplay } from '../../utils/model/agent.js'
 import { Markdown } from '../Markdown.js'
 import { getActualRelativeAgentFilePath } from './agentFileUtils.js'
--- a/src/components/agents/AgentEditor.tsx
+++ b/src/components/agents/AgentEditor.tsx
@@ -9,13 +9,13 @@ import type { Tools } from '../../Tool.js'
 import {
  type AgentColorName,
  setAgentColor,
-} from '../../tools/AgentTool/agentColorManager.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
 import {
  type AgentDefinition,
  getActiveAgentsFromList,
  isCustomAgent,
  isPluginAgent,
-} from '../../tools/AgentTool/loadAgentsDir.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { editFileInEditor } from '../../utils/promptEditor.js'
 import { getActualAgentFilePath, updateAgentFile } from './agentFileUtils.js'
 import { ColorPicker } from './ColorPicker.js'
--- a/src/components/agents/AgentsList.tsx
+++ b/src/components/agents/AgentsList.tsx
@@ -2,14 +2,14 @@ import figures from 'figures'
 import * as React from 'react'
 import type { SettingSource } from 'src/utils/settings/constants.js'
 import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import type { ResolvedAgent } from '../../tools/AgentTool/agentDisplay.js'
+import type { ResolvedAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js'
 import {
  AGENT_SOURCE_GROUPS,
  compareAgentsByName,
  getOverrideSourceLabel,
  resolveAgentModelDisplay,
-} from '../../tools/AgentTool/agentDisplay.js'
-import type { AgentDefinition } from '../../tools/AgentTool/loadAgentsDir.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js'
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { count } from '../../utils/array.js'
 import { Dialog, Divider } from '@anthropic/ink'
 import { getAgentSourceDisplayName } from './utils.js'
--- a/src/components/agents/AgentsMenu.tsx
+++ b/src/components/agents/AgentsMenu.tsx
@@ -11,11 +11,11 @@ import type { Tools } from '../../Tool.js'
 import {
  type ResolvedAgent,
  resolveAgentOverrides,
-} from '../../tools/AgentTool/agentDisplay.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js'
 import {
  type AgentDefinition,
  getActiveAgentsFromList,
-} from '../../tools/AgentTool/loadAgentsDir.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { toError } from '../../utils/errors.js'
 import { logError } from '../../utils/log.js'
 import { Select } from '../CustomSelect/select.js'
--- a/src/components/agents/ColorPicker.tsx
+++ b/src/components/agents/ColorPicker.tsx
@@ -6,7 +6,7 @@ import {
  AGENT_COLOR_TO_THEME_COLOR,
  AGENT_COLORS,
  type AgentColorName,
-} from '../../tools/AgentTool/agentColorManager.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
 import { capitalize } from '../../utils/stringUtils.js'

 type ColorOption = AgentColorName | 'automatic'
--- a/src/components/agents/SnapshotUpdateDialog.ts
+++ b/src/components/agents/SnapshotUpdateDialog.ts
@@ -1,6 +1,6 @@
 // Auto-generated stub — replace with real implementation
 import type React from 'react';
-import type { AgentMemoryScope } from '../../tools/AgentTool/agentMemory.js';
+import type { AgentMemoryScope } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js';

 export {};
 export const SnapshotUpdateDialog: React.FC<{
--- a/src/components/agents/ToolSelector.tsx
+++ b/src/components/agents/ToolSelector.tsx
@@ -3,24 +3,24 @@ import React, { useCallback, useMemo, useState } from 'react'
 import { mcpInfoFromString } from 'src/services/mcp/mcpStringUtils.js'
 import { isMcpTool } from 'src/services/mcp/utils.js'
 import type { Tool, Tools } from 'src/Tool.js'
-import { filterToolsForAgent } from 'src/tools/AgentTool/agentToolUtils.js'
-import { AGENT_TOOL_NAME } from 'src/tools/AgentTool/constants.js'
-import { BashTool } from 'src/tools/BashTool/BashTool.js'
-import { ExitPlanModeV2Tool } from 'src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
-import { FileEditTool } from 'src/tools/FileEditTool/FileEditTool.js'
-import { FileReadTool } from 'src/tools/FileReadTool/FileReadTool.js'
-import { FileWriteTool } from 'src/tools/FileWriteTool/FileWriteTool.js'
-import { GlobTool } from 'src/tools/GlobTool/GlobTool.js'
-import { GrepTool } from 'src/tools/GrepTool/GrepTool.js'
-import { ListMcpResourcesTool } from 'src/tools/ListMcpResourcesTool/ListMcpResourcesTool.js'
-import { NotebookEditTool } from 'src/tools/NotebookEditTool/NotebookEditTool.js'
-import { ReadMcpResourceTool } from 'src/tools/ReadMcpResourceTool/ReadMcpResourceTool.js'
-import { TaskOutputTool } from 'src/tools/TaskOutputTool/TaskOutputTool.js'
-import { TaskStopTool } from 'src/tools/TaskStopTool/TaskStopTool.js'
-import { TodoWriteTool } from 'src/tools/TodoWriteTool/TodoWriteTool.js'
-import { TungstenTool } from 'src/tools/TungstenTool/TungstenTool.js'
-import { WebFetchTool } from 'src/tools/WebFetchTool/WebFetchTool.js'
-import { WebSearchTool } from 'src/tools/WebSearchTool/WebSearchTool.js'
+import { filterToolsForAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js'
+import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js'
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
+import { ExitPlanModeV2Tool } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
+import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js'
+import { FileReadTool } from '@claude-code-best/builtin-tools/tools/FileReadTool/FileReadTool.js'
+import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js'
+import { GlobTool } from '@claude-code-best/builtin-tools/tools/GlobTool/GlobTool.js'
+import { GrepTool } from '@claude-code-best/builtin-tools/tools/GrepTool/GrepTool.js'
+import { ListMcpResourcesTool } from '@claude-code-best/builtin-tools/tools/ListMcpResourcesTool/ListMcpResourcesTool.js'
+import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js'
+import { ReadMcpResourceTool } from '@claude-code-best/builtin-tools/tools/ReadMcpResourceTool/ReadMcpResourceTool.js'
+import { TaskOutputTool } from '@claude-code-best/builtin-tools/tools/TaskOutputTool/TaskOutputTool.js'
+import { TaskStopTool } from '@claude-code-best/builtin-tools/tools/TaskStopTool/TaskStopTool.js'
+import { TodoWriteTool } from '@claude-code-best/builtin-tools/tools/TodoWriteTool/TodoWriteTool.js'
+import { TungstenTool } from '@claude-code-best/builtin-tools/tools/TungstenTool/TungstenTool.js'
+import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js'
+import { WebSearchTool } from '@claude-code-best/builtin-tools/tools/WebSearchTool/WebSearchTool.js'
 import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
 import { useKeybinding } from '../../keybindings/useKeybinding.js'
 import { count } from '../../utils/array.js'
--- a/src/components/agents/agentFileUtils.ts
+++ b/src/components/agents/agentFileUtils.ts
@@ -2,12 +2,12 @@ import { mkdir, open, unlink } from 'fs/promises'
 import { join } from 'path'
 import type { SettingSource } from 'src/utils/settings/constants.js'
 import { getManagedFilePath } from 'src/utils/settings/managedPath.js'
-import type { AgentMemoryScope } from '../../tools/AgentTool/agentMemory.js'
+import type { AgentMemoryScope } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
 import {
  type AgentDefinition,
  isBuiltInAgent,
  isPluginAgent,
-} from '../../tools/AgentTool/loadAgentsDir.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { getCwd } from '../../utils/cwd.js'
 import type { EffortValue } from '../../utils/effort.js'
 import { getClaudeConfigHomeDir } from '../../utils/envUtils.js'
--- a/src/components/agents/generateAgent.ts
+++ b/src/components/agents/generateAgent.ts
@@ -2,7 +2,7 @@ import type { ContentBlock } from '@anthropic-ai/sdk/resources/index.mjs'
 import { getUserContext } from 'src/context.js'
 import { queryModelWithoutStreaming } from 'src/services/api/claude.js'
 import { getEmptyToolPermissionContext } from 'src/Tool.js'
-import { AGENT_TOOL_NAME } from 'src/tools/AgentTool/constants.js'
+import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js'
 import { prependUserContext } from 'src/utils/api.js'
 import {
  createUserMessage,
--- a/src/components/agents/new-agent-creation/CreateAgentWizard.tsx
+++ b/src/components/agents/new-agent-creation/CreateAgentWizard.tsx
@@ -1,7 +1,7 @@
 import React, { type ReactNode } from 'react'
 import { isAutoMemoryEnabled } from '../../../memdir/paths.js'
 import type { Tools } from '../../../Tool.js'
-import type { AgentDefinition } from '../../../tools/AgentTool/loadAgentsDir.js'
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { WizardProvider } from '../../wizard/index.js'
 import type { WizardStepComponent } from '../../wizard/types.js'
 import type { AgentWizardData } from './types.js'
--- a/src/components/agents/new-agent-creation/wizard-steps/ColorStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/ColorStep.tsx
@@ -1,7 +1,7 @@
 import React, { type ReactNode } from 'react'
 import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import type { AgentColorName } from '../../../../tools/AgentTool/agentColorManager.js'
+import type { AgentColorName } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
--- a/src/components/agents/new-agent-creation/wizard-steps/ConfirmStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/ConfirmStep.tsx
@@ -3,8 +3,8 @@ import { type KeyboardEvent, Box, Byline, KeyboardShortcutHint, Text } from '@an
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
 import { isAutoMemoryEnabled } from '../../../../memdir/paths.js'
 import type { Tools } from '../../../../Tool.js'
-import { getMemoryScopeDisplay } from '../../../../tools/AgentTool/agentMemory.js'
-import type { AgentDefinition } from '../../../../tools/AgentTool/loadAgentsDir.js'
+import { getMemoryScopeDisplay } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { truncateToWidth } from '../../../../utils/format.js'
 import { getAgentModelDisplay } from '../../../../utils/model/agent.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
--- a/src/components/agents/new-agent-creation/wizard-steps/ConfirmStepWrapper.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/ConfirmStepWrapper.tsx
@@ -6,8 +6,8 @@ import {
 } from 'src/services/analytics/index.js'
 import { useSetAppState } from 'src/state/AppState.js'
 import type { Tools } from '../../../../Tool.js'
-import type { AgentDefinition } from '../../../../tools/AgentTool/loadAgentsDir.js'
-import { getActiveAgentsFromList } from '../../../../tools/AgentTool/loadAgentsDir.js'
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
+import { getActiveAgentsFromList } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { editFileInEditor } from '../../../../utils/promptEditor.js'
 import { useWizard } from '../../../wizard/index.js'
 import { getNewAgentFilePath, saveAgentToFile } from '../../agentFileUtils.js'
--- a/src/components/agents/new-agent-creation/wizard-steps/MemoryStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/MemoryStep.tsx
@@ -5,7 +5,7 @@ import { isAutoMemoryEnabled } from '../../../../memdir/paths.js'
 import {
  type AgentMemoryScope,
  loadAgentMemoryPrompt,
-} from '../../../../tools/AgentTool/agentMemory.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
 import { Select } from '../../../CustomSelect/select.js'
 import { useWizard } from '../../../wizard/index.js'
--- a/src/components/agents/new-agent-creation/wizard-steps/TypeStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/TypeStep.tsx
@@ -1,7 +1,7 @@
 import React, { type ReactNode, useState } from 'react'
 import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import type { AgentDefinition } from '../../../../tools/AgentTool/loadAgentsDir.js'
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
 import TextInput from '../../../TextInput.js'
 import { useWizard } from '../../../wizard/index.js'
--- a/src/components/agents/types.ts
+++ b/src/components/agents/types.ts
@@ -1,5 +1,5 @@
 import type { SettingSource } from 'src/utils/settings/constants.js'
-import type { AgentDefinition } from '../../tools/AgentTool/loadAgentsDir.js'
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'

 export const AGENT_PATHS = {
  FOLDER_NAME: '.claude',
--- a/src/components/agents/validateAgent.ts
+++ b/src/components/agents/validateAgent.ts
@@ -1,9 +1,9 @@
 import type { Tools } from '../../Tool.js'
-import { resolveAgentTools } from '../../tools/AgentTool/agentToolUtils.js'
+import { resolveAgentTools } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js'
 import type {
  AgentDefinition,
  CustomAgentDefinition,
-} from '../../tools/AgentTool/loadAgentsDir.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { getAgentSourceDisplayName } from './utils.js'

 export type AgentValidationResult = {
--- a/src/components/memory/MemoryFileSelector.tsx
+++ b/src/components/memory/MemoryFileSelector.tsx
@@ -13,7 +13,7 @@ import { logEvent } from '../../services/analytics/index.js'
 import { isAutoDreamEnabled } from '../../services/autoDream/config.js'
 import { readLastConsolidatedAt } from '../../services/autoDream/consolidationLock.js'
 import { useAppState } from '../../state/AppState.js'
-import { getAgentMemoryDir } from '../../tools/AgentTool/agentMemory.js'
+import { getAgentMemoryDir } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
 import { openPath } from '../../utils/browser.js'
 import { getMemoryFiles, type MemoryFileInfo } from '../../utils/claudemd.js'
 import { getClaudeConfigHomeDir } from '../../utils/envUtils.js'
--- a/src/components/messages/CollapsedReadSearchContent.tsx
+++ b/src/components/messages/CollapsedReadSearchContent.tsx
@@ -4,7 +4,7 @@ import React, { useRef } from 'react'
 import { useMinDisplayTime } from '../../hooks/useMinDisplayTime.js'
 import { Ansi, Box, Text, useTheme } from '@anthropic/ink'
 import { findToolByName, type Tools } from '../../Tool.js'
-import { getReplPrimitiveTools } from '../../tools/REPLTool/primitiveTools.js'
+import { getReplPrimitiveTools } from '@claude-code-best/builtin-tools/tools/REPLTool/primitiveTools.js'
 import type {
  CollapsedReadSearchGroup,
  NormalizedAssistantMessage,
--- a/src/components/messages/UserBashOutputMessage.tsx
+++ b/src/components/messages/UserBashOutputMessage.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import BashToolResultMessage from '../../tools/BashTool/BashToolResultMessage.js'
+import BashToolResultMessage from '@claude-code-best/builtin-tools/tools/BashTool/BashToolResultMessage.js'
 import { extractTag } from '../../utils/messages.js'

 export function UserBashOutputMessage({
--- a/src/components/permissions/AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.tsx
@@ -19,8 +19,8 @@ import {
  logEvent,
 } from '../../../services/analytics/index.js'
 import { useAppState } from '../../../state/AppState.js'
-import type { Question } from '../../../tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import { AskUserQuestionTool } from '../../../tools/AskUserQuestionTool/AskUserQuestionTool.js'
+import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
+import { AskUserQuestionTool } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
 import {
  type CliHighlight,
  getCliHighlightPromise,
--- a/src/components/permissions/AskUserQuestionPermissionRequest/PreviewQuestionView.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/PreviewQuestionView.tsx
@@ -7,7 +7,7 @@ import {
  useKeybindings,
 } from '../../../keybindings/useKeybinding.js'
 import { useAppState } from '../../../state/AppState.js'
-import type { Question } from '../../../tools/AskUserQuestionTool/AskUserQuestionTool.js'
+import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
 import { getExternalEditor } from '../../../utils/editor.js'
 import { toIDEDisplayName } from '../../../utils/ide.js'
 import { editPromptInEditor } from '../../../utils/promptEditor.js'
--- a/src/components/permissions/AskUserQuestionPermissionRequest/QuestionNavigationBar.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/QuestionNavigationBar.tsx
@@ -2,7 +2,7 @@ import figures from 'figures'
 import React, { useMemo } from 'react'
 import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
 import { Box, Text, stringWidth } from '@anthropic/ink'
-import type { Question } from '../../../tools/AskUserQuestionTool/AskUserQuestionTool.js'
+import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
 import { truncateToWidth } from '../../../utils/format.js'

 type Props = {
--- a/src/components/permissions/AskUserQuestionPermissionRequest/QuestionView.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/QuestionView.tsx
@@ -5,7 +5,7 @@ import { useAppState } from '../../../state/AppState.js'
 import type {
  Question,
  QuestionOption,
-} from '../../../tools/AskUserQuestionTool/AskUserQuestionTool.js'
+} from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
 import type { PastedContent } from '../../../utils/config.js'
 import { getExternalEditor } from '../../../utils/editor.js'
 import { toIDEDisplayName } from '../../../utils/ide.js'
--- a/src/components/permissions/AskUserQuestionPermissionRequest/SubmitQuestionsView.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/SubmitQuestionsView.tsx
@@ -1,7 +1,7 @@
 import figures from 'figures'
 import React from 'react'
 import { Box, Text } from '@anthropic/ink'
-import type { Question } from '../../../tools/AskUserQuestionTool/AskUserQuestionTool.js'
+import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
 import type { PermissionDecision } from '../../../utils/permissions/PermissionResult.js'
 import { Select } from '../../CustomSelect/index.js'
 import { Divider } from '@anthropic/ink'
--- a/src/components/permissions/BashPermissionRequest/BashPermissionRequest.tsx
+++ b/src/components/permissions/BashPermissionRequest/BashPermissionRequest.tsx
@@ -10,14 +10,14 @@ import {
 } from '../../../services/analytics/index.js'
 import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js'
 import { useAppState } from '../../../state/AppState.js'
-import { BashTool } from '../../../tools/BashTool/BashTool.js'
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
 import {
  getFirstWordPrefix,
  getSimpleCommandPrefix,
-} from '../../../tools/BashTool/bashPermissions.js'
-import { getDestructiveCommandWarning } from '../../../tools/BashTool/destructiveCommandWarning.js'
-import { parseSedEditCommand } from '../../../tools/BashTool/sedEditParser.js'
-import { shouldUseSandbox } from '../../../tools/BashTool/shouldUseSandbox.js'
+} from '@claude-code-best/builtin-tools/tools/BashTool/bashPermissions.js'
+import { getDestructiveCommandWarning } from '@claude-code-best/builtin-tools/tools/BashTool/destructiveCommandWarning.js'
+import { parseSedEditCommand } from '@claude-code-best/builtin-tools/tools/BashTool/sedEditParser.js'
+import { shouldUseSandbox } from '@claude-code-best/builtin-tools/tools/BashTool/shouldUseSandbox.js'
 import { getCompoundCommandPrefixesStatic } from '../../../utils/bash/prefix.js'
 import {
  createPromptRuleContent,
--- a/src/components/permissions/BashPermissionRequest/bashToolUseOptions.tsx
+++ b/src/components/permissions/BashPermissionRequest/bashToolUseOptions.tsx
@@ -1,4 +1,4 @@
-import { BASH_TOOL_NAME } from '../../../tools/BashTool/toolName.js'
+import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js'
 import { extractOutputRedirections } from '../../../utils/bash/commands.js'
 import { isClassifierPermissionsEnabled } from '../../../utils/permissions/bashClassifier.js'
 import type { PermissionDecisionReason } from '../../../utils/permissions/PermissionResult.js'
--- a/src/components/permissions/ExitPlanModePermissionRequest/ExitPlanModePermissionRequest.tsx
+++ b/src/components/permissions/ExitPlanModePermissionRequest/ExitPlanModePermissionRequest.tsx
@@ -31,10 +31,10 @@ import { generateSessionName } from '../../../commands/rename/generateSessionNam
 import { launchUltraplan } from '../../../commands/ultraplan.js'
 import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
 import type { AppState } from '../../../state/AppStateStore.js'
-import { AGENT_TOOL_NAME } from '../../../tools/AgentTool/constants.js'
-import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '../../../tools/ExitPlanModeTool/constants.js'
-import type { AllowedPrompt } from '../../../tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
-import { TEAM_CREATE_TOOL_NAME } from '../../../tools/TeamCreateTool/constants.js'
+import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js'
+import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/constants.js'
+import type { AllowedPrompt } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
+import { TEAM_CREATE_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/TeamCreateTool/constants.js'
 import { isAgentSwarmsEnabled } from '../../../utils/agentSwarmsEnabled.js'
 import {
  calculateContextPercentages,
--- a/src/components/permissions/FileEditPermissionRequest/FileEditPermissionRequest.tsx
+++ b/src/components/permissions/FileEditPermissionRequest/FileEditPermissionRequest.tsx
@@ -4,7 +4,7 @@ import { FileEditToolDiff } from 'src/components/FileEditToolDiff.js'
 import { getCwd } from 'src/utils/cwd.js'
 import type { z } from 'zod/v4'
 import { Text } from '@anthropic/ink'
-import { FileEditTool } from '../../../tools/FileEditTool/FileEditTool.js'
+import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js'
 import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js'
 import {
  createSingleEditDiffConfig,
--- a/src/components/permissions/FilePermissionDialog/usePermissionHandler.ts
+++ b/src/components/permissions/FilePermissionDialog/usePermissionHandler.ts
@@ -8,7 +8,7 @@ import {
  CLAUDE_FOLDER_PERMISSION_PATTERN,
  FILE_EDIT_TOOL_NAME,
  GLOBAL_CLAUDE_FOLDER_PERMISSION_PATTERN,
-} from '../../../tools/FileEditTool/constants.js'
+} from '@claude-code-best/builtin-tools/tools/FileEditTool/constants.js'
 import { env } from '../../../utils/env.js'
 import { generateSuggestions } from '../../../utils/permissions/filesystem.js'
 import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js'
--- a/src/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx
+++ b/src/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx
@@ -2,7 +2,7 @@ import { basename, relative } from 'path'
 import React, { useMemo } from 'react'
 import type { z } from 'zod/v4'
 import { Text } from '@anthropic/ink'
-import { FileWriteTool } from '../../../tools/FileWriteTool/FileWriteTool.js'
+import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js'
 import { getCwd } from '../../../utils/cwd.js'
 import { isENOENT } from '../../../utils/errors.js'
 import { readFileSync } from '../../../utils/fileRead.js'
--- a/src/components/permissions/NotebookEditPermissionRequest/NotebookEditPermissionRequest.tsx
+++ b/src/components/permissions/NotebookEditPermissionRequest/NotebookEditPermissionRequest.tsx
@@ -2,7 +2,7 @@ import { basename } from 'path'
 import React from 'react'
 import type { z } from 'zod/v4'
 import { Text } from '@anthropic/ink'
-import { NotebookEditTool } from '../../../tools/NotebookEditTool/NotebookEditTool.js'
+import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js'
 import { logError } from '../../../utils/log.js'
 import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js'
 import type { PermissionRequestProps } from '../PermissionRequest.js'
--- a/src/components/permissions/PermissionRequest.tsx
+++ b/src/components/permissions/PermissionRequest.tsx
@@ -1,21 +1,21 @@
 import { feature } from 'bun:bundle'
 import * as React from 'react'
-import { EnterPlanModeTool } from 'src/tools/EnterPlanModeTool/EnterPlanModeTool.js'
-import { ExitPlanModeV2Tool } from 'src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
+import { EnterPlanModeTool } from '@claude-code-best/builtin-tools/tools/EnterPlanModeTool/EnterPlanModeTool.js'
+import { ExitPlanModeV2Tool } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
 import { useNotifyAfterTimeout } from '../../hooks/useNotifyAfterTimeout.js'
 import { useKeybinding } from '../../keybindings/useKeybinding.js'
 import type { AnyObject, Tool, ToolUseContext } from '../../Tool.js'
-import { AskUserQuestionTool } from '../../tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import { BashTool } from '../../tools/BashTool/BashTool.js'
-import { FileEditTool } from '../../tools/FileEditTool/FileEditTool.js'
-import { FileReadTool } from '../../tools/FileReadTool/FileReadTool.js'
-import { FileWriteTool } from '../../tools/FileWriteTool/FileWriteTool.js'
-import { GlobTool } from '../../tools/GlobTool/GlobTool.js'
-import { GrepTool } from '../../tools/GrepTool/GrepTool.js'
-import { NotebookEditTool } from '../../tools/NotebookEditTool/NotebookEditTool.js'
-import { PowerShellTool } from '../../tools/PowerShellTool/PowerShellTool.js'
-import { SkillTool } from '../../tools/SkillTool/SkillTool.js'
-import { WebFetchTool } from '../../tools/WebFetchTool/WebFetchTool.js'
+import { AskUserQuestionTool } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
+import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js'
+import { FileReadTool } from '@claude-code-best/builtin-tools/tools/FileReadTool/FileReadTool.js'
+import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js'
+import { GlobTool } from '@claude-code-best/builtin-tools/tools/GlobTool/GlobTool.js'
+import { GrepTool } from '@claude-code-best/builtin-tools/tools/GrepTool/GrepTool.js'
+import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js'
+import { PowerShellTool } from '@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js'
+import { SkillTool } from '@claude-code-best/builtin-tools/tools/SkillTool/SkillTool.js'
+import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js'
 import type { AssistantMessage } from '../../types/message.js'
 import type { PermissionDecision } from '../../utils/permissions/PermissionResult.js'
 import { AskUserQuestionPermissionRequest } from './AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.js'
@@ -34,7 +34,7 @@ import { WebFetchPermissionRequest } from './WebFetchPermissionRequest/WebFetchP
 /* eslint-disable @typescript-eslint/no-require-imports */
 const ReviewArtifactTool = feature('REVIEW_ARTIFACT')
  ? (
-      require('../../tools/ReviewArtifactTool/ReviewArtifactTool.js') as typeof import('../../tools/ReviewArtifactTool/ReviewArtifactTool.js')
+      require('@claude-code-best/builtin-tools/tools/ReviewArtifactTool/ReviewArtifactTool.js') as typeof import('@claude-code-best/builtin-tools/tools/ReviewArtifactTool/ReviewArtifactTool.js')
    ).ReviewArtifactTool
  : null

@@ -46,19 +46,19 @@ const ReviewArtifactPermissionRequest = feature('REVIEW_ARTIFACT')

 const WorkflowTool = feature('WORKFLOW_SCRIPTS')
  ? (
-      require('../../tools/WorkflowTool/WorkflowTool.js') as typeof import('../../tools/WorkflowTool/WorkflowTool.js')
+      require('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowTool.js') as typeof import('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowTool.js')
    ).WorkflowTool
  : null

 const WorkflowPermissionRequest = feature('WORKFLOW_SCRIPTS')
  ? (
-      require('../../tools/WorkflowTool/WorkflowPermissionRequest.js') as typeof import('../../tools/WorkflowTool/WorkflowPermissionRequest.js')
+      require('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowPermissionRequest.js') as typeof import('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowPermissionRequest.js')
    ).WorkflowPermissionRequest
  : null

 const MonitorTool = feature('MONITOR_TOOL')
  ? (
-      require('../../tools/MonitorTool/MonitorTool.js') as typeof import('../../tools/MonitorTool/MonitorTool.js')
+      require('@claude-code-best/builtin-tools/tools/MonitorTool/MonitorTool.js') as typeof import('@claude-code-best/builtin-tools/tools/MonitorTool/MonitorTool.js')
    ).MonitorTool
  : null

--- a/src/components/permissions/PowerShellPermissionRequest/PowerShellPermissionRequest.tsx
+++ b/src/components/permissions/PowerShellPermissionRequest/PowerShellPermissionRequest.tsx
@@ -7,9 +7,9 @@ import {
  logEvent,
 } from '../../../services/analytics/index.js'
 import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js'
-import { getDestructiveCommandWarning } from '../../../tools/PowerShellTool/destructiveCommandWarning.js'
-import { PowerShellTool } from '../../../tools/PowerShellTool/PowerShellTool.js'
-import { isAllowlistedCommand } from '../../../tools/PowerShellTool/readOnlyValidation.js'
+import { getDestructiveCommandWarning } from '@claude-code-best/builtin-tools/tools/PowerShellTool/destructiveCommandWarning.js'
+import { PowerShellTool } from '@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js'
+import { isAllowlistedCommand } from '@claude-code-best/builtin-tools/tools/PowerShellTool/readOnlyValidation.js'
 import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js'
 import { getCompoundCommandPrefixesStatic } from '../../../utils/powershell/staticPrefix.js'
 import { Select } from '../../CustomSelect/select.js'
--- a/src/components/permissions/PowerShellPermissionRequest/powershellToolUseOptions.tsx
+++ b/src/components/permissions/PowerShellPermissionRequest/powershellToolUseOptions.tsx
@@ -1,4 +1,4 @@
-import { POWERSHELL_TOOL_NAME } from '../../../tools/PowerShellTool/toolName.js'
+import { POWERSHELL_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/PowerShellTool/toolName.js'
 import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js'
 import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
 import type { OptionWithDescription } from '../../CustomSelect/select.js'
--- a/src/components/permissions/SedEditPermissionRequest/SedEditPermissionRequest.tsx
+++ b/src/components/permissions/SedEditPermissionRequest/SedEditPermissionRequest.tsx
@@ -6,11 +6,11 @@ import { isENOENT } from 'src/utils/errors.js'
 import { detectEncodingForResolvedPath } from 'src/utils/fileRead.js'
 import { getFsImplementation } from 'src/utils/fsOperations.js'
 import { Text } from '@anthropic/ink'
-import { BashTool } from '../../../tools/BashTool/BashTool.js'
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
 import {
  applySedSubstitution,
  type SedEditInfo,
-} from '../../../tools/BashTool/sedEditParser.js'
+} from '@claude-code-best/builtin-tools/tools/BashTool/sedEditParser.js'
 import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js'
 import type { PermissionRequestProps } from '../PermissionRequest.js'

--- a/src/components/permissions/SkillPermissionRequest/SkillPermissionRequest.tsx
+++ b/src/components/permissions/SkillPermissionRequest/SkillPermissionRequest.tsx
@@ -3,8 +3,8 @@ import { logError } from 'src/utils/log.js'
 import { getOriginalCwd } from '../../../bootstrap/state.js'
 import { Box, Text } from '@anthropic/ink'
 import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js'
-import { SKILL_TOOL_NAME } from '../../../tools/SkillTool/constants.js'
-import { SkillTool } from '../../../tools/SkillTool/SkillTool.js'
+import { SKILL_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SkillTool/constants.js'
+import { SkillTool } from '@claude-code-best/builtin-tools/tools/SkillTool/SkillTool.js'
 import { env } from '../../../utils/env.js'
 import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
 import { logUnaryEvent } from '../../../utils/unaryLogging.js'
--- a/src/components/permissions/WebFetchPermissionRequest/WebFetchPermissionRequest.tsx
+++ b/src/components/permissions/WebFetchPermissionRequest/WebFetchPermissionRequest.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react'
 import { Box, Text, useTheme } from '@anthropic/ink'
-import { WebFetchTool } from '../../../tools/WebFetchTool/WebFetchTool.js'
+import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js'
 import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
 import {
  type OptionWithDescription,
--- a/src/components/permissions/hooks.ts
+++ b/src/components/permissions/hooks.ts
@@ -5,7 +5,7 @@ import {
  logEvent,
 } from 'src/services/analytics/index.js'
 import { sanitizeToolNameForAnalytics } from 'src/services/analytics/metadata.js'
-import { BashTool } from 'src/tools/BashTool/BashTool.js'
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
 import { splitCommand_DEPRECATED } from 'src/utils/bash/commands.js'
 import type {
  PermissionDecisionReason,
--- a/src/components/permissions/rules/PermissionRuleDescription.tsx
+++ b/src/components/permissions/rules/PermissionRuleDescription.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Text } from '@anthropic/ink'
-import { BashTool } from '../../../tools/BashTool/BashTool.js'
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
 import type { PermissionRuleValue } from '../../../utils/permissions/PermissionRule.js'

 type RuleSubtitleProps = {
--- a/src/components/permissions/rules/PermissionRuleInput.tsx
+++ b/src/components/permissions/rules/PermissionRuleInput.tsx
@@ -6,8 +6,8 @@ import { useExitOnCtrlCDWithKeybindings } from '../../../hooks/useExitOnCtrlCDWi
 import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
 import { Box, Newline, Text } from '@anthropic/ink'
 import { useKeybinding } from '../../../keybindings/useKeybinding.js'
-import { BashTool } from '../../../tools/BashTool/BashTool.js'
-import { WebFetchTool } from '../../../tools/WebFetchTool/WebFetchTool.js'
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
+import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js'
 import type {
  PermissionBehavior,
  PermissionRuleValue,
--- a/src/components/tasks/BackgroundTaskStatus.tsx
+++ b/src/components/tasks/BackgroundTaskStatus.tsx
@@ -21,7 +21,7 @@ import {
  AGENT_COLOR_TO_THEME_COLOR,
  AGENT_COLORS,
  type AgentColorName,
-} from '../../tools/AgentTool/agentColorManager.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
 import type { Theme } from '../../utils/theme.js'
 import { KeyboardShortcutHint } from '@anthropic/ink'
 import { shouldHideTasksFooter } from './taskStatusUtils.js'
--- a/src/components/tasks/RemoteSessionDetailDialog.tsx
+++ b/src/components/tasks/RemoteSessionDetailDialog.tsx
@@ -12,9 +12,9 @@ import { getRemoteTaskSessionUrl } from '../../tasks/RemoteAgentTask/RemoteAgent
 import {
  AGENT_TOOL_NAME,
  LEGACY_AGENT_TOOL_NAME,
-} from '../../tools/AgentTool/constants.js'
-import { ASK_USER_QUESTION_TOOL_NAME } from '../../tools/AskUserQuestionTool/prompt.js'
-import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '../../tools/ExitPlanModeTool/constants.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js'
+import { ASK_USER_QUESTION_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/prompt.js'
+import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/constants.js'
 import { openBrowser } from '../../utils/browser.js'
 import { errorMessage } from '../../utils/errors.js'
 import { formatDuration, truncateToWidth } from '../../utils/format.js'
--- a/src/components/teams/TeamsDialog.tsx
+++ b/src/components/teams/TeamsDialog.tsx
@@ -14,7 +14,7 @@ import {
  useSetAppState,
 } from '../../state/AppState.js'
 import { getEmptyToolPermissionContext } from '../../Tool.js'
-import { AGENT_COLOR_TO_THEME_COLOR } from '../../tools/AgentTool/agentColorManager.js'
+import { AGENT_COLOR_TO_THEME_COLOR } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
 import { logForDebugging } from '../../utils/debug.js'
 import { execFileNoThrow } from '../../utils/execFileNoThrow.js'
 import { truncateToWidth } from '../../utils/format.js'