Merge pull request #268 from dgageot/remove-dead-code-2

Remove dead code

Author: dgageot

go.sum

@@ -135,8 +135,6 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
-github.com/mark3labs/mcp-go v0.40.0 h1:M0oqK412OHBKut9JwXSsj4KanSmEKpzoW8TcxoPOkAU=
-github.com/mark3labs/mcp-go v0.40.0/go.mod h1:T7tUa2jO6MavG+3P25Oy/jR7iCeJPHImCZHRymCn39g=
 github.com/mark3labs/mcp-go v0.40.1-0.20250919152514-dd0058cb6537 h1:bI/2B+eDqHiwO0pPZCjTGfyQGGvsyNEONOHOlFOynNw=
 github.com/mark3labs/mcp-go v0.40.1-0.20250919152514-dd0058cb6537/go.mod h1:T7tUa2jO6MavG+3P25Oy/jR7iCeJPHImCZHRymCn39g=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=

pkg/oci/build.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/docker/cagent/pkg/config"
-	v2 "github.com/docker/cagent/pkg/config/v2"
 )
 
 //go:embed Dockerfile.template
@@ -40,31 +39,6 @@ func BuildDockerImage(ctx context.Context, agentFilePath, dockerImageName string
 		return err
 	}
 
-	// Collect information about MCP servers
-	servers := Servers{
-		MCPServers: map[string]Server{},
-	}
-
-	// Make sure the config is compatible with `cagent build`
-	for _, agent := range cfg.Agents {
-		for i := range agent.Toolsets {
-			toolSet := agent.Toolsets[i]
-			if toolSet.Type != "mcp" {
-				continue
-			}
-
-			if toolSet.Command != "" {
-				return fmt.Errorf("toolset with command \"%s\" can't be used in `cagent build`", toolSet.Command)
-			}
-
-			server, err := mcpToolSetToServer(ctx, &toolSet)
-			if err != nil {
-				return err
-			}
-			servers.MCPServers[toolSet.Ref] = server
-		}
-	}
-
 	// Analyze the config to find which secrets are needed
 	modelNames := config.GatherModelNames(cfg)
 	mcpServers := config.GatherMCPServerReferences(cfg)
@@ -121,21 +95,3 @@ func BuildDockerImage(ctx context.Context, agentFilePath, dockerImageName string
 
 	return buildCmd.Run()
 }
-
-func mcpToolSetToServer(ctx context.Context, toolSet *v2.Toolset) (Server, error) {
-	args, err := mcpServerArgs(ctx, toolSet.Ref, toolSet.Config)
-	if err != nil {
-		return Server{}, err
-	}
-
-	// TODO(dga): support the config part (probably by appending to the args or by adding env variables)
-	//   - type: mcp
-	//     ref: docker:ast-grep
-	//     config:
-	//       path: .
-	// TODO(dga): What's the actual command?
-	return Server{
-		Command: "docker",
-		Args:    args,
-	}, nil
-}