feat: Make server-tool name separator configurable SERVER_TOOLNAME_SEPERATOR

Author: ptbsare

README.md

@@ -174,6 +174,14 @@ Example `config/tool_config.json`:
     export TOOLS_FOLDER=/srv/mcp_tools
     ```
 
+-   **`SERVER_TOOLNAME_SEPERATOR`**: (Optional) Defines the separator used to combine the server name and tool name when generating the unique key for tools (e.g., `server-key--tool-name`). This key is used internally and in the `tool_config.json` file.
+    -   Default: `--`.
+    -   Must be at least 2 characters long and contain only letters (a-z, A-Z), numbers (0-9), hyphens (`-`), and underscores (`_`).
+    -   If the provided value is invalid, the default (`--`) will be used, and a warning will be logged.
+    ```bash
+    export SERVER_TOOLNAME_SEPERATOR="___" # Example: using triple underscore
+    ```
+
 -   **`LOGGING`**: (Optional) Controls the minimum log level output by the server.
     -   Possible values (case-insensitive): `error`, `warn`, `info`, `debug`.
     -   Logs at the specified level and all levels above it will be shown.

README_ZH.md

@@ -175,6 +175,14 @@
     export TOOLS_FOLDER=/srv/mcp_tools
     ```
 
+-   **`SERVER_TOOLNAME_SEPERATOR`**: (可选) 定义用于组合服务器名称和工具名称以生成工具唯一键的分隔符（例如 `server-key--tool-name`）。此键在内部和 `tool_config.json` 文件中使用。
+    -   默认值：`--`。
+    -   必须至少包含 2 个字符，且只能包含字母（a-z, A-Z）、数字（0-9）、连字符（`-`）和下划线（`_`）。
+    -   如果提供的值无效，将使用默认值（`--`）并记录警告。
+    ```bash
+    export SERVER_TOOLNAME_SEPERATOR="___" # 示例：使用三个下划线
+    ```
+
 -   **`LOGGING`**: (可选) 控制服务器输出的最低日志级别。
     -   可能的值（不区分大小写）：`error`, `warn`, `info`, `debug`。
     -   将显示指定级别及以上的所有日志。

public/tools.js

@@ -4,31 +4,37 @@ const saveToolConfigButton = document.getElementById('save-tool-config-button');
 // const saveToolStatus = document.getElementById('save-tool-status'); // Removed: Declared in script.js
 // Note: Assumes currentToolConfig and discoveredTools variables are globally accessible from script.js or passed.
 // Note: Assumes triggerReload function is globally accessible from script.js or passed.
+let serverToolnameSeparator = '--'; // Default separator
 
 // --- Tool Configuration Management ---
 async function loadToolData() {
     if (!saveToolStatus || !toolListDiv) return; // Guard
     saveToolStatus.textContent = 'Loading tool data...';
     window.toolDataLoaded = false; // Reset flag during load attempt (use global flag)
     try {
-        // Fetch both discovered tools and tool config concurrently
-        const [toolsResponse, configResponse] = await Promise.all([
+        // Fetch discovered tools, tool config, and environment info concurrently
+        const [toolsResponse, configResponse, envResponse] = await Promise.all([
             fetch('/admin/tools/list'),
-            fetch('/admin/tools/config')
+            fetch('/admin/tools/config'),
+            fetch('/admin/environment') // Fetch environment info
         ]);
 
         if (!toolsResponse.ok) throw new Error(`Failed to fetch discovered tools: ${toolsResponse.statusText}`);
         if (!configResponse.ok) throw new Error(`Failed to fetch tool config: ${configResponse.statusText}`);
+        if (!envResponse.ok) throw new Error(`Failed to fetch environment info: ${envResponse.statusText}`); // Check env response
 
         const toolsResult = await toolsResponse.json();
         window.discoveredTools = toolsResult.tools || []; // Expecting { tools: [...] } (use global var)
 
         window.currentToolConfig = await configResponse.json(); // Use global var
         if (!window.currentToolConfig || typeof window.currentToolConfig !== 'object' || !window.currentToolConfig.tools) {
              console.warn("Received invalid tool configuration format, initializing empty.", window.currentToolConfig);
-             window.currentToolConfig = { tools: {} }; // Initialize if invalid or empty
+         window.currentToolConfig = { tools: {} }; // Initialize if invalid or empty
         }
 
+        const envResult = await envResponse.json(); // Parse environment info
+        serverToolnameSeparator = envResult.serverToolnameSeparator || '--'; // Update separator
+        console.log(`Using server toolname separator from backend: "${serverToolnameSeparator}"`);
 
         renderTools(); // Render using both discovered and configured data
         window.toolDataLoaded = true; // Set global flag only after successful load and render
@@ -66,7 +72,7 @@ function renderTools() {
 
     // Render discovered tools first, merging with config
     discoveredTools.forEach(tool => {
-        const toolKey = `${tool.serverName}--${tool.name}`; // Unique key
+        const toolKey = `${tool.serverName}${serverToolnameSeparator}${tool.name}`; // Use the fetched separator
         const config = currentToolConfig.tools[toolKey] || {}; // Get config or empty object
         // For discovered tools, their server is considered active by the proxy at connection time
         renderToolEntry(toolKey, tool, config, false, true); // isConfigOnly = false, isServerActive = true
@@ -76,7 +82,8 @@ function renderTools() {
     // Render any remaining configured tools that were not discovered
     configuredToolKeys.forEach(toolKey => {
          const config = currentToolConfig.tools[toolKey];
-         const serverKeyForConfigOnlyTool = toolKey.split('--')[0];
+         // Use the fetched separator for splitting
+         const serverKeyForConfigOnlyTool = toolKey.split(serverToolnameSeparator)[0];
          let isServerActiveForConfigOnlyTool = true; // Default to true if server config not found or active flag is missing/true
 
          if (window.currentServerConfig && window.currentServerConfig.mcpServers && window.currentServerConfig.mcpServers[serverKeyForConfigOnlyTool]) {