Merge pull request #65 from eaugene/streamableSupport

Adding support for streamable MCP server

Author: catkins

README.md

@@ -384,6 +384,20 @@ When the threshold is exceeded, the `get_job_logs` tool will:
 
 ---
 
+## 🌐 Streamable HTTP / SSE transport
+
+You can also run the MCP server using the Streamable HTTP Transport, and connect to the MCP server at <http://localhost:3000/mcp>.
+
+```sh
+buildkite-mcp-server http --listen "localhost:3000" --api-token=${BUILDKITE_API_TOKEN}
+```
+
+Or with the legacy HTTP/SSE transport, and connect to the MCP server at <http://localhost:3000/sse>.
+
+```sh
+buildkite-mcp-server http --listen "localhost:3000" --use-sse --api-token=${BUILDKITE_API_TOKEN}
+```
+
 ## 📸 Screenshots
 
 ![Get Pipeline Tool](docs/images/get_pipeline.png)

cmd/buildkite-mcp-server/main.go

@@ -18,7 +18,7 @@ var (
 
 	cli struct {
 		Stdio       commands.StdioCmd `cmd:"" help:"stdio mcp server."`
-		HTTP        commands.HTTPCmd  `cmd:"" help:"http mcp server."`
+		HTTP        commands.HTTPCmd  `cmd:"" help:"http mcp server. (pass --use-sse to use SSE transport"`
 		Tools       commands.ToolsCmd `cmd:"" help:"list available tools." hidden:""`
 		APIToken    string            `help:"The Buildkite API token to use." env:"BUILDKITE_API_TOKEN"`
 		BaseURL     string            `help:"The base URL of the Buildkite API to use." env:"BUILDKITE_BASE_URL" default:"https://api.buildkite.com/"`
@@ -47,6 +47,8 @@ func main() {
 	if cli.Debug {
 		logger = logger.Level(zerolog.DebugLevel).With().Caller().Logger()
 	}
+	log.Logger = logger
+	zerolog.DefaultContextLogger = &logger
 
 	tp, err := trace.NewProvider(ctx, "buildkite-mcp-server", version)
 	if err != nil {

internal/commands/http.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/buildkite/buildkite-mcp-server/pkg/server"
 	mcpserver "github.com/mark3labs/mcp-go/server"
@@ -10,15 +11,24 @@ import (
 
 type HTTPCmd struct {
 	Listen string `help:"The address to listen on." default:"localhost:3000"`
+	UseSSE bool   `help:"Use deprecated SSS transport instead of Streamable HTTP." default:"false"`
 }
 
 func (c *HTTPCmd) Run(ctx context.Context, globals *Globals) error {
-
 	mcpServer := server.NewMCPServer(globals.Version, globals.Client, globals.BuildkiteLogsClient)
+	logEvent := log.Ctx(ctx).Info().Str("address", c.Listen)
 
-	httpServer := mcpserver.NewSSEServer(mcpServer)
+	if c.UseSSE {
+		httpServer := mcpserver.NewSSEServer(mcpServer)
+		endpoint := fmt.Sprintf("http://%s%s", c.Listen, httpServer.CompleteSsePath())
+		logEvent.Str("transport", "sse").Str("endpoint", endpoint).Msg("Starting SSE HTTP server")
 
-	log.Ctx(ctx).Info().Str("address", c.Listen).Msg("Starting HTTP server")
+		return httpServer.Start(c.Listen)
+	} else {
+		httpServer := mcpserver.NewStreamableHTTPServer(mcpServer)
+		endpoint := fmt.Sprintf("http://%s/mcp", c.Listen)
+		logEvent.Str("transport", "streamable-http").Str("endpoint", endpoint).Msg("Starting streamable HTTP server")
 
-	return httpServer.Start(c.Listen)
+		return httpServer.Start(c.Listen)
+	}
 }