wip

Author: bobbyhouse

cmd/docker-mcp/commands/gateway.go

@@ -138,6 +138,8 @@ func gatewayCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command
 				}
 
 				// Set server names from the working-set
+				// These are treated as server references (can be OCI image refs or catalog names)
+				// and will go through the self-contained catalog resolution
 				options.ServerNames = ws.Servers
 			}
 

cmd/docker-mcp/commands/working-set.go

@@ -28,23 +28,29 @@ func createWorkingSetCommand() *cobra.Command {
 		Servers     []string
 	}
 	cmd := &cobra.Command{
-		Use:   "create --name <name> [--description <description>] --server <server1> --server <server2> ...",
+		Use:   "create --name <name> [--description <description>] --server <ref1> --server <ref2> ...",
 		Short: "Create a new working-set of MCP servers",
 		Long: `Create a new working-set that groups multiple MCP servers together.
-A working-set allows you to organize and manage related servers as a single unit.`,
-		Example: `  # Create a working-set with multiple servers
-  docker mcp working-set create --name dev-tools --description "Development tools" --server github --server slack
+A working-set allows you to organize and manage related servers as a single unit.
+Working-sets are decoupled from catalogs. Servers can be:
+  - Catalog server names (e.g., "github", "docker")
+  - OCI image references with docker:// prefix (e.g., "docker://mcp/github:latest")`,
+		Example: `  # Create a working-set with multiple servers (OCI references)
+  docker mcp working-set create --name dev-tools --description "Development tools" --server docker://mcp/github:latest --server docker://mcp/slack:latest
 
-  # Create a working-set with a single server
-  docker mcp working-set create --name docker-only --server docker`,
+  # Create a working-set with catalog server names
+  docker mcp working-set create --name catalog-servers --server github --server docker
+
+  # Mix catalog names and OCI references
+  docker mcp working-set create --name mixed --server github --server docker://custom/server:v1`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return workingset.Create(opts.Name, opts.Description, opts.Servers)
 		},
 	}
 	flags := cmd.Flags()
 	flags.StringVar(&opts.Name, "name", "", "Name of the working-set (required)")
 	flags.StringVar(&opts.Description, "description", "", "Description of the working-set")
-	flags.StringArrayVar(&opts.Servers, "server", []string{}, "Server to include in the working-set (can be specified multiple times)")
+	flags.StringArrayVar(&opts.Servers, "server", []string{}, "Server to include: catalog name or OCI reference with docker:// prefix (can be specified multiple times)")
 
 	_ = cmd.MarkFlagRequired("name")
 	_ = cmd.MarkFlagRequired("server")

cmd/docker-mcp/working-set/list.go

@@ -48,8 +48,8 @@ func SupportedFormats() string {
 
 // WorkingSetListMetadata contains summary info about a working-set (excluding full server list)
 type WorkingSetListMetadata struct {
-	Description  string `json:"description,omitempty" yaml:"description,omitempty"`
-	ServerCount  int    `json:"serverCount" yaml:"serverCount"`
+	Description string `json:"description,omitempty" yaml:"description,omitempty"`
+	ServerCount int    `json:"serverCount" yaml:"serverCount"`
 }
 
 type ListOutput struct {

pkg/oci/self_contained.go

@@ -30,13 +30,19 @@ func SelfContainedCatalog(ctx context.Context, dockerClient docker.Client, serve
 			}
 
 			metadataLabel, exists := inspect.Config.Labels["io.docker.server.metadata"]
-			if !exists {
-				return catalog.Catalog{}, nil, fmt.Errorf("server name %s looks like an OCI ref but is missing the io.docker.server.metadata label", serverName)
-			}
 
 			var server catalog.Server
-			if err := yaml.Unmarshal([]byte(metadataLabel), &server); err != nil {
-				return catalog.Catalog{}, nil, fmt.Errorf("failed to parse metadata label for %s: %w", serverName, err)
+			if exists {
+				// If metadata label exists, parse it for full server configuration
+				if err := yaml.Unmarshal([]byte(metadataLabel), &server); err != nil {
+					return catalog.Catalog{}, nil, fmt.Errorf("failed to parse metadata label for %s: %w", serverName, err)
+				}
+			} else {
+				// If no metadata label, create a minimal server entry with just the image
+				// This allows plain MCP server images to work without requiring the label
+				server = catalog.Server{
+					Type: "server",
+				}
 			}
 
 			server.Image = ociRef