Merge pull request #1053 from dgageot/better-toolnames

Better tool names for MCP and A2A

Author: dgageot

cmd/root/mcp.go

@@ -48,7 +48,7 @@ func (f *mcpFlags) runMCPCommand(cmd *cobra.Command, args []string) error {
 	ctx := cmd.Context()
 	agentFilename := args[0]
 
-	if f.http {
+	if f.http || f.port != 0 {
 		ln, err := server.Listen(ctx, fmt.Sprintf(":%d", f.port))
 		if err != nil {
 			return fmt.Errorf("failed to bind to port %d: %w", f.port, err)

examples/tic-tac-toe.yaml

@@ -46,10 +46,8 @@ agents:
       - type: shell
       - type: filesystem
       - type: a2a
-        name: player_blue
         url: http://localhost:8080/
       - type: a2a
-        name: player_red
         url: http://localhost:8081/
 
   # BLUE Player

pkg/a2a/server.go

@@ -57,8 +57,8 @@ func Run(ctx context.Context, agentFilename, agentName string, runConfig *config
 		Name:        name,
 		Description: adkAgent.Description(),
 		Skills: []a2a.AgentSkill{{
-			ID:          name,
-			Name:        "main",
+			ID:          fmt.Sprintf("%s_%s", name, agentName),
+			Name:        agentName,
 			Description: adkAgent.Description(),
 			Tags:        []string{"llm", "cagent"},
 		}},

pkg/config/latest/validate.go

@@ -69,8 +69,8 @@ func (t *Toolset) validate() error {
 	if t.URL != "" && t.Type != "a2a" {
 		return errors.New("url can only be used with type 'a2a'")
 	}
-	if t.Name != "" && t.Type != "a2a" {
-		return errors.New("name can only be used with type 'a2a'")
+	if t.Name != "" && (t.Type != "mcp" && t.Type != "a2a") {
+		return errors.New("name can only be used with type 'mcp' or 'a2a'")
 	}
 
 	switch t.Type {

pkg/teamloader/registry.go

@@ -195,10 +195,10 @@ func createMCPTool(ctx context.Context, toolset latest.Toolset, _ string, runCon
 
 		// TODO(dga): until the MCP Gateway supports oauth with cagent, we fetch the remote url and directly connect to it.
 		if serverSpec.Type == "remote" {
-			return mcp.NewRemoteToolset(serverSpec.Remote.URL, serverSpec.Remote.TransportType, nil), nil
+			return mcp.NewRemoteToolset(toolset.Name, serverSpec.Remote.URL, serverSpec.Remote.TransportType, nil), nil
 		}
 
-		return mcp.NewGatewayToolset(ctx, mcpServerName, toolset.Config, runConfig.EnvProvider(), runConfig.WorkingDir)
+		return mcp.NewGatewayToolset(ctx, toolset.Name, mcpServerName, toolset.Config, runConfig.EnvProvider(), runConfig.WorkingDir)
 	}
 
 	if toolset.Command != "" {
@@ -207,7 +207,7 @@ func createMCPTool(ctx context.Context, toolset latest.Toolset, _ string, runCon
 			return nil, fmt.Errorf("failed to expand the tool's environment variables: %w", err)
 		}
 		env = append(env, os.Environ()...)
-		return mcp.NewToolsetCommand(toolset.Command, toolset.Args, env, runConfig.WorkingDir), nil
+		return mcp.NewToolsetCommand(toolset.Name, toolset.Command, toolset.Args, env, runConfig.WorkingDir), nil
 	}
 
 	if toolset.Remote.URL != "" {
@@ -221,7 +221,7 @@ func createMCPTool(ctx context.Context, toolset latest.Toolset, _ string, runCon
 			headers[k] = expanded
 		}
 
-		return mcp.NewRemoteToolset(toolset.Remote.URL, toolset.Remote.TransportType, headers), nil
+		return mcp.NewRemoteToolset(toolset.Name, toolset.Remote.URL, toolset.Remote.TransportType, headers), nil
 	}
 
 	return nil, fmt.Errorf("mcp toolset requires either ref, command, or remote configuration")

pkg/tools/a2a/a2a.go

@@ -78,13 +78,13 @@ func (t *Toolset) Tools(_ context.Context) ([]tools.Tool, error) {
 
 	result := make([]tools.Tool, 0, len(skills))
 	for _, skill := range skills {
-		name := t.name
-		if name == "" {
-			name = skill.ID
-		}
+		name := skill.ID
 		if name == "" {
 			name = skill.Name
 		}
+		if t.name != "" {
+			name = fmt.Sprintf("%s_%s", t.name, name)
+		}
 		name = sanitizeToolName(name)
 
 		result = append(result, tools.Tool{

pkg/tools/mcp/gateway.go

@@ -22,7 +22,7 @@ type GatewayToolset struct {
 
 var _ tools.ToolSet = (*GatewayToolset)(nil)
 
-func NewGatewayToolset(ctx context.Context, mcpServerName string, config any, envProvider environment.Provider, cwd string) (*GatewayToolset, error) {
+func NewGatewayToolset(ctx context.Context, name, mcpServerName string, config any, envProvider environment.Provider, cwd string) (*GatewayToolset, error) {
 	slog.Debug("Creating MCP Gateway toolset", "name", mcpServerName)
 
 	// Check which secrets (env vars) are required by the MCP server.
@@ -55,7 +55,7 @@ func NewGatewayToolset(ctx context.Context, mcpServerName string, config any, en
 	}
 
 	return &GatewayToolset{
-		cmdToolset: NewToolsetCommand("docker", args, nil, cwd),
+		cmdToolset: NewToolsetCommand(name, "docker", args, nil, cwd),
 		cleanUp: func() error {
 			return errors.Join(os.Remove(fileSecrets), os.Remove(fileConfig))
 		},

pkg/tools/mcp/mcp.go

@@ -30,6 +30,7 @@ type mcpClient interface {
 
 // Toolset represents a set of MCP tools
 type Toolset struct {
+	name         string
 	mcpClient    mcpClient
 	logID        string
 	instructions string
@@ -39,20 +40,22 @@ type Toolset struct {
 var _ tools.ToolSet = (*Toolset)(nil)
 
 // NewToolsetCommand creates a new MCP toolset from a command.
-func NewToolsetCommand(command string, args, env []string, cwd string) *Toolset {
+func NewToolsetCommand(name, command string, args, env []string, cwd string) *Toolset {
 	slog.Debug("Creating Stdio MCP toolset", "command", command, "args", args)
 
 	return &Toolset{
+		name:      name,
 		mcpClient: newStdioCmdClient(command, args, env, cwd),
 		logID:     command,
 	}
 }
 
 // NewRemoteToolset creates a new MCP toolset from a remote MCP Server.
-func NewRemoteToolset(url, transport string, headers map[string]string) *Toolset {
+func NewRemoteToolset(name, url, transport string, headers map[string]string) *Toolset {
 	slog.Debug("Creating Remote MCP toolset", "url", url, "transport", transport, "headers", headers)
 
 	return &Toolset{
+		name:      name,
 		mcpClient: newRemoteClient(url, transport, headers, NewInMemoryTokenStore(), false),
 		logID:     url,
 	}
@@ -139,8 +142,13 @@ func (ts *Toolset) Tools(ctx context.Context) ([]tools.Tool, error) {
 			return nil, err
 		}
 
+		name := t.Name
+		if ts.name != "" {
+			name = fmt.Sprintf("%s_%s", ts.name, name)
+		}
+
 		tool := tools.Tool{
-			Name:         t.Name,
+			Name:         name,
 			Description:  t.Description,
 			Parameters:   t.InputSchema,
 			OutputSchema: t.OutputSchema,
@@ -151,7 +159,7 @@ func (ts *Toolset) Tools(ctx context.Context) ([]tools.Tool, error) {
 		}
 		toolsList = append(toolsList, tool)
 
-		slog.Debug("Added MCP tool", "tool", t.Name)
+		slog.Debug("Added MCP tool", "tool", name)
 	}
 
 	slog.Debug("Listed MCP tools", "count", len(toolsList))