Add proxy to docs mcp server (#21)

Author: nathanjcochran

internal/tiger/cmd/config.go

@@ -136,6 +136,8 @@ func outputTable(cfg *config.Config, cmd *cobra.Command) error {
 	fmt.Fprintf(out, "  API URL:     %s\n", cfg.APIURL)
 	fmt.Fprintf(out, "  Console URL: %s\n", cfg.ConsoleURL)
 	fmt.Fprintf(out, "  Gateway URL: %s\n", cfg.GatewayURL)
+	fmt.Fprintf(out, "  Docs MCP:       %t\n", cfg.DocsMCP)
+	fmt.Fprintf(out, "  Docs MCP URL:   %s\n", cfg.DocsMCPURL)
 	fmt.Fprintf(out, "  Project ID:  %s\n", valueOrEmpty(cfg.ProjectID))
 	fmt.Fprintf(out, "  Service ID:  %s\n", valueOrEmpty(cfg.ServiceID))
 	fmt.Fprintf(out, "  Output:      %s\n", cfg.Output)
@@ -151,6 +153,8 @@ func outputJSON(cfg *config.Config, cmd *cobra.Command) error {
 		"api_url":          cfg.APIURL,
 		"console_url":      cfg.ConsoleURL,
 		"gateway_url":      cfg.GatewayURL,
+		"docs_mcp":         cfg.DocsMCP,
+		"docs_mcp_url":     cfg.DocsMCPURL,
 		"project_id":       cfg.ProjectID,
 		"service_id":       cfg.ServiceID,
 		"output":           cfg.Output,
@@ -170,6 +174,8 @@ func outputYAML(cfg *config.Config, cmd *cobra.Command) error {
 		"api_url":          cfg.APIURL,
 		"console_url":      cfg.ConsoleURL,
 		"gateway_url":      cfg.GatewayURL,
+		"docs_mcp":         cfg.DocsMCP,
+		"docs_mcp_url":     cfg.DocsMCPURL,
 		"project_id":       cfg.ProjectID,
 		"service_id":       cfg.ServiceID,
 		"output":           cfg.Output,

internal/tiger/cmd/mcp.go

@@ -145,14 +145,19 @@ func startStdioServer(ctx context.Context) error {
 	defer stop()
 
 	// Create MCP server
-	server, err := mcp.NewServer()
+	server, err := mcp.NewServer(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to create MCP server: %w", err)
 	}
 
 	// Start the stdio transport
 	if err := server.StartStdio(ctx); !errors.Is(err, context.Canceled) {
-		return err
+		return fmt.Errorf("failed to start MCP server: %w", err)
+	}
+
+	// Close the MCP server when finished
+	if err := server.Close(); err != nil {
+		return fmt.Errorf("failed to close MCP server: %w", err)
 	}
 	return nil
 }
@@ -161,16 +166,16 @@ func startStdioServer(ctx context.Context) error {
 func startHTTPServer(ctx context.Context, host string, port int) error {
 	logging.Info("Starting Tiger MCP server", zap.String("transport", "http"))
 
+	// Setup graceful shutdown handling
+	ctx, stop := signalContext(ctx)
+	defer stop()
+
 	// Create MCP server
-	server, err := mcp.NewServer()
+	server, err := mcp.NewServer(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to create MCP server: %w", err)
 	}
 
-	// Setup graceful shutdown handling
-	ctx, stop := signalContext(ctx)
-	defer stop()
-
 	// Find available port and get the listener
 	listener, actualPort, err := getListener(host, port)
 	if err != nil {
@@ -181,7 +186,8 @@ func startHTTPServer(ctx context.Context, host string, port int) error {
 	if actualPort != port {
 		logging.Info("Specified port was busy, using alternative port",
 			zap.Int("requested_port", port),
-			zap.Int("actual_port", actualPort))
+			zap.Int("actual_port", actualPort),
+		)
 	}
 
 	address := fmt.Sprintf("%s:%d", host, actualPort)
@@ -212,7 +218,15 @@ func startHTTPServer(ctx context.Context, host string, port int) error {
 
 	// Shutdown server gracefully
 	logging.Info("Shutting down HTTP server...")
-	return httpServer.Shutdown(context.Background())
+	if err := httpServer.Shutdown(context.Background()); err != nil {
+		return fmt.Errorf("failed to shut down HTTP server: %w", err)
+	}
+
+	// Close the MCP server when finished
+	if err := server.Close(); err != nil {
+		return fmt.Errorf("failed to close MCP server: %w", err)
+	}
+	return nil
 }
 
 // getListener finds an available port starting from the specified port and returns the listener

internal/tiger/config/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strconv"
 
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -13,19 +14,23 @@ type Config struct {
 	APIURL          string `mapstructure:"api_url" yaml:"api_url"`
 	ConsoleURL      string `mapstructure:"console_url" yaml:"console_url"`
 	GatewayURL      string `mapstructure:"gateway_url" yaml:"gateway_url"`
+	DocsMCP         bool   `mapstructure:"docs_mcp" yaml:"docs_mcp"`
+	DocsMCPURL      string `mapstructure:"docs_mcp_url" yaml:"docs_mcp_url"`
 	ProjectID       string `mapstructure:"project_id" yaml:"project_id"`
 	ServiceID       string `mapstructure:"service_id" yaml:"service_id"`
 	Output          string `mapstructure:"output" yaml:"output"`
 	Analytics       bool   `mapstructure:"analytics" yaml:"analytics"`
 	PasswordStorage string `mapstructure:"password_storage" yaml:"password_storage"`
-	ConfigDir       string `mapstructure:"config_dir" yaml:"-"`
 	Debug           bool   `mapstructure:"debug" yaml:"debug"`
+	ConfigDir       string `mapstructure:"config_dir" yaml:"-"`
 }
 
 const (
 	DefaultAPIURL          = "https://console.cloud.timescale.com/public/api/v1"
 	DefaultConsoleURL      = "https://console.cloud.timescale.com"
 	DefaultGatewayURL      = "https://console.cloud.timescale.com/api"
+	DefaultDocsMCP         = true
+	DefaultDocsMCPURL      = "https://mcp.tigerdata.com/docs"
 	DefaultOutput          = "table"
 	DefaultAnalytics       = true
 	DefaultPasswordStorage = "keyring"
@@ -47,6 +52,8 @@ func SetupViper(configDir string) error {
 	viper.SetDefault("api_url", DefaultAPIURL)
 	viper.SetDefault("console_url", DefaultConsoleURL)
 	viper.SetDefault("gateway_url", DefaultGatewayURL)
+	viper.SetDefault("docs_mcp", DefaultDocsMCP)
+	viper.SetDefault("docs_mcp_url", DefaultDocsMCPURL)
 	viper.SetDefault("project_id", "")
 	viper.SetDefault("service_id", "")
 	viper.SetDefault("output", DefaultOutput)
@@ -96,6 +103,8 @@ func (c *Config) Save() error {
 	viper.Set("api_url", c.APIURL)
 	viper.Set("console_url", c.ConsoleURL)
 	viper.Set("gateway_url", c.GatewayURL)
+	viper.Set("docs_mcp", c.DocsMCP)
+	viper.Set("docs_mcp_url", c.DocsMCPURL)
 	viper.Set("project_id", c.ProjectID)
 	viper.Set("service_id", c.ServiceID)
 	viper.Set("output", c.Output)
@@ -118,6 +127,14 @@ func (c *Config) Set(key, value string) error {
 		c.ConsoleURL = value
 	case "gateway_url":
 		c.GatewayURL = value
+	case "docs_mcp":
+		b, err := setBool("docs_mcp", value)
+		if err != nil {
+			return err
+		}
+		c.DocsMCP = b
+	case "docs_mcp_url":
+		c.DocsMCPURL = value
 	case "project_id":
 		c.ProjectID = value
 	case "service_id":
@@ -128,33 +145,37 @@ func (c *Config) Set(key, value string) error {
 		}
 		c.Output = value
 	case "analytics":
-		if value == "true" {
-			c.Analytics = true
-		} else if value == "false" {
-			c.Analytics = false
-		} else {
-			return fmt.Errorf("invalid analytics value: %s (must be true or false)", value)
-		}
-	case "debug":
-		if value == "true" {
-			c.Debug = true
-		} else if value == "false" {
-			c.Debug = false
-		} else {
-			return fmt.Errorf("invalid debug value: %s (must be true or false)", value)
+		b, err := setBool("analytics", value)
+		if err != nil {
+			return err
 		}
+		c.Analytics = b
 	case "password_storage":
 		if value != "keyring" && value != "pgpass" && value != "none" {
 			return fmt.Errorf("invalid password_storage value: %s (must be keyring, pgpass, or none)", value)
 		}
 		c.PasswordStorage = value
+	case "debug":
+		b, err := setBool("debug", value)
+		if err != nil {
+			return err
+		}
+		c.Debug = b
 	default:
 		return fmt.Errorf("unknown configuration key: %s", key)
 	}
 
 	return c.Save()
 }
 
+func setBool(key, val string) (bool, error) {
+	b, err := strconv.ParseBool(val)
+	if err != nil {
+		return false, fmt.Errorf("invalid %s value: %s (must be true or false)", key, val)
+	}
+	return b, nil
+}
+
 func (c *Config) Unset(key string) error {
 	switch key {
 	case "api_url":
@@ -163,6 +184,10 @@ func (c *Config) Unset(key string) error {
 		c.ConsoleURL = DefaultConsoleURL
 	case "gateway_url":
 		c.GatewayURL = DefaultGatewayURL
+	case "docs_mcp":
+		c.DocsMCP = DefaultDocsMCP
+	case "docs_mcp_url":
+		c.DocsMCPURL = DefaultDocsMCPURL
 	case "project_id":
 		c.ProjectID = ""
 	case "service_id":
@@ -171,10 +196,10 @@ func (c *Config) Unset(key string) error {
 		c.Output = DefaultOutput
 	case "analytics":
 		c.Analytics = DefaultAnalytics
-	case "debug":
-		c.Debug = DefaultDebug
 	case "password_storage":
 		c.PasswordStorage = DefaultPasswordStorage
+	case "debug":
+		c.Debug = DefaultDebug
 	default:
 		return fmt.Errorf("unknown configuration key: %s", key)
 	}
@@ -186,6 +211,8 @@ func (c *Config) Reset() error {
 	c.APIURL = DefaultAPIURL
 	c.ConsoleURL = DefaultConsoleURL
 	c.GatewayURL = DefaultGatewayURL
+	c.DocsMCP = DefaultDocsMCP
+	c.DocsMCPURL = DefaultDocsMCPURL
 	c.ProjectID = ""
 	c.ServiceID = ""
 	c.Output = DefaultOutput