[FEL] MCP streamable HTTP server implemented with MCP SDK

framework/fel/java/plugins/tool-mcp-server/pom.xml

@@ -41,6 +41,11 @@
             <groupId>org.fitframework.fel</groupId>
             <artifactId>tool-mcp-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.modelcontextprotocol.sdk</groupId>
+            <artifactId>mcp</artifactId>
+            <version>0.14.1</version>
+        </dependency>
 
         <!-- Test -->
         <dependency>
@@ -69,6 +74,16 @@
                 <configuration>
                     <category>system</category>
                     <level>5</level>
+                    <sharedDependencies>
+                        <sharedDependency>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-api</artifactId>
+                        </sharedDependency>
+                        <sharedDependency>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-simple</artifactId>
+                        </sharedDependency>
+                    </sharedDependencies>
                 </configuration>
                 <executions>
                     <execution>

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/support/DefaultMcpServer.java → framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/DefaultMcpStreamableServer.java

@@ -4,13 +4,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-package modelengine.fel.tool.mcp.server.support;
-
-import static modelengine.fitframework.inspection.Validation.notNull;
+package modelengine.fel.tool.mcp.server;
 
+import io.modelcontextprotocol.server.McpServerFeatures;
+import io.modelcontextprotocol.server.McpSyncServer;
+import io.modelcontextprotocol.spec.McpSchema;
 import modelengine.fel.tool.mcp.entity.ServerSchema;
 import modelengine.fel.tool.mcp.entity.Tool;
-import modelengine.fel.tool.mcp.server.McpServer;
 import modelengine.fel.tool.service.ToolChangedObserver;
 import modelengine.fel.tool.service.ToolExecuteService;
 import modelengine.fitframework.annotation.Component;
@@ -23,15 +23,22 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static modelengine.fel.tool.info.schema.PluginSchema.TYPE;
+import static modelengine.fel.tool.info.schema.ToolsSchema.PROPERTIES;
+import static modelengine.fel.tool.info.schema.ToolsSchema.REQUIRED;
+import static modelengine.fitframework.inspection.Validation.notNull;
+
 /**
- * The default implementation of {@link McpServer}.
+ * Mcp Server implementing interface {@link McpServer}, {@link ToolChangedObserver}
+ * with MCP Server Bean {@link McpSyncServer}.
  *
  * @author 季聿阶
  * @since 2025-05-15
  */
 @Component
