Merge branch 'main' of https://github.com/docker/mcp-gateway into bootstrap_server

Author: kgprs

cmd/docker-mcp/catalog/ls.go

@@ -6,10 +6,13 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/docker/cli/cli/command"
+
+	"github.com/docker/mcp-gateway/cmd/docker-mcp/hints"
 	"github.com/docker/mcp-gateway/pkg/telemetry"
 )
 
-func Ls(ctx context.Context, format Format) error {
+func Ls(ctx context.Context, dockerCli command.Cli, format Format) error {
 	// Initialize telemetry
 	telemetry.Init()
 
@@ -32,13 +35,13 @@ func Ls(ctx context.Context, format Format) error {
 		}
 		fmt.Println(string(data))
 	} else {
-		humanPrintCatalog(*cfg)
+		humanPrintCatalog(dockerCli, *cfg)
 	}
 
 	return nil
 }
 
-func humanPrintCatalog(cfg Config) {
+func humanPrintCatalog(dockerCli command.Cli, cfg Config) {
 	if len(cfg.Catalogs) == 0 {
 		fmt.Println("No catalogs configured.")
 		return
@@ -47,4 +50,9 @@ func humanPrintCatalog(cfg Config) {
 	for name, catalog := range cfg.Catalogs {
 		fmt.Printf("%s: %s\n", name, catalog.DisplayName)
 	}
+	if hints.Enabled(dockerCli) {
+		hints.TipCyan.Print("Tip: To browse a catalog's servers, use ")
+		hints.TipCyanBoldItalic.Print("docker mcp catalog show <catalog-name>")
+		fmt.Println()
+	}
 }

cmd/docker-mcp/catalog/show.go

@@ -9,10 +9,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/cli/cli/command"
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"github.com/moby/term"
 	"gopkg.in/yaml.v3"
 
+	"github.com/docker/mcp-gateway/cmd/docker-mcp/hints"
 	"github.com/docker/mcp-gateway/pkg/yq"
 )
 
@@ -53,7 +55,7 @@ func SupportedFormats() string {
 	return strings.Join(quoted, ", ")
 }
 
-func Show(ctx context.Context, name string, format Format, mcpOAuthDcrEnabled bool) error {
+func Show(ctx context.Context, dockerCli command.Cli, name string, format Format, mcpOAuthDcrEnabled bool) error {
 	cfg, err := ReadConfigWithDefaultCatalog(ctx)
 	if err != nil {
 		return err
@@ -153,6 +155,12 @@ func Show(ctx context.Context, name string, format Format, mcpOAuthDcrEnabled bo
 	fmt.Printf("  %s\n", strings.Repeat("─", headerLineWidth))
 	fmt.Printf("  %d servers total\n", serverCount)
 	fmt.Println()
+	if hints.Enabled(dockerCli) {
+		hints.TipCyan.Print("Tip: To view server details, use ")
+		hints.TipCyanBoldItalic.Print("docker mcp server inspect <server-name>")
+		hints.TipCyan.Print(". To add servers, use ")
+		hints.TipCyanBoldItalic.Println("docker mcp server enable <server-name>")
+	}
 
 	return nil
 }

cmd/docker-mcp/client/config.yml

@@ -71,6 +71,25 @@ system:
       list: '.mcpServers | to_entries | map(.value + {"name": .key})'
       set: .mcpServers[$NAME] = $JSON
       del: del(.mcpServers[$NAME])
+  vscode:
+    displayName: Visual Studio Code
+    source: https://code.visualstudio.com/
+    icon: https://raw.githubusercontent.com/docker/mcp-gateway/main/img/client/vscode.svg
+    installCheckPaths:
+      - /Applications/Visual Studio Code.app
+      - $APPDATA\Code\
+      - $HOME/.config/Code
+    paths:
+      linux:
+        - $HOME/.config/Code/User/mcp.json
+      darwin:
+        - $HOME/Library/Application Support/Code/User/mcp.json
+      windows:
+        - $APPDATA\Code\User\mcp.json
+    yq:
+      list: '.servers | to_entries | map(.value + {"name": .key})'
+      set: .servers[$NAME] = $JSON+{"type":"stdio"}
+      del: del(.servers[$NAME])
   gemini:
     displayName: Gemini CLI
     source: https://github.com/google-gemini/gemini-cli
@@ -211,7 +230,7 @@ project:
       set: .mcpServers[$NAME] = $JSON
       del: del(.mcpServers[$NAME])
   vscode:
-    displayname: VSCode
+    displayname: Visual Studio Code
     projectfile: .vscode/mcp.json
     icon: https://raw.githubusercontent.com/docker/mcp-gateway/main/img/client/vscode.svg
     yq:
@@ -226,4 +245,3 @@ project:
       list: '.mcpServers | to_entries | map(.value + {"name": .key})'
       set: .mcpServers[$NAME] = $JSON+{"type":"stdio"}
       del: del(.mcpServers[$NAME])
-

cmd/docker-mcp/client/connect.go

@@ -3,9 +3,13 @@ package client
 import (
 	"context"
 	"fmt"
+
+	"github.com/docker/cli/cli/command"
+
+	"github.com/docker/mcp-gateway/cmd/docker-mcp/hints"
 )
 
-func Connect(ctx context.Context, cwd string, config Config, vendor string, global, quiet bool) error {
+func Connect(ctx context.Context, dockerCli command.Cli, cwd string, config Config, vendor string, global, quiet bool) error {
 	if vendor == vendorCodex {
 		if !global {
 			return fmt.Errorf("codex only supports global configuration. Re-run with --global or -g")
@@ -33,5 +37,11 @@ func Connect(ctx context.Context, cwd string, config Config, vendor string, glob
 		return err
 	}
 	fmt.Printf("You might have to restart '%s'.\n", vendor)
+	if hints.Enabled(dockerCli) {
+		hints.TipCyan.Print("Tip: Your client is now connected! Use ")
+		hints.TipCyanBoldItalic.Print("docker mcp tools ls")
+		hints.TipCyan.Println(" to see your available tools")
+		fmt.Println()
+	}
 	return nil
 }

cmd/docker-mcp/commands/catalog.go

@@ -23,7 +23,7 @@ func catalogCommand(dockerCli command.Cli) *cobra.Command {
 	cmd.AddCommand(bootstrapCatalogCommand())
 	cmd.AddCommand(importCatalogCommand())
 	cmd.AddCommand(exportCatalogCommand())
-	cmd.AddCommand(lsCatalogCommand())
+	cmd.AddCommand(lsCatalogCommand(dockerCli))
 	cmd.AddCommand(rmCatalogCommand())
 	cmd.AddCommand(updateCatalogCommand(dockerCli))
 	cmd.AddCommand(showCatalogCommand(dockerCli))
@@ -86,7 +86,7 @@ cannot be exported as it is managed by Docker.`,
 	}
 }
 
-func lsCatalogCommand() *cobra.Command {
+func lsCatalogCommand(dockerCli command.Cli) *cobra.Command {
 	var opts struct {
 		Format catalog.Format
 	}
@@ -101,7 +101,7 @@ func lsCatalogCommand() *cobra.Command {
   # List catalogs in JSON format
   docker mcp catalog ls --format=json`,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			return catalog.Ls(cmd.Context(), opts.Format)
+			return catalog.Ls(cmd.Context(), dockerCli, opts.Format)
 		},
 	}
 	flags := cmd.Flags()
@@ -165,7 +165,7 @@ If no name is provided, shows the Docker official catalog.`,
 			}
 
 			mcpOAuthDcrEnabled := isMcpOAuthDcrFeatureEnabled(dockerCli)
-			return catalog.Show(cmd.Context(), name, opts.Format, mcpOAuthDcrEnabled)
+			return catalog.Show(cmd.Context(), dockerCli, name, opts.Format, mcpOAuthDcrEnabled)
 		},
 	}
 	flags := cmd.Flags()

cmd/docker-mcp/commands/client.go

@@ -5,21 +5,21 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/spf13/pflag"
-
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 
 	"github.com/docker/mcp-gateway/cmd/docker-mcp/client"
 )
 
-func clientCommand(cwd string) *cobra.Command {
+func clientCommand(dockerCli command.Cli, cwd string) *cobra.Command {
 	cfg := client.ReadConfig()
 	cmd := &cobra.Command{
 		Use:   fmt.Sprintf("client (Supported: %s)", strings.Join(client.GetSupportedMCPClients(*cfg), ", ")),
 		Short: "Manage MCP clients",
 	}
 	cmd.AddCommand(listClientCommand(cwd, *cfg))
-	cmd.AddCommand(connectClientCommand(cwd, *cfg))
+	cmd.AddCommand(connectClientCommand(dockerCli, cwd, *cfg))
 	cmd.AddCommand(disconnectClientCommand(cwd, *cfg))
 	cmd.AddCommand(manualClientCommand())
 	return cmd
@@ -44,7 +44,7 @@ func listClientCommand(cwd string, cfg client.Config) *cobra.Command {
 	return cmd
 }
 
-func connectClientCommand(cwd string, cfg client.Config) *cobra.Command {
+func connectClientCommand(dockerCli command.Cli, cwd string, cfg client.Config) *cobra.Command {
 	var opts struct {
 		Global bool
 		Quiet  bool
@@ -54,7 +54,7 @@ func connectClientCommand(cwd string, cfg client.Config) *cobra.Command {
 		Short: fmt.Sprintf("Connect the Docker MCP Toolkit to a client. Supported clients: %s", strings.Join(client.GetSupportedMCPClients(cfg), " ")),
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return client.Connect(cmd.Context(), cwd, cfg, args[0], opts.Global, opts.Quiet)
+			return client.Connect(cmd.Context(), dockerCli, cwd, cfg, args[0], opts.Global, opts.Quiet)
 		},
 	}
 	flags := cmd.Flags()

cmd/docker-mcp/commands/feature.go

@@ -199,13 +199,19 @@ func isFeatureEnabledFromCli(dockerCli command.Cli, feature string) bool {
 
 // isFeatureEnabledFromConfig checks if a feature is enabled from a config file
 func isFeatureEnabledFromConfig(configFile *configfile.ConfigFile, feature string) bool {
+	// Features that are enabled by default
+	defaultEnabledFeatures := map[string]bool{
+		"mcp-oauth-dcr": true,
+		"dynamic-tools": true,
+	}
+
 	if configFile.Features == nil {
-		return feature == "mcp-oauth-dcr" // mcp-oauth-dcr is enabled by default
+		return defaultEnabledFeatures[feature]
 	}
 
 	value, exists := configFile.Features[feature]
 	if !exists {
-		return feature == "mcp-oauth-dcr" // mcp-oauth-dcr is enabled by default
+		return defaultEnabledFeatures[feature]
 	}
 
 	// Handle both boolean string values and "enabled"/"disabled" strings

cmd/docker-mcp/commands/feature_test.go

@@ -63,7 +63,15 @@ func TestIsFeatureEnabledDynamicTools(t *testing.T) {
 			Features: make(map[string]string),
 		}
 		enabled := isFeatureEnabledFromConfig(configFile, "dynamic-tools")
-		assert.False(t, enabled, "missing features should default to disabled")
+		assert.True(t, enabled, "dynamic-tools should default to enabled when missing")
+	})
+
+	t.Run("nil features map", func(t *testing.T) {
+		configFile := &configfile.ConfigFile{
+			Features: nil,
+		}
+		enabled := isFeatureEnabledFromConfig(configFile, "dynamic-tools")
+		assert.True(t, enabled, "dynamic-tools should default to enabled when Features is nil")
 	})
 }
 

cmd/docker-mcp/commands/gateway.go

@@ -177,6 +177,7 @@ func gatewayCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command
 	runCmd.Flags().StringVar(&options.Memory, "memory", options.Memory, "Memory allocated to each MCP Server (default is 2Gb)")
 	runCmd.Flags().BoolVar(&options.Static, "static", options.Static, "Enable static mode (aka pre-started servers)")
 	runCmd.Flags().StringVar(&options.LogFilePath, "log", options.LogFilePath, "Path to log file for stderr output (relative or absolute)")
+	runCmd.Flags().StringVar(&options.SessionName, "session", "", "Session name for loading and persisting configuration from ~/.docker/mcp/{SessionName}/")
 
 	// Very experimental features
 	_ = runCmd.Flags().MarkHidden("log")
@@ -295,12 +296,12 @@ func isMcpOAuthDcrFeatureEnabled(dockerCli command.Cli) bool {
 func isDynamicToolsFeatureEnabled(dockerCli command.Cli) bool {
 	configFile := dockerCli.ConfigFile()
 	if configFile == nil || configFile.Features == nil {
-		return false
+		return true // Default enabled when no config exists
 	}
 
 	value, exists := configFile.Features["dynamic-tools"]
 	if !exists {
-		return false
+		return true // Default enabled when not in config
 	}
 
 	return value == "enabled"

cmd/docker-mcp/commands/gateway_test.go

@@ -88,31 +88,31 @@ func TestIsDynamicToolsFeatureEnabled(t *testing.T) {
 			Features: map[string]string{},
 		}
 		enabled := isDynamicToolsFeatureEnabledFromConfig(configFile)
-		assert.False(t, enabled, "should return false when dynamic-tools is not set")
+		assert.True(t, enabled, "should return true when dynamic-tools is not set")
 	})
 
 	t.Run("nil config", func(t *testing.T) {
 		enabled := isDynamicToolsFeatureEnabledFromConfig(nil)
-		assert.False(t, enabled, "should return false when config is nil")
+		assert.True(t, enabled, "should return true when config is nil")
 	})
 
 	t.Run("nil features", func(t *testing.T) {
 		configFile := &configfile.ConfigFile{
 			Features: nil,
 		}
 		enabled := isDynamicToolsFeatureEnabledFromConfig(configFile)
-		assert.False(t, enabled, "should return false when features is nil")
+		assert.True(t, enabled, "should return true when features is nil")
 	})
 }
 
 // Helper function for testing (extract logic from isDynamicToolsFeatureEnabled)
 func isDynamicToolsFeatureEnabledFromConfig(configFile *configfile.ConfigFile) bool {
 	if configFile == nil || configFile.Features == nil {
-		return false
+		return true // Default enabled when no config exists
 	}
 	value, exists := configFile.Features["dynamic-tools"]
 	if !exists {
-		return false
+		return true // Default enabled when not in config
 	}
 	return value == "enabled"
 }