alibaba · KomachiSion · Apr 21, 2025 · Apr 16, 2025 · Apr 21, 2025 · Apr 21, 2025
diff --git a/ai/src/main/java/com/alibaba/nacos/ai/constant/Constants.java b/ai/src/main/java/com/alibaba/nacos/ai/constant/Constants.java
@@ -35,15 +35,15 @@ public class Constants {
 
     public static final String ALL_PATTERN = com.alibaba.nacos.api.common.Constants.ALL_PATTERN;
 
-    public static final String MCP_SERVER_GROUP = "mcp_server";
+    public static final String MCP_SERVER_GROUP = "mcp-server";
 
-    public static final String MCP_SERVER_TOOL_GROUP = "mcp_server_tool";
+    public static final String MCP_SERVER_TOOL_GROUP = "mcp-tools";
 
-    public static final String MCP_SERVER_SPEC_DATA_ID_SUFFIX = "_mcp_server.json";
+    public static final String MCP_SERVER_SPEC_DATA_ID_SUFFIX = "-mcp-server.json";
 
-    public static final String MCP_SERVER_TOOL_DATA_ID_SUFFIX = "_mcp_server_tool.json";
+    public static final String MCP_SERVER_TOOL_DATA_ID_SUFFIX = "-mcp-server-tool.json";
 
-    public static final String MCP_SERVER_ENDPOINT_GROUP = "mcp_server_endpoint";
+    public static final String MCP_SERVER_ENDPOINT_GROUP = "mcp-endpoints";
 
     public static final String MCP_SERVER_ENDPOINT_CLUSTER = com.alibaba.nacos.api.common.Constants.DEFAULT_CLUSTER_NAME;
 

diff --git a/ai/src/main/java/com/alibaba/nacos/ai/service/McpToolOperationService.java b/ai/src/main/java/com/alibaba/nacos/ai/service/McpToolOperationService.java
@@ -62,7 +62,6 @@ public McpToolOperationService(ConfigQueryChainService configQueryChainService,
     public void refreshMcpTool(String namespaceId, String mcpName, List<McpTool> toolSpecification)
             throws NacosException {
         ConfigRequestInfo configRequestInfo = new ConfigRequestInfo();
-        configRequestInfo.setUpdateForExist(false);
         configOperationService.publishConfig(buildMcpToolConfigForm(namespaceId, mcpName, toolSpecification),
                 configRequestInfo, null);
     }

diff --git a/api/src/main/java/com/alibaba/nacos/api/ai/constant/AiConstants.java b/api/src/main/java/com/alibaba/nacos/api/ai/constant/AiConstants.java
@@ -31,7 +31,7 @@ public static class Mcp {
 
         public static final String MCP_TYPE_SSE_REMOTE = "sse-remote";
 
-        public static final String MCP_TYPE_STREAM_REMOTE = "streamble-remote";
+        public static final String MCP_TYPE_STREAM_REMOTE = "streamable-remote";
 
         public static final String MCP_ENDPOINT_TYPE_REF = "REF";
 

diff --git a/api/src/main/java/com/alibaba/nacos/api/ai/model/mcp/McpEndpointSpec.java b/api/src/main/java/com/alibaba/nacos/api/ai/model/mcp/McpEndpointSpec.java
@@ -16,6 +16,8 @@
 
 package com.alibaba.nacos.api.ai.model.mcp;
 
+import com.alibaba.nacos.api.ai.constant.AiConstants;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -26,8 +28,23 @@
  */
 public class McpEndpointSpec {
 
+    /**
+     * Endpoint type. Should be {@link AiConstants.Mcp#MCP_ENDPOINT_TYPE_DIRECT} or
+     * {@link AiConstants.Mcp#MCP_ENDPOINT_TYPE_REF}.
+     */
     private String type;
 
+    /**
+     * Endpoint data. Depend on the `type`, the data should be different.
+     * <p>
+     *  If `type` is {@link AiConstants.Mcp#MCP_ENDPOINT_TYPE_DIRECT}, the data should be include `address` and `port` to
+     *  spec mcp server endpoint.
+     * </p>
+     * <p>
+     *  If `type` is {@link AiConstants.Mcp#MCP_ENDPOINT_TYPE_REF}, the data should be include `namespaceId`, `groupName` and `serviceName`
+     *  to spec the ref server which already register into Nacos.
+     * </p>
+     */
     private Map<String, String> data = new HashMap<>();
 
     public String getType() {

diff --git a/api/src/main/java/com/alibaba/nacos/api/ai/model/mcp/McpServerBasicInfo.java b/api/src/main/java/com/alibaba/nacos/api/ai/model/mcp/McpServerBasicInfo.java
@@ -16,6 +16,8 @@
 
 package com.alibaba.nacos.api.ai.model.mcp;
 
+import com.alibaba.nacos.api.ai.constant.AiConstants;
+
 import java.util.List;
 import java.util.Map;
 
@@ -28,18 +30,32 @@ public class McpServerBasicInfo {
 
     private String name;
 
+    /**
+     * It should be {@link AiConstants.Mcp#MCP_TYPE_LOCAL}, {@link AiConstants.Mcp#MCP_TYPE_SSE_REMOTE} or
+     * {@link AiConstants.Mcp#MCP_TYPE_STREAM_REMOTE}.
+     */
     private String type;
 
     private String description;
 
     private String version;
 
+    /**
+     * Should be set when `type` is {@link AiConstants.Mcp#MCP_TYPE_SSE_REMOTE} or
+     * {@link AiConstants.Mcp#MCP_TYPE_STREAM_REMOTE}.
+     */
     private McpServerRemoteServiceConfig remoteServerConfig;
 
+    /**
+     * Should be set when `type` is {@link AiConstants.Mcp#MCP_TYPE_LOCAL}.
+     */
     private Map<String, Object> localServerConfig;
 
     private boolean enabled;
 
+    /**
+     * Auto discovery capabilities by Nacos. No need to set when create or update Mcp server.
+     */
     private List<McpCapability> capabilities;
 
     public String getName() {

@@ -17,6 +17,7 @@
 package com.alibaba.nacos.console.config;
 
 import com.alibaba.nacos.auth.config.NacosAuthConfigHolder;
+import com.alibaba.nacos.core.exception.NacosApiExceptionHandler;
 import com.alibaba.nacos.console.filter.NacosConsoleAuthFilter;
 import com.alibaba.nacos.console.filter.XssFilter;
 import com.alibaba.nacos.core.code.ControllerMethodsCache;
@@ -140,4 +141,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
         return http.build();
     }
 
+    @Bean
+    public NacosApiExceptionHandler nacosApiExceptionHandler() {
+        return new NacosApiExceptionHandler();
+    }
 }
@@ -24,6 +24,8 @@
 import com.alibaba.nacos.core.cluster.Member;
 import com.alibaba.nacos.core.cluster.MemberChangeListener;
 import com.alibaba.nacos.core.cluster.MembersChangeEvent;
+import com.alibaba.nacos.maintainer.client.ai.AiMaintainerFactory;
+import com.alibaba.nacos.maintainer.client.ai.AiMaintainerService;
 import com.alibaba.nacos.maintainer.client.config.ConfigMaintainerFactory;
 import com.alibaba.nacos.maintainer.client.config.ConfigMaintainerService;
 import com.alibaba.nacos.maintainer.client.naming.NamingMaintainerFactory;
@@ -52,6 +54,8 @@ public class NacosMaintainerClientHolder extends MemberChangeListener {
 
     private volatile ConfigMaintainerService configMaintainerService;
 
+    private volatile AiMaintainerService aiMaintainerService;
+
     public NacosMaintainerClientHolder(RemoteServerMemberManager memberManager) throws NacosException {
         this.memberManager = memberManager;
         buildMaintainerService();
@@ -65,6 +69,7 @@ private void buildMaintainerService() throws NacosException {
         properties.setProperty(PropertyKeyConst.SERVER_ADDR, memberAddressString);
         namingMaintainerService = NamingMaintainerFactory.createNamingMaintainerService(properties);
         configMaintainerService = ConfigMaintainerFactory.createConfigMaintainerService(properties);
+        aiMaintainerService = AiMaintainerFactory.createAiMaintainerService(properties);
     }
 
     public NamingMaintainerService getNamingMaintainerService() {
@@ -75,6 +80,10 @@ public ConfigMaintainerService getConfigMaintainerService() {
         return configMaintainerService;
     }
 
+    public AiMaintainerService getAiMaintainerService() {
+        return aiMaintainerService;
+    }
+
     @Override
     public void onEvent(MembersChangeEvent event) {
         try {

@@ -16,6 +16,7 @@
 
 package com.alibaba.nacos.console.handler.impl.remote.ai;
 
+import com.alibaba.nacos.ai.constant.Constants;
 import com.alibaba.nacos.api.ai.model.mcp.McpEndpointSpec;
 import com.alibaba.nacos.api.ai.model.mcp.McpServerBasicInfo;
 import com.alibaba.nacos.api.ai.model.mcp.McpServerDetailInfo;
@@ -24,6 +25,7 @@
 import com.alibaba.nacos.api.model.Page;
 import com.alibaba.nacos.console.handler.ai.McpHandler;
 import com.alibaba.nacos.console.handler.impl.remote.EnabledRemoteHandler;
+import com.alibaba.nacos.console.handler.impl.remote.NacosMaintainerClientHolder;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -37,31 +39,43 @@
 @EnabledRemoteHandler
 public class McpRemoteHandler implements McpHandler {
 
+    private final NacosMaintainerClientHolder clientHolder;
+
+    public McpRemoteHandler(NacosMaintainerClientHolder clientHolder) {
+        this.clientHolder = clientHolder;
+    }
+
     @Override
     public Page<McpServerBasicInfo> listMcpServers(String namespaceId, String mcpName, String search, int pageNo,
             int pageSize) throws NacosException {
-        throw new UnsupportedOperationException("AI MCP API not support for console mode.");
+        if (Constants.MCP_LIST_SEARCH_ACCURATE.equalsIgnoreCase(search)) {
+            return clientHolder.getAiMaintainerService().listMcpServer(mcpName, pageNo, pageSize);
+        } else {
+            return clientHolder.getAiMaintainerService().searchMcpServer(mcpName, pageNo, pageSize);
+        }
     }
 
     @Override
     public McpServerDetailInfo getMcpServer(String namespaceId, String mcpName) throws NacosException {
-        throw new UnsupportedOperationException("AI MCP API not support for console mode.");
+        return clientHolder.getAiMaintainerService().getMcpServerDetail(mcpName);
     }
 
     @Override
     public void createMcpServer(String namespaceId, String mcpName, McpServerBasicInfo serverSpecification,
             List<McpTool> toolSpecification, McpEndpointSpec endpointSpecification) throws NacosException {
-        throw new UnsupportedOperationException("AI MCP API not support for console mode.");
+        clientHolder.getAiMaintainerService()
+                .createMcpServer(mcpName, serverSpecification, toolSpecification, endpointSpecification);
     }
 
     @Override
     public void updateMcpServer(String namespaceId, String mcpName, McpServerBasicInfo serverSpecification,
             List<McpTool> toolSpecification, McpEndpointSpec endpointSpecification) throws NacosException {
-        throw new UnsupportedOperationException("AI MCP API not support for console mode.");
+        clientHolder.getAiMaintainerService()
+                .updateMcpServer(mcpName, serverSpecification, toolSpecification, endpointSpecification);
     }
 
     @Override
     public void deleteMcpServer(String namespaceId, String mcpName) throws NacosException {
-        throw new UnsupportedOperationException("AI MCP API not support for console mode.");
+        clientHolder.getAiMaintainerService().deleteMcpServer(mcpName);
     }
 }
@@ -86,6 +86,11 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test-autoconfigure</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -163,5 +168,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
         </dependency>
+
     </dependencies>
 </project>
@@ -106,7 +106,7 @@ public Result<Namespace> getNamespace(@RequestParam("namespaceId") String namesp
     @PostMapping
     @Secured(resource = Commons.NACOS_ADMIN_CORE_CONTEXT_V3
             + "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE, apiType = ApiType.ADMIN_API)
-    public Result<Boolean> createNamespace(NamespaceForm namespaceForm) throws NacosException {
+    public Result<Boolean> createNamespace(NamespaceForm namespaceForm) throws Exception {
         namespaceForm.validate();
 
         String namespaceId = namespaceForm.getNamespaceId();

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 Alibaba Group Holding Ltd.
+ * Copyright 1999-2025 Alibaba Group Holding Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.console.exception;
+package com.alibaba.nacos.core.exception;
 
 import com.alibaba.nacos.api.annotation.NacosApi;
 import com.alibaba.nacos.api.exception.NacosException;

@@ -0,0 +1,28 @@
+/*
+ * Copyright 1999-2025 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.nacos.core;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication(scanBasePackages = "com.alibaba.nacos.core")
+public class CoreUtApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CoreUtApplication.class, args);
+    }
+}
@@ -96,7 +96,7 @@ void testGetNamespace() throws NacosException {
     }
 
     @Test
-    void testCreateNamespace() throws NacosException {
+    void testCreateNamespace() throws Exception {
         NamespaceForm form = new NamespaceForm();
         form.setNamespaceId(TEST_NAMESPACE_ID);
         form.setNamespaceName(TEST_NAMESPACE_NAME);