-public class DefaultMcpServer implements McpServer, ToolChangedObserver {
-    private static final Logger log = Logger.get(DefaultMcpServer.class);
+public class DefaultMcpStreamableServer implements McpServer, ToolChangedObserver {
+    private static final Logger log = Logger.get(DefaultMcpStreamableServer.class);
+    private final McpSyncServer mcpSyncServer;
 
     private final ToolExecuteService toolExecuteService;
     private final Map<String, Tool> tools = new ConcurrentHashMap<>();
@@ -43,8 +50,9 @@ public class DefaultMcpServer implements McpServer, ToolChangedObserver {
      * @param toolExecuteService The service used to execute tools when handling tool call requests.
      * @throws IllegalArgumentException If {@code toolExecuteService} is null.
      */
-    public DefaultMcpServer(ToolExecuteService toolExecuteService) {
+    public DefaultMcpStreamableServer(ToolExecuteService toolExecuteService, McpSyncServer mcpSyncServer) {
         this.toolExecuteService = notNull(toolExecuteService, "The tool execute service cannot be null.");
+        this.mcpSyncServer = mcpSyncServer;
     }
 
     @Override
@@ -53,22 +61,14 @@ public ServerSchema getSchema() {
         ServerSchema.Capabilities.Logging logging = new ServerSchema.Capabilities.Logging();
         ServerSchema.Capabilities.Tools tools = new ServerSchema.Capabilities.Tools(true);
         ServerSchema.Capabilities capabilities = new ServerSchema.Capabilities(logging, tools);
-        return new ServerSchema("2024-11-05", capabilities, info);
+        return new ServerSchema("2025-06-18", capabilities, info);
     }
 
     @Override
     public List<Tool> getTools() {
         return List.copyOf(this.tools.values());
     }
 
-    @Override
-    public Object callTool(String name, Map<String, Object> arguments) {
-        log.info("Calling tool. [toolName={}, arguments={}]", name, arguments);
-        String result = this.toolExecuteService.execute(name, arguments);
-        log.info("Tool called. [result={}]", result);
-        return result;
-    }
-
     @Override
     public void registerToolsChangedObserver(ToolsChangedObserver observer) {
         if (observer != null) {
@@ -90,11 +90,45 @@ public void onToolAdded(String name, String description, Map<String, Object> par
             log.warn("Tool addition is ignored: tool schema is null or empty. [toolName={}]", name);
             return;
         }
+        Object props = parameters.get(PROPERTIES);
+        Object reqs = parameters.get(REQUIRED);
+        if (!(parameters.get(TYPE) instanceof String)
+                || (props != null && (!(props instanceof Map<?, ?>)
+                || ((Map<?, ?>) props).keySet().stream().anyMatch(k -> !(k instanceof String))))
+                || (reqs != null && (!(reqs instanceof List<?>)
+                || ((List<?>) reqs).stream().anyMatch(v -> !(v instanceof String))))) {
+            log.warn("Invalid parameter schema. [toolName={}]", name);
+            return;
+        }
+        @SuppressWarnings("unchecked")
+        McpSchema.JsonSchema inputSchema = new McpSchema.JsonSchema((String) parameters.get(TYPE),
+                (Map<String, Object>) parameters.get(PROPERTIES), (List<String>) parameters.get(REQUIRED),
+                null, null,null);
+        McpServerFeatures.SyncToolSpecification toolSpecification = McpServerFeatures.SyncToolSpecification.builder()
+                .tool(McpSchema.Tool.builder()
+                        .name(name)
+                        .description(description)
+                        .inputSchema(inputSchema)
+                        .build())
+                .callHandler((exchange, request) -> {
+                    Map<String, Object> args = request.arguments();
+                    String result = this.toolExecuteService.execute(name, args);
+                    return new McpSchema.CallToolResult(result, false);
+                })
+                .build();
         Tool tool = new Tool();
         tool.setName(name);
         tool.setDescription(description);
         tool.setInputSchema(parameters);
-        this.tools.put(name, tool);
+
+        try {
+            this.mcpSyncServer.addTool(toolSpecification);
+            this.tools.put(name, tool);
+        } catch (Exception e) {
+            log.error("Failed to add tool: {}", name, e);
+            this.tools.remove(name);
+            return;
+        }
         log.info("Tool added to MCP server. [toolName={}, description={}, schema={}]", name, description, parameters);
         this.toolsChangedObservers.forEach(ToolsChangedObserver::onToolsChanged);
     }
@@ -105,6 +139,7 @@ public void onToolRemoved(String name) {
             log.warn("Tool removal is ignored: tool name is blank.");
             return;
         }
+        this.mcpSyncServer.removeTool(name);
         this.tools.remove(name);
         log.info("Tool removed from MCP server. [toolName={}]", name);
         this.toolsChangedObservers.forEach(ToolsChangedObserver::onToolsChanged);

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/McpServer.java

@@ -10,7 +10,6 @@
 import modelengine.fel.tool.mcp.entity.Tool;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Represents the MCP Server.
@@ -33,15 +32,6 @@ public interface McpServer {
      */
     List<Tool> getTools();
 
-    /**
-     * Calls MCP server tool.
-     *
-     * @param name The tool name as a {@link String}.
-     * @param arguments The tool arguments as a {@link Map}{@code <}{@link String}{@code , }{@link Object}{@code >}.
-     * @return The tool result as a {@link Object}.
-     */
-    Object callTool(String name, Map<String, Object> arguments);
-
     /**
      * Registers MCP server tools changed observer.
      *