diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go
index 08710baba2886f6c6c8421006068c7fecd511511..c8d19cf6da0a312475ca1610371ec462c287d04f 100644
--- a/internal/llm/agent/agent.go
+++ b/internal/llm/agent/agent.go
@@ -213,11 +213,8 @@ func NewAgent(
 		mcpToolsOnce.Do(func() {
 			doGetMCPTools(ctx, permissions, cfg)
 		})
-		result := make(map[string]tools.BaseTool)
-		for _, mcpTool := range mcpTools.Seq2() {
-			result[mcpTool.Name()] = mcpTool
-		}
-		return result
+
+		return maps.Collect(mcpTools.Seq2())
 	}
 
 	a := &agent{