disable embedded mcp server by default to let users opt-in, setting pre-defined port, avoid conflicts with server.port when starting up the language server

Author: martinlippert

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java

@@ -46,15 +46,16 @@ private List<String> getJVMArgs() {
 		args.add("-XX:TieredStopAtLevel=1");
 		args.add("-Dspring.config.location=classpath:/application.properties");
 
-		// disable embedded MCP server, depending on preference
-		if (BootLanguageServerPlugin.getDefault().getPreferenceStore().getBoolean(Constants.PREF_AI_MCP_ENABLED) == false) {
-			args.add("-Dspring.main.web-application-type=NONE");
-		}
-		
+		// enable/disable embedded MCP server, depending on preference
+		boolean mcpServerEnabled = BootLanguageServerPlugin.getDefault().getPreferenceStore().getBoolean(Constants.PREF_AI_MCP_ENABLED);
 		int mcpServerPort = BootLanguageServerPlugin.getDefault().getPreferenceStore().getInt(Constants.PREF_AI_MCP_PORT);
-		if (mcpServerPort >= 0 && mcpServerPort < 65536) {
+
+		if (mcpServerEnabled && mcpServerPort >= 0 && mcpServerPort < 65536) {
 			args.add("-Dserver.port=" + mcpServerPort);
 		}
+		else {
+			args.add("-Dspring.main.web-application-type=NONE");
+		}
 
 		addCustomJVMArgs(args);
 

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/AiConfigPreferencePage.java

@@ -33,7 +33,7 @@ public void init(IWorkbench workbench) {
 	@Override
 	protected void createFieldEditors() {
 		Composite fieldEditorParent = getFieldEditorParent();
-		addField(new BooleanFieldEditor(Constants.PREF_AI_MCP_ENABLED, "Enable embedded MCP server", fieldEditorParent));
+		addField(new BooleanFieldEditor(Constants.PREF_AI_MCP_ENABLED, "Enable embedded MCP server (experimental)", fieldEditorParent));
 		addField(new StringFieldEditor(Constants.PREF_AI_MCP_PORT, "Port used by the embedded MCP server", fieldEditorParent));
 	}
 

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java

@@ -69,8 +69,8 @@ public void initializeDefaultPreferences() {
 		preferenceStore.setDefault(Constants.PREF_CODELENS_QUERY_METHODS, true);
 		preferenceStore.setDefault(Constants.PREF_CODELENS_WEB_CONFIGS_ON_CONTROLLER_CLASSES, true);
 
-		preferenceStore.setDefault(Constants.PREF_AI_MCP_ENABLED, true);
-		preferenceStore.setDefault(Constants.PREF_AI_MCP_PORT, 0);
+		preferenceStore.setDefault(Constants.PREF_AI_MCP_ENABLED, false);
+		preferenceStore.setDefault(Constants.PREF_AI_MCP_PORT, 50627);
 	}
 
 }

headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageServerRunner.java

@@ -217,25 +217,25 @@ private <T> Launcher<T> createSocketLauncher(
 	}
 
 	private static Connection connectToNode() throws IOException {
-		String port = System.getProperty("server.port");
-
-		if (port != null) {
-			Socket socket = new Socket("localhost", Integer.parseInt(port));
-
-			InputStream in = socket.getInputStream();
-			OutputStream out = socket.getOutputStream();
-
-			log.info("Connected to parent using socket on port {}", port);
-			return new Connection(in, out, socket);
-		}
-		else {
+//		String port = System.getProperty("server.port");
+//
+//		if (port != null) {
+//			Socket socket = new Socket("localhost", Integer.parseInt(port));
+//
+//			InputStream in = socket.getInputStream();
+//			OutputStream out = socket.getOutputStream();
+//
+//			log.info("Connected to parent using socket on port {}", port);
+//			return new Connection(in, out, socket);
+//		}
+//		else {
 			InputStream in = System.in;
 			PrintStream out = System.out;
 
 			log.info("Connected to parent using stdio");
 
 			return new Connection(in, out, null);
-		}
+//		}
 	}
 
 	private Future<Void> runAsync(Connection connection) throws Exception {

vscode-extensions/vscode-spring-boot/lib/Main.ts

@@ -49,14 +49,15 @@ export function activate(context: ExtensionContext): Thenable<ExtensionAPI> {
     const specificVmArgs = ["-Dspring.config.location=classpath:/application.properties"];
 
     const aiPreferencesConfig = workspace.getConfiguration("boot-java.ai");
-    if (aiPreferencesConfig.get("mcp-server-enabled") === false) {
-        specificVmArgs.push("-Dspring.main.web-application-type=NONE");
-    }
+    const mcpServerEnabled = aiPreferencesConfig.get("mcp-server-enabled");
+    const mcpServerPort = aiPreferencesConfig.get<number>("mcp-server-port", 50627);
 
-    var mcpServerPort = aiPreferencesConfig.get<number>("mcp-server-port", 0);
-    if (mcpServerPort >= 0 && mcpServerPort <= 655536) {
+    if (mcpServerEnabled === true && mcpServerPort >= 0 && mcpServerPort <= 655536) {
         specificVmArgs.push("-Dserver.port=" + mcpServerPort);
     }
+    else {
+        specificVmArgs.push("-Dspring.main.web-application-type=NONE");
+    }
 
     let options : commons.ActivatorOptions = {
         DEBUG: false,

vscode-extensions/vscode-spring-boot/package.json

@@ -584,12 +584,12 @@
         "properties": {
           "boot-java.ai.mcp-server-enabled": {
             "type": "boolean",
-            "default": true,
-            "description": "Enable embedded MCP server"
+            "default": false,
+            "description": "Enable embedded MCP server (experimental)"
           },
           "boot-java.ai.mcp-server-port": {
             "type": "integer",
-            "default": 0,
+            "default": 50627,
             "description": "Port used by the embedded MCP serverr"
           }
         }