git.iko.soy/crush
on main help sign in
fix(mcp): centrally filter disabled tools (#1622)
commit43b0e0bcba1930653125dc156dd532e436a63b1d authorAmolith <amolith@secluded.site> dateWed 7 Jan 2026, 03:37 (9 months ago) parent6b3cd26
3 files changed+27−12
compare with main
unifiedsplit
internal/agent/coordinator.go−6 internal/agent/tools/mcp/init.go+2−2 internal/agent/tools/mcp/tools.go+25−4
internal/agent/coordinator.go−6
@@ -407,12 +407,6 @@ func (c *coordinator) buildTools(ctx context.Context, agent config.Agent) ([]fan
407407 }
408408
409409 for _, tool := range tools.GetMCPTools(c.permissions, c.cfg.WorkingDir()) {
410− // Check MCP-specific disabled tools.
411− if mcpCfg, ok := c.cfg.MCP[tool.MCP()]; ok {
412− if slices.Contains(mcpCfg.DisabledTools, tool.MCPToolName()) {
413− continue
414− }
415− }
416410 if agent.AllowedMCP == nil {
417411 // No MCP restrictions
418412 filteredTools = append(filteredTools, tool)
internal/agent/tools/mcp/init.go+2−2
@@ -188,12 +188,12 @@ func Initialize(ctx context.Context, permissions permission.Service, cfg *config
188188 return
189189 }
190190
191− updateTools(name, tools)
191+ toolCount := updateTools(name, tools)
192192 updatePrompts(name, prompts)
193193 sessions.Set(name, session)
194194
195195 updateState(name, StateConnected, nil, session, Counts{
196− Tools: len(tools),
196+ Tools: toolCount,
197197 Prompts: len(prompts),
198198 })
199199 }(name, m)
internal/agent/tools/mcp/tools.go+25−4
@@ -6,8 +6,10 @@ import (
66 "fmt"
77 "iter"
88 "log/slog"
9+ "slices"
910 "strings"
1011
12+ "github.com/charmbracelet/crush/internal/config"
1113 "github.com/charmbracelet/crush/internal/csync"
1214 "github.com/modelcontextprotocol/go-sdk/mcp"
1315)
@@ -119,10 +121,10 @@ func RefreshTools(ctx context.Context, name string) {
119121 return
120122 }
121123
122− updateTools(name, tools)
124+ toolCount := updateTools(name, tools)
123125
124126 prev, _ := states.Get(name)
125− prev.Counts.Tools = len(tools)
127+ prev.Counts.Tools = toolCount
126128 updateState(name, StateConnected, nil, session, prev.Counts)
127129}
128130
@@ -137,10 +139,29 @@ func getTools(ctx context.Context, session *mcp.ClientSession) ([]*Tool, error)
137139 return result.Tools, nil
138140}
139141
140−func updateTools(name string, tools []*Tool) {
142+func updateTools(name string, tools []*Tool) int {
143+ tools = filterDisabledTools(name, tools)
141144 if len(tools) == 0 {
142145 allTools.Del(name)
143− return
146+ return 0
144147 }
145148 allTools.Set(name, tools)
149+ return len(tools)
150+}
151+
152+// filterDisabledTools removes tools that are disabled via config.
153+func filterDisabledTools(mcpName string, tools []*Tool) []*Tool {
154+ cfg := config.Get()
155+ mcpCfg, ok := cfg.MCP[mcpName]
156+ if !ok || len(mcpCfg.DisabledTools) == 0 {
157+ return tools
158+ }
159+
160+ filtered := make([]*Tool, 0, len(tools))
161+ for _, tool := range tools {
162+ if !slices.Contains(mcpCfg.DisabledTools, tool.Name) {
163+ filtered = append(filtered, tool)
164+ }
165+ }
166+ return filtered
146167}