Update MCP mode as Server mode

dsc/locales/en-us.toml

@@ -35,7 +35,7 @@ resource = "The name of the resource to invoke"
 functionAbout = "Operations on DSC functions"
 listFunctionAbout = "List or find functions"
 version = "The version of the resource to invoke in semver format"
-mcpAbout = "Use DSC as a MCP server"
+serverAbout = "Use DSC as a server over JSON-RPC (useful as MCP server)"
 bicepAbout = "Use DSC as a Bicep server over gRPC"
 
 [main]
@@ -56,7 +56,7 @@ storeMessage = """DSC.exe is a command-line tool and cannot be run directly from
 Visit https://aka.ms/dscv3-docs for more information on how to use DSC.exe.
 
 Press any key to close this window"""
-failedToStartMcpServer = "Failed to start MCP server: %{error}"
+failedToStartServer = "Failed to start server: %{error}"
 
 [mcp.mod]
 failedToInitialize = "Failed to initialize MCP server: %{error}"

dsc/src/args.rs

@@ -93,8 +93,8 @@ pub enum SubCommand {
         #[clap(subcommand)]
         subcommand: FunctionSubCommand,
     },
-    #[clap(name = "mcp", about = t!("args.mcpAbout").to_string())]
-    Mcp,
+    #[clap(name = "server", alias = "mcp", about = t!("args.serverAbout").to_string())]
+    Server,
     #[clap(name = "resource", about = t!("args.resourceAbout").to_string())]
     Resource {
         #[clap(subcommand)]

dsc/src/main.rs

@@ -5,7 +5,7 @@ use args::{Args, SubCommand};
 use clap::{CommandFactory, Parser};
 use clap_complete::generate;
 use dsc_lib::progress::ProgressFormat;
-use mcp::start_mcp_server;
+use server::start_server;
 use rust_i18n::{i18n, t};
 use std::{io, process::exit};
 use sysinfo::{Process, RefreshKind, System, get_current_pid, ProcessRefreshKind};
@@ -19,9 +19,9 @@ use crossterm::event;
 use std::env;
 
 pub mod args;
-pub mod mcp;
 pub mod resolve;
 pub mod resource_command;
+pub mod server;
 pub mod subcommand;
 pub mod tablewriter;
 pub mod util;
@@ -85,10 +85,10 @@ fn main() {
         SubCommand::Function { subcommand } => {
             subcommand::function(&subcommand);
         },
-        SubCommand::Mcp => {
-            if let Err(err) = start_mcp_server() {
-                error!("{}", t!("main.failedToStartMcpServer", error = err));
-                exit(util::EXIT_MCP_FAILED);
+        SubCommand::Server => {
+            if let Err(err) = start_server() {
+                error!("{}", t!("main.failedToStartServer", error = err));
+                exit(util::EXIT_SERVER_FAILED);
             }
             exit(util::EXIT_SUCCESS);
         }

dsc/src/mcp/invoke_dsc_config.rs → dsc/src/server/invoke_dsc_config.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use crate::mcp::mcp_server::McpServer;
+use crate::server::mcp_server::McpServer;
 use dsc_lib::{
     configure::{
         config_doc::Configuration,

dsc/src/mcp/invoke_dsc_resource.rs → dsc/src/server/invoke_dsc_resource.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use crate::mcp::mcp_server::McpServer;
+use crate::server::mcp_server::McpServer;
 use dsc_lib::{
     DscManager, configure::config_doc::ExecutionKind,
     discovery::discovery_trait::DiscoveryFilter,

dsc/src/mcp/list_dsc_functions.rs → dsc/src/server/list_dsc_functions.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use crate::mcp::mcp_server::McpServer;
+use crate::server::mcp_server::McpServer;
 use dsc_lib::functions::{FunctionDispatcher, FunctionDefinition};
 use dsc_lib::util::convert_wildcard_to_regex;
 use rmcp::{ErrorData as McpError, Json, tool, tool_router, handler::server::wrapper::Parameters};
@@ -38,22 +38,22 @@ impl McpServer {
         let result = task::spawn_blocking(move || {
             let function_dispatcher = FunctionDispatcher::new();
             let mut functions = function_dispatcher.list();
-            
+
             // apply filtering if function_filter is provided
             if let Some(name_pattern) = function_filter {
                 let regex_str = convert_wildcard_to_regex(&name_pattern);
                 let mut regex_builder = RegexBuilder::new(&regex_str);
                 regex_builder.case_insensitive(true);
-                
+
                 let regex = regex_builder.build()
                     .map_err(|_| McpError::invalid_params(
-                        t!("mcp.list_dsc_functions.invalidNamePattern", pattern = name_pattern), 
+                        t!("mcp.list_dsc_functions.invalidNamePattern", pattern = name_pattern),
                         None
                     ))?;
-                
+
                 functions.retain(|func| regex.is_match(&func.name));
             }
-            
+
             Ok(FunctionListResult { functions })
         }).await.map_err(|e| McpError::internal_error(e.to_string(), None))??;
 

dsc/src/mcp/list_dsc_resources.rs → dsc/src/server/list_dsc_resources.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use crate::mcp::mcp_server::McpServer;
+use crate::server::mcp_server::McpServer;
 use dsc_lib::{
     DscManager, discovery::{
         command_discovery::ImportedManifest::Resource,

dsc/src/mcp/mod.rs → dsc/src/server/mod.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use crate::mcp::mcp_server::McpServer;
+use crate::server::mcp_server::McpServer;
 use rmcp::{
     ErrorData as McpError,
     ServiceExt,
@@ -22,7 +22,7 @@ pub mod show_dsc_schema;
 /// # Errors
 ///
 /// This function will return an error if the MCP server fails to start.
-pub async fn start_mcp_server_async() -> Result<(), McpError> {
+pub async fn start_server_async() -> Result<(), McpError> {
     // Initialize the MCP server
     let server = McpServer::new();
 
@@ -43,11 +43,11 @@ pub async fn start_mcp_server_async() -> Result<(), McpError> {
 /// # 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>> {
+pub fn start_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())
+    rt.block_on(start_server_async())
         .map_err(|e| McpError::internal_error(t!("mcp.mod.failedToStart", error = e.to_string()), None))?;
     Ok(())
 }

dsc/src/mcp/show_dsc_resource.rs → dsc/src/server/show_dsc_resource.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use crate::mcp::mcp_server::McpServer;
+use crate::server::mcp_server::McpServer;
 use dsc_lib::{
     DscManager,
     discovery::discovery_trait::DiscoveryFilter,

dsc/src/mcp/show_dsc_schema.rs → dsc/src/server/show_dsc_schema.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use crate::{args::SchemaType, mcp::mcp_server::McpServer, util};
+use crate::{args::SchemaType, server::mcp_server::McpServer, util};
 use rmcp::{ErrorData as McpError, Json, tool, tool_router, handler::server::wrapper::Parameters};
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Serialize};

dsc/src/util.rs

@@ -74,7 +74,7 @@ pub const EXIT_VALIDATION_FAILED: i32 = 5;
 pub const EXIT_CTRL_C: i32 = 6;
 pub const EXIT_DSC_RESOURCE_NOT_FOUND: i32 = 7;
 pub const EXIT_DSC_ASSERTION_FAILED: i32 = 8;
-pub const EXIT_MCP_FAILED: i32 = 9;
+pub const EXIT_SERVER_FAILED: i32 = 9;
 pub const EXIT_BICEP_FAILED: i32 = 10;
 
 pub const DSC_CONFIG_ROOT: &str = "DSC_CONFIG_ROOT";

dsc/tests/dsc_mcp.tests.ps1 → dsc/tests/dsc_server.tests.ps1

@@ -1,11 +1,11 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe 'Tests for MCP server' {
+Describe 'Tests for DSC server' {
     BeforeAll {
         $processStartInfo = [System.Diagnostics.ProcessStartInfo]::new()
         $processStartInfo.FileName = "dsc"
-        $processStartInfo.Arguments = "--trace-format plaintext mcp"
+        $processStartInfo.Arguments = "--trace-format plaintext server"
         $processStartInfo.UseShellExecute = $false
         $processStartInfo.RedirectStandardError = $true
         $processStartInfo.RedirectStandardOutput = $true