MCP-324 Remove namespace from proxied servers

nquinquenel · nquinquenel · commit 90b6602d4320 · 2026-03-04T13:05:30.000+01:00
diff --git a/docs/proxied-mcp-servers.md b/docs/proxied-mcp-servers.md
@@ -32,7 +32,6 @@ Proxied MCP servers are defined in `/proxied-mcp-servers.json` (bundled in the J
 [
   {
     "name": "my-server",
-    "namespace": "myserver",
     "command": "node",
     "args": ["path/to/mcp-server.js"],
     "env": {},
@@ -43,20 +42,16 @@ Proxied MCP servers are defined in `/proxied-mcp-servers.json` (bundled in the J
 
 **Fields:**
 - `name` (required): Human-readable server name (for logging)
-- `namespace` (required): Tool name prefix (e.g., tool `analyze` becomes `context/analyze`)
 - `command` (required): Executable command to start the MCP server
 - `args` (optional): Command-line arguments
 - `env` (optional): Environment variables with explicit values. These take precedence over inherited variables.
 - `inherits` (optional): Array of environment variable names to inherit from the parent process. Only variables listed here will be inherited.
 - `supportedTransports` (required): Array of transport modes supported by this provider. Valid values: `"stdio"`, `"http"`. Providers are only loaded if they support the server's current transport mode.
 - `instructions` (optional): Brief instructions to help AI assistants use this provider's tools effectively. These are automatically appended to the server's base instructions.
 
-### Tool Namespacing
+### Tool Names
 
-Proxied tools are prefixed with their namespace to avoid conflicts with the main server's tools, following the [MCP SEP-986 naming convention](https://modelcontextprotocol.io/community/seps/986-specify-format-for-tool-names):
-- Server namespace: `context`
-- Original tool name: `analyze_code`
-- Exposed name: `context/analyze_code`
+Proxied tools are exposed with their original names from the proxied MCP server.
 
 **Tool Name Validation:**
 
@@ -102,7 +97,6 @@ Edit `src/main/resources/proxied-mcp-servers.json`:
 [
   {
     "name": "my-server",
-    "namespace": "myserver",
     "command": "node",
     "args": ["path/to/mcp-server.js"],
     "env": {
@@ -141,7 +135,6 @@ This provides security through explicit allowlisting while maintaining flexibili
 ```json
 {
   "name": "my-server",
-  "namespace": "myserver",
   "command": "python",
   "args": ["-m", "my_mcp_server"],
   "env": {
@@ -159,7 +152,6 @@ The proxied server receives:
 ```json
 {
   "name": "my-server",
-  "namespace": "myserver",
   "command": "python",
   "args": ["-m", "my_mcp_server"],
   "env": {
@@ -178,7 +170,6 @@ If the parent process has `SONARQUBE_TOKEN=secret123` and `SONARQUBE_URL=https:/
 ```json
 {
   "name": "my-server",
-  "namespace": "myserver",
   "command": "python",
   "args": ["-m", "my_mcp_server"],
   "env": {
diff --git a/its/src/test/java/org/sonarsource/sonarqube/mcp/its/ProxiedServerITest.java b/its/src/test/java/org/sonarsource/sonarqube/mcp/its/ProxiedServerITest.java
@@ -52,7 +52,7 @@ void should_successfully_connect_to_cag_proxied_server_when_given_enough_time()
       .contains("Loading proxied MCP servers configuration")
       .contains("Successfully loaded 1 proxied MCP server(s)")
       .contains("Initializing 1 proxied MCP server(s)")
-      .contains("Connecting to 'caas' (namespace: context)")
+      .contains("Connecting to 'caas'")
       .contains("Connected to 'caas' - discovered 1 tool(s)")
       .contains("MCP client manager initialization completed. 1/1 server(s) connected")
       .contains("Loaded 1 proxied tool(s) from 1/1 server(s)");
diff --git a/its/src/test/resources/proxied-mcp-servers-its.json b/its/src/test/resources/proxied-mcp-servers-its.json
@@ -1,7 +1,6 @@
 [
   {
     "name": "caas",
-    "namespace": "context",
     "command": "/app/binaries/sonar-code-context-mcp",
     "args": [],
     "env": {},
diff --git a/src/main/java/org/sonarsource/sonarqube/mcp/client/McpClientManager.java b/src/main/java/org/sonarsource/sonarqube/mcp/client/McpClientManager.java
@@ -65,7 +65,7 @@ public void initialize() {
   private void initializeClient(ProxiedMcpServerConfig config) {
     var serverName = config.name();
     try {
-      LOG.info("Connecting to '" + config.name() + "' (namespace: " + config.namespace() + ")");
+      LOG.info("Connecting to '" + config.name() + "'");
       
       // Build server parameters for STDIO transport
       var serverParamsBuilder = ServerParameters.builder(config.command());
@@ -99,7 +99,7 @@ private void initializeClient(ProxiedMcpServerConfig config) {
       LOG.info("Connected to '" + config.name() + "' - discovered " + tools.size() + " tool(s)");
       clients.put(serverName, client);
       serverTools.put(serverName, tools);
-      tools.forEach(tool -> LOG.debug(" - " + config.namespace() + "/" + tool.name()));
+      tools.forEach(tool -> LOG.debug(" - " + tool.name()));
     } catch (Exception e) {
       LOG.error("Failed to initialize '" + config.name() + "': " + e.getMessage(), e);
       serverErrors.put(serverName, e.getMessage());
@@ -110,13 +110,11 @@ public Map<String, ToolMapping> getAllProxiedTools() {
     var allTools = new HashMap<String, ToolMapping>();
     for (var config : serverConfigs) {
       var serverId = config.name();
-      var namespace = config.namespace();
       var tools = serverTools.getOrDefault(serverId, List.of());
       tools.forEach(tool -> {
-        var namespacedToolName = namespace + "/" + tool.name();
         try {
-          ToolNameValidator.validate(namespacedToolName);
-          allTools.put(namespacedToolName, new ToolMapping(serverId, namespace, tool.name(), tool));
+          ToolNameValidator.validate(tool.name());
+          allTools.put(tool.name(), new ToolMapping(serverId, tool.name(), tool));
         } catch (IllegalArgumentException e) {
           LOG.error("Skipping tool with invalid name from server '" + serverId + "': " + e.getMessage(), e);
         }
@@ -206,6 +204,6 @@ Map<String, String> buildEnvironmentVariables(ProxiedMcpServerConfig config, Map
     return filteredEnv;
   }
 
-  public record ToolMapping(String serverId, String namespace, String originalToolName, McpSchema.Tool tool) {}
+  public record ToolMapping(String serverId, String originalToolName, McpSchema.Tool tool) {}
 
 }
diff --git a/src/main/java/org/sonarsource/sonarqube/mcp/client/ProxiedMcpServerConfig.java b/src/main/java/org/sonarsource/sonarqube/mcp/client/ProxiedMcpServerConfig.java
@@ -21,16 +21,13 @@
 import java.util.Set;
 import javax.annotation.Nullable;
 
-public record ProxiedMcpServerConfig(String name, String namespace, String command, List<String> args, Map<String, String> env,
+public record ProxiedMcpServerConfig(String name, String command, List<String> args, Map<String, String> env,
                                      List<String> inherits, Set<TransportMode> supportedTransports, @Nullable String instructions) {
 
   public ProxiedMcpServerConfig {
     if (name.isBlank()) {
       throw new IllegalArgumentException("Proxied MCP server name cannot be null or blank");
     }
-    if (namespace.isBlank()) {
-      throw new IllegalArgumentException("Proxied MCP server namespace cannot be null or blank");
-    }
     if (command.isBlank()) {
       throw new IllegalArgumentException("Proxied MCP server command cannot be null or blank");
     }
diff --git a/src/main/java/org/sonarsource/sonarqube/mcp/client/ProxiedServerConfigParser.java b/src/main/java/org/sonarsource/sonarqube/mcp/client/ProxiedServerConfigParser.java
@@ -98,7 +98,6 @@ static ParseResult parseAndValidateProxiedConfig(String json) {
   private static ProxiedMcpServerConfig toProxiedMcpServerConfig(JsonServerConfig jsonConfig) {
     return new ProxiedMcpServerConfig(
       jsonConfig.name,
-      jsonConfig.namespace,
       jsonConfig.command,
       jsonConfig.args != null ? jsonConfig.args : Collections.emptyList(),
       jsonConfig.env != null ? jsonConfig.env : Collections.emptyMap(),
@@ -116,7 +115,6 @@ private static ProxiedMcpServerConfig toProxiedMcpServerConfig(JsonServerConfig
   @JsonIgnoreProperties(ignoreUnknown = true)
   record JsonServerConfig(
     @JsonProperty("name") String name,
-    @JsonProperty("namespace") String namespace,
     @JsonProperty("command") String command,
     @JsonProperty("args") @Nullable List<String> args,
     @JsonProperty("env") @Nullable Map<String, String> env,
diff --git a/src/main/java/org/sonarsource/sonarqube/mcp/client/ProxiedToolsLoader.java b/src/main/java/org/sonarsource/sonarqube/mcp/client/ProxiedToolsLoader.java
@@ -75,12 +75,11 @@ public List<Tool> loadProxiedTools(TransportMode currentTransportMode) {
       mcpClientManager = new McpClientManager(compatibleConfigs);
       mcpClientManager.initialize();
 
-      var tools = mcpClientManager.getAllProxiedTools().entrySet().stream()
-        .map(e -> (Tool) new ProxiedMcpTool(
-          e.getKey(),
-          e.getValue().serverId(),
-          e.getValue().originalToolName(),
-          e.getValue().tool(),
+      var tools = mcpClientManager.getAllProxiedTools().values().stream()
+        .map(toolMapping -> (Tool) new ProxiedMcpTool(
+          toolMapping.serverId(),
+          toolMapping.originalToolName(),
+          toolMapping.tool(),
           mcpClientManager
         ))
         .toList();
diff --git a/src/main/java/org/sonarsource/sonarqube/mcp/tools/proxied/ProxiedMcpTool.java b/src/main/java/org/sonarsource/sonarqube/mcp/tools/proxied/ProxiedMcpTool.java
@@ -31,20 +31,20 @@ public class ProxiedMcpTool extends Tool {
   private final String serverId;
   private final String originalToolName;
 
-  public ProxiedMcpTool(String prefixedName, String serverId, String originalToolName, McpSchema.Tool originalTool,
+  public ProxiedMcpTool(String serverId, String originalToolName, McpSchema.Tool originalTool,
     McpClientManager clientManager) {
-    super(createProxyDefinition(prefixedName, originalTool), ToolCategory.EXTERNAL);
+    super(createProxyDefinition(originalToolName, originalTool), ToolCategory.EXTERNAL);
     this.serverId = serverId;
     this.originalToolName = originalToolName;
     this.clientManager = clientManager;
   }
   
-  private static McpSchema.Tool createProxyDefinition(String prefixedName, McpSchema.Tool originalTool) {
+  private static McpSchema.Tool createProxyDefinition(String toolName, McpSchema.Tool originalTool) {
     var title = originalTool.title() != null ? originalTool.title() : originalTool.name();
     var description = originalTool.description() != null ? originalTool.description() : "Proxied MCP tool";
     
     return new McpSchema.Tool(
-      prefixedName,
+      toolName,
       title,
       description,
       originalTool.inputSchema(),
diff --git a/src/test/java/org/sonarsource/sonarqube/mcp/client/McpClientManagerTest.java b/src/test/java/org/sonarsource/sonarqube/mcp/client/McpClientManagerTest.java
@@ -49,8 +49,8 @@ void initialize_should_be_idempotent() {
   @Test
   void getTotalCount_should_match_config_count() {
     var configs = List.of(
-      new ProxiedMcpServerConfig("server1", "server1", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null),
-      new ProxiedMcpServerConfig("server2", "server2", "uv", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null)
+      new ProxiedMcpServerConfig("server1", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null),
+      new ProxiedMcpServerConfig("server2", "uv", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null)
     );
 
     var manager = new McpClientManager(configs);
@@ -60,7 +60,7 @@ void getTotalCount_should_match_config_count() {
 
   @Test
   void getAllExternalTools_should_return_empty_map_before_initialization() {
-    var configs = List.of(new ProxiedMcpServerConfig("server1", "server1", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null));
+    var configs = List.of(new ProxiedMcpServerConfig("server1", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null));
 
     var manager = new McpClientManager(configs);
 
@@ -102,7 +102,7 @@ void shutdown_should_clear_state() {
 
   @Test
   void executeTool_should_include_error_message_for_failed_server() {
-    var configs = List.of(new ProxiedMcpServerConfig("failing-server", "failing-server", "/non/existent/command", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null));
+    var configs = List.of(new ProxiedMcpServerConfig("failing-server", "/non/existent/command", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null));
     var manager = new McpClientManager(configs);
     var emptyMap = Map.<String, Object>of();
 
@@ -116,7 +116,7 @@ void executeTool_should_include_error_message_for_failed_server() {
   @Test
   void buildEnvironmentVariables_should_include_explicit_values_from_config() {
     var manager = new McpClientManager(List.of());
-    var config = new ProxiedMcpServerConfig("server", "ns", "cmd", List.of(), 
+    var config = new ProxiedMcpServerConfig("server", "cmd", List.of(), 
       Map.of("EXPLICIT_VAR1", "value1", "EXPLICIT_VAR2", "value2"), 
       List.of(), Set.of(TransportMode.STDIO), null);
     var parentEnv = Map.of("PARENT_VAR", "parent_value");
@@ -133,7 +133,7 @@ void buildEnvironmentVariables_should_include_explicit_values_from_config() {
   @Test
   void buildEnvironmentVariables_should_inherit_variables_from_parent() {
     var manager = new McpClientManager(List.of());
-    var config = new ProxiedMcpServerConfig("server", "ns", "cmd", List.of(), 
+    var config = new ProxiedMcpServerConfig("server", "cmd", List.of(), 
       Map.of(), 
       List.of("INHERITED_VAR1", "INHERITED_VAR2"), 
       Set.of(TransportMode.STDIO), null);
@@ -155,7 +155,7 @@ void buildEnvironmentVariables_should_inherit_variables_from_parent() {
   @Test
   void buildEnvironmentVariables_should_prioritize_explicit_values_over_inherited() {
     var manager = new McpClientManager(List.of());
-    var config = new ProxiedMcpServerConfig("server", "ns", "cmd", List.of(), 
+    var config = new ProxiedMcpServerConfig("server", "cmd", List.of(), 
       Map.of("OVERRIDE_VAR", "explicit_value"), 
       List.of("OVERRIDE_VAR"), 
       Set.of(TransportMode.STDIO), null);
@@ -171,7 +171,7 @@ void buildEnvironmentVariables_should_prioritize_explicit_values_over_inherited(
   @Test
   void buildEnvironmentVariables_should_skip_inherited_var_not_in_parent() {
     var manager = new McpClientManager(List.of());
-    var config = new ProxiedMcpServerConfig("server", "ns", "cmd", List.of(), 
+    var config = new ProxiedMcpServerConfig("server", "cmd", List.of(), 
       Map.of(), 
       List.of("MISSING_VAR", "EXISTING_VAR"), 
       Set.of(TransportMode.STDIO), null);
diff --git a/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedMcpServerConfigTest.java b/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedMcpServerConfigTest.java
@@ -31,27 +31,17 @@ void constructor_should_throw_when_name_is_blank() {
     var emptyList = List.<String>of();
     var emptyMap = Map.<String, String>of();
     var defaultTransports = Set.of(TransportMode.STDIO);
-    assertThatThrownBy(() -> new ProxiedMcpServerConfig("  ", "namespace", "npx", emptyList, emptyMap, emptyList, defaultTransports, "the instructions"))
+    assertThatThrownBy(() -> new ProxiedMcpServerConfig("  ", "npx", emptyList, emptyMap, emptyList, defaultTransports, "the instructions"))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("Proxied MCP server name cannot be null or blank");
   }
 
-  @Test
-  void constructor_should_throw_when_namespace_is_blank() {
-    var emptyList = List.<String>of();
-    var emptyMap = Map.<String, String>of();
-    var defaultTransports = Set.of(TransportMode.STDIO);
-    assertThatThrownBy(() -> new ProxiedMcpServerConfig("server", "  ", "npx", emptyList, emptyMap, emptyList, defaultTransports, "the instructions"))
-      .isInstanceOf(IllegalArgumentException.class)
-      .hasMessage("Proxied MCP server namespace cannot be null or blank");
-  }
-
   @Test
   void constructor_should_throw_when_command_is_blank() {
     var emptyList = List.<String>of();
     var emptyMap = Map.<String, String>of();
     var defaultTransports = Set.of(TransportMode.STDIO);
-    assertThatThrownBy(() -> new ProxiedMcpServerConfig("server", "namespace", "  ", emptyList, emptyMap, emptyList, defaultTransports, null))
+    assertThatThrownBy(() -> new ProxiedMcpServerConfig("server", "  ", emptyList, emptyMap, emptyList, defaultTransports, null))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("Proxied MCP server command cannot be null or blank");
   }
@@ -62,36 +52,36 @@ void constructor_should_throw_when_supported_transports_is_empty() {
     var emptyMap = Map.<String, String>of();
     var emptyTransports = Set.<TransportMode>of();
 
-    assertThatThrownBy(() -> new ProxiedMcpServerConfig("server", "namespace", "npx", emptyList, emptyMap, emptyList, emptyTransports, "the instructions"))
+    assertThatThrownBy(() -> new ProxiedMcpServerConfig("server", "npx", emptyList, emptyMap, emptyList, emptyTransports, "the instructions"))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("Proxied MCP server must support at least one transport mode");
   }
 
   @Test
   void supportsTransport_should_return_true_for_supported_transport() {
-    var config = new ProxiedMcpServerConfig("server", "namespace", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO, TransportMode.HTTP), "the instructions");
+    var config = new ProxiedMcpServerConfig("server", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO, TransportMode.HTTP), "the instructions");
 
     assertThat(config.supportsTransport(TransportMode.STDIO)).isTrue();
     assertThat(config.supportsTransport(TransportMode.HTTP)).isTrue();
   }
 
   @Test
   void supportsTransport_should_return_false_for_unsupported_transport() {
-    var config = new ProxiedMcpServerConfig("server", "namespace", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null);
+    var config = new ProxiedMcpServerConfig("server", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null);
 
     assertThat(config.supportsTransport(TransportMode.HTTP)).isFalse();
   }
 
   @Test
   void instructions_should_return_blank_description_when_empty() {
-    var config = new ProxiedMcpServerConfig("server", "namespace", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null);
+    var config = new ProxiedMcpServerConfig("server", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), null);
 
     assertThat(config.instructions()).isBlank();
   }
 
   @Test
   void instructions_should_return_description() {
-    var config = new ProxiedMcpServerConfig("server", "namespace", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), "the instructions");
+    var config = new ProxiedMcpServerConfig("server", "npx", List.of(), Map.of(), List.of(), Set.of(TransportMode.STDIO), "the instructions");
 
     assertThat(config.instructions()).isEqualTo("the instructions");
   }
diff --git a/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedMcpToolTest.java b/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedMcpToolTest.java
@@ -55,36 +55,35 @@ void setUp() {
   @Test
   void constructor_should_create_tool_with_correct_definition() {
     var tool = new ProxiedMcpTool(
-      "weather/get_weather",
       "weather",
       "get_weather",
       originalTool,
       clientManager
     );
 
     var definition = tool.definition();
-    assertThat(definition.name()).isEqualTo("weather/get_weather");
+    assertThat(definition.name()).isEqualTo("get_weather");
     assertThat(definition.title()).isEqualTo("Get Weather");
     assertThat(definition.description()).isEqualTo("Get the current weather for a location");
   }
 
   @Test
   void getCategory_should_return_external() {
-    var tool = new ProxiedMcpTool("weather/get_weather", "weather", "get_weather", originalTool, clientManager);
+    var tool = new ProxiedMcpTool("weather", "get_weather", originalTool, clientManager);
 
     assertThat(tool.getCategory()).isEqualTo(ToolCategory.EXTERNAL);
   }
 
   @Test
   void getOriginalToolName_should_return_original_name() {
-    var tool = new ProxiedMcpTool("weather/get_weather", "weather", "get_weather", originalTool, clientManager);
+    var tool = new ProxiedMcpTool("weather", "get_weather", originalTool, clientManager);
 
     assertThat(tool.getOriginalToolName()).isEqualTo("get_weather");
   }
 
   @Test
   void execute_should_handle_error_result_from_proxied_server() throws Exception {
-    var tool = new ProxiedMcpTool("weather/get_weather", "weather", "get_weather", originalTool, clientManager);
+    var tool = new ProxiedMcpTool("weather", "get_weather", originalTool, clientManager);
 
     var errorResult = McpSchema.CallToolResult.builder()
       .isError(true)
@@ -104,7 +103,7 @@ void execute_should_handle_error_result_from_proxied_server() throws Exception {
 
   @Test
   void execute_should_ignore_image_content_in_error_result() throws Exception {
-    var tool = new ProxiedMcpTool("img/process_image", "img", "process_image", originalTool, clientManager);
+    var tool = new ProxiedMcpTool("img", "process_image", originalTool, clientManager);
 
     var imageContent = new McpSchema.ImageContent(
       null,
diff --git a/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedServerConfigParserTest.java b/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedServerConfigParserTest.java
diff --git a/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedToolsLoaderInstructionsTest.java b/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedToolsLoaderInstructionsTest.java
diff --git a/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedToolsLoaderMediumTest.java b/src/test/java/org/sonarsource/sonarqube/mcp/client/ProxiedToolsLoaderMediumTest.java
diff --git a/src/test/java/org/sonarsource/sonarqube/mcp/tools/McpSchemaValidationTest.java b/src/test/java/org/sonarsource/sonarqube/mcp/tools/McpSchemaValidationTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "caas",`
`4`		`- "namespace": "context",`
`5`	`4`	`"command": "/app/binaries/sonar-code-context-mcp",`
`6`	`5`	`"args": [],`
`7`	`6`	`"env": {},`