feat!: Make server-tool name separator configurable

The default separator for combining server names and tool names has been changed from '--' to '__'. This is a breaking change for users who relied on the hardcoded separator in tool_config.json or other integrations.

The separator can now be configured using the SERVER_TOOLNAME_SEPERATOR environment variable. It must be at least 2 characters long and contain only letters, numbers, '-', and '_'. Invalid values will fall back to the default '__'.

Author: ptbsare

README.md

@@ -121,18 +121,18 @@ Example `config/tool_config.json`:
 ```json
 {
   "tools": {
-    "unique-server-key1--tool-name-from-server": {
+    "unique-server-key1__tool-name-from-server": {
       "enabled": true,
       "displayName": "My Custom Tool Name",
       "description": "A more user-friendly description."
     },
-    "another-sse-server--another-tool": {
+    "another-sse-server__another-tool": {
       "enabled": false
     }
   }
 }
 ```
-- Keys are in the format `<server_key>--<original_tool_name>`.
+- Keys are in the format `<server_key><separator><original_tool_name>`, where `<separator>` is the value of the `SERVER_TOOLNAME_SEPERATOR` environment variable (defaults to `__`).
 - `enabled`: (Optional, default: `true`) Set to `false` to hide this tool from clients connecting to the proxy.
 - `displayName`: (Optional) Override the tool's name in client UIs.
 - `description`: (Optional) Override the tool's description.
@@ -174,10 +174,10 @@ 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: `--`.
+-   **`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.
+    -   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
     ```

README_ZH.md

@@ -122,18 +122,18 @@
 ```json
 {
   "tools": {
-    "unique-server-key1--tool-name-from-server": {
+    "unique-server-key1__tool-name-from-server": {
       "enabled": true,
       "displayName": "我的自定义工具名称",
       "description": "一个更友好的描述。"
     },
-    "another-sse-server--another-tool": {
+    "another-sse-server__another-tool": {
       "enabled": false
     }
   }
 }
 ```
-- 键的格式为 `<server_key>--<original_tool_name>`。
+- 键的格式为 `<server_key><separator><original_tool_name>`，其中 `<separator>` 是 `SERVER_TOOLNAME_SEPERATOR` 环境变量的值（默认为 `__`）。
 - `enabled`: (可选, 默认: `true`) 设置为 `false` 以向连接到代理的客户端隐藏此工具。
 - `displayName`: (可选) 在客户端 UI 中覆盖工具的名称。
 - `description`: (可选) 覆盖工具的描述。
@@ -175,10 +175,10 @@
     export TOOLS_FOLDER=/srv/mcp_tools
     ```
 
--   **`SERVER_TOOLNAME_SEPERATOR`**: (可选) 定义用于组合服务器名称和工具名称以生成工具唯一键的分隔符（例如 `server-key--tool-name`）。此键在内部和 `tool_config.json` 文件中使用。
-    -   默认值：`--`。
+-   **`SERVER_TOOLNAME_SEPERATOR`**: (可选) 定义用于组合服务器名称和工具名称以生成工具唯一键的分隔符（例如 `server-key__tool-name`）。此键在内部和 `tool_config.json` 文件中使用。
+    -   默认值：`__`。
     -   必须至少包含 2 个字符，且只能包含字母（a-z, A-Z）、数字（0-9）、连字符（`-`）和下划线（`_`）。
-    -   如果提供的值无效，将使用默认值（`--`）并记录警告。
+    -   如果提供的值无效，将使用默认值（`__`）并记录警告。
     ```bash
     export SERVER_TOOLNAME_SEPERATOR="___" # 示例：使用三个下划线
     ```

public/tools.js

@@ -4,7 +4,7 @@ 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
+let serverToolnameSeparator = '__'; // Default separator
 
 // --- Tool Configuration Management ---
 async function loadToolData() {
@@ -33,7 +33,7 @@ async function loadToolData() {
         }
 
         const envResult = await envResponse.json(); // Parse environment info
-        serverToolnameSeparator = envResult.serverToolnameSeparator || '--'; // Update separator
+        serverToolnameSeparator = envResult.serverToolnameSeparator || '__'; // Update separator
         console.log(`Using server toolname separator from backend: "${serverToolnameSeparator}"`);
 
         renderTools(); // Render using both discovered and configured data

src/config.ts

@@ -47,7 +47,7 @@ export interface ProxySettings {
   stdioToolCallRetryDelayBaseMs?: number;
 }
 
-export const DEFAULT_SERVER_TOOLNAME_SEPERATOR = '--';
+export const DEFAULT_SERVER_TOOLNAME_SEPERATOR = '__'; // Changed default separator
 export const SERVER_TOOLNAME_SEPERATOR_ENV_VAR = 'SERVER_TOOLNAME_SEPERATOR';
 
 export interface Config {