Release profiles as the default.

Author: cmrigney

cmd/docker-mcp/commands/catalog.go

@@ -13,12 +13,13 @@ import (
 	"github.com/docker/mcp-gateway/pkg/yq"
 )
 
-func catalogCommand(dockerCli command.Cli) *cobra.Command {
+func deprecatedCatalogCommand(dockerCli command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "catalog",
-		Aliases: []string{"catalogs"},
-		Short:   "Manage MCP server catalogs",
-		Long:    `Manage MCP server catalogs for organizing and configuring custom MCP servers alongside Docker's official catalog.`,
+		Use:     "catalog-deprecated",
+		Aliases: []string{"catalogs-deprecated"},
+		Short:   "Deprecated: Manage MCP server catalogs",
+		Long:    `Deprecated: Manage MCP server catalogs for organizing and configuring custom MCP servers alongside Docker's official catalog.`,
+		Hidden:  true,
 	}
 	cmd.AddCommand(bootstrapCatalogCommand())
 	cmd.AddCommand(importCatalogCommand())

cmd/docker-mcp/commands/catalog_next.go

@@ -13,10 +13,10 @@ import (
 	"github.com/docker/mcp-gateway/pkg/workingset"
 )
 
-func catalogNextCommand() *cobra.Command {
+func catalogCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "catalog-next",
-		Short: "Manage catalogs (next generation)",
+		Use:   "catalog",
+		Short: "Manage MCP server catalogs",
 	}
 
 	cmd.AddCommand(createCatalogNextCommand())

cmd/docker-mcp/commands/client.go

@@ -52,7 +52,7 @@ func connectClientCommand(dockerCli command.Cli, cwd string, cfg client.Config)
 		WorkingSet string
 	}
 	cmd := &cobra.Command{
-		Use:   fmt.Sprintf("connect [OPTIONS] <mcp-client>\n\nSupported clients: %s", strings.Join(client.GetSupportedMCPClients(cfg), " ")),
+		Use:   fmt.Sprintf("connect [OPTIONS] <mcp-client> --profile <profile-id>\n\nSupported clients: %s", strings.Join(client.GetSupportedMCPClients(cfg), " ")),
 		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 {
@@ -62,9 +62,8 @@ func connectClientCommand(dockerCli command.Cli, cwd string, cfg client.Config)
 	flags := cmd.Flags()
 	addGlobalFlag(flags, &opts.Global)
 	addQuietFlag(flags, &opts.Quiet)
-	if isWorkingSetsFeatureEnabled(dockerCli) {
-		addWorkingSetFlag(flags, &opts.WorkingSet)
-	}
+	_ = cmd.MarkFlagRequired(addWorkingSetFlag(flags, &opts.WorkingSet))
+
 	return cmd
 }
 
@@ -125,6 +124,7 @@ func addQuietFlag(flags *pflag.FlagSet, p *bool) {
 	flags.BoolVarP(p, "quiet", "q", false, "Only display errors.")
 }
 
-func addWorkingSetFlag(flags *pflag.FlagSet, p *string) {
+func addWorkingSetFlag(flags *pflag.FlagSet, p *string) string {
 	flags.StringVarP(p, "profile", "p", "", "Profile to use for client connection.")
+	return "profile"
 }

cmd/docker-mcp/commands/feature.go

@@ -40,15 +40,14 @@ Available features:
   oauth-interceptor      Enable GitHub OAuth flow interception for automatic authentication
   mcp-oauth-dcr          Enable Dynamic Client Registration (DCR) for automatic OAuth client setup
   dynamic-tools          Enable internal MCP management tools (mcp-find, mcp-add, mcp-remove)
-	profiles               Enable profile management (docker mcp profile <subcommand>)
   tool-name-prefix       Prefix all tool names with server name to avoid conflicts`,
 		Args: cobra.ExactArgs(1),
 		RunE: func(_ *cobra.Command, args []string) error {
 			featureName := args[0]
 
 			// Validate feature name
 			if !isKnownFeature(featureName) {
-				return fmt.Errorf("unknown feature: %s\n\nAvailable features:\n  oauth-interceptor      Enable GitHub OAuth flow interception\n  mcp-oauth-dcr          Enable Dynamic Client Registration for automatic OAuth setup\n  dynamic-tools          Enable internal MCP management tools\n  profiles               Enable profile management (docker mcp profile <subcommand>)\n  tool-name-prefix       Prefix all tool names with server name", featureName)
+				return fmt.Errorf("unknown feature: %s\n\nAvailable features:\n  oauth-interceptor      Enable GitHub OAuth flow interception\n  mcp-oauth-dcr          Enable Dynamic Client Registration for automatic OAuth setup\n  dynamic-tools          Enable internal MCP management tools\n  tool-name-prefix       Prefix all tool names with server name", featureName)
 			}
 
 			// Enable the feature
@@ -85,11 +84,6 @@ Available features:
 				fmt.Println("  - mcp-add: add MCP servers to the registry and reload configuration")
 				fmt.Println("  - mcp-remove: remove MCP servers from the registry and reload configuration")
 				fmt.Println("\nNo additional flags are needed - this applies to all gateway runs.")
-			case "profiles":
-				fmt.Println("\nThis feature enables profile management tools.")
-				fmt.Println("When enabled, the cli provides commands for managing profiles:")
-				fmt.Println("  - docker mcp profile <subcommand> ...")
-				fmt.Println("\nThis also enables the --profile flag for the docker mcp gateway run command.")
 			case "tool-name-prefix":
 				fmt.Println("\nThis feature enables automatic prefixing of tool names with server names.")
 				fmt.Println("When enabled, all tools are automatically prefixed with their server name:")
@@ -151,7 +145,7 @@ func featureListCommand(dockerCli command.Cli) *cobra.Command {
 			fmt.Println()
 
 			// Show all known features
-			knownFeatures := []string{"oauth-interceptor", "mcp-oauth-dcr", "dynamic-tools", "profiles", "tool-name-prefix"}
+			knownFeatures := []string{"oauth-interceptor", "mcp-oauth-dcr", "dynamic-tools", "tool-name-prefix"}
 			for _, feature := range knownFeatures {
 				status := "disabled"
 				if isFeatureEnabledFromCli(dockerCli, feature) {
@@ -168,8 +162,6 @@ func featureListCommand(dockerCli command.Cli) *cobra.Command {
 					fmt.Printf("  %-20s %s\n", "", "Enable Dynamic Client Registration (DCR) for automatic OAuth client setup")
 				case "dynamic-tools":
 					fmt.Printf("  %-20s %s\n", "", "Enable internal MCP management tools (mcp-find, mcp-add, mcp-remove)")
-				case "profiles":
-					fmt.Printf("  %-20s %s\n", "", "Enable profile management tools (docker mcp profile <subcommand>)")
 				case "tool-name-prefix":
 					fmt.Printf("  %-20s %s\n", "", "Prefix all tool names with server name to avoid conflicts")
 				}
@@ -240,7 +232,6 @@ func isKnownFeature(feature string) bool {
 		"oauth-interceptor",
 		"mcp-oauth-dcr",
 		"dynamic-tools",
-		"profiles",
 		"tool-name-prefix",
 	}
 

cmd/docker-mcp/commands/gateway.go

@@ -47,11 +47,7 @@ func gatewayCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command
 	} else {
 		// On-host.
 		options = gateway.Config{
-			CatalogPath:  []string{catalog.DockerCatalogFilename},
-			RegistryPath: []string{"registry.yaml"},
-			ConfigPath:   []string{"config.yaml"},
-			ToolsPath:    []string{"tools.yaml"},
-			SecretsPath:  "docker-desktop",
+			SecretsPath: "docker-desktop",
 			Options: gateway.Options{
 				Cpus:         1,
 				Memory:       "2Gb",
@@ -68,6 +64,22 @@ func gatewayCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command
 		Short: "Run the gateway",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
+			if len(options.CatalogPath) == 0 && len(options.RegistryPath) == 0 && len(options.ConfigPath) == 0 && len(options.ToolsPath) == 0 {
+				// We're in working set mode, so use the default profile if no profile is specified
+				if options.WorkingSet == "" {
+					options.WorkingSet = "default"
+				}
+			}
+
+			if options.WorkingSet != "" &&
+				(len(options.ServerNames) > 0 || enableAllServers ||
+					len(options.CatalogPath) > 0 || len(options.RegistryPath) > 0 || len(options.ConfigPath) > 0 || len(options.ToolsPath) > 0 ||
+					len(additionalCatalogs) > 0 || len(additionalRegistries) > 0 || len(additionalConfigs) > 0 || len(additionalToolsConfig) > 0 ||
+					len(mcpRegistryUrls) > 0 || len(options.OciRef) > 0 ||
+					options.SecretsPath != "docker-desktop") {
+				return fmt.Errorf("cannot use --profile with --servers, --enable-all-servers, --catalog, --additional-catalog, --registry, --additional-registry, --config, --additional-config, --tools-config, --additional-tools-config, --secrets, --oci-ref, --mcp-registry flags")
+			}
+
 			// Check if OAuth interceptor feature is enabled
 			options.OAuthInterceptorEnabled = isOAuthInterceptorFeatureEnabled(dockerCli)
 
@@ -123,15 +135,6 @@ func gatewayCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command
 				options.MCPRegistryServers = mcpServers
 			}
 
-			if options.WorkingSet != "" {
-				if len(options.ServerNames) > 0 {
-					return fmt.Errorf("cannot use --profile with --servers flag")
-				}
-				if enableAllServers {
-					return fmt.Errorf("cannot use --profile with --enable-all-servers flag")
-				}
-			}
-
 			// Handle --enable-all-servers flag
 			if enableAllServers {
 				if len(options.ServerNames) > 0 {
@@ -169,9 +172,7 @@ func gatewayCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command
 	}
 
 	runCmd.Flags().StringSliceVar(&options.ServerNames, "servers", nil, "Names of the servers to enable (if non empty, ignore --registry flag)")
-	if isWorkingSetsFeatureEnabled(dockerCli) {
-		runCmd.Flags().StringVar(&options.WorkingSet, "profile", "", "Profile ID to use (mutually exclusive with --servers and --enable-all-servers)")
-	}
+	runCmd.Flags().StringVar(&options.WorkingSet, "profile", options.WorkingSet, "Profile ID to use (incompatible with --servers, --enable-all-servers, --catalog, --registry, --config, --tools-config, --secrets, --oci-ref, --mcp-registry)")
 	runCmd.Flags().BoolVar(&enableAllServers, "enable-all-servers", false, "Enable all servers in the catalog (instead of using individual --servers options)")
 	runCmd.Flags().StringSliceVar(&options.CatalogPath, "catalog", options.CatalogPath, "Paths to docker catalogs (absolute or relative to ~/.docker/mcp/catalogs/)")
 	runCmd.Flags().StringSliceVar(&additionalCatalogs, "additional-catalog", nil, "Additional catalog paths to append to the default catalogs")
@@ -345,17 +346,3 @@ func isToolNamePrefixFeatureEnabled(dockerCli command.Cli) bool {
 
 	return value == "enabled"
 }
-
-// isWorkingSetsFeatureEnabled checks if the profiles feature is enabled
-func isWorkingSetsFeatureEnabled(dockerCli command.Cli) bool {
-	configFile := dockerCli.ConfigFile()
-	if configFile == nil || configFile.Features == nil {
-		return false
-	}
-
-	value, exists := configFile.Features["profiles"]
-	if !exists {
-		return false
-	}
-	return value == "enabled"
-}

cmd/docker-mcp/commands/root.go

@@ -70,11 +70,9 @@ func Root(ctx context.Context, cwd string, dockerCli command.Cli) *cobra.Command
 
 	dockerClient := docker.NewClient(dockerCli)
 
-	if isWorkingSetsFeatureEnabled(dockerCli) {
-		cmd.AddCommand(workingSetCommand())
-		cmd.AddCommand(catalogNextCommand())
-	}
-	cmd.AddCommand(catalogCommand(dockerCli))
+	cmd.AddCommand(workingSetCommand())
+	cmd.AddCommand(catalogCommand())
+	cmd.AddCommand(deprecatedCatalogCommand(dockerCli))
 	cmd.AddCommand(clientCommand(dockerCli, cwd))
 	cmd.AddCommand(configCommand(dockerClient))
 	cmd.AddCommand(featureCommand(dockerCli))

cmd/docker-mcp/commands/workingset.go

@@ -20,7 +20,7 @@ func workingSetCommand() *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "profile",
-		Short: "Manage profiles",
+		Short: "Manage MCP profiles",
 	}
 
 	cmd.AddCommand(exportWorkingSetCommand())

docs/profiles.md

@@ -615,11 +615,11 @@ docker mcp profile pull docker.io/myorg/my-tools:1.1
 
 ```bash
 # 1. Import Docker's official catalog (or pull from OCI registry)
-docker mcp catalog-next create docker-mcp-catalog \
+docker mcp catalog create docker-mcp-catalog \
   --from-legacy-catalog https://desktop.docker.com/mcp/catalog/v3/catalog.json
 
 # Or pull a team catalog from OCI registry
-docker mcp catalog-next pull myorg/team-catalog:latest
+docker mcp catalog pull myorg/team-catalog:latest
 
 # 2. Create an initial profile
 docker mcp profile create --name my-workflow
@@ -801,7 +801,7 @@ Error: server 'nonexistent' not found in catalog
 ```
 
 **Solution**: 
-- Use `docker mcp catalog-next show <catalog-name>` to see available servers in the catalog
+- Use `docker mcp catalog show <catalog-name>` to see available servers in the catalog
 - Check that the server name is spelled correctly (names are case-sensitive)
 
 ### Cannot Remove Server
@@ -868,36 +868,36 @@ Error: tool 'invalid_tool' not found in server 'github'
 
 ## Creating Catalogs from Profiles
 
-The `catalog-next` command allows you to create and share catalogs:
+The `catalog` command allows you to create and share catalogs:
 
 ```bash
 # Create a catalog from a working set
-docker mcp catalog-next create my-catalog --from-profile my-profile
+docker mcp catalog create my-catalog --from-profile my-profile
 
 # Create with a custom name
-docker mcp catalog-next create my-catalog --from-profile my-profile --name "My Catalog"
+docker mcp catalog create my-catalog --from-profile my-profile --name "My Catalog"
 
 # Create a catalog from a legacy catalog
-docker mcp catalog-next create docker-mcp-catalog --from-legacy-catalog https://desktop.docker.com/mcp/catalog/v3/catalog.json
+docker mcp catalog create docker-mcp-catalog --from-legacy-catalog https://desktop.docker.com/mcp/catalog/v3/catalog.json
 
 # List all catalogs
-docker mcp catalog-next list
+docker mcp catalog list
 
 # Show catalog details
-docker mcp catalog-next show my-catalog
+docker mcp catalog show my-catalog
 
 # Show a catalog, pulling it if missing (other options include 'never' and 'always')
-docker mcp catalog-next show mcp/docker-mcp-catalog --pull missing
+docker mcp catalog show mcp/docker-mcp-catalog --pull missing
 
 # Remove a catalog
-docker mcp catalog-next remove my-catalog
+docker mcp catalog remove my-catalog
 
 # Push catalog to OCI registry
-docker mcp catalog-next tag my-catalog my-org/my-catalog:latest
-docker mcp catalog-next push myorg/my-catalog:latest
+docker mcp catalog tag my-catalog my-org/my-catalog:latest
+docker mcp catalog push myorg/my-catalog:latest
 
 # Pull catalog from OCI registry
-docker mcp catalog-next pull myorg/my-catalog:latest
+docker mcp catalog pull myorg/my-catalog:latest
 ```
 
 **Key points:**
@@ -909,7 +909,7 @@ docker mcp catalog-next pull myorg/my-catalog:latest
 
 **💡 Tip:** You can import Docker's official MCP catalog as a starting point:
 ```bash
-docker mcp catalog-next create docker-mcp-catalog \
+docker mcp catalog create docker-mcp-catalog \
   --from-legacy-catalog https://desktop.docker.com/mcp/catalog/v3/catalog.json
 ```
 This gives you access to Docker's curated collection of MCP servers, which you can then use to build your profiles with the `--server catalog://docker-mcp-catalog/<server>` flag

pkg/catalog_next/list.go

@@ -19,7 +19,7 @@ func List(ctx context.Context, dao db.DAO, format workingset.OutputFormat) error
 	}
 
 	if len(dbCatalogs) == 0 && format == workingset.OutputFormatHumanReadable {
-		fmt.Println("No catalogs found. Use `docker mcp catalog-next create` or `docker mcp catalog-next pull <oci-reference>` to create a catalog.")
+		fmt.Println("No catalogs found. Use `docker mcp catalog create` or `docker mcp catalog pull <oci-reference>` to create a catalog.")
 		return nil
 	}
 

pkg/catalog_next/list_test.go

@@ -41,7 +41,7 @@ func TestListEmpty(t *testing.T) {
 	})
 
 	assert.Contains(t, output, "No catalogs found")
-	assert.Contains(t, output, "docker mcp catalog-next create")
+	assert.Contains(t, output, "docker mcp catalog create")
 }
 
 func TestListHumanReadable(t *testing.T) {