Jul 3, 2025 · Jun 30, 2025 · Jul 2, 2025 · Jul 2, 2025 · Jul 2, 2025
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go
 r.Route("/aitasks", func(r chi.Router) {
 r.Get("/prompts", api.aiTasksPrompts)
 })
 r.Route("/mcp", func(r chi.Router) {
 // MCP HTTP transport endpoint with mandatory authentication
 r.Mount("/http", api.mcpHTTPHandler())
 })
 })

 r.Route("/api/v2", func(r chi.Router) {
diff --git a/coderd/mcp/mcp.go b/coderd/mcp/mcp.go
 package mcp

 import (
 "bytes"
 "context"
 "encoding/json"
 "fmt"
 "net/http"
 "time"

 "github.com/mark3labs/mcp-go/mcp"
 "github.com/mark3labs/mcp-go/server"
 "golang.org/x/xerrors"

 "cdr.dev/slog"

 "github.com/coder/coder/v2/buildinfo"
 "github.com/coder/coder/v2/codersdk"
 "github.com/coder/coder/v2/codersdk/toolsdk"
 )

 const (
 // MCPServerName is the name used for the MCP server.
 MCPServerName = "Coder"
 // MCPServerInstructions is the instructions text for the MCP server.
 MCPServerInstructions = "Coder MCP Server providing workspace and template management tools"
 )

 // Server represents an MCP HTTP server instance
 type Server struct {
 Logger slog.Logger

 // mcpServer is the underlying MCP server
 mcpServer *server.MCPServer

 // streamableServer handles HTTP transport
 streamableServer *server.StreamableHTTPServer
 }

 // NewServer creates a new MCP HTTP server
 func NewServer(logger slog.Logger) (*Server, error) {
 // Create the core MCP server
 mcpSrv := server.NewMCPServer(
 MCPServerName,
 buildinfo.Version(),
 server.WithInstructions(MCPServerInstructions),
 )

 // Create logger adapter for mcp-go
 mcpLogger := &mcpLoggerAdapter{logger: logger}

 // Create streamable HTTP server with configuration
 streamableServer := server.NewStreamableHTTPServer(mcpSrv,
 server.WithHeartbeatInterval(30*time.Second),
 server.WithLogger(mcpLogger),
 )

 return &Server{
 Logger:           logger,
 mcpServer:        mcpSrv,
 streamableServer: streamableServer,
 }, nil
 }

 // ServeHTTP implements http.Handler interface
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 s.streamableServer.ServeHTTP(w, r)
 }

 // RegisterTools registers all available MCP tools with the server
 func (s *Server) RegisterTools(client *codersdk.Client) error {
 if client == nil {
 return xerrors.New("client cannot be nil: MCP HTTP server requires authenticated client")
 }

 // Create tool dependencies
 toolDeps, err := toolsdk.NewDeps(client)
 if err != nil {
 return xerrors.Errorf("failed to initialize tool dependencies: %w", err)
 }

 // Register all available tools
 for _, tool := range toolsdk.All {
 s.mcpServer.AddTools(mcpFromSDK(tool, toolDeps))
 }

 return nil
 }

 // mcpFromSDK adapts a toolsdk.Tool to go-mcp's server.ServerTool
 func mcpFromSDK(sdkTool toolsdk.GenericTool, tb toolsdk.Deps) server.ServerTool {
 if sdkTool.Schema.Properties == nil {
 panic("developer error: schema properties cannot be nil")
 }

 return server.ServerTool{
 Tool: mcp.Tool{
 Name:        sdkTool.Name,
 Description: sdkTool.Description,
 InputSchema: mcp.ToolInputSchema{
 Type:       "object",
 Properties: sdkTool.Schema.Properties,
 Required:   sdkTool.Schema.Required,
 },
 },
 Handler: func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 var buf bytes.Buffer
 if err := json.NewEncoder(&buf).Encode(request.Params.Arguments); err != nil {
 return nil, xerrors.Errorf("failed to encode request arguments: %w", err)
 }
 result, err := sdkTool.Handler(ctx, tb, buf.Bytes())
 if err != nil {
 return nil, err
 }
 return &mcp.CallToolResult{
 Content: []mcp.Content{
 mcp.NewTextContent(string(result)),
 },
 }, nil
 },
 }
 }

 // mcpLoggerAdapter adapts slog.Logger to the mcp-go util.Logger interface
 type mcpLoggerAdapter struct {
 logger slog.Logger
 }

 func (l *mcpLoggerAdapter) Infof(format string, v ...any) {
 l.logger.Info(context.Background(), fmt.Sprintf(format, v...))
 }

 func (l *mcpLoggerAdapter) Errorf(format string, v ...any) {
 l.logger.Error(context.Background(), fmt.Sprintf(format, v...))
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -972,6 +972,10 @@ func New(options Options) API {
		r.Route("/aitasks", func(r chi.Router) {
		r.Get("/prompts", api.aiTasksPrompts)
		})
		r.Route("/mcp", func(r chi.Router) {
Copy link Contributor dannykoppingJul 2, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Do we want to hide this behind a flag or experiment perhaps? Copy link Member johnstcnJul 2, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. +1 Copy link MemberAuthor ThomasK33Jul 2, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Sure, I added an experiment up the stack in:#18712 johnstcn reacted with heart emoji
		// MCP HTTP transport endpoint with mandatory authentication
		r.Mount("/http", api.mcpHTTPHandler())
dannykopping marked this conversation as resolved. Show resolvedHide resolved
		})
		})

		r.Route("/api/v2", func(r chi.Router) {
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,135 @@
		package mcp

		import (
		"bytes"
		"context"
		"encoding/json"
		"fmt"
		"net/http"
		"time"

		"github.com/mark3labs/mcp-go/mcp"
		"github.com/mark3labs/mcp-go/server"
		"golang.org/x/xerrors"

		"cdr.dev/slog"

		"github.com/coder/coder/v2/buildinfo"
		"github.com/coder/coder/v2/codersdk"
		"github.com/coder/coder/v2/codersdk/toolsdk"
		)

		const (
		// MCPServerName is the name used for the MCP server.
		MCPServerName = "Coder"
		// MCPServerInstructions is the instructions text for the MCP server.
		MCPServerInstructions = "Coder MCP Server providing workspace and template management tools"
		)

		// Server represents an MCP HTTP server instance
		type Server struct {
		Logger slog.Logger

		// mcpServer is the underlying MCP server
		mcpServer *server.MCPServer

		// streamableServer handles HTTP transport
		streamableServer *server.StreamableHTTPServer
		}

		// NewServer creates a new MCP HTTP server
		func NewServer(logger slog.Logger) (*Server, error) {
		// Create the core MCP server
		mcpSrv := server.NewMCPServer(
		MCPServerName,
		buildinfo.Version(),
		server.WithInstructions(MCPServerInstructions),
		)

		// Create logger adapter for mcp-go
		mcpLogger := &mcpLoggerAdapter{logger: logger}

		// Create streamable HTTP server with configuration
		streamableServer := server.NewStreamableHTTPServer(mcpSrv,
		server.WithHeartbeatInterval(30*time.Second),
		server.WithLogger(mcpLogger),
		)

		return &Server{
		Logger: logger,
		mcpServer: mcpSrv,
		streamableServer: streamableServer,
		}, nil
		}

		// ServeHTTP implements http.Handler interface
		func (s Server) ServeHTTP(w http.ResponseWriter, r http.Request) {
		s.streamableServer.ServeHTTP(w, r)
		}

		// RegisterTools registers all available MCP tools with the server
		func (s Server) RegisterTools(client codersdk.Client) error {
		if client == nil {
		return xerrors.New("client cannot be nil: MCP HTTP server requires authenticated client")
		}

		// Create tool dependencies
		toolDeps, err := toolsdk.NewDeps(client)
		if err != nil {
		return xerrors.Errorf("failed to initialize tool dependencies: %w", err)
		}

		// Register all available tools
		for _, tool := range toolsdk.All {
		s.mcpServer.AddTools(mcpFromSDK(tool, toolDeps))
		}

		return nil
		}

		// mcpFromSDK adapts a toolsdk.Tool to go-mcp's server.ServerTool
		func mcpFromSDK(sdkTool toolsdk.GenericTool, tb toolsdk.Deps) server.ServerTool {
		if sdkTool.Schema.Properties == nil {
		panic("developer error: schema properties cannot be nil")
		}

		return server.ServerTool{
		Tool: mcp.Tool{
		Name: sdkTool.Name,
		Description: sdkTool.Description,
		InputSchema: mcp.ToolInputSchema{
		Type: "object",
		Properties: sdkTool.Schema.Properties,
		Required: sdkTool.Schema.Required,
		},
		},
		Handler: func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
		var buf bytes.Buffer
		if err := json.NewEncoder(&buf).Encode(request.Params.Arguments); err != nil {
		return nil, xerrors.Errorf("failed to encode request arguments: %w", err)
		}
		result, err := sdkTool.Handler(ctx, tb, buf.Bytes())
		if err != nil {
		return nil, err
		}
		return &mcp.CallToolResult{
		Content: []mcp.Content{
		mcp.NewTextContent(string(result)),
		},
		}, nil
		},
		}
		}

		// mcpLoggerAdapter adapts slog.Logger to the mcp-go util.Logger interface
		type mcpLoggerAdapter struct {
		logger slog.Logger
		}

		func (l *mcpLoggerAdapter) Infof(format string, v ...any) {
		l.logger.Info(context.Background(), fmt.Sprintf(format, v...))
		}

		func (l *mcpLoggerAdapter) Errorf(format string, v ...any) {
		l.logger.Error(context.Background(), fmt.Sprintf(format, v...))
		}