Repository navigation
SANDBOX-1814: Implement MCP server setup and entry point #21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
fbm3307
merged 3 commits into
codeready-toolchain:master
from
fbm3307:feat/SANDBOX-1814-mcp-server-setup
Jul 17, 2026
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,6 +41,8 @@ config.local.json | |
| # Build output | ||
| /bin/ | ||
| /dist/ | ||
| /server | ||
| /agent | ||
|
|
||
| # Temporary files | ||
| /tmp/ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,240 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "log" | ||
| "log/slog" | ||
| "net/http" | ||
| "os" | ||
| "os/signal" | ||
| "syscall" | ||
| "time" | ||
|
|
||
| "github.com/codeready-toolchain/cli-mcp-server/pkg/server" | ||
| "github.com/codeready-toolchain/cli-mcp-server/pkg/session" | ||
| "github.com/codeready-toolchain/cli-mcp-server/pkg/tools" | ||
| "github.com/codeready-toolchain/cli-mcp-server/pkg/version" | ||
| "github.com/modelcontextprotocol/go-sdk/mcp" | ||
| "github.com/spf13/cobra" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/client-go/kubernetes" | ||
| "k8s.io/client-go/rest" | ||
| "k8s.io/client-go/tools/clientcmd" | ||
| ) | ||
|
|
||
| const shutdownTimeout = 310 * time.Second | ||
|
|
||
| func main() { | ||
| fmt.Fprintf(os.Stderr, "cli-mcp-server %s (built %s)\n", version.Commit, version.BuildTime) | ||
| // TODO: Cobra root command, MCP server setup (SANDBOX-1814) | ||
|
|
||
| var ( | ||
| address string | ||
| transport string | ||
| stateless bool | ||
| namespace string | ||
| sandboxImage string | ||
| kubeconfig string | ||
| hmacKeyFile string | ||
| idleTimeout time.Duration | ||
| warmPoolSize int | ||
| ) | ||
|
|
||
| rootCmd := &cobra.Command{ | ||
| Use: "cli-mcp-server", | ||
| Short: "Sandboxed exec environment MCP server for LLM investigation", | ||
| RunE: func(_ *cobra.Command, _ []string) error { | ||
| return runServer(runConfig{ | ||
| address: address, | ||
| transport: transport, | ||
| stateless: stateless, | ||
| namespace: namespace, | ||
| sandboxImage: sandboxImage, | ||
| kubeconfig: kubeconfig, | ||
| hmacKeyFile: hmacKeyFile, | ||
| idleTimeout: idleTimeout, | ||
| warmPoolSize: warmPoolSize, | ||
| }) | ||
| }, | ||
| } | ||
|
|
||
| rootCmd.Flags().StringVarP(&address, "address", "a", "localhost:8080", "Server address (host:port)") | ||
| rootCmd.Flags().StringVarP(&transport, "transport", "t", "stdio", "Transport (stdio, http)") | ||
| rootCmd.Flags().BoolVar(&stateless, "stateless", false, "Enable stateless mode (required for HTTP)") | ||
| rootCmd.Flags().StringVar(&namespace, "namespace", "tarsy", "Namespace for sandbox pods") | ||
| rootCmd.Flags().StringVar(&sandboxImage, "sandbox-image", "", "Container image for sandbox pods (required)") | ||
| rootCmd.Flags().StringVar(&kubeconfig, "kubeconfig", "", "Path to kubeconfig for sandbox pods") | ||
| rootCmd.Flags().StringVar(&hmacKeyFile, "hmac-key-file", "", "Path to HMAC shared secret file (required)") | ||
| rootCmd.Flags().DurationVar(&idleTimeout, "idle-timeout", 30*time.Minute, "Idle timeout for sandbox pods") | ||
| rootCmd.Flags().IntVar(&warmPoolSize, "warm-pool-size", 0, "Pre-warmed sandbox pods (0 = disabled)") | ||
|
|
||
| if err := rootCmd.Execute(); err != nil { | ||
| os.Exit(1) | ||
| } | ||
| } | ||
|
|
||
| type runConfig struct { | ||
| address string | ||
| transport string | ||
| stateless bool | ||
| namespace string | ||
| sandboxImage string | ||
| kubeconfig string | ||
| hmacKeyFile string | ||
| idleTimeout time.Duration | ||
| warmPoolSize int | ||
| } | ||
|
|
||
| func runServer(cfg runConfig) error { | ||
| if err := server.ValidateTransportFlags(cfg.transport, cfg.stateless, cfg.address); err != nil { | ||
| return err | ||
| } | ||
| if cfg.sandboxImage == "" { | ||
| return fmt.Errorf("--sandbox-image is required") | ||
| } | ||
| hmacKey, err := loadHMACKey(cfg.hmacKeyFile) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| logger := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{ | ||
| Level: slog.LevelInfo, | ||
| AddSource: true, | ||
| })).With("server", "cli-mcp-server") | ||
|
|
||
| clientset, err := buildClientset(cfg.kubeconfig) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to create kubernetes client: %w", err) | ||
| } | ||
|
|
||
| sandboxCfg := session.DefaultConfig() | ||
| sandboxCfg.Image = cfg.sandboxImage | ||
| sandboxCfg.HMACKey = hmacKey | ||
| sandboxCfg.Namespace = cfg.namespace | ||
| sandboxCfg.IdleTimeout = cfg.idleTimeout | ||
| sandboxCfg.WarmPoolSize = cfg.warmPoolSize | ||
|
|
||
| mgr, err := session.NewSessionManager(clientset, sandboxCfg, logger) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to create session manager: %w", err) | ||
| } | ||
|
|
||
| mcpServer := server.NewMCPServer("cli-mcp-server", cfg.stateless, logger) | ||
| tools.NewBashTool(mgr).RegisterWith(mcpServer) | ||
|
|
||
| // Shared context cancelled on SIGTERM/SIGINT — stops background workers for both transports. | ||
| ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT) | ||
| defer cancel() | ||
|
|
||
| startCleanupLoop(ctx, mgr, logger) | ||
| if cfg.warmPoolSize > 0 { | ||
| mgr.StartPool(ctx) | ||
| } | ||
|
|
||
| switch cfg.transport { | ||
| case "http": | ||
| return serveHTTP(ctx, cancel, cfg.address, mcpServer, mgr, clientset, cfg.namespace, logger) | ||
| case "stdio": | ||
| return serveStdio(ctx, mcpServer) | ||
| default: | ||
| return fmt.Errorf("unsupported transport: %s", cfg.transport) | ||
| } | ||
| } | ||
|
|
||
| func serveHTTP(ctx context.Context, cancel context.CancelFunc, address string, mcpServer *mcp.Server, mgr *session.SessionManager, clientset kubernetes.Interface, namespace string, logger *slog.Logger) error { | ||
| checker := &k8sHealthChecker{clientset: clientset, namespace: namespace} | ||
| mux := server.NewMux(mcpServer, mgr, checker, logger) | ||
|
|
||
| srv := &http.Server{Addr: address, Handler: mux} | ||
| serverErrChan := make(chan error, 1) | ||
| go func() { | ||
| log.Printf("listening on %s (HTTP, stateless)", address) | ||
| if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed { | ||
| serverErrChan <- err | ||
| } | ||
| }() | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
|
|
||
| select { | ||
| case <-ctx.Done(): | ||
| log.Println("received shutdown signal, draining...") | ||
| case err := <-serverErrChan: | ||
| cancel() | ||
| return fmt.Errorf("HTTP serve failed: %w", err) | ||
| } | ||
|
|
||
| cancel() | ||
| shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), shutdownTimeout) | ||
| defer shutdownCancel() | ||
| if err := srv.Shutdown(shutdownCtx); err != nil { | ||
| log.Printf("shutdown error: %v", err) | ||
| } | ||
| log.Println("shutdown complete") | ||
| return nil | ||
| } | ||
|
|
||
| func serveStdio(ctx context.Context, mcpServer *mcp.Server) error { | ||
| log.Println("serving on stdio") | ||
| if err := mcpServer.Run(ctx, &mcp.StdioTransport{}); err != nil && ctx.Err() == nil { | ||
| return fmt.Errorf("stdio transport error: %w", err) | ||
| } | ||
| log.Println("shutdown complete") | ||
| return nil | ||
| } | ||
|
|
||
| func startCleanupLoop(ctx context.Context, mgr *session.SessionManager, logger *slog.Logger) { | ||
| go func() { | ||
| ticker := time.NewTicker(5 * time.Minute) | ||
| defer ticker.Stop() | ||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return | ||
| case <-ticker.C: | ||
| cleaned, err := mgr.CleanupStale(ctx) | ||
| if err != nil { | ||
| logger.Error("stale cleanup failed", "error", err) | ||
| } else if cleaned > 0 { | ||
| logger.Info("cleaned stale sessions", "count", cleaned) | ||
| } | ||
| } | ||
| } | ||
| }() | ||
| } | ||
|
|
||
| func loadHMACKey(path string) (string, error) { | ||
| if path == "" { | ||
| return "", fmt.Errorf("--hmac-key-file is required") | ||
| } | ||
| data, err := os.ReadFile(path) | ||
| if err != nil { | ||
| return "", fmt.Errorf("failed to read HMAC key file: %w", err) | ||
| } | ||
| if len(data) == 0 { | ||
| return "", fmt.Errorf("HMAC key file is empty (zero bytes): %s", path) | ||
| } | ||
| return string(data), nil | ||
| } | ||
|
|
||
| func buildClientset(kubeconfigPath string) (kubernetes.Interface, error) { | ||
| var config *rest.Config | ||
| var err error | ||
| if kubeconfigPath != "" { | ||
| config, err = clientcmd.BuildConfigFromFlags("", kubeconfigPath) | ||
| } else { | ||
| config, err = rest.InClusterConfig() | ||
| } | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return kubernetes.NewForConfig(config) | ||
| } | ||
|
|
||
| type k8sHealthChecker struct { | ||
| clientset kubernetes.Interface | ||
| namespace string | ||
| } | ||
|
|
||
| func (c *k8sHealthChecker) CheckHealth(ctx context.Context) error { | ||
| _, err := c.clientset.CoreV1().Namespaces().Get(ctx, c.namespace, metav1.GetOptions{}) | ||
| return err | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.