fix clippy, rename tool

Author: SteveL-MSFT

dsc/locales/en-us.toml

@@ -60,9 +60,11 @@ failedToStartMcpServer = "Failed to start MCP server: %{error}"
 
 [mcp.mod]
 failedToInitialize = "Failed to initialize MCP server: %{error}"
+failedToStart = "Failed to start MCP server: %{error}"
 instructions = "This server provides tools that work with DSC (DesiredStateConfiguration) which enables users to manage and configure their systems declaratively."
 serverStopped = "MCP server stopped"
 failedToWait = "Failed to wait for MCP server: %{error}"
+failedToCreateRuntime = "Failed to create async runtime: %{error}"
 
 [resolve]
 processingInclude = "Processing Include input"

dsc/src/mcp/list_resources.rs renamed to dsc/src/mcp/list_dsc_resources.rs

@@ -39,7 +39,7 @@ impl McpServer {
             open_world_hint = true,
         )
     )]
-    async fn list_resources(&self) -> Result<Json<ResourceListResult>, McpError> {
+    async fn list_dsc_resources(&self) -> Result<Json<ResourceListResult>, McpError> {
         let result = task::spawn_blocking(move || {
             let mut dsc = DscManager::new();
             let mut resources = Vec::new();

dsc/src/mcp/mod.rs

@@ -13,7 +13,7 @@ use rmcp::{
 };
 use rust_i18n::t;
 
-pub mod list_resources;
+pub mod list_dsc_resources;
 
 #[derive(Debug, Clone)]
 pub struct McpServer {
@@ -48,24 +48,32 @@ impl ServerHandler for McpServer {
 /// # Errors
 ///
 /// This function will return an error if the MCP server fails to start.
-#[tokio::main(flavor = "multi_thread")]
-pub async fn start_mcp_server() -> Result<(), McpError> {
-    let service = match McpServer::new().serve(stdio()).await {
-        Ok(service) => service,
-        Err(err) => {
-            tracing::error!(error = %err, "Failed to start MCP server");
-            return Err(McpError::internal_error(t!("mcp.mod.failedToInitialize", error = err.to_string()), None));
-        }
-    };
+pub async fn start_mcp_server_async() -> Result<(), McpError> {
+    // Initialize the MCP server
+    let server = McpServer::new();
 
-    match service.waiting().await {
-        Ok(_) => {
-            tracing::info!("{}", t!("mcp.mod.serverStopped"));
-        }
-        Err(err) => {
-            tracing::error!("{}", t!("mcp.mod.failedToWait", error = err));
-        }
-    }
+    // Try to create the service with proper error handling
+    let service = server.serve(stdio()).await
+        .map_err(|err|  McpError::internal_error(t!("mcp.mod.failedToInitialize", error = err.to_string()), None))?;
+
+    // Wait for the service to complete with proper error handling
+    service.waiting().await
+        .map_err(|err| McpError::internal_error(t!("mcp.mod.serverWaitFailed", error = err.to_string()), None))?;
+
+    tracing::info!("{}", t!("mcp.mod.serverStopped"));
+    Ok(())
+}
+
+/// Synchronous wrapper to start the MCP server
+///
+/// # Errors
+///
+/// This function will return an error if the MCP server fails to start or if the tokio runtime cannot be created.
+pub fn start_mcp_server() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    let rt = tokio::runtime::Runtime::new()
+        .map_err(|e| McpError::internal_error(t!("mcp.mod.failedToCreateRuntime", error = e.to_string()), None))?;
 
+    rt.block_on(start_mcp_server_async())
+        .map_err(|e| McpError::internal_error(t!("mcp.mod.failedToStart", error = e.to_string()), None))?;
     Ok(())
 }

dsc/tests/dsc_mcp.tests.ps1

@@ -73,16 +73,16 @@ Describe 'Tests for MCP server' {
 
         $response.id | Should -Be 2
         $response.result.tools.Count | Should -Be 1
-        $response.result.tools[0].name | Should -BeExactly 'list_resources'
+        $response.result.tools[0].name | Should -BeExactly 'list_dsc_resources'
     }
 
-    It 'Calling list_resources works' {
+    It 'Calling list_dsc_resources works' {
         $mcpRequest = @{
             jsonrpc = "2.0"
             id = 3
             method = "tools/call"
             params = @{
-                name = "list_resources"
+                name = "list_dsc_resources"
                 arguments = @{}
             }
         }