More YAML tests

Author: msabramo

tests/client/config/mcp.yaml

@@ -5,6 +5,9 @@ mcpServers:
   time:
     command: uvx mcp-server-time
 
+  filesystem:
+    command: npx -y @modelcontextprotocol/server-filesystem /Users/username/Desktop /path/to/other/allowed/dir
+
   # Stdio server with full command string
   # The library will automatically parse this.
   # The effective_command will be "python" and effective_args will be ["-m", "my_server"]
@@ -40,12 +43,6 @@ mcpServers:
     args:
       - --debug  # Will be appended to parsed args: ["-m", "my_server", "--debug"]
 
-  # Streamable HTTP server with headers
-  streamable_http_server_with_headers:
-    url: https://api.example.com/mcp
-    headers:
-      Authorization: Bearer token123
-
   # Servers with explicit types - these demonstrate that type inference
   # can be overridden by explicitly specifying the "type" field
 

tests/client/config/test_yaml_functionality.py

@@ -48,7 +48,7 @@ def test_use_pyyaml_parameter_with_json_file():
     assert list(config.servers.keys()) == list(config_json.servers.keys())
 
 
-def test_time_server(mcp_yaml_config_file: Path):
+def test_uvx_time_server(mcp_yaml_config_file: Path):
     """Test the time server configuration with uvx command."""
     config = MCPServersConfig.from_file(mcp_yaml_config_file)
 
@@ -81,3 +81,29 @@ def test_streamable_http_server(mcp_yaml_config_file: Path):
     assert http_server.type == "streamable_http"  # Should be auto-inferred
     assert http_server.url == "https://api.example.com/mcp"
     assert http_server.headers is None  # No headers specified
+
+
+def test_npx_filesystem_server(mcp_yaml_config_file: Path):
+    """Test the filesystem server configuration with full command string and multiple arguments."""
+    config = MCPServersConfig.from_file(mcp_yaml_config_file)
+    
+    # Should have the filesystem server
+    assert "filesystem" in config.servers
+    
+    # Verify the server configuration
+    filesystem_server = config.servers["filesystem"]
+    assert isinstance(filesystem_server, StdioServerConfig)
+    assert filesystem_server.type == "stdio"  # Should be auto-inferred from command field
+    assert filesystem_server.command == "npx -y @modelcontextprotocol/server-filesystem /Users/username/Desktop /path/to/other/allowed/dir"
+    assert filesystem_server.args is None  # No explicit args
+    assert filesystem_server.env is None  # No environment variables
+    
+    # Test the effective command parsing
+    assert filesystem_server.effective_command == "npx"
+    expected_args = [
+        "-y", 
+        "@modelcontextprotocol/server-filesystem", 
+        "/Users/username/Desktop", 
+        "/path/to/other/allowed/dir"
+    ]
+    assert filesystem_server.effective_args == expected_args