Implement Model Context Protocol (MCP) server #1926

cli/golem-cli/Cargo.toml

@@ -101,6 +101,10 @@ tracing = { workspace = true }
 tracing-log = "0.2.0"
 tracing-subscriber = { workspace = true }
 tree-sitter = { workspace = true }
+axum = { workspace = true }
+rmcp = { workspace = true }
+tower = { workspace = true }
+http = { workspace = true }
 tree-sitter-json = { workspace = true }
 tree-sitter-rust = { workspace = true }
 tree-sitter-typescript = { workspace = true }

cli/golem-cli/src/command.rs

@@ -59,7 +59,7 @@ pub struct GolemCliCommand {
     pub global_flags: GolemCliGlobalFlags,
 
     #[clap(subcommand)]
-    pub subcommand: GolemCliSubcommand,
+    pub subcommand: Option<GolemCliSubcommand>,
 }
 
 impl GolemCliCommand {
@@ -196,6 +196,14 @@ pub struct GolemCliGlobalFlags {
     #[arg(long, global = true, display_order = 112)]
     pub dev_mode: bool,
 
+    /// Run golem-cli as an MCP server over HTTP/SSE
+    #[arg(long, global = true, display_order = 113)]
+    pub serve: bool,
+
+    /// Port for the MCP HTTP/SSE server
+    #[arg(long, global = true, requires = "serve", display_order = 114)]
+    pub serve_port: Option<u16>,
+
     #[command(flatten)]
     verbosity: Verbosity,
 
@@ -407,6 +415,13 @@ impl GolemCliCommand {
                         }
                     };
 
+                if fallback_command.global_flags.serve {
+                    return GolemCliCommandParseResult::FullMatch(GolemCliCommand {
+                        global_flags: fallback_command.global_flags,
+                        subcommand: None,
+                    });
+                }
+
                 let partial_match = match error.kind() {
                     ErrorKind::DisplayHelp => {
                         let positional_args = fallback_command

cli/golem-cli/src/command_handler/mod.rs

@@ -41,6 +41,7 @@ use crate::command_handler::worker::WorkerCommandHandler;
 use crate::context::Context;
 use crate::error::{ContextInitHintError, HintError, NonSuccessfulExit, PipedExitCode};
 use crate::log::{log_anyhow_error, logln, set_log_output, Output};
+use crate::mcp_adapter::McpServer;
 use crate::{command_name, init_tracing};
 use anyhow::anyhow;
 use clap::CommandFactory;
@@ -139,18 +140,19 @@ impl<Hooks: CommandHandlerHooks + 'static> CommandHandler<Hooks> {
         let result = match GolemCliCommand::try_parse_from_lenient(args_iterator, true) {
             GolemCliCommandParseResult::FullMatch(command) => {
                 #[cfg(feature = "server-commands")]
-                let verbosity = if matches!(command.subcommand, GolemCliSubcommand::Server { .. }) {
-                    Hooks::override_verbosity(command.global_flags.verbosity())
-                } else {
-                    command.global_flags.verbosity()
-                };
+                let verbosity =
+                    if matches!(command.subcommand, Some(GolemCliSubcommand::Server { .. })) {
+                        Hooks::override_verbosity(command.global_flags.verbosity())
+                    } else {
+                        command.global_flags.verbosity()
+                    };
                 #[cfg(feature = "server-commands")]
-                let pretty_mode = if matches!(command.subcommand, GolemCliSubcommand::Server { .. })
-                {
-                    Hooks::override_pretty_mode()
-                } else {
-                    false
-                };
+                let pretty_mode =
+                    if matches!(command.subcommand, Some(GolemCliSubcommand::Server { .. })) {
+                        Hooks::override_pretty_mode()
+                    } else {
+                        false
+                    };
                 #[cfg(not(feature = "server-commands"))]
                 let verbosity = command.global_flags.verbosity();
                 #[cfg(not(feature = "server-commands"))]
@@ -250,7 +252,15 @@ impl<Hooks: CommandHandlerHooks + 'static> CommandHandler<Hooks> {
         command: GolemCliCommand,
     ) -> std::pin::Pin<Box<dyn std::future::Future<Output = anyhow::Result<()>> + '_>> {
         Box::pin(async move {
-            match command.subcommand {
+            if command.global_flags.serve {
+                let port = command.global_flags.serve_port.unwrap_or(1232);
+                return McpServer::new(self.ctx.clone()).run(port).await;
+            }
+
+            match command
+                .subcommand
+                .expect("subcommand required unless --serve is used")
+            {
                 // App scoped root commands
                 GolemCliSubcommand::New {
                     application_path,

cli/golem-cli/src/lib.rs

@@ -41,6 +41,7 @@ pub mod evcxr_repl;
 pub mod fs;
 pub mod fuzzy;
 pub mod log;
+pub mod mcp_adapter;
 pub mod model;
 pub mod process;
 pub mod sdk_overrides;