McpSyncServer: set immediate execution when in a servlet context

Signed-off-by: Daniel Garnier-Moiroux <[email protected]>

Author: Kehrlann

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpServerAutoConfiguration.java

@@ -55,9 +55,11 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
 import org.springframework.core.log.LogAccessor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MimeType;
+import org.springframework.web.context.support.StandardServletEnvironment;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for the Model Context Protocol (MCP)
@@ -177,7 +179,7 @@ public McpSyncServer mcpSyncServer(McpServerTransportProvider transportProvider,
 			ObjectProvider<List<SyncPromptSpecification>> prompts,
 			ObjectProvider<List<SyncCompletionSpecification>> completions,
 			ObjectProvider<BiConsumer<McpSyncServerExchange, List<McpSchema.Root>>> rootsChangeConsumers,
-			List<ToolCallbackProvider> toolCallbackProvider) {
+			List<ToolCallbackProvider> toolCallbackProvider, Environment environment) {
 
 		McpSchema.Implementation serverInfo = new Implementation(serverProperties.getName(),
 				serverProperties.getVersion());
@@ -259,6 +261,9 @@ public McpSyncServer mcpSyncServer(McpServerTransportProvider transportProvider,
 		serverBuilder.instructions(serverProperties.getInstructions());
 
 		serverBuilder.requestTimeout(serverProperties.getRequestTimeout());
+		if (environment instanceof StandardServletEnvironment) {
+			serverBuilder.immediateExecution(true);
+		}
 
 		return serverBuilder.build();
 	}

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/test/java/org/springframework/ai/mcp/server/autoconfigure/McpWebMvcServerAutoConfigurationIT.java

@@ -17,11 +17,16 @@
 package org.springframework.ai.mcp.server.autoconfigure;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.modelcontextprotocol.server.McpSyncServer;
 import io.modelcontextprotocol.server.transport.WebMvcSseServerTransportProvider;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.web.context.support.StandardServletEnvironment;
 import org.springframework.web.servlet.function.RouterFunction;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -68,4 +73,21 @@ void serverBaseUrlConfiguration() {
 				.isEqualTo("/test"));
 	}
 
+	@Test
+	void servletEnvironmentConfiguration() {
+		new ApplicationContextRunner(() -> new AnnotationConfigApplicationContext() {
+			@Override
+			public ConfigurableEnvironment getEnvironment() {
+				return new StandardServletEnvironment();
+			}
+		}).withConfiguration(
+				AutoConfigurations.of(McpWebMvcServerAutoConfiguration.class, McpServerAutoConfiguration.class))
+			.run(context -> {
+				var mcpSyncServer = context.getBean(McpSyncServer.class);
+				var field = ReflectionUtils.findField(McpSyncServer.class, "immediateExecution");
+				field.setAccessible(true);
+				assertThat(field.getBoolean(mcpSyncServer)).isTrue();
+			});
+	}
+
 }