feat(cluster): add cluster configuration options and update system settings

Co-authored-by: samanhappy <2755122+samanhappy@users.noreply.github.com>

Dockerfile

@@ -9,9 +9,25 @@ RUN apt-get update && apt-get install -y curl gnupg git \
 
 RUN npm install -g pnpm
 
-ENV PNPM_HOME=/usr/local/share/pnpm
-ENV PATH=$PNPM_HOME:$PATH
-RUN mkdir -p $PNPM_HOME && \
+ENV MCP_DATA_DIR=/app/data
+ENV MCP_SERVERS_DIR=$MCP_DATA_DIR/servers
+ENV MCP_NPM_DIR=$MCP_SERVERS_DIR/npm
+ENV MCP_PYTHON_DIR=$MCP_SERVERS_DIR/python
+ENV PNPM_HOME=$MCP_DATA_DIR/pnpm
+ENV NPM_CONFIG_PREFIX=$MCP_DATA_DIR/npm-global
+ENV NPM_CONFIG_CACHE=$MCP_DATA_DIR/npm-cache
+ENV UV_TOOL_DIR=$MCP_DATA_DIR/uv/tools
+ENV UV_CACHE_DIR=$MCP_DATA_DIR/uv/cache
+ENV PATH=$PNPM_HOME:$NPM_CONFIG_PREFIX/bin:$UV_TOOL_DIR/bin:$PATH
+RUN mkdir -p \
+  $PNPM_HOME \
+  $NPM_CONFIG_PREFIX/bin \
+  $NPM_CONFIG_PREFIX/lib/node_modules \
+  $NPM_CONFIG_CACHE \
+  $UV_TOOL_DIR \
+  $UV_CACHE_DIR \
+  $MCP_NPM_DIR \
+  $MCP_PYTHON_DIR && \
   pnpm add -g @amap/amap-maps-mcp-server @playwright/mcp@latest tavily-mcp@latest @modelcontextprotocol/server-github @modelcontextprotocol/server-slack
 
 ARG INSTALL_EXT=false

README.md

@@ -21,6 +21,7 @@ MCPHub makes it easy to manage and scale multiple MCP (Model Context Protocol) s
 - **Secure Authentication**: Built-in user management with role-based access powered by JWT and bcrypt.
 - **OAuth 2.0 Support**: Full OAuth support for upstream MCP servers with proxy authorization capabilities.
 - **Environment Variable Expansion**: Use environment variables anywhere in your configuration for secure credential management. See [Environment Variables Guide](docs/environment-variables.md).
+- **Cluster Deployment**: Deploy multiple nodes for high availability and load distribution with sticky session support. See [Cluster Deployment Guide](docs/cluster-deployment.md).
 - **Docker-Ready**: Deploy instantly with our containerized setup.
 
 ## 🔧 Quick Start

README.zh.md

@@ -19,6 +19,9 @@ MCPHub 通过将多个 MCP（Model Context Protocol）服务器组织为灵活
 - **热插拔式配置**：在运行时动态添加、移除或更新服务器配置，无需停机。
 - **基于分组的访问控制**：自定义分组并管理服务器访问权限。
 - **安全认证机制**：内置用户管理，基于 JWT 和 bcrypt，实现角色权限控制。
+- **OAuth 2.0 支持**：完整的 OAuth 支持，用于上游 MCP 服务器的代理授权功能。
+- **环境变量扩展**：在配置中的任何位置使用环境变量，实现安全凭证管理。参见[环境变量指南](docs/environment-variables.md)。
+- **集群部署**：部署多个节点实现高可用性和负载分配，支持会话粘性。参见[集群部署指南](docs/cluster-deployment.zh.md)。
 - **Docker 就绪**：提供容器化镜像，快速部署。
 
 ## 🔧 快速开始

docs/cluster-deployment.md

@@ -0,0 +1,516 @@
+# Cluster Deployment Guide
+
+MCPHub supports cluster deployment, allowing you to run multiple nodes that work together as a unified system. This enables:
+
+- **High Availability**: Distribute MCP servers across multiple nodes for redundancy
+- **Load Distribution**: Balance requests across multiple replicas of the same MCP server
+- **Sticky Sessions**: Ensure client sessions are routed to the same node consistently
+- **Centralized Management**: One coordinator manages the entire cluster
+
+## Architecture
+
+MCPHub cluster has three operating modes:
+
+1. **Standalone Mode** (Default): Single node operation, no cluster features
+2. **Coordinator Mode**: Central node that manages the cluster, routes requests, and maintains session affinity
+3. **Node Mode**: Worker nodes that register with the coordinator and run MCP servers
+
+```
+┌─────────────────────────────────────────┐
+│         Coordinator Node                │
+│  - Manages cluster state                │
+│  - Routes client requests                │
+│  - Maintains session affinity           │
+│  - Health monitoring                    │
+└───────────┬─────────────────────────────┘
+            │
+    ┌───────┴───────────────────┐
+    │                           │
+┌───▼────────┐         ┌────────▼────┐
+│  Node 1    │         │   Node 2    │
+│  - MCP A   │         │   - MCP A   │
+│  - MCP B   │         │   - MCP C   │
+└────────────┘         └─────────────┘
+```
+
+## Configuration
+
+### Coordinator Configuration
+
+Create or update `mcp_settings.json` on the coordinator node:
+
+```json
+{
+  "mcpServers": {
+    // Optional: coordinator can also run MCP servers
+    "example": {
+      "command": "npx",
+      "args": ["-y", "example-mcp-server"]
+    }
+  },
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "coordinator",
+      "coordinator": {
+        "nodeTimeout": 15000,
+        "cleanupInterval": 30000,
+        "stickySessionTimeout": 3600000
+      },
+      "stickySession": {
+        "enabled": true,
+        "strategy": "consistent-hash",
+        "cookieName": "MCPHUB_NODE",
+        "headerName": "X-MCPHub-Node"
+      }
+    }
+  }
+}
+```
+
+**Configuration Options:**
+
+- `nodeTimeout`: Time (ms) before marking a node as unhealthy (default: 15000)
+- `cleanupInterval`: Interval (ms) for cleaning up inactive nodes (default: 30000)
+- `stickySessionTimeout`: Session affinity timeout (ms) (default: 3600000 - 1 hour)
+- `stickySession.enabled`: Enable sticky session routing (default: true)
+- `stickySession.strategy`: Session affinity strategy:
+  - `consistent-hash`: Hash-based routing (default)
+  - `cookie`: Cookie-based routing
+  - `header`: Header-based routing
+
+### Node Configuration
+
+Create or update `mcp_settings.json` on each worker node:
+
+```json
+{
+  "mcpServers": {
+    "amap": {
+      "command": "npx",
+      "args": ["-y", "@amap/amap-maps-mcp-server"]
+    },
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@latest", "--headless"]
+    }
+  },
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "node",
+      "node": {
+        "id": "node-1",
+        "name": "Worker Node 1",
+        "coordinatorUrl": "http://coordinator:3000",
+        "heartbeatInterval": 5000,
+        "registerOnStartup": true
+      }
+    }
+  }
+}
+```
+
+**Configuration Options:**
+
+- `node.id`: Unique node identifier (auto-generated if not provided)
+- `node.name`: Human-readable node name (defaults to hostname)
+- `node.coordinatorUrl`: URL of the coordinator node (required)
+- `node.heartbeatInterval`: Heartbeat interval (ms) (default: 5000)
+- `node.registerOnStartup`: Auto-register on startup (default: true)
+
+## Deployment Scenarios
+
+### Scenario 1: Docker Compose
+
+Create a `docker-compose.yml`:
+
+```yaml
+version: '3.8'
+
+services:
+  coordinator:
+    image: samanhappy/mcphub:latest
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./coordinator-config.json:/app/mcp_settings.json
+      - coordinator-data:/app/data
+    environment:
+      - NODE_ENV=production
+
+  node1:
+    image: samanhappy/mcphub:latest
+    volumes:
+      - ./node1-config.json:/app/mcp_settings.json
+      - node1-data:/app/data
+    environment:
+      - NODE_ENV=production
+    depends_on:
+      - coordinator
+
+  node2:
+    image: samanhappy/mcphub:latest
+    volumes:
+      - ./node2-config.json:/app/mcp_settings.json
+      - node2-data:/app/data
+    environment:
+      - NODE_ENV=production
+    depends_on:
+      - coordinator
+
+volumes:
+  coordinator-data:
+  node1-data:
+  node2-data:
+```
+
+Start the cluster:
+
+```bash
+docker-compose up -d
+```
+
+### Scenario 2: Kubernetes
+
+Create Kubernetes manifests:
+
+**Coordinator Deployment:**
+
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mcphub-coordinator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: mcphub-coordinator
+  template:
+    metadata:
+      labels:
+        app: mcphub-coordinator
+    spec:
+      containers:
+      - name: mcphub
+        image: samanhappy/mcphub:latest
+        ports:
+        - containerPort: 3000
+        volumeMounts:
+        - name: config
+          mountPath: /app/mcp_settings.json
+          subPath: mcp_settings.json
+      volumes:
+      - name: config
+        configMap:
+          name: mcphub-coordinator-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mcphub-coordinator
+spec:
+  selector:
+    app: mcphub-coordinator
+  ports:
+  - port: 3000
+    targetPort: 3000
+  type: LoadBalancer
+```
+
+**Worker Node Deployment:**
+
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mcphub-node
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: mcphub-node
+  template:
+    metadata:
+      labels:
+        app: mcphub-node
+    spec:
+      containers:
+      - name: mcphub
+        image: samanhappy/mcphub:latest
+        volumeMounts:
+        - name: config
+          mountPath: /app/mcp_settings.json
+          subPath: mcp_settings.json
+      volumes:
+      - name: config
+        configMap:
+          name: mcphub-node-config
+```
+
+Apply the manifests:
+
+```bash
+kubectl apply -f coordinator.yaml
+kubectl apply -f nodes.yaml
+```
+
+### Scenario 3: Manual Deployment
+
+**On Coordinator (192.168.1.100):**
+
+```bash
+# Install MCPHub
+npm install -g @samanhappy/mcphub
+
+# Configure as coordinator
+cat > mcp_settings.json <<EOF
+{
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "coordinator"
+    }
+  }
+}
+EOF
+
+# Start coordinator
+PORT=3000 mcphub
+```
+
+**On Node 1 (192.168.1.101):**
+
+```bash
+# Install MCPHub
+npm install -g @samanhappy/mcphub
+
+# Configure as node
+cat > mcp_settings.json <<EOF
+{
+  "mcpServers": {
+    "server1": { "command": "..." }
+  },
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "node",
+      "node": {
+        "coordinatorUrl": "http://192.168.1.100:3000"
+      }
+    }
+  }
+}
+EOF
+
+# Start node
+PORT=3001 mcphub
+```
+
+**On Node 2 (192.168.1.102):**
+
+```bash
+# Similar to Node 1, but with PORT=3002
+```
+
+## Usage
+
+### Accessing the Cluster
+
+Once the cluster is running, connect AI clients to the coordinator's endpoint:
+
+```
+http://coordinator:3000/mcp
+http://coordinator:3000/sse
+```
+
+The coordinator will:
+1. Route requests to appropriate nodes based on session affinity
+2. Load balance across multiple replicas of the same server
+3. Automatically failover to healthy nodes
+
+### Sticky Sessions
+
+Sticky sessions ensure that a client's requests are routed to the same node throughout their session. This is important for:
+
+- Maintaining conversation context
+- Preserving temporary state
+- Consistent tool execution
+
+The default strategy is **consistent-hash**, which uses the session ID to determine the target node. Alternative strategies:
+
+- **Cookie-based**: Uses `MCPHUB_NODE` cookie
+- **Header-based**: Uses `X-MCPHub-Node` header
+
+### Multiple Replicas
+
+You can deploy the same MCP server on multiple nodes for:
+
+- **Load balancing**: Distribute requests across replicas
+- **High availability**: Failover if one node goes down
+
+Example configuration:
+
+**Node 1:**
+```json
+{
+  "mcpServers": {
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@latest"]
+    }
+  }
+}
+```
+
+**Node 2:**
+```json
+{
+  "mcpServers": {
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@latest"]
+    }
+  }
+}
+```
+
+The coordinator will automatically load balance requests to `playwright` across both nodes.
+
+## Management API
+
+The coordinator exposes cluster management endpoints:
+
+### Get Cluster Status
+
+```bash
+curl http://coordinator:3000/api/cluster/status
+```
+
+Response:
+```json
+{
+  "success": true,
+  "data": {
+    "enabled": true,
+    "mode": "coordinator",
+    "nodeId": "coordinator",
+    "stats": {
+      "nodes": 3,
+      "activeNodes": 3,
+      "servers": 5,
+      "sessions": 10
+    }
+  }
+}
+```
+
+### Get All Nodes
+
+```bash
+curl http://coordinator:3000/api/cluster/nodes
+```
+
+### Get Server Replicas
+
+```bash
+curl http://coordinator:3000/api/cluster/servers/playwright/replicas
+```
+
+### Get Session Affinity
+
+```bash
+curl http://coordinator:3000/api/cluster/sessions/{sessionId}
+```
+
+## Monitoring and Troubleshooting
+
+### Check Node Health
+
+Monitor coordinator logs for heartbeat messages:
+
+```
+Node registered: Worker Node 1 (node-1) with 2 servers
+```
+
+If a node becomes unhealthy:
+
+```
+Marking node node-1 as unhealthy (last heartbeat: 2024-01-01T10:00:00.000Z)
+```
+
+### Verify Registration
+
+Check if nodes are registered:
+
+```bash
+curl http://coordinator:3000/api/cluster/nodes?active=true
+```
+
+### Session Affinity Issues
+
+If sessions aren't sticking to the same node:
+
+1. Verify sticky sessions are enabled in coordinator config
+2. Check that session IDs are being passed correctly
+3. Review coordinator logs for session affinity errors
+
+### Network Connectivity
+
+Ensure worker nodes can reach the coordinator:
+
+```bash
+# From worker node
+curl http://coordinator:3000/health
+```
+
+## Performance Considerations
+
+### Coordinator Load
+
+The coordinator handles:
+- Request routing
+- Node heartbeats
+- Session tracking
+
+For very large clusters (>50 nodes), consider:
+- Increasing coordinator resources
+- Tuning heartbeat intervals
+- Using header-based sticky sessions (lower overhead)
+
+### Network Latency
+
+Minimize latency between coordinator and nodes:
+- Deploy in the same datacenter/region
+- Use low-latency networking
+- Consider coordinator placement near clients
+
+### Session Timeout
+
+Balance session timeout with resource usage:
+- Shorter timeout: Less memory, more re-routing
+- Longer timeout: Better stickiness, more memory
+
+Default is 1 hour, adjust based on your use case.
+
+## Limitations
+
+1. **Stateful Sessions**: Node-local state is lost if a node fails. Use external storage for persistent state.
+2. **Single Coordinator**: Currently supports one coordinator. Consider load balancing at the infrastructure level.
+3. **Network Partitions**: Nodes that lose connection to coordinator will be marked unhealthy.
+
+## Best Practices
+
+1. **Use Groups**: Organize MCP servers into groups for easier management
+2. **Monitor Health**: Set up alerts for unhealthy nodes
+3. **Version Consistency**: Run the same MCPHub version across all nodes
+4. **Resource Planning**: Allocate appropriate resources based on MCP server requirements
+5. **Backup Configuration**: Keep coordinator config backed up
+6. **Gradual Rollout**: Test cluster configuration with a small number of nodes first
+
+## See Also
+
+- [Docker Deployment](../deployment/docker.md)
+- [Kubernetes Deployment](../deployment/kubernetes.md)
+- [High Availability Setup](../deployment/high-availability.md)

docs/cluster-deployment.zh.md

@@ -0,0 +1,510 @@
+# 集群部署指南
+
+MCPHub 支持集群部署，允许多个节点协同工作组成一个统一的系统。这提供了：
+
+- **高可用性**：将 MCP 服务器分布在多个节点上实现冗余
+- **负载分配**：在同一 MCP 服务器的多个副本之间平衡请求
+- **会话粘性**：确保客户端会话一致性地路由到同一节点
+- **集中管理**：一个协调器管理整个集群
+
+## 架构
+
+MCPHub 集群有三种运行模式：
+
+1. **独立模式**（默认）：单节点运行，无集群功能
+2. **协调器模式**：管理集群、路由请求、维护会话亲和性的中心节点
+3. **节点模式**：向协调器注册并运行 MCP 服务器的工作节点
+
+```
+┌─────────────────────────────────────────┐
+│         协调器节点                       │
+│  - 管理集群状态                          │
+│  - 路由客户端请求                        │
+│  - 维护会话亲和性                        │
+│  - 健康监控                             │
+└───────────┬─────────────────────────────┘
+            │
+    ┌───────┴───────────────────┐
+    │                           │
+┌───▼────────┐         ┌────────▼────┐
+│  节点 1    │         │   节点 2    │
+│  - MCP A   │         │   - MCP A   │
+│  - MCP B   │         │   - MCP C   │
+└────────────┘         └─────────────┘
+```
+
+## 配置
+
+### 协调器配置
+
+在协调器节点上创建或更新 `mcp_settings.json`：
+
+```json
+{
+  "mcpServers": {
+    // 可选：协调器也可以运行 MCP 服务器
+    "example": {
+      "command": "npx",
+      "args": ["-y", "example-mcp-server"]
+    }
+  },
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "coordinator",
+      "coordinator": {
+        "nodeTimeout": 15000,
+        "cleanupInterval": 30000,
+        "stickySessionTimeout": 3600000
+      },
+      "stickySession": {
+        "enabled": true,
+        "strategy": "consistent-hash",
+        "cookieName": "MCPHUB_NODE",
+        "headerName": "X-MCPHub-Node"
+      }
+    }
+  }
+}
+```
+
+**配置选项：**
+
+- `nodeTimeout`: 将节点标记为不健康之前的时间（毫秒）（默认：15000）
+- `cleanupInterval`: 清理不活跃节点的间隔（毫秒）（默认：30000）
+- `stickySessionTimeout`: 会话亲和性超时（毫秒）（默认：3600000 - 1小时）
+- `stickySession.enabled`: 启用会话粘性路由（默认：true）
+- `stickySession.strategy`: 会话亲和性策略：
+  - `consistent-hash`: 基于哈希的路由（默认）
+  - `cookie`: 基于 Cookie 的路由
+  - `header`: 基于请求头的路由
+
+### 节点配置
+
+在每个工作节点上创建或更新 `mcp_settings.json`：
+
+```json
+{
+  "mcpServers": {
+    "amap": {
+      "command": "npx",
+      "args": ["-y", "@amap/amap-maps-mcp-server"]
+    },
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@latest", "--headless"]
+    }
+  },
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "node",
+      "node": {
+        "id": "node-1",
+        "name": "工作节点 1",
+        "coordinatorUrl": "http://coordinator:3000",
+        "heartbeatInterval": 5000,
+        "registerOnStartup": true
+      }
+    }
+  }
+}
+```
+
+**配置选项：**
+
+- `node.id`: 唯一节点标识符（如未提供则自动生成）
+- `node.name`: 人类可读的节点名称（默认为主机名）
+- `node.coordinatorUrl`: 协调器节点的 URL（必需）
+- `node.heartbeatInterval`: 心跳间隔（毫秒）（默认：5000）
+- `node.registerOnStartup`: 启动时自动注册（默认：true）
+
+## 部署场景
+
+### 场景 1：Docker Compose
+
+创建 `docker-compose.yml`：
+
+```yaml
+version: '3.8'
+
+services:
+  coordinator:
+    image: samanhappy/mcphub:latest
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./coordinator-config.json:/app/mcp_settings.json
+      - coordinator-data:/app/data
+    environment:
+      - NODE_ENV=production
+
+  node1:
+    image: samanhappy/mcphub:latest
+    volumes:
+      - ./node1-config.json:/app/mcp_settings.json
+      - node1-data:/app/data
+    environment:
+      - NODE_ENV=production
+    depends_on:
+      - coordinator
+
+  node2:
+    image: samanhappy/mcphub:latest
+    volumes:
+      - ./node2-config.json:/app/mcp_settings.json
+      - node2-data:/app/data
+    environment:
+      - NODE_ENV=production
+    depends_on:
+      - coordinator
+
+volumes:
+  coordinator-data:
+  node1-data:
+  node2-data:
+```
+
+启动集群：
+
+```bash
+docker-compose up -d
+```
+
+### 场景 2：Kubernetes
+
+创建 Kubernetes 清单：
+
+**协调器部署：**
+
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mcphub-coordinator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: mcphub-coordinator
+  template:
+    metadata:
+      labels:
+        app: mcphub-coordinator
+    spec:
+      containers:
+      - name: mcphub
+        image: samanhappy/mcphub:latest
+        ports:
+        - containerPort: 3000
+        volumeMounts:
+        - name: config
+          mountPath: /app/mcp_settings.json
+          subPath: mcp_settings.json
+      volumes:
+      - name: config
+        configMap:
+          name: mcphub-coordinator-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mcphub-coordinator
+spec:
+  selector:
+    app: mcphub-coordinator
+  ports:
+  - port: 3000
+    targetPort: 3000
+  type: LoadBalancer
+```
+
+**工作节点部署：**
+
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mcphub-node
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: mcphub-node
+  template:
+    metadata:
+      labels:
+        app: mcphub-node
+    spec:
+      containers:
+      - name: mcphub
+        image: samanhappy/mcphub:latest
+        volumeMounts:
+        - name: config
+          mountPath: /app/mcp_settings.json
+          subPath: mcp_settings.json
+      volumes:
+      - name: config
+        configMap:
+          name: mcphub-node-config
+```
+
+应用清单：
+
+```bash
+kubectl apply -f coordinator.yaml
+kubectl apply -f nodes.yaml
+```
+
+### 场景 3：手动部署
+
+**在协调器上（192.168.1.100）：**
+
+```bash
+# 安装 MCPHub
+npm install -g @samanhappy/mcphub
+
+# 配置为协调器
+cat > mcp_settings.json <<EOF
+{
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "coordinator"
+    }
+  }
+}
+EOF
+
+# 启动协调器
+PORT=3000 mcphub
+```
+
+**在节点 1 上（192.168.1.101）：**
+
+```bash
+# 安装 MCPHub
+npm install -g @samanhappy/mcphub
+
+# 配置为节点
+cat > mcp_settings.json <<EOF
+{
+  "mcpServers": {
+    "server1": { "command": "..." }
+  },
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "node",
+      "node": {
+        "coordinatorUrl": "http://192.168.1.100:3000"
+      }
+    }
+  }
+}
+EOF
+
+# 启动节点
+PORT=3001 mcphub
+```
+
+## 使用方法
+
+### 访问集群
+
+集群运行后，将 AI 客户端连接到协调器的端点：
+
+```
+http://coordinator:3000/mcp
+http://coordinator:3000/sse
+```
+
+协调器将：
+1. 根据会话亲和性将请求路由到适当的节点
+2. 在同一服务器的多个副本之间进行负载均衡
+3. 自动故障转移到健康的节点
+
+### 会话粘性
+
+会话粘性确保客户端的请求在整个会话期间路由到同一节点。这对于以下场景很重要：
+
+- 维护对话上下文
+- 保持临时状态
+- 一致的工具执行
+
+默认策略是 **consistent-hash**，使用会话 ID 来确定目标节点。替代策略：
+
+- **Cookie-based**: 使用 `MCPHUB_NODE` cookie
+- **Header-based**: 使用 `X-MCPHub-Node` 请求头
+
+### 多副本
+
+您可以在多个节点上部署相同的 MCP 服务器以实现：
+
+- **负载均衡**：在副本之间分配请求
+- **高可用性**：如果一个节点宕机则故障转移
+
+配置示例：
+
+**节点 1：**
+```json
+{
+  "mcpServers": {
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@latest"]
+    }
+  }
+}
+```
+
+**节点 2：**
+```json
+{
+  "mcpServers": {
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@latest"]
+    }
+  }
+}
+```
+
+协调器将自动在两个节点之间对 `playwright` 的请求进行负载均衡。
+
+## 管理 API
+
+协调器公开集群管理端点：
+
+### 获取集群状态
+
+```bash
+curl http://coordinator:3000/api/cluster/status
+```
+
+响应：
+```json
+{
+  "success": true,
+  "data": {
+    "enabled": true,
+    "mode": "coordinator",
+    "nodeId": "coordinator",
+    "stats": {
+      "nodes": 3,
+      "activeNodes": 3,
+      "servers": 5,
+      "sessions": 10
+    }
+  }
+}
+```
+
+### 获取所有节点
+
+```bash
+curl http://coordinator:3000/api/cluster/nodes
+```
+
+### 获取服务器副本
+
+```bash
+curl http://coordinator:3000/api/cluster/servers/playwright/replicas
+```
+
+### 获取会话亲和性
+
+```bash
+curl http://coordinator:3000/api/cluster/sessions/{sessionId}
+```
+
+## 监控和故障排除
+
+### 检查节点健康
+
+监控协调器日志以查看心跳消息：
+
+```
+Node registered: Worker Node 1 (node-1) with 2 servers
+```
+
+如果节点变得不健康：
+
+```
+Marking node node-1 as unhealthy (last heartbeat: 2024-01-01T10:00:00.000Z)
+```
+
+### 验证注册
+
+检查节点是否已注册：
+
+```bash
+curl http://coordinator:3000/api/cluster/nodes?active=true
+```
+
+### 会话亲和性问题
+
+如果会话没有粘性到同一节点：
+
+1. 验证协调器配置中是否启用了会话粘性
+2. 检查会话 ID 是否正确传递
+3. 查看协调器日志以查找会话亲和性错误
+
+### 网络连接
+
+确保工作节点可以访问协调器：
+
+```bash
+# 从工作节点
+curl http://coordinator:3000/health
+```
+
+## 性能考虑
+
+### 协调器负载
+
+协调器处理：
+- 请求路由
+- 节点心跳
+- 会话跟踪
+
+对于非常大的集群（>50个节点），考虑：
+- 增加协调器资源
+- 调整心跳间隔
+- 使用基于请求头的会话粘性（开销更低）
+
+### 网络延迟
+
+最小化协调器和节点之间的延迟：
+- 在同一数据中心/地区部署
+- 使用低延迟网络
+- 考虑协调器放置在接近客户端的位置
+
+### 会话超时
+
+平衡会话超时与资源使用：
+- 较短超时：更少内存，更多重新路由
+- 较长超时：更好的粘性，更多内存
+
+默认为 1 小时，根据您的用例进行调整。
+
+## 限制
+
+1. **有状态会话**：如果节点失败，节点本地状态会丢失。使用外部存储实现持久状态。
+2. **单协调器**：当前支持一个协调器。考虑在基础设施级别进行负载均衡。
+3. **网络分区**：失去与协调器连接的节点将被标记为不健康。
+
+## 最佳实践
+
+1. **使用分组**：将 MCP 服务器组织到分组中以便更容易管理
+2. **监控健康**：为不健康的节点设置告警
+3. **版本一致性**：在所有节点上运行相同的 MCPHub 版本
+4. **资源规划**：根据 MCP 服务器要求分配适当的资源
+5. **备份配置**：保持协调器配置的备份
+6. **逐步推出**：首先使用少量节点测试集群配置
+
+## 相关文档
+
+- [Docker 部署](../deployment/docker.md)
+- [Kubernetes 部署](../deployment/kubernetes.md)
+- [高可用性设置](../deployment/high-availability.md)

entrypoint.sh

@@ -1,5 +1,27 @@
 #!/bin/bash
 
+DATA_DIR=${MCP_DATA_DIR:-/app/data}
+SERVERS_DIR=${MCP_SERVERS_DIR:-$DATA_DIR/servers}
+NPM_SERVER_DIR=${MCP_NPM_DIR:-$SERVERS_DIR/npm}
+PYTHON_SERVER_DIR=${MCP_PYTHON_DIR:-$SERVERS_DIR/python}
+PNPM_HOME=${PNPM_HOME:-$DATA_DIR/pnpm}
+NPM_CONFIG_PREFIX=${NPM_CONFIG_PREFIX:-$DATA_DIR/npm-global}
+NPM_CONFIG_CACHE=${NPM_CONFIG_CACHE:-$DATA_DIR/npm-cache}
+UV_TOOL_DIR=${UV_TOOL_DIR:-$DATA_DIR/uv/tools}
+UV_CACHE_DIR=${UV_CACHE_DIR:-$DATA_DIR/uv/cache}
+
+mkdir -p \
+  "$PNPM_HOME" \
+  "$NPM_CONFIG_PREFIX/bin" \
+  "$NPM_CONFIG_PREFIX/lib/node_modules" \
+  "$NPM_CONFIG_CACHE" \
+  "$UV_TOOL_DIR" \
+  "$UV_CACHE_DIR" \
+  "$NPM_SERVER_DIR" \
+  "$PYTHON_SERVER_DIR"
+
+export PATH="$PNPM_HOME:$NPM_CONFIG_PREFIX/bin:$UV_TOOL_DIR/bin:$PATH"
+
 NPM_REGISTRY=${NPM_REGISTRY:-https://registry.npmjs.org/}
 echo "Setting npm registry to ${NPM_REGISTRY}"
 npm config set registry "$NPM_REGISTRY"

examples/cluster-config-examples.md

@@ -0,0 +1,444 @@
+# Cluster Configuration Examples
+
+## Coordinator Node Configuration
+
+```json
+{
+  "mcpServers": {
+    "fetch": {
+      "command": "uvx",
+      "args": ["mcp-server-fetch"],
+      "enabled": true
+    }
+  },
+  "users": [
+    {
+      "username": "admin",
+      "password": "$2b$10$Vt7krIvjNgyN67LXqly0uOcTpN0LI55cYRbcKC71pUDAP0nJ7RPa.",
+      "isAdmin": true
+    }
+  ],
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "coordinator",
+      "coordinator": {
+        "nodeTimeout": 15000,
+        "cleanupInterval": 30000,
+        "stickySessionTimeout": 3600000
+      },
+      "stickySession": {
+        "enabled": true,
+        "strategy": "consistent-hash",
+        "cookieName": "MCPHUB_NODE",
+        "headerName": "X-MCPHub-Node"
+      }
+    },
+    "routing": {
+      "enableGlobalRoute": true,
+      "enableGroupNameRoute": true,
+      "enableBearerAuth": false
+    }
+  }
+}
+```
+
+## Worker Node 1 Configuration
+
+```json
+{
+  "mcpServers": {
+    "amap": {
+      "command": "npx",
+      "args": ["-y", "@amap/amap-maps-mcp-server"],
+      "env": {
+        "AMAP_MAPS_API_KEY": "${AMAP_MAPS_API_KEY}"
+      },
+      "enabled": true
+    },
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@latest", "--headless"],
+      "enabled": true
+    }
+  },
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "node",
+      "node": {
+        "id": "node-1",
+        "name": "Worker Node 1",
+        "coordinatorUrl": "http://coordinator:3000",
+        "heartbeatInterval": 5000,
+        "registerOnStartup": true
+      }
+    }
+  }
+}
+```
+
+## Worker Node 2 Configuration
+
+```json
+{
+  "mcpServers": {
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@latest", "--headless"],
+      "enabled": true
+    },
+    "slack": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-slack"],
+      "env": {
+        "SLACK_BOT_TOKEN": "${SLACK_BOT_TOKEN}",
+        "SLACK_TEAM_ID": "${SLACK_TEAM_ID}"
+      },
+      "enabled": true
+    }
+  },
+  "systemConfig": {
+    "cluster": {
+      "enabled": true,
+      "mode": "node",
+      "node": {
+        "id": "node-2",
+        "name": "Worker Node 2",
+        "coordinatorUrl": "http://coordinator:3000",
+        "heartbeatInterval": 5000,
+        "registerOnStartup": true
+      }
+    }
+  }
+}
+```
+
+## Docker Compose Example
+
+```yaml
+version: '3.8'
+
+services:
+  coordinator:
+    image: samanhappy/mcphub:latest
+    container_name: mcphub-coordinator
+    hostname: coordinator
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./examples/coordinator-config.json:/app/mcp_settings.json
+      - coordinator-data:/app/data
+    environment:
+      - NODE_ENV=production
+      - PORT=3000
+    networks:
+      - mcphub-cluster
+    restart: unless-stopped
+
+  node1:
+    image: samanhappy/mcphub:latest
+    container_name: mcphub-node1
+    hostname: node1
+    volumes:
+      - ./examples/node1-config.json:/app/mcp_settings.json
+      - node1-data:/app/data
+    environment:
+      - NODE_ENV=production
+      - PORT=3001
+      - AMAP_MAPS_API_KEY=${AMAP_MAPS_API_KEY}
+    networks:
+      - mcphub-cluster
+    depends_on:
+      - coordinator
+    restart: unless-stopped
+
+  node2:
+    image: samanhappy/mcphub:latest
+    container_name: mcphub-node2
+    hostname: node2
+    volumes:
+      - ./examples/node2-config.json:/app/mcp_settings.json
+      - node2-data:/app/data
+    environment:
+      - NODE_ENV=production
+      - PORT=3002
+      - SLACK_BOT_TOKEN=${SLACK_BOT_TOKEN}
+      - SLACK_TEAM_ID=${SLACK_TEAM_ID}
+    networks:
+      - mcphub-cluster
+    depends_on:
+      - coordinator
+    restart: unless-stopped
+
+networks:
+  mcphub-cluster:
+    driver: bridge
+
+volumes:
+  coordinator-data:
+  node1-data:
+  node2-data:
+```
+
+## Kubernetes Example
+
+### ConfigMaps
+
+**coordinator-config.yaml:**
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mcphub-coordinator-config
+  namespace: mcphub
+data:
+  mcp_settings.json: |
+    {
+      "mcpServers": {
+        "fetch": {
+          "command": "uvx",
+          "args": ["mcp-server-fetch"],
+          "enabled": true
+        }
+      },
+      "users": [
+        {
+          "username": "admin",
+          "password": "$2b$10$Vt7krIvjNgyN67LXqly0uOcTpN0LI55cYRbcKC71pUDAP0nJ7RPa.",
+          "isAdmin": true
+        }
+      ],
+      "systemConfig": {
+        "cluster": {
+          "enabled": true,
+          "mode": "coordinator",
+          "coordinator": {
+            "nodeTimeout": 15000,
+            "cleanupInterval": 30000,
+            "stickySessionTimeout": 3600000
+          },
+          "stickySession": {
+            "enabled": true,
+            "strategy": "consistent-hash"
+          }
+        }
+      }
+    }
+```
+
+**node-config.yaml:**
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mcphub-node-config
+  namespace: mcphub
+data:
+  mcp_settings.json: |
+    {
+      "mcpServers": {
+        "playwright": {
+          "command": "npx",
+          "args": ["@playwright/mcp@latest", "--headless"],
+          "enabled": true
+        }
+      },
+      "systemConfig": {
+        "cluster": {
+          "enabled": true,
+          "mode": "node",
+          "node": {
+            "coordinatorUrl": "http://mcphub-coordinator:3000",
+            "heartbeatInterval": 5000,
+            "registerOnStartup": true
+          }
+        }
+      }
+    }
+```
+
+### Deployments
+
+**coordinator.yaml:**
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mcphub-coordinator
+  namespace: mcphub
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: mcphub-coordinator
+  template:
+    metadata:
+      labels:
+        app: mcphub-coordinator
+    spec:
+      containers:
+      - name: mcphub
+        image: samanhappy/mcphub:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 3000
+          name: http
+        env:
+        - name: NODE_ENV
+          value: production
+        - name: PORT
+          value: "3000"
+        volumeMounts:
+        - name: config
+          mountPath: /app/mcp_settings.json
+          subPath: mcp_settings.json
+        - name: data
+          mountPath: /app/data
+        resources:
+          requests:
+            memory: "512Mi"
+            cpu: "500m"
+          limits:
+            memory: "1Gi"
+            cpu: "1000m"
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 3000
+          initialDelaySeconds: 30
+          periodSeconds: 10
+        readinessProbe:
+          httpGet:
+            path: /health
+            port: 3000
+          initialDelaySeconds: 10
+          periodSeconds: 5
+      volumes:
+      - name: config
+        configMap:
+          name: mcphub-coordinator-config
+      - name: data
+        emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mcphub-coordinator
+  namespace: mcphub
+spec:
+  selector:
+    app: mcphub-coordinator
+  ports:
+  - port: 3000
+    targetPort: 3000
+    name: http
+  type: LoadBalancer
+```
+
+**nodes.yaml:**
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mcphub-node
+  namespace: mcphub
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: mcphub-node
+  template:
+    metadata:
+      labels:
+        app: mcphub-node
+    spec:
+      containers:
+      - name: mcphub
+        image: samanhappy/mcphub:latest
+        imagePullPolicy: Always
+        env:
+        - name: NODE_ENV
+          value: production
+        volumeMounts:
+        - name: config
+          mountPath: /app/mcp_settings.json
+          subPath: mcp_settings.json
+        - name: data
+          mountPath: /app/data
+        resources:
+          requests:
+            memory: "512Mi"
+            cpu: "500m"
+          limits:
+            memory: "2Gi"
+            cpu: "2000m"
+      volumes:
+      - name: config
+        configMap:
+          name: mcphub-node-config
+      - name: data
+        emptyDir: {}
+```
+
+## Environment Variables
+
+Create a `.env` file for sensitive values:
+
+```bash
+# API Keys
+AMAP_MAPS_API_KEY=your-amap-api-key
+SLACK_BOT_TOKEN=xoxb-your-slack-bot-token
+SLACK_TEAM_ID=T01234567
+
+# Optional: Custom ports
+COORDINATOR_PORT=3000
+NODE1_PORT=3001
+NODE2_PORT=3002
+```
+
+## Testing the Cluster
+
+After starting the cluster, test connectivity:
+
+```bash
+# Check coordinator health
+curl http://localhost:3000/health
+
+# Get cluster status
+curl http://localhost:3000/api/cluster/status
+
+# List all nodes
+curl http://localhost:3000/api/cluster/nodes
+
+# Test MCP endpoint
+curl -X POST http://localhost:3000/mcp \
+  -H "Content-Type: application/json" \
+  -d '{
+    "jsonrpc": "2.0",
+    "method": "initialize",
+    "params": {
+      "protocolVersion": "2024-11-05",
+      "capabilities": {},
+      "clientInfo": {
+        "name": "test-client",
+        "version": "1.0.0"
+      }
+    },
+    "id": 1
+  }'
+```
+
+## Scaling
+
+### Scale worker nodes (Docker Compose):
+
+```bash
+docker-compose up -d --scale node1=3
+```
+
+### Scale worker nodes (Kubernetes):
+
+```bash
+kubectl scale deployment mcphub-node --replicas=5 -n mcphub
+```

frontend/src/components/MarketServerDetail.tsx

@@ -19,7 +19,7 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
   onBack,
   onInstall,
   installing = false,
-  isInstalled = false
+  isInstalled = false,
 }) => {
   const { t } = useTranslation();
   const [modalVisible, setModalVisible] = useState(false);
@@ -32,21 +32,23 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
   const getButtonProps = () => {
     if (isInstalled) {
       return {
-        className: "bg-green-600 cursor-default px-4 py-2 rounded text-sm font-medium text-white",
+        className: 'bg-green-600 cursor-default px-4 py-2 rounded text-sm font-medium text-white',
         disabled: true,
-        text: t('market.installed')
+        text: t('market.installed'),
       };
     } else if (installing) {
       return {
-        className: "bg-gray-400 cursor-not-allowed px-4 py-2 rounded text-sm font-medium text-white",
+        className:
+          'bg-gray-400 cursor-not-allowed px-4 py-2 rounded text-sm font-medium text-white',
         disabled: true,
-        text: t('market.installing')
+        text: t('market.installing'),
       };
     } else {
       return {
-        className: "bg-blue-600 hover:bg-blue-700 px-4 py-2 rounded text-sm font-medium text-white btn-primary",
+        className:
+          'bg-blue-600 hover:bg-blue-700 px-4 py-2 rounded text-sm font-medium text-white btn-primary',
         disabled: false,
-        text: t('market.install')
+        text: t('market.install'),
       };
     }
   };
@@ -133,12 +135,18 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
   return (
     <div className="bg-white rounded-lg shadow-md p-6">
       <div className="mb-4">
-        <button
-          onClick={onBack}
-          className="text-gray-600 hover:text-gray-900 flex items-center"
-        >
-          <svg className="h-5 w-5 mr-1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-            <path fillRule="evenodd" d="M9.707 16.707a1 1 0 01-1.414 0l-6-6a1 1 0 010-1.414l6-6a1 1 0 011.414 1.414L5.414 9H17a1 1 0 110 2H5.414l4.293 4.293a1 1 0 010 1.414z" clipRule="evenodd" />
+        <button onClick={onBack} className="text-gray-600 hover:text-gray-900 flex items-center">
+          <svg
+            className="h-5 w-5 mr-1"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 20 20"
+            fill="currentColor"
+          >
+            <path
+              fillRule="evenodd"
+              d="M9.707 16.707a1 1 0 01-1.414 0l-6-6a1 1 0 010-1.414l6-6a1 1 0 011.414 1.414L5.414 9H17a1 1 0 110 2H5.414l4.293 4.293a1 1 0 010 1.414z"
+              clipRule="evenodd"
+            />
           </svg>
           {t('market.backToList')}
         </button>
@@ -150,7 +158,8 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
             {server.display_name}
             <span className="text-sm font-normal text-gray-500 ml-2">({server.name})</span>
             <span className="text-sm font-normal text-gray-600 ml-4">
-              {t('market.author')}: {server.author.name} • {t('market.license')}: {server.license} •
+              {t('market.author')}: {server.author?.name || t('market.unknown')} •{' '}
+              {t('market.license')}: {server.license} •
               <a
                 href={server.repository.url}
                 target="_blank"
@@ -182,18 +191,24 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
       <p className="text-gray-700 mb-6">{server.description}</p>
 
       <div className="mb-6">
-        <h3 className="text-lg font-semibold mb-3">{t('market.categories')} & {t('market.tags')}</h3>
+        <h3 className="text-lg font-semibold mb-3">
+          {t('market.categories')} & {t('market.tags')}
+        </h3>
         <div className="flex flex-wrap gap-2">
           {server.categories?.map((category, index) => (
             <span key={`cat-${index}`} className="bg-gray-100 text-gray-800 px-3 py-1 rounded">
               {category}
             </span>
           ))}
-          {server.tags && server.tags.map((tag, index) => (
-            <span key={`tag-${index}`} className="bg-gray-100 text-green-700 px-2 py-1 rounded text-sm">
-              #{tag}
-            </span>
-          ))}
+          {server.tags &&
+            server.tags.map((tag, index) => (
+              <span
+                key={`tag-${index}`}
+                className="bg-gray-100 text-green-700 px-2 py-1 rounded text-sm"
+              >
+                #{tag}
+              </span>
+            ))}
         </div>
       </div>
 
@@ -224,9 +239,7 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
                     <td className="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900">
                       {name}
                     </td>
-                    <td className="px-6 py-4 text-sm text-gray-500">
-                      {arg.description}
-                    </td>
+                    <td className="px-6 py-4 text-sm text-gray-500">{arg.description}</td>
                     <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
                       {arg.required ? (
                         <span className="text-green-600">✓</span>
@@ -268,7 +281,10 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
               </h4>
               <p className="text-gray-600 mb-2">{tool.description}</p>
               <div className="mt-2">
-                <pre id={`schema-${index}`} className="hidden bg-gray-50 p-3 rounded text-sm overflow-auto mt-2">
+                <pre
+                  id={`schema-${index}`}
+                  className="hidden bg-gray-50 p-3 rounded text-sm overflow-auto mt-2"
+                >
                   {JSON.stringify(tool.inputSchema, null, 2)}
                 </pre>
               </div>
@@ -285,9 +301,7 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
               <div key={index} className="border border-gray-200 rounded p-4">
                 <h4 className="font-medium mb-2">{example.title}</h4>
                 <p className="text-gray-600 mb-2">{example.description}</p>
-                <pre className="bg-gray-50 p-3 rounded text-sm overflow-auto">
-                  {example.prompt}
-                </pre>
+                <pre className="bg-gray-50 p-3 rounded text-sm overflow-auto">{example.prompt}</pre>
               </div>
             ))}
           </div>
@@ -316,11 +330,11 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
               status: 'disconnected',
               config: preferredInstallation
                 ? {
-                  command: preferredInstallation.command || '',
-                  args: preferredInstallation.args || [],
-                  env: preferredInstallation.env || {}
-                }
-                : undefined
+                    command: preferredInstallation.command || '',
+                    args: preferredInstallation.args || [],
+                    env: preferredInstallation.env || {},
+                  }
+                : undefined,
             }}
           />
         </div>
@@ -332,14 +346,16 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
             <h3 className="text-lg font-semibold text-gray-900 mb-4">
               {t('server.confirmVariables')}
             </h3>
-            <p className="text-gray-600 mb-4">
-              {t('server.variablesDetected')}
-            </p>
+            <p className="text-gray-600 mb-4">{t('server.variablesDetected')}</p>
             <div className="bg-yellow-50 border border-yellow-200 rounded p-3 mb-4">
               <div className="flex items-start">
                 <div className="flex-shrink-0">
                   <svg className="h-5 w-5 text-yellow-400" viewBox="0 0 20 20" fill="currentColor">
-                    <path fillRule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clipRule="evenodd" />
+                    <path
+                      fillRule="evenodd"
+                      d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z"
+                      clipRule="evenodd"
+                    />
                   </svg>
                 </div>
                 <div className="ml-3">
@@ -356,14 +372,12 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
                 </div>
               </div>
             </div>
-            <p className="text-gray-600 text-sm mb-6">
-              {t('market.confirmVariablesMessage')}
-            </p>
+            <p className="text-gray-600 text-sm mb-6">{t('market.confirmVariablesMessage')}</p>
             <div className="flex justify-end space-x-3">
               <button
                 onClick={() => {
-                  setConfirmationVisible(false)
-                  setPendingPayload(null)
+                  setConfirmationVisible(false);
+                  setPendingPayload(null);
                 }}
                 className="px-4 py-2 text-gray-600 border border-gray-300 rounded hover:bg-gray-50 btn-secondary"
               >

frontend/src/constants/permissions.ts

@@ -5,6 +5,7 @@ export const PERMISSIONS = {
   SETTINGS_SKIP_AUTH: 'settings:skip_auth',
   SETTINGS_INSTALL_CONFIG: 'settings:install_config',
   SETTINGS_EXPORT_CONFIG: 'settings:export_config',
+  SETTINGS_CLUSTER_CONFIG: 'settings:cluster_config',
 } as const;
 
 export default PERMISSIONS;

frontend/src/hooks/useCloudData.ts

@@ -287,9 +287,13 @@ export const useCloudData = () => {
   const callServerTool = useCallback(
     async (serverName: string, toolName: string, args: Record<string, any>) => {
       try {
-        const data = await apiPost(`/cloud/servers/${serverName}/tools/${toolName}/call`, {
-          arguments: args,
-        });
+        // URL-encode server and tool names to handle slashes (e.g., "com.atlassian/atlassian-mcp-server")
+        const data = await apiPost(
+          `/cloud/servers/${encodeURIComponent(serverName)}/tools/${encodeURIComponent(toolName)}/call`,
+          {
+            arguments: args,
+          },
+        );
 
         if (data && data.success) {
           return data.data;

frontend/src/hooks/useSettingsData.ts

@@ -34,6 +34,35 @@ interface MCPRouterConfig {
   baseUrl: string;
 }
 
+interface ClusterNodeConfig {
+  id?: string;
+  name?: string;
+  coordinatorUrl: string;
+  heartbeatInterval?: number;
+  registerOnStartup?: boolean;
+}
+
+interface ClusterCoordinatorConfig {
+  nodeTimeout?: number;
+  cleanupInterval?: number;
+  stickySessionTimeout?: number;
+}
+
+interface ClusterStickySessionConfig {
+  enabled: boolean;
+  strategy: 'consistent-hash' | 'cookie' | 'header';
+  cookieName?: string;
+  headerName?: string;
+}
+
+interface ClusterConfig {
+  enabled: boolean;
+  mode: 'standalone' | 'node' | 'coordinator';
+  node?: ClusterNodeConfig;
+  coordinator?: ClusterCoordinatorConfig;
+  stickySession?: ClusterStickySessionConfig;
+}
+
 interface SystemSettings {
   systemConfig?: {
     routing?: RoutingConfig;
@@ -41,6 +70,7 @@ interface SystemSettings {
     smartRouting?: SmartRoutingConfig;
     mcpRouter?: MCPRouterConfig;
     nameSeparator?: string;
+    cluster?: ClusterConfig;
   };
 }
 
@@ -85,6 +115,27 @@ export const useSettingsData = () => {
     baseUrl: 'https://api.mcprouter.to/v1',
   });
 
+  const [clusterConfig, setClusterConfig] = useState<ClusterConfig>({
+    enabled: false,
+    mode: 'standalone',
+    node: {
+      coordinatorUrl: '',
+      heartbeatInterval: 5000,
+      registerOnStartup: true,
+    },
+    coordinator: {
+      nodeTimeout: 15000,
+      cleanupInterval: 30000,
+      stickySessionTimeout: 3600000,
+    },
+    stickySession: {
+      enabled: true,
+      strategy: 'consistent-hash',
+      cookieName: 'MCPHUB_NODE',
+      headerName: 'X-MCPHub-Node',
+    },
+  });
+
   const [nameSeparator, setNameSeparator] = useState<string>('-');
 
   const [loading, setLoading] = useState(false);
@@ -141,6 +192,28 @@ export const useSettingsData = () => {
       if (data.success && data.data?.systemConfig?.nameSeparator !== undefined) {
         setNameSeparator(data.data.systemConfig.nameSeparator);
       }
+      if (data.success && data.data?.systemConfig?.cluster) {
+        setClusterConfig({
+          enabled: data.data.systemConfig.cluster.enabled ?? false,
+          mode: data.data.systemConfig.cluster.mode || 'standalone',
+          node: data.data.systemConfig.cluster.node || {
+            coordinatorUrl: '',
+            heartbeatInterval: 5000,
+            registerOnStartup: true,
+          },
+          coordinator: data.data.systemConfig.cluster.coordinator || {
+            nodeTimeout: 15000,
+            cleanupInterval: 30000,
+            stickySessionTimeout: 3600000,
+          },
+          stickySession: data.data.systemConfig.cluster.stickySession || {
+            enabled: true,
+            strategy: 'consistent-hash',
+            cookieName: 'MCPHUB_NODE',
+            headerName: 'X-MCPHub-Node',
+          },
+        });
+      }
     } catch (error) {
       console.error('Failed to fetch settings:', error);
       setError(error instanceof Error ? error.message : 'Failed to fetch settings');
@@ -420,6 +493,39 @@ export const useSettingsData = () => {
     }
   };
 
+  // Update cluster configuration
+  const updateClusterConfig = async (updates: Partial<ClusterConfig>) => {
+    setLoading(true);
+    setError(null);
+
+    try {
+      const data = await apiPut('/system-config', {
+        cluster: updates,
+      });
+
+      if (data.success) {
+        setClusterConfig({
+          ...clusterConfig,
+          ...updates,
+        });
+        showToast(t('settings.systemConfigUpdated'));
+        return true;
+      } else {
+        showToast(data.message || t('errors.failedToUpdateSystemConfig'));
+        return false;
+      }
+    } catch (error) {
+      console.error('Failed to update cluster config:', error);
+      const errorMessage =
+        error instanceof Error ? error.message : 'Failed to update cluster config';
+      setError(errorMessage);
+      showToast(errorMessage);
+      return false;
+    } finally {
+      setLoading(false);
+    }
+  };
+
   const exportMCPSettings = async (serverName?: string) => {
     setLoading(true);
     setError(null);
@@ -455,6 +561,7 @@ export const useSettingsData = () => {
     installConfig,
     smartRoutingConfig,
     mcpRouterConfig,
+    clusterConfig,
     nameSeparator,
     loading,
     error,
@@ -468,6 +575,7 @@ export const useSettingsData = () => {
     updateRoutingConfigBatch,
     updateMCPRouterConfig,
     updateMCPRouterConfigBatch,
+    updateClusterConfig,
     updateNameSeparator,
     exportMCPSettings,
   };

frontend/src/pages/SettingsPage.tsx

@@ -1,55 +1,99 @@
-import React, { useState, useEffect } from 'react'
-import { useTranslation } from 'react-i18next'
-import { useNavigate } from 'react-router-dom'
-import ChangePasswordForm from '@/components/ChangePasswordForm'
-import { Switch } from '@/components/ui/ToggleGroup'
-import { useSettingsData } from '@/hooks/useSettingsData'
-import { useToast } from '@/contexts/ToastContext'
-import { generateRandomKey } from '@/utils/key'
-import { PermissionChecker } from '@/components/PermissionChecker'
-import { PERMISSIONS } from '@/constants/permissions'
-import { Copy, Check, Download } from 'lucide-react'
+import React, { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import ChangePasswordForm from '@/components/ChangePasswordForm';
+import { Switch } from '@/components/ui/ToggleGroup';
+import { useSettingsData } from '@/hooks/useSettingsData';
+import { useToast } from '@/contexts/ToastContext';
+import { generateRandomKey } from '@/utils/key';
+import { PermissionChecker } from '@/components/PermissionChecker';
+import { PERMISSIONS } from '@/constants/permissions';
+import { Copy, Check, Download } from 'lucide-react';
 
 const SettingsPage: React.FC = () => {
-  const { t } = useTranslation()
-  const navigate = useNavigate()
-  const { showToast } = useToast()
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const { showToast } = useToast();
 
   const [installConfig, setInstallConfig] = useState<{
-    pythonIndexUrl: string
-    npmRegistry: string
-    baseUrl: string
+    pythonIndexUrl: string;
+    npmRegistry: string;
+    baseUrl: string;
   }>({
     pythonIndexUrl: '',
     npmRegistry: '',
     baseUrl: 'http://localhost:3000',
-  })
+  });
 
   const [tempSmartRoutingConfig, setTempSmartRoutingConfig] = useState<{
-    dbUrl: string
-    openaiApiBaseUrl: string
-    openaiApiKey: string
-    openaiApiEmbeddingModel: string
+    dbUrl: string;
+    openaiApiBaseUrl: string;
+    openaiApiKey: string;
+    openaiApiEmbeddingModel: string;
   }>({
     dbUrl: '',
     openaiApiBaseUrl: '',
     openaiApiKey: '',
     openaiApiEmbeddingModel: '',
-  })
+  });
 
   const [tempMCPRouterConfig, setTempMCPRouterConfig] = useState<{
-    apiKey: string
-    referer: string
-    title: string
-    baseUrl: string
+    apiKey: string;
+    referer: string;
+    title: string;
+    baseUrl: string;
   }>({
     apiKey: '',
     referer: 'https://www.mcphubx.com',
     title: 'MCPHub',
     baseUrl: 'https://api.mcprouter.to/v1',
-  })
+  });
 
-  const [tempNameSeparator, setTempNameSeparator] = useState<string>('-')
+  const [tempNameSeparator, setTempNameSeparator] = useState<string>('-');
+
+  const [tempClusterConfig, setTempClusterConfig] = useState<{
+    enabled: boolean;
+    mode: 'standalone' | 'node' | 'coordinator';
+    node: {
+      id?: string;
+      name?: string;
+      coordinatorUrl: string;
+      heartbeatInterval?: number;
+      registerOnStartup?: boolean;
+    };
+    coordinator: {
+      nodeTimeout?: number;
+      cleanupInterval?: number;
+      stickySessionTimeout?: number;
+    };
+    stickySession: {
+      enabled: boolean;
+      strategy: 'consistent-hash' | 'cookie' | 'header';
+      cookieName?: string;
+      headerName?: string;
+    };
+  }>({
+    enabled: false,
+    mode: 'standalone',
+    node: {
+      id: '',
+      name: '',
+      coordinatorUrl: '',
+      heartbeatInterval: 5000,
+      registerOnStartup: true,
+    },
+    coordinator: {
+      nodeTimeout: 15000,
+      cleanupInterval: 30000,
+      stickySessionTimeout: 3600000,
+    },
+    stickySession: {
+      enabled: true,
+      strategy: 'consistent-hash',
+      cookieName: 'MCPHUB_NODE',
+      headerName: 'X-MCPHub-Node',
+    },
+  });
 
   const {
     routingConfig,
@@ -58,6 +102,7 @@ const SettingsPage: React.FC = () => {
     installConfig: savedInstallConfig,
     smartRoutingConfig,
     mcpRouterConfig,
+    clusterConfig,
     nameSeparator,
     loading,
     updateRoutingConfig,
@@ -66,16 +111,17 @@ const SettingsPage: React.FC = () => {
     updateSmartRoutingConfig,
     updateSmartRoutingConfigBatch,
     updateMCPRouterConfig,
+    updateClusterConfig,
     updateNameSeparator,
     exportMCPSettings,
-  } = useSettingsData()
+  } = useSettingsData();
 
   // Update local installConfig when savedInstallConfig changes
   useEffect(() => {
     if (savedInstallConfig) {
-      setInstallConfig(savedInstallConfig)
+      setInstallConfig(savedInstallConfig);
     }
-  }, [savedInstallConfig])
+  }, [savedInstallConfig]);
 
   // Update local tempSmartRoutingConfig when smartRoutingConfig changes
   useEffect(() => {
@@ -85,9 +131,9 @@ const SettingsPage: React.FC = () => {
         openaiApiBaseUrl: smartRoutingConfig.openaiApiBaseUrl || '',
         openaiApiKey: smartRoutingConfig.openaiApiKey || '',
         openaiApiEmbeddingModel: smartRoutingConfig.openaiApiEmbeddingModel || '',
-      })
+      });
     }
-  }, [smartRoutingConfig])
+  }, [smartRoutingConfig]);
 
   // Update local tempMCPRouterConfig when mcpRouterConfig changes
   useEffect(() => {
@@ -97,24 +143,53 @@ const SettingsPage: React.FC = () => {
         referer: mcpRouterConfig.referer || 'https://www.mcphubx.com',
         title: mcpRouterConfig.title || 'MCPHub',
         baseUrl: mcpRouterConfig.baseUrl || 'https://api.mcprouter.to/v1',
-      })
+      });
     }
-  }, [mcpRouterConfig])
+  }, [mcpRouterConfig]);
 
   // Update local tempNameSeparator when nameSeparator changes
   useEffect(() => {
-    setTempNameSeparator(nameSeparator)
-  }, [nameSeparator])
+    setTempNameSeparator(nameSeparator);
+  }, [nameSeparator]);
+
+  // Update local tempClusterConfig when clusterConfig changes
+  useEffect(() => {
+    if (clusterConfig) {
+      setTempClusterConfig({
+        enabled: clusterConfig.enabled ?? false,
+        mode: clusterConfig.mode || 'standalone',
+        node: clusterConfig.node || {
+          id: '',
+          name: '',
+          coordinatorUrl: '',
+          heartbeatInterval: 5000,
+          registerOnStartup: true,
+        },
+        coordinator: clusterConfig.coordinator || {
+          nodeTimeout: 15000,
+          cleanupInterval: 30000,
+          stickySessionTimeout: 3600000,
+        },
+        stickySession: clusterConfig.stickySession || {
+          enabled: true,
+          strategy: 'consistent-hash',
+          cookieName: 'MCPHUB_NODE',
+          headerName: 'X-MCPHub-Node',
+        },
+      });
+    }
+  }, [clusterConfig]);
 
   const [sectionsVisible, setSectionsVisible] = useState({
     routingConfig: false,
     installConfig: false,
     smartRoutingConfig: false,
     mcpRouterConfig: false,
+    clusterConfig: false,
     nameSeparator: false,
     password: false,
     exportConfig: false,
-  })
+  });
 
   const toggleSection = (
     section:
@@ -122,6 +197,7 @@ const SettingsPage: React.FC = () => {
       | 'installConfig'
       | 'smartRoutingConfig'
       | 'mcpRouterConfig'
+      | 'clusterConfig'
       | 'nameSeparator'
       | 'password'
       | 'exportConfig',
@@ -129,8 +205,8 @@ const SettingsPage: React.FC = () => {
     setSectionsVisible((prev) => ({
       ...prev,
       [section]: !prev[section],
-    }))
-  }
+    }));
+  };
 
   const handleRoutingConfigChange = async (
     key:
@@ -144,39 +220,39 @@ const SettingsPage: React.FC = () => {
     // If enableBearerAuth is turned on and there's no key, generate one first
     if (key === 'enableBearerAuth' && value === true) {
       if (!tempRoutingConfig.bearerAuthKey && !routingConfig.bearerAuthKey) {
-        const newKey = generateRandomKey()
-        handleBearerAuthKeyChange(newKey)
+        const newKey = generateRandomKey();
+        handleBearerAuthKeyChange(newKey);
 
         // Update both enableBearerAuth and bearerAuthKey in a single call
         const success = await updateRoutingConfigBatch({
           enableBearerAuth: true,
           bearerAuthKey: newKey,
-        })
+        });
 
         if (success) {
           // Update tempRoutingConfig to reflect the saved values
           setTempRoutingConfig((prev) => ({
             ...prev,
             bearerAuthKey: newKey,
-          }))
+          }));
         }
-        return
+        return;
       }
     }
 
-    await updateRoutingConfig(key, value)
-  }
+    await updateRoutingConfig(key, value);
+  };
 
   const handleBearerAuthKeyChange = (value: string) => {
     setTempRoutingConfig((prev) => ({
       ...prev,
       bearerAuthKey: value,
-    }))
-  }
+    }));
+  };
 
   const saveBearerAuthKey = async () => {
-    await updateRoutingConfig('bearerAuthKey', tempRoutingConfig.bearerAuthKey)
-  }
+    await updateRoutingConfig('bearerAuthKey', tempRoutingConfig.bearerAuthKey);
+  };
 
   const handleInstallConfigChange = (
     key: 'pythonIndexUrl' | 'npmRegistry' | 'baseUrl',
@@ -185,12 +261,12 @@ const SettingsPage: React.FC = () => {
     setInstallConfig({
       ...installConfig,
       [key]: value,
-    })
-  }
+    });
+  };
 
   const saveInstallConfig = async (key: 'pythonIndexUrl' | 'npmRegistry' | 'baseUrl') => {
-    await updateInstallConfig(key, installConfig[key])
-  }
+    await updateInstallConfig(key, installConfig[key]);
+  };
 
   const handleSmartRoutingConfigChange = (
     key: 'dbUrl' | 'openaiApiBaseUrl' | 'openaiApiKey' | 'openaiApiEmbeddingModel',
@@ -199,14 +275,14 @@ const SettingsPage: React.FC = () => {
     setTempSmartRoutingConfig({
       ...tempSmartRoutingConfig,
       [key]: value,
-    })
-  }
+    });
+  };
 
   const saveSmartRoutingConfig = async (
     key: 'dbUrl' | 'openaiApiBaseUrl' | 'openaiApiKey' | 'openaiApiEmbeddingModel',
   ) => {
-    await updateSmartRoutingConfig(key, tempSmartRoutingConfig[key])
-  }
+    await updateSmartRoutingConfig(key, tempSmartRoutingConfig[key]);
+  };
 
   const handleMCPRouterConfigChange = (
     key: 'apiKey' | 'referer' | 'title' | 'baseUrl',
@@ -215,141 +291,141 @@ const SettingsPage: React.FC = () => {
     setTempMCPRouterConfig({
       ...tempMCPRouterConfig,
       [key]: value,
-    })
-  }
+    });
+  };
 
   const saveMCPRouterConfig = async (key: 'apiKey' | 'referer' | 'title' | 'baseUrl') => {
-    await updateMCPRouterConfig(key, tempMCPRouterConfig[key])
-  }
+    await updateMCPRouterConfig(key, tempMCPRouterConfig[key]);
+  };
 
   const saveNameSeparator = async () => {
-    await updateNameSeparator(tempNameSeparator)
-  }
+    await updateNameSeparator(tempNameSeparator);
+  };
 
   const handleSmartRoutingEnabledChange = async (value: boolean) => {
     // If enabling Smart Routing, validate required fields and save any unsaved changes
     if (value) {
-      const currentDbUrl = tempSmartRoutingConfig.dbUrl || smartRoutingConfig.dbUrl
+      const currentDbUrl = tempSmartRoutingConfig.dbUrl || smartRoutingConfig.dbUrl;
       const currentOpenaiApiKey =
-        tempSmartRoutingConfig.openaiApiKey || smartRoutingConfig.openaiApiKey
+        tempSmartRoutingConfig.openaiApiKey || smartRoutingConfig.openaiApiKey;
 
       if (!currentDbUrl || !currentOpenaiApiKey) {
-        const missingFields = []
-        if (!currentDbUrl) missingFields.push(t('settings.dbUrl'))
-        if (!currentOpenaiApiKey) missingFields.push(t('settings.openaiApiKey'))
+        const missingFields = [];
+        if (!currentDbUrl) missingFields.push(t('settings.dbUrl'));
+        if (!currentOpenaiApiKey) missingFields.push(t('settings.openaiApiKey'));
 
         showToast(
           t('settings.smartRoutingValidationError', {
             fields: missingFields.join(', '),
           }),
-        )
-        return
+        );
+        return;
       }
 
       // Prepare updates object with unsaved changes and enabled status
-      const updates: any = { enabled: value }
+      const updates: any = { enabled: value };
 
       // Check for unsaved changes and include them in the batch update
       if (tempSmartRoutingConfig.dbUrl !== smartRoutingConfig.dbUrl) {
-        updates.dbUrl = tempSmartRoutingConfig.dbUrl
+        updates.dbUrl = tempSmartRoutingConfig.dbUrl;
       }
       if (tempSmartRoutingConfig.openaiApiBaseUrl !== smartRoutingConfig.openaiApiBaseUrl) {
-        updates.openaiApiBaseUrl = tempSmartRoutingConfig.openaiApiBaseUrl
+        updates.openaiApiBaseUrl = tempSmartRoutingConfig.openaiApiBaseUrl;
       }
       if (tempSmartRoutingConfig.openaiApiKey !== smartRoutingConfig.openaiApiKey) {
-        updates.openaiApiKey = tempSmartRoutingConfig.openaiApiKey
+        updates.openaiApiKey = tempSmartRoutingConfig.openaiApiKey;
       }
       if (
         tempSmartRoutingConfig.openaiApiEmbeddingModel !==
         smartRoutingConfig.openaiApiEmbeddingModel
       ) {
-        updates.openaiApiEmbeddingModel = tempSmartRoutingConfig.openaiApiEmbeddingModel
+        updates.openaiApiEmbeddingModel = tempSmartRoutingConfig.openaiApiEmbeddingModel;
       }
 
       // Save all changes in a single batch update
-      await updateSmartRoutingConfigBatch(updates)
+      await updateSmartRoutingConfigBatch(updates);
     } else {
       // If disabling, just update the enabled status
-      await updateSmartRoutingConfig('enabled', value)
+      await updateSmartRoutingConfig('enabled', value);
     }
-  }
+  };
 
   const handlePasswordChangeSuccess = () => {
     setTimeout(() => {
-      navigate('/')
-    }, 2000)
-  }
+      navigate('/');
+    }, 2000);
+  };
 
-  const [copiedConfig, setCopiedConfig] = useState(false)
-  const [mcpSettingsJson, setMcpSettingsJson] = useState<string>('')
+  const [copiedConfig, setCopiedConfig] = useState(false);
+  const [mcpSettingsJson, setMcpSettingsJson] = useState<string>('');
 
   const fetchMcpSettings = async () => {
     try {
-      const result = await exportMCPSettings()
-      console.log('Fetched MCP settings:', result)
-      const configJson = JSON.stringify(result.data, null, 2)
-      setMcpSettingsJson(configJson)
+      const result = await exportMCPSettings();
+      console.log('Fetched MCP settings:', result);
+      const configJson = JSON.stringify(result.data, null, 2);
+      setMcpSettingsJson(configJson);
     } catch (error) {
-      console.error('Error fetching MCP settings:', error)
-      showToast(t('settings.exportError') || 'Failed to fetch settings', 'error')
+      console.error('Error fetching MCP settings:', error);
+      showToast(t('settings.exportError') || 'Failed to fetch settings', 'error');
     }
-  }
+  };
 
   useEffect(() => {
     if (sectionsVisible.exportConfig && !mcpSettingsJson) {
-      fetchMcpSettings()
+      fetchMcpSettings();
     }
-  }, [sectionsVisible.exportConfig])
+  }, [sectionsVisible.exportConfig]);
 
   const handleCopyConfig = async () => {
-    if (!mcpSettingsJson) return
+    if (!mcpSettingsJson) return;
 
     try {
       if (navigator.clipboard && window.isSecureContext) {
-        await navigator.clipboard.writeText(mcpSettingsJson)
-        setCopiedConfig(true)
-        showToast(t('common.copySuccess') || 'Copied to clipboard', 'success')
-        setTimeout(() => setCopiedConfig(false), 2000)
+        await navigator.clipboard.writeText(mcpSettingsJson);
+        setCopiedConfig(true);
+        showToast(t('common.copySuccess') || 'Copied to clipboard', 'success');
+        setTimeout(() => setCopiedConfig(false), 2000);
       } else {
         // Fallback for HTTP or unsupported clipboard API
-        const textArea = document.createElement('textarea')
-        textArea.value = mcpSettingsJson
-        textArea.style.position = 'fixed'
-        textArea.style.left = '-9999px'
-        document.body.appendChild(textArea)
-        textArea.focus()
-        textArea.select()
+        const textArea = document.createElement('textarea');
+        textArea.value = mcpSettingsJson;
+        textArea.style.position = 'fixed';
+        textArea.style.left = '-9999px';
+        document.body.appendChild(textArea);
+        textArea.focus();
+        textArea.select();
         try {
-          document.execCommand('copy')
-          setCopiedConfig(true)
-          showToast(t('common.copySuccess') || 'Copied to clipboard', 'success')
-          setTimeout(() => setCopiedConfig(false), 2000)
+          document.execCommand('copy');
+          setCopiedConfig(true);
+          showToast(t('common.copySuccess') || 'Copied to clipboard', 'success');
+          setTimeout(() => setCopiedConfig(false), 2000);
         } catch (err) {
-          showToast(t('common.copyFailed') || 'Copy failed', 'error')
-          console.error('Copy to clipboard failed:', err)
+          showToast(t('common.copyFailed') || 'Copy failed', 'error');
+          console.error('Copy to clipboard failed:', err);
         }
-        document.body.removeChild(textArea)
+        document.body.removeChild(textArea);
       }
     } catch (error) {
-      console.error('Error copying configuration:', error)
-      showToast(t('common.copyFailed') || 'Copy failed', 'error')
+      console.error('Error copying configuration:', error);
+      showToast(t('common.copyFailed') || 'Copy failed', 'error');
     }
-  }
+  };
 
   const handleDownloadConfig = () => {
-    if (!mcpSettingsJson) return
+    if (!mcpSettingsJson) return;
 
-    const blob = new Blob([mcpSettingsJson], { type: 'application/json' })
-    const url = URL.createObjectURL(blob)
-    const link = document.createElement('a')
-    link.href = url
-    link.download = 'mcp_settings.json'
-    document.body.appendChild(link)
-    link.click()
-    document.body.removeChild(link)
-    URL.revokeObjectURL(url)
-    showToast(t('settings.exportSuccess') || 'Settings exported successfully', 'success')
-  }
+    const blob = new Blob([mcpSettingsJson], { type: 'application/json' });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = 'mcp_settings.json';
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    URL.revokeObjectURL(url);
+    showToast(t('settings.exportSuccess') || 'Settings exported successfully', 'success');
+  };
 
   return (
     <div className="container mx-auto">
@@ -563,6 +639,432 @@ const SettingsPage: React.FC = () => {
         </div>
       </PermissionChecker>
 
+      {/* Cluster Configuration Settings */}
+      <PermissionChecker permissions={PERMISSIONS.SETTINGS_CLUSTER_CONFIG}>
+        <div className="bg-white shadow rounded-lg py-4 px-6 mb-6 page-card dashboard-card">
+          <div
+            className="flex justify-between items-center cursor-pointer transition-colors duration-200 hover:text-blue-600"
+            onClick={() => toggleSection('clusterConfig')}
+          >
+            <h2 className="font-semibold text-gray-800">{t('settings.clusterConfig')}</h2>
+            <span className="text-gray-500 transition-transform duration-200">
+              {sectionsVisible.clusterConfig ? '▼' : '►'}
+            </span>
+          </div>
+
+          {sectionsVisible.clusterConfig && (
+            <div className="space-y-4 mt-4">
+              {/* Enable Cluster Mode */}
+              <div className="flex items-center justify-between p-3 bg-gray-50 rounded-md">
+                <div>
+                  <h3 className="font-medium text-gray-700">{t('settings.clusterEnabled')}</h3>
+                  <p className="text-sm text-gray-500">{t('settings.clusterEnabledDescription')}</p>
+                </div>
+                <Switch
+                  disabled={loading}
+                  checked={tempClusterConfig.enabled}
+                  onCheckedChange={(checked) => {
+                    setTempClusterConfig((prev) => ({ ...prev, enabled: checked }));
+                    updateClusterConfig({ enabled: checked });
+                  }}
+                />
+              </div>
+
+              {/* Cluster Mode Selection */}
+              {tempClusterConfig.enabled && (
+                <div className="p-3 bg-gray-50 rounded-md">
+                  <div className="mb-2">
+                    <h3 className="font-medium text-gray-700">{t('settings.clusterMode')}</h3>
+                    <p className="text-sm text-gray-500">{t('settings.clusterModeDescription')}</p>
+                  </div>
+                  <select
+                    value={tempClusterConfig.mode}
+                    onChange={(e) => {
+                      const mode = e.target.value as 'standalone' | 'node' | 'coordinator';
+                      setTempClusterConfig((prev) => ({ ...prev, mode }));
+                      updateClusterConfig({ mode });
+                    }}
+                    className="mt-1 block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                    disabled={loading}
+                  >
+                    <option value="standalone">{t('settings.clusterModeStandalone')}</option>
+                    <option value="node">{t('settings.clusterModeNode')}</option>
+                    <option value="coordinator">{t('settings.clusterModeCoordinator')}</option>
+                  </select>
+                </div>
+              )}
+
+              {/* Node Configuration */}
+              {tempClusterConfig.enabled && tempClusterConfig.mode === 'node' && (
+                <div className="p-3 bg-blue-50 border border-blue-200 rounded-md space-y-3">
+                  <h3 className="font-semibold text-gray-800 mb-2">{t('settings.nodeConfig')}</h3>
+
+                  {/* Coordinator URL */}
+                  <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      {t('settings.coordinatorUrl')} <span className="text-red-500">*</span>
+                    </label>
+                    <p className="text-xs text-gray-500 mb-2">
+                      {t('settings.coordinatorUrlDescription')}
+                    </p>
+                    <input
+                      type="text"
+                      value={tempClusterConfig.node.coordinatorUrl}
+                      onChange={(e) => {
+                        const coordinatorUrl = e.target.value;
+                        setTempClusterConfig((prev) => ({
+                          ...prev,
+                          node: { ...prev.node, coordinatorUrl },
+                        }));
+                      }}
+                      onBlur={() => updateClusterConfig({ node: { ...tempClusterConfig.node } })}
+                      placeholder={t('settings.coordinatorUrlPlaceholder')}
+                      className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                      disabled={loading}
+                    />
+                  </div>
+
+                  {/* Node ID */}
+                  <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      {t('settings.nodeId')}
+                    </label>
+                    <p className="text-xs text-gray-500 mb-2">{t('settings.nodeIdDescription')}</p>
+                    <input
+                      type="text"
+                      value={tempClusterConfig.node.id || ''}
+                      onChange={(e) => {
+                        const id = e.target.value;
+                        setTempClusterConfig((prev) => ({
+                          ...prev,
+                          node: { ...prev.node, id },
+                        }));
+                      }}
+                      onBlur={() => updateClusterConfig({ node: { ...tempClusterConfig.node } })}
+                      placeholder={t('settings.nodeIdPlaceholder')}
+                      className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                      disabled={loading}
+                    />
+                  </div>
+
+                  {/* Node Name */}
+                  <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      {t('settings.nodeName')}
+                    </label>
+                    <p className="text-xs text-gray-500 mb-2">
+                      {t('settings.nodeNameDescription')}
+                    </p>
+                    <input
+                      type="text"
+                      value={tempClusterConfig.node.name || ''}
+                      onChange={(e) => {
+                        const name = e.target.value;
+                        setTempClusterConfig((prev) => ({
+                          ...prev,
+                          node: { ...prev.node, name },
+                        }));
+                      }}
+                      onBlur={() => updateClusterConfig({ node: { ...tempClusterConfig.node } })}
+                      placeholder={t('settings.nodeNamePlaceholder')}
+                      className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                      disabled={loading}
+                    />
+                  </div>
+
+                  {/* Heartbeat Interval */}
+                  <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      {t('settings.heartbeatInterval')}
+                    </label>
+                    <p className="text-xs text-gray-500 mb-2">
+                      {t('settings.heartbeatIntervalDescription')}
+                    </p>
+                    <input
+                      type="number"
+                      value={tempClusterConfig.node.heartbeatInterval || 5000}
+                      onChange={(e) => {
+                        const heartbeatInterval = parseInt(e.target.value);
+                        setTempClusterConfig((prev) => ({
+                          ...prev,
+                          node: { ...prev.node, heartbeatInterval },
+                        }));
+                      }}
+                      onBlur={() => updateClusterConfig({ node: { ...tempClusterConfig.node } })}
+                      placeholder={t('settings.heartbeatIntervalPlaceholder')}
+                      className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                      disabled={loading}
+                      min="1000"
+                      step="1000"
+                    />
+                  </div>
+
+                  {/* Register on Startup */}
+                  <div className="flex items-center justify-between">
+                    <div>
+                      <label className="block text-sm font-medium text-gray-700">
+                        {t('settings.registerOnStartup')}
+                      </label>
+                      <p className="text-xs text-gray-500">
+                        {t('settings.registerOnStartupDescription')}
+                      </p>
+                    </div>
+                    <Switch
+                      disabled={loading}
+                      checked={tempClusterConfig.node.registerOnStartup ?? true}
+                      onCheckedChange={(checked) => {
+                        setTempClusterConfig((prev) => ({
+                          ...prev,
+                          node: { ...prev.node, registerOnStartup: checked },
+                        }));
+                        updateClusterConfig({
+                          node: { ...tempClusterConfig.node, registerOnStartup: checked },
+                        });
+                      }}
+                    />
+                  </div>
+                </div>
+              )}
+
+              {/* Coordinator Configuration */}
+              {tempClusterConfig.enabled && tempClusterConfig.mode === 'coordinator' && (
+                <div className="p-3 bg-purple-50 border border-purple-200 rounded-md space-y-3">
+                  <h3 className="font-semibold text-gray-800 mb-2">
+                    {t('settings.coordinatorConfig')}
+                  </h3>
+
+                  {/* Node Timeout */}
+                  <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      {t('settings.nodeTimeout')}
+                    </label>
+                    <p className="text-xs text-gray-500 mb-2">
+                      {t('settings.nodeTimeoutDescription')}
+                    </p>
+                    <input
+                      type="number"
+                      value={tempClusterConfig.coordinator.nodeTimeout || 15000}
+                      onChange={(e) => {
+                        const nodeTimeout = parseInt(e.target.value);
+                        setTempClusterConfig((prev) => ({
+                          ...prev,
+                          coordinator: { ...prev.coordinator, nodeTimeout },
+                        }));
+                      }}
+                      onBlur={() =>
+                        updateClusterConfig({ coordinator: { ...tempClusterConfig.coordinator } })
+                      }
+                      placeholder={t('settings.nodeTimeoutPlaceholder')}
+                      className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                      disabled={loading}
+                      min="5000"
+                      step="1000"
+                    />
+                  </div>
+
+                  {/* Cleanup Interval */}
+                  <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      {t('settings.cleanupInterval')}
+                    </label>
+                    <p className="text-xs text-gray-500 mb-2">
+                      {t('settings.cleanupIntervalDescription')}
+                    </p>
+                    <input
+                      type="number"
+                      value={tempClusterConfig.coordinator.cleanupInterval || 30000}
+                      onChange={(e) => {
+                        const cleanupInterval = parseInt(e.target.value);
+                        setTempClusterConfig((prev) => ({
+                          ...prev,
+                          coordinator: { ...prev.coordinator, cleanupInterval },
+                        }));
+                      }}
+                      onBlur={() =>
+                        updateClusterConfig({ coordinator: { ...tempClusterConfig.coordinator } })
+                      }
+                      placeholder={t('settings.cleanupIntervalPlaceholder')}
+                      className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                      disabled={loading}
+                      min="10000"
+                      step="5000"
+                    />
+                  </div>
+
+                  {/* Sticky Session Timeout */}
+                  <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">
+                      {t('settings.stickySessionTimeout')}
+                    </label>
+                    <p className="text-xs text-gray-500 mb-2">
+                      {t('settings.stickySessionTimeoutDescription')}
+                    </p>
+                    <input
+                      type="number"
+                      value={tempClusterConfig.coordinator.stickySessionTimeout || 3600000}
+                      onChange={(e) => {
+                        const stickySessionTimeout = parseInt(e.target.value);
+                        setTempClusterConfig((prev) => ({
+                          ...prev,
+                          coordinator: { ...prev.coordinator, stickySessionTimeout },
+                        }));
+                      }}
+                      onBlur={() =>
+                        updateClusterConfig({ coordinator: { ...tempClusterConfig.coordinator } })
+                      }
+                      placeholder={t('settings.stickySessionTimeoutPlaceholder')}
+                      className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                      disabled={loading}
+                      min="60000"
+                      step="60000"
+                    />
+                  </div>
+                </div>
+              )}
+
+              {/* Sticky Session Configuration */}
+              {tempClusterConfig.enabled &&
+                (tempClusterConfig.mode === 'coordinator' || tempClusterConfig.mode === 'node') && (
+                  <div className="p-3 bg-green-50 border border-green-200 rounded-md space-y-3">
+                    <h3 className="font-semibold text-gray-800 mb-2">
+                      {t('settings.stickySessionConfig')}
+                    </h3>
+
+                    {/* Enable Sticky Sessions */}
+                    <div className="flex items-center justify-between">
+                      <div>
+                        <label className="block text-sm font-medium text-gray-700">
+                          {t('settings.stickySessionEnabled')}
+                        </label>
+                        <p className="text-xs text-gray-500">
+                          {t('settings.stickySessionEnabledDescription')}
+                        </p>
+                      </div>
+                      <Switch
+                        disabled={loading}
+                        checked={tempClusterConfig.stickySession.enabled}
+                        onCheckedChange={(checked) => {
+                          setTempClusterConfig((prev) => ({
+                            ...prev,
+                            stickySession: { ...prev.stickySession, enabled: checked },
+                          }));
+                          updateClusterConfig({
+                            stickySession: { ...tempClusterConfig.stickySession, enabled: checked },
+                          });
+                        }}
+                      />
+                    </div>
+
+                    {tempClusterConfig.stickySession.enabled && (
+                      <>
+                        {/* Session Strategy */}
+                        <div>
+                          <label className="block text-sm font-medium text-gray-700 mb-1">
+                            {t('settings.stickySessionStrategy')}
+                          </label>
+                          <p className="text-xs text-gray-500 mb-2">
+                            {t('settings.stickySessionStrategyDescription')}
+                          </p>
+                          <select
+                            value={tempClusterConfig.stickySession.strategy}
+                            onChange={(e) => {
+                              const strategy = e.target.value as
+                                | 'consistent-hash'
+                                | 'cookie'
+                                | 'header';
+                              setTempClusterConfig((prev) => ({
+                                ...prev,
+                                stickySession: { ...prev.stickySession, strategy },
+                              }));
+                              updateClusterConfig({
+                                stickySession: { ...tempClusterConfig.stickySession, strategy },
+                              });
+                            }}
+                            className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                            disabled={loading}
+                          >
+                            <option value="consistent-hash">
+                              {t('settings.stickySessionStrategyConsistentHash')}
+                            </option>
+                            <option value="cookie">
+                              {t('settings.stickySessionStrategyCookie')}
+                            </option>
+                            <option value="header">
+                              {t('settings.stickySessionStrategyHeader')}
+                            </option>
+                          </select>
+                        </div>
+
+                        {/* Cookie Name (only for cookie strategy) */}
+                        {tempClusterConfig.stickySession.strategy === 'cookie' && (
+                          <div>
+                            <label className="block text-sm font-medium text-gray-700 mb-1">
+                              {t('settings.cookieName')}
+                            </label>
+                            <p className="text-xs text-gray-500 mb-2">
+                              {t('settings.cookieNameDescription')}
+                            </p>
+                            <input
+                              type="text"
+                              value={tempClusterConfig.stickySession.cookieName || 'MCPHUB_NODE'}
+                              onChange={(e) => {
+                                const cookieName = e.target.value;
+                                setTempClusterConfig((prev) => ({
+                                  ...prev,
+                                  stickySession: { ...prev.stickySession, cookieName },
+                                }));
+                              }}
+                              onBlur={() =>
+                                updateClusterConfig({
+                                  stickySession: { ...tempClusterConfig.stickySession },
+                                })
+                              }
+                              placeholder={t('settings.cookieNamePlaceholder')}
+                              className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                              disabled={loading}
+                            />
+                          </div>
+                        )}
+
+                        {/* Header Name (only for header strategy) */}
+                        {tempClusterConfig.stickySession.strategy === 'header' && (
+                          <div>
+                            <label className="block text-sm font-medium text-gray-700 mb-1">
+                              {t('settings.headerName')}
+                            </label>
+                            <p className="text-xs text-gray-500 mb-2">
+                              {t('settings.headerNameDescription')}
+                            </p>
+                            <input
+                              type="text"
+                              value={tempClusterConfig.stickySession.headerName || 'X-MCPHub-Node'}
+                              onChange={(e) => {
+                                const headerName = e.target.value;
+                                setTempClusterConfig((prev) => ({
+                                  ...prev,
+                                  stickySession: { ...prev.stickySession, headerName },
+                                }));
+                              }}
+                              onBlur={() =>
+                                updateClusterConfig({
+                                  stickySession: { ...tempClusterConfig.stickySession },
+                                })
+                              }
+                              placeholder={t('settings.headerNamePlaceholder')}
+                              className="block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+                              disabled={loading}
+                            />
+                          </div>
+                        )}
+                      </>
+                    )}
+                  </div>
+                )}
+            </div>
+          )}
+        </div>
+      </PermissionChecker>
+
       {/* System Settings */}
       <div className="bg-white shadow rounded-lg py-4 px-6 mb-6 dashboard-card">
         <div
@@ -794,7 +1296,10 @@ const SettingsPage: React.FC = () => {
       </PermissionChecker>
 
       {/* Change Password */}
-      <div className="bg-white shadow rounded-lg py-4 px-6 mb-6 dashboard-card" data-section="password">
+      <div
+        className="bg-white shadow rounded-lg py-4 px-6 mb-6 dashboard-card"
+        data-section="password"
+      >
         <div
           className="flex justify-between items-center cursor-pointer"
           onClick={() => toggleSection('password')}
@@ -864,7 +1369,7 @@ const SettingsPage: React.FC = () => {
         </div>
       </PermissionChecker>
     </div>
-  )
-}
+  );
+};
 
-export default SettingsPage
+export default SettingsPage;

frontend/src/services/promptService.ts

@@ -59,8 +59,9 @@ export const getPrompt = async (
   server?: string,
 ): Promise<GetPromptResult> => {
   try {
+    // URL-encode server and prompt names to handle slashes (e.g., "com.atlassian/atlassian-mcp-server")
     const response = await apiPost(
-      `/mcp/${server}/prompts/${encodeURIComponent(request.promptName)}`,
+      `/mcp/${encodeURIComponent(server || '')}/prompts/${encodeURIComponent(request.promptName)}`,
       {
         name: request.promptName,
         arguments: request.arguments,
@@ -94,9 +95,13 @@ export const togglePrompt = async (
   enabled: boolean,
 ): Promise<{ success: boolean; error?: string }> => {
   try {
-    const response = await apiPost<any>(`/servers/${serverName}/prompts/${promptName}/toggle`, {
-      enabled,
-    });
+    // URL-encode server and prompt names to handle slashes (e.g., "com.atlassian/atlassian-mcp-server")
+    const response = await apiPost<any>(
+      `/servers/${encodeURIComponent(serverName)}/prompts/${encodeURIComponent(promptName)}/toggle`,
+      {
+        enabled,
+      },
+    );
 
     return {
       success: response.success,
@@ -120,8 +125,9 @@ export const updatePromptDescription = async (
   description: string,
 ): Promise<{ success: boolean; error?: string }> => {
   try {
+    // URL-encode server and prompt names to handle slashes (e.g., "com.atlassian/atlassian-mcp-server")
     const response = await apiPut<any>(
-      `/servers/${serverName}/prompts/${promptName}/description`,
+      `/servers/${encodeURIComponent(serverName)}/prompts/${encodeURIComponent(promptName)}/description`,
       { description },
       {
         headers: {

frontend/src/services/toolService.ts

@@ -25,7 +25,10 @@ export const callTool = async (
 ): Promise<ToolCallResult> => {
   try {
     // Construct the URL with optional server parameter
-    const url = server ? `/tools/${server}/${request.toolName}` : '/tools/call';
+    // URL-encode server and tool names to handle slashes in names (e.g., "com.atlassian/atlassian-mcp-server")
+    const url = server
+      ? `/tools/${encodeURIComponent(server)}/${encodeURIComponent(request.toolName)}`
+      : '/tools/call';
 
     const response = await apiPost<any>(url, request.arguments, {
       headers: {
@@ -62,8 +65,9 @@ export const toggleTool = async (
   enabled: boolean,
 ): Promise<{ success: boolean; error?: string }> => {
   try {
+    // URL-encode server and tool names to handle slashes (e.g., "com.atlassian/atlassian-mcp-server")
     const response = await apiPost<any>(
-      `/servers/${serverName}/tools/${toolName}/toggle`,
+      `/servers/${encodeURIComponent(serverName)}/tools/${encodeURIComponent(toolName)}/toggle`,
       { enabled },
       {
         headers: {
@@ -94,8 +98,9 @@ export const updateToolDescription = async (
   description: string,
 ): Promise<{ success: boolean; error?: string }> => {
   try {
+    // URL-encode server and tool names to handle slashes (e.g., "com.atlassian/atlassian-mcp-server")
     const response = await apiPut<any>(
-      `/servers/${serverName}/tools/${toolName}/description`,
+      `/servers/${encodeURIComponent(serverName)}/tools/${encodeURIComponent(toolName)}/description`,
       { description },
       {
         headers: {

locales/en.json

@@ -574,6 +574,53 @@
     "systemSettings": "System Settings",
     "nameSeparatorLabel": "Name Separator",
     "nameSeparatorDescription": "Character used to separate server name and tool/prompt name (default: -)",
+    "clusterConfig": "Cluster Configuration",
+    "clusterEnabled": "Enable Cluster Mode",
+    "clusterEnabledDescription": "Enable distributed cluster deployment for high availability and scalability",
+    "clusterMode": "Cluster Mode",
+    "clusterModeDescription": "Select the operating mode for this instance",
+    "clusterModeStandalone": "Standalone",
+    "clusterModeNode": "Node",
+    "clusterModeCoordinator": "Coordinator",
+    "nodeConfig": "Node Configuration",
+    "nodeId": "Node ID",
+    "nodeIdDescription": "Unique identifier for this node (auto-generated if not provided)",
+    "nodeIdPlaceholder": "e.g. node-1",
+    "nodeName": "Node Name",
+    "nodeNameDescription": "Human-readable name for this node (defaults to hostname)",
+    "nodeNamePlaceholder": "e.g. mcp-node-1",
+    "coordinatorUrl": "Coordinator URL",
+    "coordinatorUrlDescription": "URL of the coordinator node to register with",
+    "coordinatorUrlPlaceholder": "http://coordinator:3000",
+    "heartbeatInterval": "Heartbeat Interval (ms)",
+    "heartbeatIntervalDescription": "Interval in milliseconds between heartbeat signals (default: 5000)",
+    "heartbeatIntervalPlaceholder": "5000",
+    "registerOnStartup": "Register on Startup",
+    "registerOnStartupDescription": "Automatically register with coordinator when node starts (default: true)",
+    "coordinatorConfig": "Coordinator Configuration",
+    "nodeTimeout": "Node Timeout (ms)",
+    "nodeTimeoutDescription": "Time in milliseconds before marking a node as unhealthy (default: 15000)",
+    "nodeTimeoutPlaceholder": "15000",
+    "cleanupInterval": "Cleanup Interval (ms)",
+    "cleanupIntervalDescription": "Interval for cleaning up inactive nodes in milliseconds (default: 30000)",
+    "cleanupIntervalPlaceholder": "30000",
+    "stickySessionTimeout": "Sticky Session Timeout (ms)",
+    "stickySessionTimeoutDescription": "Session timeout in milliseconds (default: 3600000 = 1 hour)",
+    "stickySessionTimeoutPlaceholder": "3600000",
+    "stickySessionConfig": "Sticky Session Configuration",
+    "stickySessionEnabled": "Enable Sticky Sessions",
+    "stickySessionEnabledDescription": "Enable session affinity to route requests from the same client to the same node",
+    "stickySessionStrategy": "Session Strategy",
+    "stickySessionStrategyDescription": "Strategy for maintaining session affinity",
+    "stickySessionStrategyConsistentHash": "Consistent Hash",
+    "stickySessionStrategyCookie": "Cookie",
+    "stickySessionStrategyHeader": "Header",
+    "cookieName": "Cookie Name",
+    "cookieNameDescription": "Cookie name for cookie-based sticky sessions (default: MCPHUB_NODE)",
+    "cookieNamePlaceholder": "MCPHUB_NODE",
+    "headerName": "Header Name",
+    "headerNameDescription": "Header name for header-based sticky sessions (default: X-MCPHub-Node)",
+    "headerNamePlaceholder": "X-MCPHub-Node",
     "restartRequired": "Configuration saved. It is recommended to restart the application to ensure all services load the new settings correctly.",
     "exportMcpSettings": "Export Settings",
     "mcpSettingsJson": "MCP Settings JSON",

locales/fr.json

@@ -574,6 +574,53 @@
     "systemSettings": "Paramètres système",
     "nameSeparatorLabel": "Séparateur de noms",
     "nameSeparatorDescription": "Caractère utilisé pour séparer le nom du serveur et le nom de l'outil/prompt (par défaut : -)",
+    "clusterConfig": "Configuration du cluster",
+    "clusterEnabled": "Activer le mode cluster",
+    "clusterEnabledDescription": "Activer le déploiement en cluster distribué pour la haute disponibilité et l'évolutivité",
+    "clusterMode": "Mode cluster",
+    "clusterModeDescription": "Sélectionnez le mode de fonctionnement pour cette instance",
+    "clusterModeStandalone": "Autonome",
+    "clusterModeNode": "Nœud",
+    "clusterModeCoordinator": "Coordinateur",
+    "nodeConfig": "Configuration du nœud",
+    "nodeId": "ID du nœud",
+    "nodeIdDescription": "Identifiant unique pour ce nœud (généré automatiquement si non fourni)",
+    "nodeIdPlaceholder": "ex. node-1",
+    "nodeName": "Nom du nœud",
+    "nodeNameDescription": "Nom lisible par l'homme pour ce nœud (par défaut, nom d'hôte)",
+    "nodeNamePlaceholder": "ex. mcp-node-1",
+    "coordinatorUrl": "URL du coordinateur",
+    "coordinatorUrlDescription": "URL du nœud coordinateur auquel s'inscrire",
+    "coordinatorUrlPlaceholder": "http://coordinator:3000",
+    "heartbeatInterval": "Intervalle de battement de cœur (ms)",
+    "heartbeatIntervalDescription": "Intervalle en millisecondes entre les signaux de battement de cœur (par défaut : 5000)",
+    "heartbeatIntervalPlaceholder": "5000",
+    "registerOnStartup": "S'inscrire au démarrage",
+    "registerOnStartupDescription": "S'inscrire automatiquement auprès du coordinateur au démarrage du nœud (par défaut : true)",
+    "coordinatorConfig": "Configuration du coordinateur",
+    "nodeTimeout": "Délai d'expiration du nœud (ms)",
+    "nodeTimeoutDescription": "Temps en millisecondes avant de marquer un nœud comme non sain (par défaut : 15000)",
+    "nodeTimeoutPlaceholder": "15000",
+    "cleanupInterval": "Intervalle de nettoyage (ms)",
+    "cleanupIntervalDescription": "Intervalle de nettoyage des nœuds inactifs en millisecondes (par défaut : 30000)",
+    "cleanupIntervalPlaceholder": "30000",
+    "stickySessionTimeout": "Délai d'expiration de la session persistante (ms)",
+    "stickySessionTimeoutDescription": "Délai d'expiration de la session en millisecondes (par défaut : 3600000 = 1 heure)",
+    "stickySessionTimeoutPlaceholder": "3600000",
+    "stickySessionConfig": "Configuration de la session persistante",
+    "stickySessionEnabled": "Activer les sessions persistantes",
+    "stickySessionEnabledDescription": "Activer l'affinité de session pour acheminer les requêtes du même client vers le même nœud",
+    "stickySessionStrategy": "Stratégie de session",
+    "stickySessionStrategyDescription": "Stratégie pour maintenir l'affinité de session",
+    "stickySessionStrategyConsistentHash": "Hachage cohérent",
+    "stickySessionStrategyCookie": "Cookie",
+    "stickySessionStrategyHeader": "En-tête",
+    "cookieName": "Nom du cookie",
+    "cookieNameDescription": "Nom du cookie pour les sessions persistantes basées sur les cookies (par défaut : MCPHUB_NODE)",
+    "cookieNamePlaceholder": "MCPHUB_NODE",
+    "headerName": "Nom de l'en-tête",
+    "headerNameDescription": "Nom de l'en-tête pour les sessions persistantes basées sur les en-têtes (par défaut : X-MCPHub-Node)",
+    "headerNamePlaceholder": "X-MCPHub-Node",
     "restartRequired": "Configuration enregistrée. Il est recommandé de redémarrer l'application pour s'assurer que tous les services chargent correctement les nouveaux paramètres.",
     "exportMcpSettings": "Exporter les paramètres",
     "mcpSettingsJson": "JSON des paramètres MCP",

locales/zh.json

@@ -576,6 +576,53 @@
     "systemSettings": "系统设置",
     "nameSeparatorLabel": "名称分隔符",
     "nameSeparatorDescription": "用于分隔服务器名称和工具/提示名称（默认：-）",
+    "clusterConfig": "集群配置",
+    "clusterEnabled": "启用集群模式",
+    "clusterEnabledDescription": "启用分布式集群部署，实现高可用和可扩展性",
+    "clusterMode": "集群模式",
+    "clusterModeDescription": "选择此实例的运行模式",
+    "clusterModeStandalone": "独立模式",
+    "clusterModeNode": "节点模式",
+    "clusterModeCoordinator": "协调器模式",
+    "nodeConfig": "节点配置",
+    "nodeId": "节点 ID",
+    "nodeIdDescription": "节点的唯一标识符（如果未提供则自动生成）",
+    "nodeIdPlaceholder": "例如: node-1",
+    "nodeName": "节点名称",
+    "nodeNameDescription": "节点的可读名称（默认为主机名）",
+    "nodeNamePlaceholder": "例如: mcp-node-1",
+    "coordinatorUrl": "协调器地址",
+    "coordinatorUrlDescription": "要注册的协调器节点的地址",
+    "coordinatorUrlPlaceholder": "http://coordinator:3000",
+    "heartbeatInterval": "心跳间隔（毫秒）",
+    "heartbeatIntervalDescription": "心跳信号的发送间隔，单位为毫秒（默认：5000）",
+    "heartbeatIntervalPlaceholder": "5000",
+    "registerOnStartup": "启动时注册",
+    "registerOnStartupDescription": "节点启动时自动向协调器注册（默认：true）",
+    "coordinatorConfig": "协调器配置",
+    "nodeTimeout": "节点超时（毫秒）",
+    "nodeTimeoutDescription": "将节点标记为不健康之前的超时时间，单位为毫秒（默认：15000）",
+    "nodeTimeoutPlaceholder": "15000",
+    "cleanupInterval": "清理间隔（毫秒）",
+    "cleanupIntervalDescription": "清理非活动节点的间隔时间，单位为毫秒（默认：30000）",
+    "cleanupIntervalPlaceholder": "30000",
+    "stickySessionTimeout": "会话超时（毫秒）",
+    "stickySessionTimeoutDescription": "会话的超时时间，单位为毫秒（默认：3600000 = 1 小时）",
+    "stickySessionTimeoutPlaceholder": "3600000",
+    "stickySessionConfig": "会话保持配置",
+    "stickySessionEnabled": "启用会话保持",
+    "stickySessionEnabledDescription": "启用会话亲和性，将来自同一客户端的请求路由到同一节点",
+    "stickySessionStrategy": "会话策略",
+    "stickySessionStrategyDescription": "维护会话亲和性的策略",
+    "stickySessionStrategyConsistentHash": "一致性哈希",
+    "stickySessionStrategyCookie": "Cookie",
+    "stickySessionStrategyHeader": "Header",
+    "cookieName": "Cookie 名称",
+    "cookieNameDescription": "基于 Cookie 的会话保持使用的 Cookie 名称（默认：MCPHUB_NODE）",
+    "cookieNamePlaceholder": "MCPHUB_NODE",
+    "headerName": "Header 名称",
+    "headerNameDescription": "基于 Header 的会话保持使用的 Header 名称（默认：X-MCPHub-Node）",
+    "headerNamePlaceholder": "X-MCPHub-Node",
     "restartRequired": "配置已保存。为确保所有服务正确加载新设置，建议重启应用。",
     "exportMcpSettings": "导出配置",
     "mcpSettingsJson": "MCP 配置 JSON",

src/controllers/cloudController.ts

@@ -207,7 +207,8 @@ export const getCloudServersByTag = async (req: Request, res: Response): Promise
 // Get tools for a specific cloud server
 export const getCloudServerToolsList = async (req: Request, res: Response): Promise<void> => {
   try {
-    const { serverName } = req.params;
+    // Decode URL-encoded parameter to handle slashes in server name
+    const serverName = decodeURIComponent(req.params.serverName);
     if (!serverName) {
       res.status(400).json({
         success: false,
@@ -236,7 +237,9 @@ export const getCloudServerToolsList = async (req: Request, res: Response): Prom
 // Call a tool on a cloud server
 export const callCloudTool = async (req: Request, res: Response): Promise<void> => {
   try {
-    const { serverName, toolName } = req.params;
+    // Decode URL-encoded parameters to handle slashes in server/tool names
+    const serverName = decodeURIComponent(req.params.serverName);
+    const toolName = decodeURIComponent(req.params.toolName);
     const { arguments: args } = req.body;
 
     if (!serverName) {

src/controllers/clusterController.ts

@@ -0,0 +1,240 @@
+/**
+ * Cluster Controller
+ * 
+ * Handles cluster-related API endpoints:
+ * - Node registration
+ * - Heartbeat updates
+ * - Cluster status queries
+ * - Session affinity management
+ */
+
+import { Request, Response } from 'express';
+import {
+  getClusterMode,
+  isClusterEnabled,
+  getCurrentNodeId,
+  registerNode,
+  updateNodeHeartbeat,
+  getActiveNodes,
+  getAllNodes,
+  getServerReplicas,
+  getSessionAffinity,
+  getClusterStats,
+} from '../services/clusterService.js';
+import { ClusterNode } from '../types/index.js';
+
+/**
+ * Get cluster status
+ * GET /api/cluster/status
+ */
+export const getClusterStatus = (_req: Request, res: Response): void => {
+  try {
+    const enabled = isClusterEnabled();
+    const mode = getClusterMode();
+    const nodeId = getCurrentNodeId();
+    const stats = getClusterStats();
+
+    res.json({
+      success: true,
+      data: {
+        enabled,
+        mode,
+        nodeId,
+        stats,
+      },
+    });
+  } catch (error) {
+    console.error('Error getting cluster status:', error);
+    res.status(500).json({
+      success: false,
+      message: 'Failed to get cluster status',
+    });
+  }
+};
+
+/**
+ * Register a node (coordinator only)
+ * POST /api/cluster/register
+ */
+export const registerNodeEndpoint = (req: Request, res: Response): void => {
+  try {
+    const mode = getClusterMode();
+    
+    if (mode !== 'coordinator') {
+      res.status(403).json({
+        success: false,
+        message: 'This endpoint is only available on coordinator nodes',
+      });
+      return;
+    }
+
+    const nodeInfo: ClusterNode = req.body;
+    
+    // Validate required fields
+    if (!nodeInfo.id || !nodeInfo.name || !nodeInfo.url) {
+      res.status(400).json({
+        success: false,
+        message: 'Missing required fields: id, name, url',
+      });
+      return;
+    }
+
+    registerNode(nodeInfo);
+
+    res.json({
+      success: true,
+      message: 'Node registered successfully',
+    });
+  } catch (error) {
+    console.error('Error registering node:', error);
+    res.status(500).json({
+      success: false,
+      message: 'Failed to register node',
+    });
+  }
+};
+
+/**
+ * Update node heartbeat (coordinator only)
+ * POST /api/cluster/heartbeat
+ */
+export const updateHeartbeat = (req: Request, res: Response): void => {
+  try {
+    const mode = getClusterMode();
+    
+    if (mode !== 'coordinator') {
+      res.status(403).json({
+        success: false,
+        message: 'This endpoint is only available on coordinator nodes',
+      });
+      return;
+    }
+
+    const { id, servers } = req.body;
+    
+    if (!id) {
+      res.status(400).json({
+        success: false,
+        message: 'Missing required field: id',
+      });
+      return;
+    }
+
+    updateNodeHeartbeat(id, servers || []);
+
+    res.json({
+      success: true,
+      message: 'Heartbeat updated successfully',
+    });
+  } catch (error) {
+    console.error('Error updating heartbeat:', error);
+    res.status(500).json({
+      success: false,
+      message: 'Failed to update heartbeat',
+    });
+  }
+};
+
+/**
+ * Get all nodes (coordinator only)
+ * GET /api/cluster/nodes
+ */
+export const getNodes = (req: Request, res: Response): void => {
+  try {
+    const mode = getClusterMode();
+    
+    if (mode !== 'coordinator') {
+      res.status(403).json({
+        success: false,
+        message: 'This endpoint is only available on coordinator nodes',
+      });
+      return;
+    }
+
+    const activeOnly = req.query.active === 'true';
+    const nodes = activeOnly ? getActiveNodes() : getAllNodes();
+
+    res.json({
+      success: true,
+      data: nodes,
+    });
+  } catch (error) {
+    console.error('Error getting nodes:', error);
+    res.status(500).json({
+      success: false,
+      message: 'Failed to get nodes',
+    });
+  }
+};
+
+/**
+ * Get server replicas (coordinator only)
+ * GET /api/cluster/servers/:serverId/replicas
+ */
+export const getReplicasForServer = (req: Request, res: Response): void => {
+  try {
+    const mode = getClusterMode();
+    
+    if (mode !== 'coordinator') {
+      res.status(403).json({
+        success: false,
+        message: 'This endpoint is only available on coordinator nodes',
+      });
+      return;
+    }
+
+    const { serverId } = req.params;
+    const replicas = getServerReplicas(serverId);
+
+    res.json({
+      success: true,
+      data: replicas,
+    });
+  } catch (error) {
+    console.error('Error getting server replicas:', error);
+    res.status(500).json({
+      success: false,
+      message: 'Failed to get server replicas',
+    });
+  }
+};
+
+/**
+ * Get session affinity information (coordinator only)
+ * GET /api/cluster/sessions/:sessionId
+ */
+export const getSessionAffinityInfo = (req: Request, res: Response): void => {
+  try {
+    const mode = getClusterMode();
+    
+    if (mode !== 'coordinator') {
+      res.status(403).json({
+        success: false,
+        message: 'This endpoint is only available on coordinator nodes',
+      });
+      return;
+    }
+
+    const { sessionId } = req.params;
+    const affinity = getSessionAffinity(sessionId);
+
+    if (!affinity) {
+      res.status(404).json({
+        success: false,
+        message: 'Session affinity not found',
+      });
+      return;
+    }
+
+    res.json({
+      success: true,
+      data: affinity,
+    });
+  } catch (error) {
+    console.error('Error getting session affinity:', error);
+    res.status(500).json({
+      success: false,
+      message: 'Failed to get session affinity',
+    });
+  }
+};

src/controllers/openApiController.ts

@@ -8,82 +8,13 @@ import {
 import { getServerByName } from '../services/mcpService.js';
 import { getGroupByIdOrName } from '../services/groupService.js';
 import { getNameSeparator } from '../config/index.js';
+import { convertParametersToTypes } from '../utils/parameterConversion.js';
 
 /**
  * Controller for OpenAPI generation endpoints
  * Provides OpenAPI specifications for MCP tools to enable OpenWebUI integration
  */
 
-/**
- * Convert query parameters to their proper types based on the tool's input schema
- */
-function convertQueryParametersToTypes(
-  queryParams: Record<string, any>,
-  inputSchema: Record<string, any>,
-): Record<string, any> {
-  if (!inputSchema || typeof inputSchema !== 'object' || !inputSchema.properties) {
-    return queryParams;
-  }
-
-  const convertedParams: Record<string, any> = {};
-  const properties = inputSchema.properties;
-
-  for (const [key, value] of Object.entries(queryParams)) {
-    const propDef = properties[key];
-    if (!propDef || typeof propDef !== 'object') {
-      // No schema definition found, keep as is
-      convertedParams[key] = value;
-      continue;
-    }
-
-    const propType = propDef.type;
-
-    try {
-      switch (propType) {
-        case 'integer':
-        case 'number':
-          // Convert string to number
-          if (typeof value === 'string') {
-            const numValue = propType === 'integer' ? parseInt(value, 10) : parseFloat(value);
-            convertedParams[key] = isNaN(numValue) ? value : numValue;
-          } else {
-            convertedParams[key] = value;
-          }
-          break;
-
-        case 'boolean':
-          // Convert string to boolean
-          if (typeof value === 'string') {
-            convertedParams[key] = value.toLowerCase() === 'true' || value === '1';
-          } else {
-            convertedParams[key] = value;
-          }
-          break;
-
-        case 'array':
-          // Handle array conversion if needed (e.g., comma-separated strings)
-          if (typeof value === 'string' && value.includes(',')) {
-            convertedParams[key] = value.split(',').map((item) => item.trim());
-          } else {
-            convertedParams[key] = value;
-          }
-          break;
-
-        default:
-          // For string and other types, keep as is
-          convertedParams[key] = value;
-          break;
-      }
-    } catch (error) {
-      // If conversion fails, keep the original value
-      console.warn(`Failed to convert parameter '${key}' to type '${propType}':`, error);
-      convertedParams[key] = value;
-    }
-  }
-
-  return convertedParams;
-}
-
 /**
  * Generate and return OpenAPI specification
  * GET /api/openapi.json
@@ -167,7 +98,9 @@ export const getOpenAPIStats = async (req: Request, res: Response): Promise<void
  */
 export const executeToolViaOpenAPI = async (req: Request, res: Response): Promise<void> => {
   try {
-    const { serverName, toolName } = req.params;
+    // Decode URL-encoded parameters to handle slashes in server/tool names
+    const serverName = decodeURIComponent(req.params.serverName);
+    const toolName = decodeURIComponent(req.params.toolName);
 
     // Import handleCallToolRequest function
     const { handleCallToolRequest } = await import('../services/mcpService.js');
@@ -189,7 +122,7 @@ export const executeToolViaOpenAPI = async (req: Request, res: Response): Promis
 
     // Prepare arguments from query params (GET) or body (POST)
     let args = req.method === 'GET' ? req.query : req.body || {};
-    args = convertQueryParametersToTypes(args, inputSchema);
+    args = convertParametersToTypes(args, inputSchema);
 
     // Create a mock request structure that matches what handleCallToolRequest expects
     const mockRequest = {

src/controllers/promptController.ts

@@ -7,7 +7,9 @@ import { handleGetPromptRequest } from '../services/mcpService.js';
  */
 export const getPrompt = async (req: Request, res: Response): Promise<void> => {
   try {
-    const { serverName, promptName } = req.params;
+    // Decode URL-encoded parameters to handle slashes in server/prompt names
+    const serverName = decodeURIComponent(req.params.serverName);
+    const promptName = decodeURIComponent(req.params.promptName);
     if (!serverName || !promptName) {
       res.status(400).json({
         success: false,

src/controllers/serverController.ts

@@ -375,7 +375,9 @@ export const toggleServer = async (req: Request, res: Response): Promise<void> =
 // Toggle tool status for a specific server
 export const toggleTool = async (req: Request, res: Response): Promise<void> => {
   try {
-    const { serverName, toolName } = req.params;
+    // Decode URL-encoded parameters to handle slashes in server/tool names
+    const serverName = decodeURIComponent(req.params.serverName);
+    const toolName = decodeURIComponent(req.params.toolName);
     const { enabled } = req.body;
 
     if (!serverName || !toolName) {
@@ -437,7 +439,9 @@ export const toggleTool = async (req: Request, res: Response): Promise<void> =>
 // Update tool description for a specific server
 export const updateToolDescription = async (req: Request, res: Response): Promise<void> => {
   try {
-    const { serverName, toolName } = req.params;
+    // Decode URL-encoded parameters to handle slashes in server/tool names
+    const serverName = decodeURIComponent(req.params.serverName);
+    const toolName = decodeURIComponent(req.params.toolName);
     const { description } = req.body;
 
     if (!serverName || !toolName) {
@@ -504,7 +508,7 @@ export const updateToolDescription = async (req: Request, res: Response): Promis
 
 export const updateSystemConfig = (req: Request, res: Response): void => {
   try {
-    const { routing, install, smartRouting, mcpRouter, nameSeparator } = req.body;
+    const { routing, install, smartRouting, mcpRouter, nameSeparator, cluster } = req.body;
     const currentUser = (req as any).user;
 
     if (
@@ -529,7 +533,8 @@ export const updateSystemConfig = (req: Request, res: Response): void => {
           typeof mcpRouter.referer !== 'string' &&
           typeof mcpRouter.title !== 'string' &&
           typeof mcpRouter.baseUrl !== 'string')) &&
-      typeof nameSeparator !== 'string'
+      typeof nameSeparator !== 'string' &&
+      !cluster
     ) {
       res.status(400).json({
         success: false,
@@ -606,6 +611,13 @@ export const updateSystemConfig = (req: Request, res: Response): void => {
       };
     }
 
+    if (!settings.systemConfig.cluster) {
+      settings.systemConfig.cluster = {
+        enabled: false,
+        mode: 'standalone',
+      };
+    }
+
     if (routing) {
       if (typeof routing.enableGlobalRoute === 'boolean') {
         settings.systemConfig.routing.enableGlobalRoute = routing.enableGlobalRoute;
@@ -715,6 +727,88 @@ export const updateSystemConfig = (req: Request, res: Response): void => {
       settings.systemConfig.nameSeparator = nameSeparator;
     }
 
+    if (cluster) {
+      if (typeof cluster.enabled === 'boolean') {
+        settings.systemConfig.cluster.enabled = cluster.enabled;
+      }
+      if (
+        typeof cluster.mode === 'string' &&
+        ['standalone', 'node', 'coordinator'].includes(cluster.mode)
+      ) {
+        settings.systemConfig.cluster.mode = cluster.mode as 'standalone' | 'node' | 'coordinator';
+      }
+
+      // Node configuration
+      if (cluster.node) {
+        if (!settings.systemConfig.cluster.node) {
+          settings.systemConfig.cluster.node = {
+            coordinatorUrl: '',
+          };
+        }
+        if (typeof cluster.node.id === 'string') {
+          settings.systemConfig.cluster.node.id = cluster.node.id;
+        }
+        if (typeof cluster.node.name === 'string') {
+          settings.systemConfig.cluster.node.name = cluster.node.name;
+        }
+        if (typeof cluster.node.coordinatorUrl === 'string') {
+          settings.systemConfig.cluster.node.coordinatorUrl = cluster.node.coordinatorUrl;
+        }
+        if (typeof cluster.node.heartbeatInterval === 'number') {
+          settings.systemConfig.cluster.node.heartbeatInterval = cluster.node.heartbeatInterval;
+        }
+        if (typeof cluster.node.registerOnStartup === 'boolean') {
+          settings.systemConfig.cluster.node.registerOnStartup = cluster.node.registerOnStartup;
+        }
+      }
+
+      // Coordinator configuration
+      if (cluster.coordinator) {
+        if (!settings.systemConfig.cluster.coordinator) {
+          settings.systemConfig.cluster.coordinator = {};
+        }
+        if (typeof cluster.coordinator.nodeTimeout === 'number') {
+          settings.systemConfig.cluster.coordinator.nodeTimeout = cluster.coordinator.nodeTimeout;
+        }
+        if (typeof cluster.coordinator.cleanupInterval === 'number') {
+          settings.systemConfig.cluster.coordinator.cleanupInterval =
+            cluster.coordinator.cleanupInterval;
+        }
+        if (typeof cluster.coordinator.stickySessionTimeout === 'number') {
+          settings.systemConfig.cluster.coordinator.stickySessionTimeout =
+            cluster.coordinator.stickySessionTimeout;
+        }
+      }
+
+      // Sticky session configuration
+      if (cluster.stickySession) {
+        if (!settings.systemConfig.cluster.stickySession) {
+          settings.systemConfig.cluster.stickySession = {
+            enabled: true,
+            strategy: 'consistent-hash',
+          };
+        }
+        if (typeof cluster.stickySession.enabled === 'boolean') {
+          settings.systemConfig.cluster.stickySession.enabled = cluster.stickySession.enabled;
+        }
+        if (
+          typeof cluster.stickySession.strategy === 'string' &&
+          ['consistent-hash', 'cookie', 'header'].includes(cluster.stickySession.strategy)
+        ) {
+          settings.systemConfig.cluster.stickySession.strategy = cluster.stickySession.strategy as
+            | 'consistent-hash'
+            | 'cookie'
+            | 'header';
+        }
+        if (typeof cluster.stickySession.cookieName === 'string') {
+          settings.systemConfig.cluster.stickySession.cookieName = cluster.stickySession.cookieName;
+        }
+        if (typeof cluster.stickySession.headerName === 'string') {
+          settings.systemConfig.cluster.stickySession.headerName = cluster.stickySession.headerName;
+        }
+      }
+    }
+
     if (saveSettings(settings, currentUser)) {
       res.json({
         success: true,
@@ -747,7 +841,9 @@ export const updateSystemConfig = (req: Request, res: Response): void => {
 // Toggle prompt status for a specific server
 export const togglePrompt = async (req: Request, res: Response): Promise<void> => {
   try {
-    const { serverName, promptName } = req.params;
+    // Decode URL-encoded parameters to handle slashes in server/prompt names
+    const serverName = decodeURIComponent(req.params.serverName);
+    const promptName = decodeURIComponent(req.params.promptName);
     const { enabled } = req.body;
 
     if (!serverName || !promptName) {
@@ -809,7 +905,9 @@ export const togglePrompt = async (req: Request, res: Response): Promise<void> =
 // Update prompt description for a specific server
 export const updatePromptDescription = async (req: Request, res: Response): Promise<void> => {
   try {
-    const { serverName, promptName } = req.params;
+    // Decode URL-encoded parameters to handle slashes in server/prompt names
+    const serverName = decodeURIComponent(req.params.serverName);
+    const promptName = decodeURIComponent(req.params.promptName);
     const { description } = req.body;
 
     if (!serverName || !promptName) {

src/controllers/toolController.ts

@@ -1,6 +1,8 @@
 import { Request, Response } from 'express';
 import { ApiResponse } from '../types/index.js';
-import { handleCallToolRequest } from '../services/mcpService.js';
+import { handleCallToolRequest, getServerByName } from '../services/mcpService.js';
+import { convertParametersToTypes } from '../utils/parameterConversion.js';
+import { getNameSeparator } from '../config/index.js';
 
 /**
  * Interface for tool call request
@@ -47,13 +49,31 @@ export const callTool = async (req: Request, res: Response): Promise<void> => {
       return;
     }
 
+    // Get the server info to access the tool's input schema
+    const serverInfo = getServerByName(server);
+    let inputSchema: Record<string, any> = {};
+
+    if (serverInfo) {
+      // Find the tool in the server's tools list
+      const fullToolName = `${server}${getNameSeparator()}${toolName}`;
+      const tool = serverInfo.tools.find(
+        (t: any) => t.name === fullToolName || t.name === toolName,
+      );
+      if (tool && tool.inputSchema) {
+        inputSchema = tool.inputSchema as Record<string, any>;
+      }
+    }
+
+    // Convert parameters to proper types based on the tool's input schema
+    const convertedArgs = convertParametersToTypes(toolArgs, inputSchema);
+
     // Create a mock request structure for handleCallToolRequest
     const mockRequest = {
       params: {
         name: 'call_tool',
         arguments: {
           toolName,
-          arguments: toolArgs,
+          arguments: convertedArgs,
         },
       },
     };
@@ -71,7 +91,7 @@ export const callTool = async (req: Request, res: Response): Promise<void> => {
       data: {
         content: result.content || [],
         toolName,
-        arguments: toolArgs,
+        arguments: convertedArgs,
       },
     };
 

src/middlewares/clusterRouting.ts

@@ -0,0 +1,176 @@
+/**
+ * Cluster Routing Middleware
+ * 
+ * Handles routing of MCP requests in cluster mode:
+ * - Determines target node based on session affinity
+ * - Proxies requests to appropriate nodes
+ * - Maintains sticky sessions
+ */
+
+import { Request, Response, NextFunction } from 'express';
+import axios from 'axios';
+import {
+  isClusterEnabled,
+  getClusterMode,
+  getNodeForSession,
+  getCurrentNodeId,
+} from '../services/clusterService.js';
+
+/**
+ * Cluster routing middleware for SSE connections
+ */
+export const clusterSseRouting = async (
+  req: Request,
+  res: Response,
+  next: NextFunction,
+): Promise<void> => {
+  // If cluster is not enabled or we're in standalone mode, proceed normally
+  if (!isClusterEnabled() || getClusterMode() === 'standalone') {
+    next();
+    return;
+  }
+
+  // Coordinator should handle all requests normally
+  if (getClusterMode() === 'coordinator') {
+    // For coordinator, we need to route to appropriate node
+    await routeToNode(req, res, next);
+    return;
+  }
+
+  // For regular nodes, proceed normally (they handle their own servers)
+  next();
+};
+
+/**
+ * Cluster routing middleware for MCP HTTP requests
+ */
+export const clusterMcpRouting = async (
+  req: Request,
+  res: Response,
+  next: NextFunction,
+): Promise<void> => {
+  // If cluster is not enabled or we're in standalone mode, proceed normally
+  if (!isClusterEnabled() || getClusterMode() === 'standalone') {
+    next();
+    return;
+  }
+
+  // Coordinator should route requests to appropriate nodes
+  if (getClusterMode() === 'coordinator') {
+    await routeToNode(req, res, next);
+    return;
+  }
+
+  // For regular nodes, proceed normally
+  next();
+};
+
+/**
+ * Route request to appropriate node based on session affinity
+ */
+const routeToNode = async (
+  req: Request,
+  res: Response,
+  next: NextFunction,
+): Promise<void> => {
+  try {
+    // Extract session ID from headers or generate new one
+    const sessionId = 
+      (req.headers['mcp-session-id'] as string) ||
+      (req.query.sessionId as string) ||
+      generateSessionId(req);
+
+    // Determine target node
+    const group = req.params.group;
+    const targetNode = getNodeForSession(sessionId, group, req.headers);
+
+    if (!targetNode) {
+      // No available nodes, return error
+      res.status(503).json({
+        success: false,
+        message: 'No available nodes to handle request',
+      });
+      return;
+    }
+
+    // Check if this is the current node
+    const currentNodeId = getCurrentNodeId();
+    if (currentNodeId && targetNode.id === currentNodeId) {
+      // Handle locally
+      next();
+      return;
+    }
+
+    // Proxy request to target node
+    await proxyRequest(req, res, targetNode.url);
+  } catch (error) {
+    console.error('Error in cluster routing:', error);
+    next(error);
+  }
+};
+
+/**
+ * Generate session ID from request
+ */
+const generateSessionId = (req: Request): string => {
+  // Use IP address and user agent as seed for consistent hashing
+  const seed = `${req.ip}-${req.get('user-agent') || 'unknown'}`;
+  return Buffer.from(seed).toString('base64');
+};
+
+/**
+ * Proxy request to another node
+ */
+const proxyRequest = async (
+  req: Request,
+  res: Response,
+  targetUrl: string,
+): Promise<void> => {
+  try {
+    // Build target URL
+    const url = new URL(req.originalUrl || req.url, targetUrl);
+    
+    // Prepare headers (excluding host and connection headers)
+    const headers: Record<string, string> = {};
+    for (const [key, value] of Object.entries(req.headers)) {
+      if (
+        key.toLowerCase() !== 'host' &&
+        key.toLowerCase() !== 'connection' &&
+        value
+      ) {
+        headers[key] = Array.isArray(value) ? value[0] : value;
+      }
+    }
+
+    // Forward request to target node
+    const response = await axios({
+      method: req.method,
+      url: url.toString(),
+      headers,
+      data: req.body,
+      responseType: 'stream',
+      timeout: 30000,
+      validateStatus: () => true, // Don't throw on any status
+    });
+
+    // Forward response headers
+    for (const [key, value] of Object.entries(response.headers)) {
+      if (
+        key.toLowerCase() !== 'connection' &&
+        key.toLowerCase() !== 'transfer-encoding'
+      ) {
+        res.setHeader(key, value as string);
+      }
+    }
+
+    // Forward status code and stream response
+    res.status(response.status);
+    response.data.pipe(res);
+  } catch (error) {
+    console.error('Error proxying request:', error);
+    res.status(502).json({
+      success: false,
+      message: 'Failed to proxy request to target node',
+    });
+  }
+};

src/routes/index.ts

@@ -80,6 +80,14 @@ import {
   getGroupOpenAPISpec,
 } from '../controllers/openApiController.js';
 import { handleOAuthCallback } from '../controllers/oauthCallbackController.js';
+import {
+  getClusterStatus,
+  registerNodeEndpoint,
+  updateHeartbeat,
+  getNodes,
+  getReplicasForServer,
+  getSessionAffinityInfo,
+} from '../controllers/clusterController.js';
 import { auth } from '../middlewares/auth.js';
 
 const router = express.Router();
@@ -167,6 +175,14 @@ export const initRoutes = (app: express.Application): void => {
   router.delete('/logs', clearLogs);
   router.get('/logs/stream', streamLogs);
 
+  // Cluster management routes
+  router.get('/cluster/status', getClusterStatus);
+  router.post('/cluster/register', registerNodeEndpoint);
+  router.post('/cluster/heartbeat', updateHeartbeat);
+  router.get('/cluster/nodes', getNodes);
+  router.get('/cluster/servers/:serverId/replicas', getReplicasForServer);
+  router.get('/cluster/sessions/:sessionId', getSessionAffinityInfo);
+
   // MCP settings export route
   router.get('/mcp-settings/export', getMcpSettingsJson);
 

src/server.ts

@@ -15,9 +15,11 @@ import {
 } from './services/sseService.js';
 import { initializeDefaultUser } from './models/User.js';
 import { sseUserContextMiddleware } from './middlewares/userContext.js';
+import { clusterSseRouting, clusterMcpRouting } from './middlewares/clusterRouting.js';
 import { findPackageRoot } from './utils/path.js';
 import { getCurrentModuleDir } from './utils/moduleDir.js';
 import { initOAuthProvider, getOAuthRouter } from './services/oauthService.js';
+import { initClusterService, shutdownClusterService } from './services/clusterService.js';
 
 /**
  * Get the directory of the current module
@@ -73,53 +75,74 @@ export class AppServer {
       initRoutes(this.app);
       console.log('Server initialized successfully');
 
+      // Initialize cluster service
+      await initClusterService();
+
       initUpstreamServers()
         .then(() => {
           console.log('MCP server initialized successfully');
 
-          // Original routes (global and group-based)
-          this.app.get(`${this.basePath}/sse/:group?`, sseUserContextMiddleware, (req, res) =>
-            handleSseConnection(req, res),
-          );
-          this.app.post(`${this.basePath}/messages`, sseUserContextMiddleware, handleSseMessage);
-          this.app.post(
-            `${this.basePath}/mcp/:group?`,
+          // Original routes (global and group-based) with cluster routing
+          this.app.get(
+            `${this.basePath}/sse/:group(.*)?`,
             sseUserContextMiddleware,
+            clusterSseRouting,
+            (req, res) => handleSseConnection(req, res),
+          );
+          this.app.post(
+            `${this.basePath}/messages`,
+            sseUserContextMiddleware,
+            clusterSseRouting,
+            handleSseMessage,
+          );
+          this.app.post(
+            `${this.basePath}/mcp/:group(.*)?`,
+            sseUserContextMiddleware,
+            clusterMcpRouting,
             handleMcpPostRequest,
           );
           this.app.get(
-            `${this.basePath}/mcp/:group?`,
+            `${this.basePath}/mcp/:group(.*)?`,
             sseUserContextMiddleware,
+            clusterMcpRouting,
             handleMcpOtherRequest,
           );
           this.app.delete(
-            `${this.basePath}/mcp/:group?`,
+            `${this.basePath}/mcp/:group(.*)?`,
             sseUserContextMiddleware,
+            clusterMcpRouting,
             handleMcpOtherRequest,
           );
 
-          // User-scoped routes with user context middleware
-          this.app.get(`${this.basePath}/:user/sse/:group?`, sseUserContextMiddleware, (req, res) =>
-            handleSseConnection(req, res),
+          // User-scoped routes with user context middleware and cluster routing
+          this.app.get(
+            `${this.basePath}/:user/sse/:group(.*)?`,
+            sseUserContextMiddleware,
+            clusterSseRouting,
+            (req, res) => handleSseConnection(req, res),
           );
           this.app.post(
             `${this.basePath}/:user/messages`,
             sseUserContextMiddleware,
+            clusterSseRouting,
             handleSseMessage,
           );
           this.app.post(
-            `${this.basePath}/:user/mcp/:group?`,
+            `${this.basePath}/:user/mcp/:group(.*)?`,
             sseUserContextMiddleware,
+            clusterMcpRouting,
             handleMcpPostRequest,
           );
           this.app.get(
-            `${this.basePath}/:user/mcp/:group?`,
+            `${this.basePath}/:user/mcp/:group(.*)?`,
             sseUserContextMiddleware,
+            clusterMcpRouting,
             handleMcpOtherRequest,
           );
           this.app.delete(
-            `${this.basePath}/:user/mcp/:group?`,
+            `${this.basePath}/:user/mcp/:group(.*)?`,
             sseUserContextMiddleware,
+            clusterMcpRouting,
             handleMcpOtherRequest,
           );
         })
@@ -191,6 +214,11 @@ export class AppServer {
     return this.app;
   }
 
+  shutdown(): void {
+    console.log('Shutting down cluster service...');
+    shutdownClusterService();
+  }
+
   // Helper method to find frontend dist path in different environments
   private findFrontendDistPath(): string | null {
     // Debug flag for detailed logging

src/services/clusterService.ts

@@ -1,457 +1,538 @@
-import { Request, Response } from 'express';
-import { URL } from 'url';
-import config, { loadSettings } from '../config/index.js';
-import { ClusterConfig, ClusterNodeConfig } from '../types/index.js';
+/**
+ * Cluster Service
+ * 
+ * Manages cluster functionality including:
+ * - Node registration and discovery
+ * - Health checking and heartbeats
+ * - Session affinity (sticky sessions)
+ * - Load balancing across replicas
+ */
 
-interface ProxyContext {
-  node: ClusterNodeConfig;
-  targetUrl: URL;
-}
+import { randomUUID } from 'crypto';
+import os from 'os';
+import crypto from 'crypto';
+import axios from 'axios';
+import {
+  ClusterNode,
+  ClusterConfig,
+  ServerReplica,
+  SessionAffinity,
+} from '../types/index.js';
+import { loadSettings } from '../config/index.js';
 
-const sessionBindings = new Map<string, string>();
-const groupCounters = new Map<string, number>();
+// In-memory storage for cluster state
+const nodes: Map<string, ClusterNode> = new Map();
+const sessionAffinities: Map<string, SessionAffinity> = new Map();
+const serverReplicas: Map<string, ServerReplica[]> = new Map();
+let currentNodeId: string | null = null;
+let heartbeatIntervalId: NodeJS.Timeout | null = null;
+let cleanupIntervalId: NodeJS.Timeout | null = null;
 
-const DEFAULT_GROUP_KEY = '__default__';
-
-const isIterableHeaderValue = (value: string | string[] | undefined): value is string[] => {
-  return Array.isArray(value);
-};
-
-const createHeadersFromRequest = (req: Request, node: ClusterNodeConfig): Headers => {
-  const headers = new Headers();
-  for (const [key, rawValue] of Object.entries(req.headers)) {
-    if (rawValue === undefined) {
-      continue;
-    }
-    if (key.toLowerCase() === 'host') {
-      continue;
-    }
-    if (isIterableHeaderValue(rawValue)) {
-      for (const value of rawValue) {
-        headers.append(key, value);
-      }
-    } else {
-      headers.set(key, String(rawValue));
-    }
-  }
-
-  if (node.forwardHeaders) {
-    for (const [key, value] of Object.entries(node.forwardHeaders)) {
-      if (value !== undefined) {
-        headers.set(key, value);
-      }
-    }
-  }
-
-  return headers;
-};
-
-const getClusterConfig = (): ClusterConfig | undefined => {
+/**
+ * Get cluster configuration from settings
+ */
+export const getClusterConfig = (): ClusterConfig | null => {
   const settings = loadSettings();
-  return settings.systemConfig?.cluster;
+  return settings.systemConfig?.cluster || null;
 };
 
-const getClusterNodes = (): ClusterNodeConfig[] => {
+/**
+ * Check if cluster mode is enabled
+ */
+export const isClusterEnabled = (): boolean => {
+  const config = getClusterConfig();
+  return config?.enabled === true;
+};
+
+/**
+ * Get the current node's operating mode
+ */
+export const getClusterMode = (): 'standalone' | 'node' | 'coordinator' => {
   const config = getClusterConfig();
   if (!config?.enabled) {
-    return [];
+    return 'standalone';
   }
-  return config.nodes ?? [];
+  return config.mode || 'standalone';
 };
 
-const isClusterEnabled = (): boolean => {
-  return getClusterNodes().length > 0;
+/**
+ * Get the current node ID
+ */
+export const getCurrentNodeId = (): string | null => {
+  return currentNodeId;
 };
 
-const sanitizePathSegment = (segment: string): string => {
-  return segment.replace(/^\/+/, '').replace(/\/+$/, '');
-};
-
-const joinUrlPaths = (...segments: (string | undefined)[]): string => {
-  const sanitizedSegments = segments
-    .filter((segment): segment is string => segment !== undefined && segment !== null && segment !== '')
-    .map((segment) => sanitizePathSegment(segment));
-
-  if (!sanitizedSegments.length) {
-    return '/';
-  }
-
-  const joined = sanitizedSegments.filter((segment) => segment.length > 0).join('/');
-  return joined ? `/${joined}` : '/';
-};
-
-const normalizeBasePath = (path?: string): string => {
-  if (!path) {
-    return '';
-  }
-  const normalized = path.startsWith('/') ? path : `/${path}`;
-  if (normalized === '/') {
-    return '';
-  }
-  if (normalized !== '/' && normalized.endsWith('/')) {
-    return normalized.slice(0, -1);
-  }
-  return normalized;
-};
-
-const buildTargetUrl = (node: ClusterNodeConfig, originalUrl: string): URL => {
-  const placeholderBase = 'http://cluster.local';
-  const requestUrl = new URL(originalUrl, placeholderBase);
-  const requestPath = requestUrl.pathname;
-  const hubBasePath = normalizeBasePath(config.basePath);
-  const relativePath = requestPath.startsWith(hubBasePath)
-    ? requestPath.slice(hubBasePath.length) || '/'
-    : requestPath;
-
-  const nodePrefix = normalizeBasePath(node.pathPrefix ?? hubBasePath);
-  const targetUrl = new URL(node.url);
-  targetUrl.pathname = joinUrlPaths(targetUrl.pathname, nodePrefix, relativePath);
-  targetUrl.search = requestUrl.search;
-  targetUrl.hash = requestUrl.hash;
-  return targetUrl;
-};
-
-const matchesNodeGroup = (nodeGroup: string, targetGroup: string): boolean => {
-  if (!targetGroup) {
-    return nodeGroup === '' || nodeGroup === '*' || nodeGroup === 'global' || nodeGroup === 'default';
-  }
-
-  if (nodeGroup === '*') {
-    return true;
-  }
-
-  return nodeGroup === targetGroup;
-};
-
-const selectNodeForGroup = (group?: string): ClusterNodeConfig | undefined => {
-  const nodes = getClusterNodes();
-  if (!nodes.length) {
-    return undefined;
-  }
-
-  const key = group ?? DEFAULT_GROUP_KEY;
-  const normalizedGroup = group ?? '';
-  const candidates = nodes.filter((node) => {
-    if (!node.groups || node.groups.length === 0) {
-      return true;
-    }
-
-    return node.groups.some((nodeGroup) => matchesNodeGroup(nodeGroup, normalizedGroup));
-  });
-
-  if (!candidates.length) {
-    return undefined;
-  }
-
-  const weightedCandidates: ClusterNodeConfig[] = [];
-  for (const candidate of candidates) {
-    const weight = Math.max(1, candidate.weight ?? 1);
-    for (let i = 0; i < weight; i += 1) {
-      weightedCandidates.push(candidate);
-    }
-  }
-
-  const index = groupCounters.get(key) ?? 0;
-  const selected = weightedCandidates[index % weightedCandidates.length];
-  groupCounters.set(key, index + 1);
-  return selected;
-};
-
-const bindSessionToNode = (sessionId: string, nodeId: string): void => {
-  sessionBindings.set(sessionId, nodeId);
-};
-
-const releaseSession = (sessionId: string): void => {
-  sessionBindings.delete(sessionId);
-};
-
-const getNodeForSession = (sessionId: string): ClusterNodeConfig | undefined => {
-  const nodeId = sessionBindings.get(sessionId);
-  if (!nodeId) {
-    return undefined;
-  }
-  return getClusterNodes().find((node) => node.id === nodeId);
-};
-
-const resolveProxyContext = (req: Request, group?: string, sessionId?: string): ProxyContext | undefined => {
-  if (!isClusterEnabled()) {
-    return undefined;
-  }
-
-  if (sessionId) {
-    const node = getNodeForSession(sessionId);
-    if (node) {
-      return { node, targetUrl: buildTargetUrl(node, req.originalUrl) };
-    }
-  }
-
-  const node = selectNodeForGroup(group);
-  if (!node) {
-    return undefined;
-  }
-
-  return {
-    node,
-    targetUrl: buildTargetUrl(node, req.originalUrl),
-  };
-};
-
-const pipeReadableStreamToResponse = async (
-  response: globalThis.Response,
-  res: Response,
-  onData?: (chunk: string) => void,
-): Promise<void> => {
-  if (!response.body) {
-    const text = await response.text();
-    res.send(text);
+/**
+ * Initialize cluster service based on configuration
+ */
+export const initClusterService = async (): Promise<void> => {
+  const config = getClusterConfig();
+  
+  if (!config?.enabled) {
+    console.log('Cluster mode is disabled');
     return;
   }
 
-  const reader = response.body.getReader();
-  const decoder = new TextDecoder();
+  console.log(`Initializing cluster service in ${config.mode} mode`);
+
+  switch (config.mode) {
+    case 'node':
+      await initAsNode(config);
+      break;
+    case 'coordinator':
+      await initAsCoordinator(config);
+      break;
+    case 'standalone':
+    default:
+      console.log('Running in standalone mode');
+      break;
+  }
+};
+
+/**
+ * Initialize this instance as a cluster node
+ */
+const initAsNode = async (config: ClusterConfig): Promise<void> => {
+  if (!config.node) {
+    throw new Error('Node configuration is required for cluster node mode');
+  }
+
+  // Generate or use provided node ID
+  currentNodeId = config.node.id || randomUUID();
+  
+  const nodeName = config.node.name || os.hostname();
+  const port = process.env.PORT || 3000;
+  
+  console.log(`Initializing as cluster node: ${nodeName} (${currentNodeId})`);
+
+  // Register with coordinator if enabled
+  if (config.node.registerOnStartup !== false) {
+    await registerWithCoordinator(config, nodeName, Number(port));
+  }
+
+  // Start heartbeat to coordinator
+  const heartbeatInterval = config.node.heartbeatInterval || 5000;
+  heartbeatIntervalId = setInterval(async () => {
+    await sendHeartbeat(config, nodeName, Number(port));
+  }, heartbeatInterval);
+
+  console.log(`Node registered with coordinator at ${config.node.coordinatorUrl}`);
+};
+
+/**
+ * Initialize this instance as the coordinator
+ */
+const initAsCoordinator = async (config: ClusterConfig): Promise<void> => {
+  currentNodeId = 'coordinator';
+  
+  console.log('Initializing as cluster coordinator');
+
+  // Start cleanup interval for inactive nodes
+  const cleanupInterval = config.coordinator?.cleanupInterval || 30000;
+  cleanupIntervalId = setInterval(() => {
+    cleanupInactiveNodes(config);
+  }, cleanupInterval);
+
+  console.log('Cluster coordinator initialized');
+};
+
+/**
+ * Register this node with the coordinator
+ */
+const registerWithCoordinator = async (
+  config: ClusterConfig,
+  nodeName: string,
+  port: number,
+): Promise<void> => {
+  if (!config.node?.coordinatorUrl) {
+    return;
+  }
+
+  const hostname = os.hostname();
+  const nodeUrl = `http://${hostname}:${port}`;
+  
+  // Get list of local MCP servers
+  const settings = loadSettings();
+  const servers = Object.keys(settings.mcpServers || {});
+
+  const nodeInfo: ClusterNode = {
+    id: currentNodeId!,
+    name: nodeName,
+    host: hostname,
+    port,
+    url: nodeUrl,
+    status: 'active',
+    lastHeartbeat: Date.now(),
+    servers,
+  };
 
   try {
-    let finished = false;
-    while (!finished) {
-      const { value, done } = await reader.read();
-      finished = Boolean(done);
-      if (value) {
-        const chunkString = decoder.decode(value, { stream: true });
-        if (onData) {
-          onData(chunkString);
+    await axios.post(
+      `${config.node.coordinatorUrl}/api/cluster/register`,
+      nodeInfo,
+      { timeout: 5000 }
+    );
+    console.log('Successfully registered with coordinator');
+  } catch (error) {
+    console.error('Failed to register with coordinator:', error);
+  }
+};
+
+/**
+ * Send heartbeat to coordinator
+ */
+const sendHeartbeat = async (
+  config: ClusterConfig,
+  nodeName: string,
+  port: number,
+): Promise<void> => {
+  if (!config.node?.coordinatorUrl || !currentNodeId) {
+    return;
+  }
+
+  const hostname = os.hostname();
+  const settings = loadSettings();
+  const servers = Object.keys(settings.mcpServers || {});
+
+  try {
+    await axios.post(
+      `${config.node.coordinatorUrl}/api/cluster/heartbeat`,
+      {
+        id: currentNodeId,
+        name: nodeName,
+        host: hostname,
+        port,
+        servers,
+        timestamp: Date.now(),
+      },
+      { timeout: 5000 }
+    );
+  } catch (error) {
+    console.warn('Failed to send heartbeat to coordinator:', error);
+  }
+};
+
+/**
+ * Cleanup inactive nodes (coordinator only)
+ */
+const cleanupInactiveNodes = (config: ClusterConfig): void => {
+  const timeout = config.coordinator?.nodeTimeout || 15000;
+  const now = Date.now();
+
+  for (const [nodeId, node] of nodes.entries()) {
+    if (now - node.lastHeartbeat > timeout) {
+      console.log(`Marking node ${nodeId} as unhealthy (last heartbeat: ${new Date(node.lastHeartbeat).toISOString()})`);
+      node.status = 'unhealthy';
+      
+      // Remove server replicas for this node
+      for (const [serverId, replicas] of serverReplicas.entries()) {
+        const updatedReplicas = replicas.filter(r => r.nodeId !== nodeId);
+        if (updatedReplicas.length === 0) {
+          serverReplicas.delete(serverId);
+        } else {
+          serverReplicas.set(serverId, updatedReplicas);
         }
-        res.write(Buffer.from(value));
       }
     }
-  } catch (error) {
-    if ((error as Error).name !== 'AbortError') {
-      console.error('Cluster proxy stream error:', error);
+  }
+
+  // Clean up expired session affinities
+  const _sessionTimeout = config.coordinator?.stickySessionTimeout || 3600000; // 1 hour
+  for (const [sessionId, affinity] of sessionAffinities.entries()) {
+    if (now > affinity.expiresAt) {
+      sessionAffinities.delete(sessionId);
+      console.log(`Removed expired session affinity: ${sessionId}`);
     }
-  } finally {
-    const finalChunk = decoder.decode();
-    if (finalChunk && onData) {
-      onData(finalChunk);
-    }
-    res.end();
   }
 };
 
-const handleSseStream = async (
-  node: ClusterNodeConfig,
-  req: Request,
-  res: Response,
-  context: ProxyContext,
-): Promise<void> => {
-  const controller = new AbortController();
-  const sessionIds = new Set<string>();
-  req.on('close', () => {
-    controller.abort();
-    for (const sessionId of sessionIds) {
-      releaseSession(sessionId);
-    }
+/**
+ * Register a node (coordinator endpoint)
+ */
+export const registerNode = (nodeInfo: ClusterNode): void => {
+  nodes.set(nodeInfo.id, {
+    ...nodeInfo,
+    status: 'active',
+    lastHeartbeat: Date.now(),
   });
 
-  let response: globalThis.Response;
-  try {
-    response = await fetch(context.targetUrl, {
-      method: 'GET',
-      headers: createHeadersFromRequest(req, node),
-      signal: controller.signal,
-    });
-  } catch (error) {
-    console.error('Failed to proxy SSE request to cluster node:', error);
-    if (!res.headersSent) {
-      res.status(502).send('Failed to reach cluster node');
-    }
-    for (const sessionId of sessionIds) {
-      releaseSession(sessionId);
-    }
-    return;
-  }
+  // Update server replicas
+  for (const serverId of nodeInfo.servers) {
+    const replicas = serverReplicas.get(serverId) || [];
+    
+    // Check if replica already exists
+    const existingIndex = replicas.findIndex(r => r.nodeId === nodeInfo.id);
+    const replica: ServerReplica = {
+      serverId,
+      nodeId: nodeInfo.id,
+      nodeUrl: nodeInfo.url,
+      status: 'active',
+      weight: 1,
+    };
 
-  res.status(response.status);
-  response.headers.forEach((value, key) => {
-    if (key.toLowerCase() === 'content-length') {
-      return;
-    }
-    res.setHeader(key, value);
-  });
-
-  if (typeof res.flushHeaders === 'function') {
-    res.flushHeaders();
-  }
-
-  const isSse = response.headers.get('content-type')?.includes('text/event-stream');
-  let buffer = '';
-  await pipeReadableStreamToResponse(
-    response,
-    res,
-    isSse
-      ? (chunk) => {
-          buffer += chunk;
-          let boundaryIndex = buffer.indexOf('\n\n');
-          while (boundaryIndex !== -1) {
-            const rawEvent = buffer.slice(0, boundaryIndex);
-            buffer = buffer.slice(boundaryIndex + 2);
-            const normalizedEvent = rawEvent.replace(/\r\n/g, '\n');
-            const lines = normalizedEvent.split('\n');
-            let eventName = '';
-            let data = '';
-            for (const line of lines) {
-              if (line.startsWith('event:')) {
-                eventName = line.slice(6).trim();
-              }
-              if (line.startsWith('data:')) {
-                data += `${line.slice(5).trim()}`;
-              }
-            }
-            if (eventName === 'endpoint' && data) {
-              try {
-                const sessionUrl = new URL(data, 'http://localhost');
-                const sessionId = sessionUrl.searchParams.get('sessionId');
-                if (sessionId) {
-                  bindSessionToNode(sessionId, node.id);
-                  sessionIds.add(sessionId);
-                }
-              } catch (error) {
-                console.warn('Failed to parse session endpoint from cluster response:', error);
-              }
-            }
-            boundaryIndex = buffer.indexOf('\n\n');
-          }
-        }
-      : undefined,
-  );
-
-  for (const sessionId of sessionIds) {
-    releaseSession(sessionId);
-  }
-};
-
-const forwardRequest = async (
-  req: Request,
-  res: Response,
-  context: ProxyContext,
-  options?: { releaseSession?: string },
-): Promise<void> => {
-  const { node, targetUrl } = context;
-  const method = req.method.toUpperCase();
-  const init: RequestInit = {
-    method,
-    headers: createHeadersFromRequest(req, node),
-  };
-
-  if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
-    if (req.body !== undefined) {
-      init.body = typeof req.body === 'string' ? req.body : JSON.stringify(req.body);
-    }
-  }
-
-  const controller = new AbortController();
-  init.signal = controller.signal;
-  req.on('close', () => {
-    controller.abort();
-  });
-
-  let response: globalThis.Response;
-  try {
-    response = await fetch(targetUrl, init);
-  } catch (error) {
-    if ((error as Error).name !== 'AbortError') {
-      console.error('Failed to proxy request to cluster node:', error);
-    }
-    if (!res.headersSent) {
-      res.status(502).send('Failed to reach cluster node');
-    }
-    if (options?.releaseSession) {
-      releaseSession(options.releaseSession);
-    }
-    return;
-  }
-
-  const newSessionId = response.headers.get('mcp-session-id');
-  if (newSessionId) {
-    bindSessionToNode(newSessionId, node.id);
-  }
-
-  res.status(response.status);
-  response.headers.forEach((value, key) => {
-    if (key.toLowerCase() === 'content-length') {
-      return;
-    }
-    res.setHeader(key, value);
-  });
-
-  if (response.headers.get('content-type')?.includes('text/event-stream')) {
-    await pipeReadableStreamToResponse(response, res);
-  } else {
-    const buffer = await response.arrayBuffer();
-    if (buffer.byteLength === 0) {
-      res.end();
+    if (existingIndex >= 0) {
+      replicas[existingIndex] = replica;
     } else {
-      res.send(Buffer.from(buffer));
+      replicas.push(replica);
+    }
+
+    serverReplicas.set(serverId, replicas);
+  }
+
+  console.log(`Node registered: ${nodeInfo.name} (${nodeInfo.id}) with ${nodeInfo.servers.length} servers`);
+};
+
+/**
+ * Update node heartbeat (coordinator endpoint)
+ */
+export const updateNodeHeartbeat = (nodeId: string, servers: string[]): void => {
+  const node = nodes.get(nodeId);
+  if (!node) {
+    console.warn(`Received heartbeat from unknown node: ${nodeId}`);
+    return;
+  }
+
+  node.lastHeartbeat = Date.now();
+  node.status = 'active';
+  node.servers = servers;
+
+  // Update server replicas
+  const currentReplicas = new Set<string>();
+  for (const [serverId, replicas] of serverReplicas.entries()) {
+    for (const replica of replicas) {
+      if (replica.nodeId === nodeId) {
+        currentReplicas.add(serverId);
+      }
     }
   }
 
-  if (options?.releaseSession) {
-    releaseSession(options.releaseSession);
+  // Add new servers
+  for (const serverId of servers) {
+    if (!currentReplicas.has(serverId)) {
+      const replicas = serverReplicas.get(serverId) || [];
+      replicas.push({
+        serverId,
+        nodeId,
+        nodeUrl: node.url,
+        status: 'active',
+        weight: 1,
+      });
+      serverReplicas.set(serverId, replicas);
+    }
+  }
+
+  // Remove servers that are no longer on this node
+  for (const serverId of currentReplicas) {
+    if (!servers.includes(serverId)) {
+      const replicas = serverReplicas.get(serverId) || [];
+      const updatedReplicas = replicas.filter(r => r.nodeId !== nodeId);
+      if (updatedReplicas.length === 0) {
+        serverReplicas.delete(serverId);
+      } else {
+        serverReplicas.set(serverId, updatedReplicas);
+      }
+    }
   }
 };
 
-export const tryProxySseConnection = async (
-  req: Request,
-  res: Response,
-  group?: string,
-): Promise<boolean> => {
-  const context = resolveProxyContext(req, group);
-  if (!context) {
-    return false;
+/**
+ * Get all active nodes (coordinator)
+ */
+export const getActiveNodes = (): ClusterNode[] => {
+  return Array.from(nodes.values()).filter(n => n.status === 'active');
+};
+
+/**
+ * Get all nodes including unhealthy ones (coordinator)
+ */
+export const getAllNodes = (): ClusterNode[] => {
+  return Array.from(nodes.values());
+};
+
+/**
+ * Get replicas for a specific server
+ */
+export const getServerReplicas = (serverId: string): ServerReplica[] => {
+  return serverReplicas.get(serverId) || [];
+};
+
+/**
+ * Get node for a session using sticky session strategy
+ */
+export const getNodeForSession = (
+  sessionId: string,
+  serverId?: string,
+  headers?: Record<string, string | string[] | undefined>
+): ClusterNode | null => {
+  const config = getClusterConfig();
+  
+  if (!config?.enabled || !config.stickySession?.enabled) {
+    return null;
   }
 
-  await handleSseStream(context.node, req, res, context);
-  return true;
-};
-
-export const tryProxySseMessage = async (req: Request, res: Response): Promise<boolean> => {
-  const sessionId = typeof req.query.sessionId === 'string' ? req.query.sessionId : undefined;
-  if (!sessionId) {
-    return false;
+  // Check if session already has affinity
+  const existingAffinity = sessionAffinities.get(sessionId);
+  if (existingAffinity) {
+    const node = nodes.get(existingAffinity.nodeId);
+    if (node && node.status === 'active') {
+      // Update last accessed time
+      existingAffinity.lastAccessed = Date.now();
+      return node;
+    } else {
+      // Node is no longer active, remove affinity
+      sessionAffinities.delete(sessionId);
+    }
   }
 
-  const context = resolveProxyContext(req, undefined, sessionId);
-  if (!context) {
-    return false;
+  // Determine which node to use based on strategy
+  const strategy = config.stickySession.strategy || 'consistent-hash';
+  let targetNode: ClusterNode | null = null;
+
+  switch (strategy) {
+    case 'consistent-hash':
+      targetNode = getNodeByConsistentHash(sessionId, serverId);
+      break;
+    case 'cookie':
+      targetNode = getNodeByCookie(headers, serverId);
+      break;
+    case 'header':
+      targetNode = getNodeByHeader(headers, serverId);
+      break;
   }
 
-  await forwardRequest(req, res, context);
-  return true;
-};
-
-export const tryProxyMcpRequest = async (
-  req: Request,
-  res: Response,
-  group?: string,
-): Promise<boolean> => {
-  const sessionIdHeader = req.headers['mcp-session-id'];
-  const sessionId = Array.isArray(sessionIdHeader) ? sessionIdHeader[0] : sessionIdHeader;
-  const context = resolveProxyContext(req, group, sessionId);
-  if (!context) {
-    return false;
+  if (targetNode) {
+    // Create session affinity
+    const timeout = config.coordinator?.stickySessionTimeout || 3600000;
+    const affinity: SessionAffinity = {
+      sessionId,
+      nodeId: targetNode.id,
+      serverId,
+      createdAt: Date.now(),
+      lastAccessed: Date.now(),
+      expiresAt: Date.now() + timeout,
+    };
+    sessionAffinities.set(sessionId, affinity);
   }
 
-  const releaseTarget = req.method.toUpperCase() === 'DELETE' ? sessionId : undefined;
-  await forwardRequest(req, res, context, { releaseSession: releaseTarget });
-  return true;
+  return targetNode;
 };
 
-export const clearClusterSessionBindings = (): void => {
-  sessionBindings.clear();
-  groupCounters.clear();
+/**
+ * Get node using consistent hashing
+ */
+const getNodeByConsistentHash = (sessionId: string, serverId?: string): ClusterNode | null => {
+  let availableNodes = getActiveNodes();
+
+  // Filter nodes that have the server if serverId is specified
+  if (serverId) {
+    const replicas = getServerReplicas(serverId);
+    const nodeIds = new Set(replicas.filter(r => r.status === 'active').map(r => r.nodeId));
+    availableNodes = availableNodes.filter(n => nodeIds.has(n.id));
+  }
+
+  if (availableNodes.length === 0) {
+    return null;
+  }
+
+  // Simple consistent hash: hash session ID and mod by node count
+  const hash = crypto.createHash('md5').update(sessionId).digest('hex');
+  const hashNum = parseInt(hash.substring(0, 8), 16);
+  const index = hashNum % availableNodes.length;
+
+  return availableNodes[index];
 };
 
-export const __clusterInternals = {
-  joinUrlPaths,
-  normalizeBasePath,
-  matchesNodeGroup,
-  buildTargetUrl,
+/**
+ * Get node from cookie
+ */
+const getNodeByCookie = (
+  headers?: Record<string, string | string[] | undefined>,
+  serverId?: string
+): ClusterNode | null => {
+  if (!headers?.cookie) {
+    return getNodeByConsistentHash(randomUUID(), serverId);
+  }
+
+  const config = getClusterConfig();
+  const cookieName = config?.stickySession?.cookieName || 'MCPHUB_NODE';
+  
+  const cookies = (Array.isArray(headers.cookie) ? headers.cookie[0] : headers.cookie) || '';
+  const cookieMatch = cookies.match(new RegExp(`${cookieName}=([^;]+)`));
+  
+  if (cookieMatch) {
+    const nodeId = cookieMatch[1];
+    const node = nodes.get(nodeId);
+    if (node && node.status === 'active') {
+      return node;
+    }
+  }
+
+  return getNodeByConsistentHash(randomUUID(), serverId);
+};
+
+/**
+ * Get node from header
+ */
+const getNodeByHeader = (
+  headers?: Record<string, string | string[] | undefined>,
+  serverId?: string
+): ClusterNode | null => {
+  const config = getClusterConfig();
+  const headerName = (config?.stickySession?.headerName || 'X-MCPHub-Node').toLowerCase();
+  
+  if (headers) {
+    const nodeId = headers[headerName];
+    if (nodeId) {
+      const nodeIdStr = Array.isArray(nodeId) ? nodeId[0] : nodeId;
+      const node = nodes.get(nodeIdStr);
+      if (node && node.status === 'active') {
+        return node;
+      }
+    }
+  }
+
+  return getNodeByConsistentHash(randomUUID(), serverId);
+};
+
+/**
+ * Get session affinity info for a session
+ */
+export const getSessionAffinity = (sessionId: string): SessionAffinity | null => {
+  return sessionAffinities.get(sessionId) || null;
+};
+
+/**
+ * Remove session affinity
+ */
+export const removeSessionAffinity = (sessionId: string): void => {
+  sessionAffinities.delete(sessionId);
+};
+
+/**
+ * Shutdown cluster service
+ */
+export const shutdownClusterService = (): void => {
+  if (heartbeatIntervalId) {
+    clearInterval(heartbeatIntervalId);
+    heartbeatIntervalId = null;
+  }
+
+  if (cleanupIntervalId) {
+    clearInterval(cleanupIntervalId);
+    cleanupIntervalId = null;
+  }
+
+  console.log('Cluster service shut down');
+};
+
+/**
+ * Get cluster statistics
+ */
+export const getClusterStats = () => {
+  return {
+    nodes: nodes.size,
+    activeNodes: getActiveNodes().length,
+    servers: serverReplicas.size,
+    sessions: sessionAffinities.size,
+  };
 };

src/services/mcpService.ts

@@ -1,4 +1,6 @@
+import fs from 'fs';
 import os from 'os';
+import path from 'path';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import {
   CallToolRequestSchema,
@@ -26,12 +28,82 @@ import { getDataService } from './services.js';
 import { getServerDao, ServerConfigWithName } from '../dao/index.js';
 import { initializeAllOAuthClients } from './oauthService.js';
 import { createOAuthProvider } from './mcpOAuthProvider.js';
-import { clearClusterSessionBindings } from './clusterService.js';
 
 const servers: { [sessionId: string]: Server } = {};
 
 const serverDao = getServerDao();
 
+const ensureDirExists = (dir: string | undefined): string => {
+  if (!dir) {
+    throw new Error('Directory path is undefined');
+  }
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+};
+
+const getDataRootDir = (): string => {
+  return ensureDirExists(process.env.MCP_DATA_DIR || path.join(process.cwd(), 'data'));
+};
+
+const getServersStorageRoot = (): string => {
+  return ensureDirExists(process.env.MCP_SERVERS_DIR || path.join(getDataRootDir(), 'servers'));
+};
+
+const getNpmBaseDir = (): string => {
+  return ensureDirExists(process.env.MCP_NPM_DIR || path.join(getServersStorageRoot(), 'npm'));
+};
+
+const getPythonBaseDir = (): string => {
+  return ensureDirExists(
+    process.env.MCP_PYTHON_DIR || path.join(getServersStorageRoot(), 'python'),
+  );
+};
+
+const getNpmCacheDir = (): string => {
+  return ensureDirExists(process.env.NPM_CONFIG_CACHE || path.join(getDataRootDir(), 'npm-cache'));
+};
+
+const getNpmPrefixDir = (): string => {
+  const dir = ensureDirExists(
+    process.env.NPM_CONFIG_PREFIX || path.join(getDataRootDir(), 'npm-global'),
+  );
+  ensureDirExists(path.join(dir, 'bin'));
+  ensureDirExists(path.join(dir, 'lib', 'node_modules'));
+  return dir;
+};
+
+const getUvCacheDir = (): string => {
+  return ensureDirExists(process.env.UV_CACHE_DIR || path.join(getDataRootDir(), 'uv', 'cache'));
+};
+
+const getUvToolDir = (): string => {
+  const dir = ensureDirExists(process.env.UV_TOOL_DIR || path.join(getDataRootDir(), 'uv', 'tools'));
+  ensureDirExists(path.join(dir, 'bin'));
+  return dir;
+};
+
+const getServerInstallDir = (serverName: string, kind: 'npm' | 'python'): string => {
+  const baseDir = kind === 'npm' ? getNpmBaseDir() : getPythonBaseDir();
+  return ensureDirExists(path.join(baseDir, serverName));
+};
+
+const prependToPath = (currentPath: string, dir: string): string => {
+  if (!dir) {
+    return currentPath;
+  }
+  const delimiter = path.delimiter;
+  const segments = currentPath ? currentPath.split(delimiter) : [];
+  if (segments.includes(dir)) {
+    return currentPath;
+  }
+  return currentPath ? `${dir}${delimiter}${currentPath}` : dir;
+};
+
+const NODE_COMMANDS = new Set(['npm', 'npx', 'pnpm', 'yarn', 'node', 'bun', 'bunx']);
+const PYTHON_COMMANDS = new Set(['uv', 'uvx', 'python', 'pip', 'pip3', 'pipx']);
+
 // Helper function to set up keep-alive ping for SSE connections
 const setupKeepAlive = (serverInfo: ServerInfo, serverConfig: ServerConfig): void => {
   // Only set up keep-alive for SSE connections
@@ -162,8 +234,6 @@ export const cleanupAllServers = (): void => {
   Object.keys(servers).forEach((sessionId) => {
     delete servers[sessionId];
   });
-
-  clearClusterSessionBindings();
 };
 
 // Helper function to create transport based on server configuration
@@ -216,7 +286,7 @@ export const createTransportFromConfig = async (name: string, conf: ServerConfig
       ...(process.env as Record<string, string>),
       ...replaceEnvVars(conf.env || {}),
     };
-    env['PATH'] = expandEnvVars(process.env.PATH as string) || '';
+    env['PATH'] = expandEnvVars(env['PATH'] || process.env.PATH || '');
 
     const settings = loadSettings();
     // Add UV_DEFAULT_INDEX and npm_config_registry if needed
@@ -238,9 +308,52 @@ export const createTransportFromConfig = async (name: string, conf: ServerConfig
       env['npm_config_registry'] = settings.systemConfig.install.npmRegistry;
     }
 
+    // Ensure stdio servers use persistent directories under /app/data (or configured override)
+    let workingDirectory = os.homedir();
+    const commandLower = conf.command.toLowerCase();
+
+    if (NODE_COMMANDS.has(commandLower)) {
+      const serverDir = getServerInstallDir(name, 'npm');
+      workingDirectory = serverDir;
+
+      const npmCacheDir = getNpmCacheDir();
+      const npmPrefixDir = getNpmPrefixDir();
+
+      if (!env['npm_config_cache']) {
+        env['npm_config_cache'] = npmCacheDir;
+      }
+      if (!env['NPM_CONFIG_CACHE']) {
+        env['NPM_CONFIG_CACHE'] = env['npm_config_cache'];
+      }
+
+      if (!env['npm_config_prefix']) {
+        env['npm_config_prefix'] = npmPrefixDir;
+      }
+      if (!env['NPM_CONFIG_PREFIX']) {
+        env['NPM_CONFIG_PREFIX'] = env['npm_config_prefix'];
+      }
+
+      env['PATH'] = prependToPath(env['PATH'], path.join(env['npm_config_prefix'], 'bin'));
+    } else if (PYTHON_COMMANDS.has(commandLower)) {
+      const serverDir = getServerInstallDir(name, 'python');
+      workingDirectory = serverDir;
+
+      const uvCacheDir = getUvCacheDir();
+      const uvToolDir = getUvToolDir();
+
+      if (!env['UV_CACHE_DIR']) {
+        env['UV_CACHE_DIR'] = uvCacheDir;
+      }
+      if (!env['UV_TOOL_DIR']) {
+        env['UV_TOOL_DIR'] = uvToolDir;
+      }
+
+      env['PATH'] = prependToPath(env['PATH'], path.join(env['UV_TOOL_DIR'], 'bin'));
+    }
+
     // Expand environment variables in command
     transport = new StdioClientTransport({
-      cwd: os.homedir(),
+      cwd: workingDirectory,
       command: conf.command,
       args: replaceEnvVars(conf.args) as string[],
       env: env,

src/services/openApiGeneratorService.ts

@@ -225,13 +225,22 @@ export async function generateOpenAPISpec(
 
   // Generate paths from tools
   const paths: OpenAPIV3.PathsObject = {};
+  const separator = getNameSeparator();
 
   for (const { tool, serverName } of allTools) {
     const operation = generateOperationFromTool(tool, serverName);
     const { requestBody } = convertToolSchemaToOpenAPI(tool);
 
-    // Create path for the tool
-    const pathName = `/tools/${serverName}/${tool.name}`;
+    // Extract the tool name without server prefix
+    // Tool names are in format: serverName + separator + toolName
+    const prefix = `${serverName}${separator}`;
+    const toolNameOnly = tool.name.startsWith(prefix)
+      ? tool.name.substring(prefix.length)
+      : tool.name;
+
+    // Create path for the tool with URL-encoded server and tool names
+    // This handles cases where names contain slashes (e.g., "com.atlassian/atlassian-mcp-server")
+    const pathName = `/tools/${encodeURIComponent(serverName)}/${encodeURIComponent(toolNameOnly)}`;
     const method = requestBody ? 'post' : 'get';
 
     if (!paths[pathName]) {

src/services/sseService.ts

@@ -9,7 +9,6 @@ import { loadSettings } from '../config/index.js';
 import config from '../config/index.js';
 import { UserContextService } from './userContextService.js';
 import { RequestContextService } from './requestContextService.js';
-import { tryProxyMcpRequest, tryProxySseConnection, tryProxySseMessage } from './clusterService.js';
 
 const transports: { [sessionId: string]: { transport: Transport; group: string } } = {};
 
@@ -82,10 +81,6 @@ export const handleSseConnection = async (req: Request, res: Response): Promise<
 
   console.log(`Creating SSE transport with messages path: ${messagesPath}`);
 
-  if (await tryProxySseConnection(req, res, group)) {
-    return;
-  }
-
   const transport = new SSEServerTransport(messagesPath, res);
   transports[transport.sessionId] = { transport, group: group };
 
@@ -122,10 +117,6 @@ export const handleSseMessage = async (req: Request, res: Response): Promise<voi
     return;
   }
 
-  if (await tryProxySseMessage(req, res)) {
-    return;
-  }
-
   // Check if transport exists before destructuring
   const transportData = transports[sessionId];
   if (!transportData) {
@@ -183,10 +174,6 @@ export const handleMcpPostRequest = async (req: Request, res: Response): Promise
     return;
   }
 
-  if (await tryProxyMcpRequest(req, res, group)) {
-    return;
-  }
-
   let transport: StreamableHTTPServerTransport;
   if (sessionId && transports[sessionId]) {
     console.log(`Reusing existing transport for sessionId: ${sessionId}`);
@@ -252,11 +239,6 @@ export const handleMcpOtherRequest = async (req: Request, res: Response) => {
     return;
   }
 
-  const group = req.params.group;
-  if (await tryProxyMcpRequest(req, res, group)) {
-    return;
-  }
-
   const sessionId = req.headers['mcp-session-id'] as string | undefined;
   if (!sessionId || !transports[sessionId]) {
     res.status(400).send('Invalid or missing session ID');

src/types/index.ts

@@ -62,20 +62,6 @@ export interface MarketServerTool {
   inputSchema: Record<string, any>;
 }
 
-export interface ClusterNodeConfig {
-  id: string; // Unique identifier for the node
-  url: string; // Base URL for the node (e.g. http://node-a:3000)
-  groups?: string[]; // Optional list of group identifiers served by this node; include empty string for global routes
-  weight?: number; // Optional weight for load balancing
-  forwardHeaders?: Record<string, string>; // Additional headers forwarded to the node on every request
-  pathPrefix?: string; // Optional prefix prepended before forwarding paths (defaults to hub base path)
-}
-
-export interface ClusterConfig {
-  enabled?: boolean; // Flag to enable/disable cluster routing
-  nodes?: ClusterNodeConfig[]; // Cluster node definitions
-}
-
 export interface MarketServer {
   name: string;
   display_name: string;
@@ -185,7 +171,7 @@ export interface SystemConfig {
   };
   nameSeparator?: string; // Separator used between server name and tool/prompt name (default: '-')
   oauth?: OAuthProviderConfig; // OAuth provider configuration for upstream MCP servers
-  cluster?: ClusterConfig; // Cluster configuration for multi-node deployments
+  cluster?: ClusterConfig; // Cluster configuration for distributed deployment
 }
 
 export interface UserConfig {
@@ -371,3 +357,63 @@ export interface AddServerRequest {
   name: string; // Name of the server to add
   config: ServerConfig; // Configuration details for the server
 }
+
+// Cluster-related types
+
+// Cluster node information
+export interface ClusterNode {
+  id: string; // Unique identifier for the node (e.g., UUID)
+  name: string; // Human-readable name of the node
+  host: string; // Hostname or IP address
+  port: number; // Port number the node is running on
+  url: string; // Full URL to access the node (e.g., 'http://node1:3000')
+  status: 'active' | 'inactive' | 'unhealthy'; // Current status of the node
+  lastHeartbeat: number; // Timestamp of last heartbeat
+  servers: string[]; // List of MCP server names hosted on this node
+  metadata?: Record<string, any>; // Additional metadata about the node
+}
+
+// Cluster configuration
+export interface ClusterConfig {
+  enabled: boolean; // Whether cluster mode is enabled
+  mode: 'standalone' | 'node' | 'coordinator'; // Cluster operating mode
+  node?: {
+    // Configuration when running as a cluster node
+    id?: string; // Node ID (generated if not provided)
+    name?: string; // Node name (defaults to hostname)
+    coordinatorUrl: string; // URL of the coordinator node
+    heartbeatInterval?: number; // Heartbeat interval in milliseconds (default: 5000)
+    registerOnStartup?: boolean; // Whether to register with coordinator on startup (default: true)
+  };
+  coordinator?: {
+    // Configuration when running as coordinator
+    nodeTimeout?: number; // Time in ms before marking a node as unhealthy (default: 15000)
+    cleanupInterval?: number; // Interval for cleaning up inactive nodes (default: 30000)
+    stickySessionTimeout?: number; // Sticky session timeout in milliseconds (default: 3600000, 1 hour)
+  };
+  stickySession?: {
+    enabled: boolean; // Whether sticky sessions are enabled (default: true for cluster mode)
+    strategy: 'consistent-hash' | 'cookie' | 'header'; // Strategy for session affinity (default: consistent-hash)
+    cookieName?: string; // Cookie name for cookie-based sticky sessions (default: 'MCPHUB_NODE')
+    headerName?: string; // Header name for header-based sticky sessions (default: 'X-MCPHub-Node')
+  };
+}
+
+// Cluster server replica configuration
+export interface ServerReplica {
+  serverId: string; // MCP server identifier
+  nodeId: string; // Node hosting this replica
+  nodeUrl: string; // URL to access this replica
+  status: 'active' | 'inactive'; // Status of this replica
+  weight?: number; // Load balancing weight (default: 1)
+}
+
+// Session affinity information
+export interface SessionAffinity {
+  sessionId: string; // Session identifier
+  nodeId: string; // Node ID for this session
+  serverId?: string; // Optional: specific server this session is bound to
+  createdAt: number; // Timestamp when session was created
+  lastAccessed: number; // Timestamp of last access
+  expiresAt: number; // Timestamp when session expires
+}

src/utils/parameterConversion.ts

@@ -0,0 +1,93 @@
+/**
+ * Utility functions for converting parameter types based on JSON schema definitions
+ */
+
+/**
+ * Convert parameters to their proper types based on the tool's input schema
+ * This ensures that form-submitted string values are converted to the correct types
+ * (e.g., numbers, booleans, arrays) before being passed to MCP tools.
+ *
+ * @param params - The parameters to convert (typically from form submission)
+ * @param inputSchema - The JSON schema definition for the tool's input
+ * @returns The converted parameters with proper types
+ */
+export function convertParametersToTypes(
+  params: Record<string, any>,
+  inputSchema: Record<string, any>,
+): Record<string, any> {
+  if (!inputSchema || typeof inputSchema !== 'object' || !inputSchema.properties) {
+    return params;
+  }
+
+  const convertedParams: Record<string, any> = {};
+  const properties = inputSchema.properties;
+
+  for (const [key, value] of Object.entries(params)) {
+    const propDef = properties[key];
+    if (!propDef || typeof propDef !== 'object') {
+      // No schema definition found, keep as is
+      convertedParams[key] = value;
+      continue;
+    }
+
+    const propType = propDef.type;
+
+    try {
+      switch (propType) {
+        case 'integer':
+        case 'number':
+          // Convert string to number
+          if (typeof value === 'string') {
+            const numValue = propType === 'integer' ? parseInt(value, 10) : parseFloat(value);
+            convertedParams[key] = isNaN(numValue) ? value : numValue;
+          } else {
+            convertedParams[key] = value;
+          }
+          break;
+
+        case 'boolean':
+          // Convert string to boolean
+          if (typeof value === 'string') {
+            convertedParams[key] = value.toLowerCase() === 'true' || value === '1';
+          } else {
+            convertedParams[key] = value;
+          }
+          break;
+
+        case 'array':
+          // Handle array conversion if needed (e.g., comma-separated strings)
+          if (typeof value === 'string' && value.includes(',')) {
+            convertedParams[key] = value.split(',').map((item) => item.trim());
+          } else {
+            convertedParams[key] = value;
+          }
+          break;
+
+        case 'object':
+          // Handle object conversion if needed
+          if (typeof value === 'string') {
+            try {
+              convertedParams[key] = JSON.parse(value);
+            } catch {
+              // If parsing fails, keep as is
+              convertedParams[key] = value;
+            }
+          } else {
+            convertedParams[key] = value;
+          }
+          break;
+
+        default:
+          // For string and other types, keep as is
+          convertedParams[key] = value;
+          break;
+      }
+    } catch (error) {
+      // If conversion fails, keep the original value
+      console.warn(`Failed to convert parameter '${key}' to type '${propType}':`, error);
+      convertedParams[key] = value;
+    }
+  }
+
+  return convertedParams;
+}

tests/clusterService.test.ts

@@ -1,67 +0,0 @@
-import { ClusterNodeConfig } from '../src/types/index.js';
-import config from '../src/config/index.js';
-import { __clusterInternals } from '../src/services/clusterService.js';
-
-const { buildTargetUrl, normalizeBasePath, matchesNodeGroup, joinUrlPaths } = __clusterInternals;
-
-describe('clusterService internals', () => {
-  const originalBasePath = config.basePath;
-
-  afterEach(() => {
-    config.basePath = originalBasePath;
-  });
-
-  test('normalizeBasePath trims trailing slashes and enforces leading slash', () => {
-    expect(normalizeBasePath('')).toBe('');
-    expect(normalizeBasePath('/')).toBe('');
-    expect(normalizeBasePath('/api/')).toBe('/api');
-    expect(normalizeBasePath('api')).toBe('/api');
-  });
-
-  test('matchesNodeGroup recognises global shortcuts', () => {
-    expect(matchesNodeGroup('', '')).toBe(true);
-    expect(matchesNodeGroup('global', '')).toBe(true);
-    expect(matchesNodeGroup('default', '')).toBe(true);
-    expect(matchesNodeGroup('*', '')).toBe(true);
-    expect(matchesNodeGroup('*', 'group-a')).toBe(true);
-    expect(matchesNodeGroup('group-a', 'group-a')).toBe(true);
-    expect(matchesNodeGroup('group-a', 'group-b')).toBe(false);
-  });
-
-  test('joinUrlPaths combines segments without duplicating slashes', () => {
-    expect(joinUrlPaths('/', '/api', '/messages')).toBe('/api/messages');
-    expect(joinUrlPaths('/root', '', '/')).toBe('/root');
-    expect(joinUrlPaths('', '', '/tools')).toBe('/tools');
-  });
-
-  test('buildTargetUrl respects hub base path and node prefix', () => {
-    config.basePath = '/hub';
-    const node: ClusterNodeConfig = {
-      id: 'node-1',
-      url: 'http://backend:3000',
-    };
-    const target = buildTargetUrl(node, '/hub/mcp/alpha?foo=bar');
-    expect(target.toString()).toBe('http://backend:3000/hub/mcp/alpha?foo=bar');
-  });
-
-  test('buildTargetUrl can override base path using node prefix', () => {
-    config.basePath = '/hub';
-    const node: ClusterNodeConfig = {
-      id: 'node-1',
-      url: 'http://backend:3000',
-      pathPrefix: '/',
-    };
-    const target = buildTargetUrl(node, '/hub/mcp/alpha?foo=bar');
-    expect(target.toString()).toBe('http://backend:3000/mcp/alpha?foo=bar');
-  });
-
-  test('buildTargetUrl appends to node URL path when provided', () => {
-    config.basePath = '';
-    const node: ClusterNodeConfig = {
-      id: 'node-1',
-      url: 'http://backend:3000/root',
-    };
-    const target = buildTargetUrl(node, '/messages?sessionId=123');
-    expect(target.toString()).toBe('http://backend:3000/root/messages?sessionId=123');
-  });
-});

tests/controllers/openApiController.test.ts

@@ -1,73 +1,7 @@
-// Simple unit test to validate the type conversion logic
-describe('Parameter Type Conversion Logic', () => {
-  // Extract the conversion function for testing
-  function convertQueryParametersToTypes(
-    queryParams: Record<string, any>,
-    inputSchema: Record<string, any>
-  ): Record<string, any> {
-    if (!inputSchema || typeof inputSchema !== 'object' || !inputSchema.properties) {
-      return queryParams;
-    }
-
-    const convertedParams: Record<string, any> = {};
-    const properties = inputSchema.properties;
-
-    for (const [key, value] of Object.entries(queryParams)) {
-      const propDef = properties[key];
-      if (!propDef || typeof propDef !== 'object') {
-        // No schema definition found, keep as is
-        convertedParams[key] = value;
-        continue;
-      }
-
-      const propType = propDef.type;
-      
-      try {
-        switch (propType) {
-          case 'integer':
-          case 'number':
-            // Convert string to number
-            if (typeof value === 'string') {
-              const numValue = propType === 'integer' ? parseInt(value, 10) : parseFloat(value);
-              convertedParams[key] = isNaN(numValue) ? value : numValue;
-            } else {
-              convertedParams[key] = value;
-            }
-            break;
-          
-          case 'boolean':
-            // Convert string to boolean
-            if (typeof value === 'string') {
-              convertedParams[key] = value.toLowerCase() === 'true' || value === '1';
-            } else {
-              convertedParams[key] = value;
-            }
-            break;
-          
-          case 'array':
-            // Handle array conversion if needed (e.g., comma-separated strings)
-            if (typeof value === 'string' && value.includes(',')) {
-              convertedParams[key] = value.split(',').map(item => item.trim());
-            } else {
-              convertedParams[key] = value;
-            }
-            break;
-          
-          default:
-            // For string and other types, keep as is
-            convertedParams[key] = value;
-            break;
-        }
-      } catch (error) {
-        // If conversion fails, keep the original value
-        console.warn(`Failed to convert parameter '${key}' to type '${propType}':`, error);
-        convertedParams[key] = value;
-      }
-    }
-
-    return convertedParams;
-  }
+import { convertParametersToTypes } from '../../src/utils/parameterConversion.js';
 
+// Integration tests for OpenAPI controller's parameter type conversion
+describe('OpenAPI Controller - Parameter Type Conversion Integration', () => {
   test('should convert integer parameters correctly', () => {
     const queryParams = {
       limit: '5',
@@ -84,7 +18,7 @@ describe('Parameter Type Conversion Logic', () => {
       }
     };
 
-    const result = convertQueryParametersToTypes(queryParams, inputSchema);
+    const result = convertParametersToTypes(queryParams, inputSchema);
 
     expect(result).toEqual({
       limit: 5,       // Converted to integer
@@ -107,7 +41,7 @@ describe('Parameter Type Conversion Logic', () => {
       }
     };
 
-    const result = convertQueryParametersToTypes(queryParams, inputSchema);
+    const result = convertParametersToTypes(queryParams, inputSchema);
 
     expect(result).toEqual({
       price: 19.99,
@@ -133,7 +67,7 @@ describe('Parameter Type Conversion Logic', () => {
       }
     };
 
-    const result = convertQueryParametersToTypes(queryParams, inputSchema);
+    const result = convertParametersToTypes(queryParams, inputSchema);
 
     expect(result).toEqual({
       enabled: true,
@@ -157,7 +91,7 @@ describe('Parameter Type Conversion Logic', () => {
       }
     };
 
-    const result = convertQueryParametersToTypes(queryParams, inputSchema);
+    const result = convertParametersToTypes(queryParams, inputSchema);
 
     expect(result).toEqual({
       tags: ['tag1', 'tag2', 'tag3'],
@@ -171,7 +105,7 @@ describe('Parameter Type Conversion Logic', () => {
       name: 'test'
     };
 
-    const result = convertQueryParametersToTypes(queryParams, {});
+    const result = convertParametersToTypes(queryParams, {});
 
     expect(result).toEqual({
       limit: '5',     // Should remain as string
@@ -192,7 +126,7 @@ describe('Parameter Type Conversion Logic', () => {
       }
     };
 
-    const result = convertQueryParametersToTypes(queryParams, inputSchema);
+    const result = convertParametersToTypes(queryParams, inputSchema);
 
     expect(result).toEqual({
       limit: 5,                     // Converted based on schema
@@ -214,7 +148,7 @@ describe('Parameter Type Conversion Logic', () => {
       }
     };
 
-    const result = convertQueryParametersToTypes(queryParams, inputSchema);
+    const result = convertParametersToTypes(queryParams, inputSchema);
 
     expect(result).toEqual({
       limit: 'not-a-number',  // Should remain as string when conversion fails
@@ -299,4 +233,16 @@ describe('OpenAPI Granular Endpoints', () => {
     const group = mockGetGroupByIdOrName('nonexistent');
     expect(group).toBeNull();
   });
+
+  test('should decode URL-encoded server and tool names with slashes', () => {
+    // Test that URL-encoded names with slashes are properly decoded
+    const encodedServerName = 'com.atlassian%2Fatlassian-mcp-server';
+    const encodedToolName = 'atlassianUserInfo';
+
+    const decodedServerName = decodeURIComponent(encodedServerName);
+    const decodedToolName = decodeURIComponent(encodedToolName);
+
+    expect(decodedServerName).toBe('com.atlassian/atlassian-mcp-server');
+    expect(decodedToolName).toBe('atlassianUserInfo');
+  });
 });

tests/integration/server-smart-routing.test.ts

@@ -0,0 +1,98 @@
+import { beforeEach, describe, expect, it, jest } from '@jest/globals';
+import request from 'supertest';
+
+const handleSseConnectionMock = jest.fn();
+const handleSseMessageMock = jest.fn();
+const handleMcpPostRequestMock = jest.fn();
+const handleMcpOtherRequestMock = jest.fn();
+const sseUserContextMiddlewareMock = jest.fn((_req, _res, next) => next());
+
+jest.mock('../../src/utils/i18n.js', () => ({
+  __esModule: true,
+  initI18n: jest.fn().mockResolvedValue(undefined),
+}));
+
+jest.mock('../../src/models/User.js', () => ({
+  __esModule: true,
+  initializeDefaultUser: jest.fn().mockResolvedValue(undefined),
+}));
+
+jest.mock('../../src/services/oauthService.js', () => ({
+  __esModule: true,
+  initOAuthProvider: jest.fn(),
+  getOAuthRouter: jest.fn(() => null),
+}));
+
+jest.mock('../../src/middlewares/index.js', () => ({
+  __esModule: true,
+  initMiddlewares: jest.fn(),
+}));
+
+jest.mock('../../src/routes/index.js', () => ({
+  __esModule: true,
+  initRoutes: jest.fn(),
+}));
+
+jest.mock('../../src/services/mcpService.js', () => ({
+  __esModule: true,
+  initUpstreamServers: jest.fn().mockResolvedValue(undefined),
+  connected: jest.fn().mockReturnValue(true),
+}));
+
+jest.mock('../../src/services/sseService.js', () => ({
+  __esModule: true,
+  handleSseConnection: handleSseConnectionMock,
+  handleSseMessage: handleSseMessageMock,
+  handleMcpPostRequest: handleMcpPostRequestMock,
+  handleMcpOtherRequest: handleMcpOtherRequestMock,
+}));
+
+jest.mock('../../src/middlewares/userContext.js', () => ({
+  __esModule: true,
+  userContextMiddleware: jest.fn((_req, _res, next) => next()),
+  sseUserContextMiddleware: sseUserContextMiddlewareMock,
+}));
+
+import { AppServer } from '../../src/server.js';
+
+const flushPromises = async () => {
+  await new Promise((resolve) => setImmediate(resolve));
+};
+
+describe('AppServer smart routing group paths', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    handleMcpPostRequestMock.mockImplementation(async (_req, res) => {
+      res.status(204).send();
+    });
+    sseUserContextMiddlewareMock.mockImplementation((_req, _res, next) => next());
+  });
+
+  const createApp = async () => {
+    const appServer = new AppServer();
+    await appServer.initialize();
+    await flushPromises();
+    return appServer.getApp();
+  };
+
+  it('routes global MCP requests with nested smart group segments', async () => {
+    const app = await createApp();
+
+    await request(app).post('/mcp/$smart/test-group').send({}).expect(204);
+
+    expect(handleMcpPostRequestMock).toHaveBeenCalledTimes(1);
+    const [req] = handleMcpPostRequestMock.mock.calls[0];
+    expect(req.params.group).toBe('$smart/test-group');
+  });
+
+  it('routes user-scoped MCP requests with nested smart group segments', async () => {
+    const app = await createApp();
+
+    await request(app).post('/alice/mcp/$smart/staging').send({}).expect(204);
+
+    expect(handleMcpPostRequestMock).toHaveBeenCalledTimes(1);
+    const [req] = handleMcpPostRequestMock.mock.calls[0];
+    expect(req.params.group).toBe('$smart/staging');
+    expect(req.params.user).toBe('alice');
+  });
+});

tests/services/clusterService.test.ts

@@ -0,0 +1,335 @@
+/**
+ * Cluster Service Tests
+ */
+
+import {
+  isClusterEnabled,
+  getClusterMode,
+  registerNode,
+  updateNodeHeartbeat,
+  getActiveNodes,
+  getAllNodes,
+  getServerReplicas,
+  getNodeForSession,
+  getSessionAffinity,
+  removeSessionAffinity,
+  getClusterStats,
+  shutdownClusterService,
+} from '../../src/services/clusterService';
+import { ClusterNode } from '../../src/types/index';
+import * as configModule from '../../src/config/index.js';
+
+// Mock the config module
+jest.mock('../../src/config/index.js', () => ({
+  loadSettings: jest.fn(),
+}));
+
+describe('Cluster Service', () => {
+  const loadSettings = configModule.loadSettings as jest.MockedFunction<typeof configModule.loadSettings>;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    // Clean up cluster service to reset state
+    shutdownClusterService();
+  });
+
+  describe('Configuration', () => {
+    it('should return false when cluster is not enabled', () => {
+      loadSettings.mockReturnValue({
+        mcpServers: {},
+      });
+
+      expect(isClusterEnabled()).toBe(false);
+    });
+
+    it('should return true when cluster is enabled', () => {
+      loadSettings.mockReturnValue({
+        mcpServers: {},
+        systemConfig: {
+          cluster: {
+            enabled: true,
+            mode: 'coordinator',
+          },
+        },
+      });
+
+      expect(isClusterEnabled()).toBe(true);
+    });
+
+    it('should return standalone mode when cluster is not configured', () => {
+      loadSettings.mockReturnValue({
+        mcpServers: {},
+      });
+
+      expect(getClusterMode()).toBe('standalone');
+    });
+
+    it('should return configured mode when cluster is enabled', () => {
+      loadSettings.mockReturnValue({
+        mcpServers: {},
+        systemConfig: {
+          cluster: {
+            enabled: true,
+            mode: 'coordinator',
+          },
+        },
+      });
+
+      expect(getClusterMode()).toBe('coordinator');
+    });
+  });
+
+  describe('Node Management', () => {
+    beforeEach(() => {
+      loadSettings.mockReturnValue({
+        mcpServers: {},
+        systemConfig: {
+          cluster: {
+            enabled: true,
+            mode: 'coordinator',
+          },
+        },
+      });
+    });
+
+    it('should register a new node', () => {
+      const node: ClusterNode = {
+        id: 'node-test-1',
+        name: 'Test Node 1',
+        host: 'localhost',
+        port: 3001,
+        url: 'http://localhost:3001',
+        status: 'active',
+        lastHeartbeat: Date.now(),
+        servers: ['server1', 'server2'],
+      };
+
+      registerNode(node);
+      const nodes = getAllNodes();
+
+      // Find our node (there might be others from previous tests)
+      const registeredNode = nodes.find(n => n.id === 'node-test-1');
+      expect(registeredNode).toBeTruthy();
+      expect(registeredNode?.name).toBe('Test Node 1');
+      expect(registeredNode?.servers).toEqual(['server1', 'server2']);
+    });
+
+    it('should update node heartbeat', () => {
+      const node: ClusterNode = {
+        id: 'node-test-2',
+        name: 'Test Node 2',
+        host: 'localhost',
+        port: 3001,
+        url: 'http://localhost:3001',
+        status: 'active',
+        lastHeartbeat: Date.now() - 10000,
+        servers: ['server1'],
+      };
+
+      registerNode(node);
+      const beforeHeartbeat = getAllNodes().find(n => n.id === 'node-test-2')?.lastHeartbeat || 0;
+
+      // Wait a bit to ensure timestamp changes
+      setTimeout(() => {
+        updateNodeHeartbeat('node-test-2', ['server1', 'server2']);
+        const updatedNode = getAllNodes().find(n => n.id === 'node-test-2');
+        const afterHeartbeat = updatedNode?.lastHeartbeat || 0;
+
+        expect(afterHeartbeat).toBeGreaterThan(beforeHeartbeat);
+        expect(updatedNode?.servers).toEqual(['server1', 'server2']);
+      }, 10);
+    });
+
+    it('should get active nodes only', () => {
+      const node1: ClusterNode = {
+        id: 'node-active-1',
+        name: 'Active Node',
+        host: 'localhost',
+        port: 3001,
+        url: 'http://localhost:3001',
+        status: 'active',
+        lastHeartbeat: Date.now(),
+        servers: ['server1'],
+      };
+
+      registerNode(node1);
+
+      const activeNodes = getActiveNodes();
+      const activeNode = activeNodes.find(n => n.id === 'node-active-1');
+      expect(activeNode).toBeTruthy();
+      expect(activeNode?.status).toBe('active');
+    });
+  });
+
+  describe('Server Replicas', () => {
+    beforeEach(() => {
+      loadSettings.mockReturnValue({
+        mcpServers: {},
+        systemConfig: {
+          cluster: {
+            enabled: true,
+            mode: 'coordinator',
+          },
+        },
+      });
+    });
+
+    it('should track server replicas across nodes', () => {
+      const node1: ClusterNode = {
+        id: 'node-replica-1',
+        name: 'Node 1',
+        host: 'localhost',
+        port: 3001,
+        url: 'http://localhost:3001',
+        status: 'active',
+        lastHeartbeat: Date.now(),
+        servers: ['test-server-1', 'test-server-2'],
+      };
+
+      const node2: ClusterNode = {
+        id: 'node-replica-2',
+        name: 'Node 2',
+        host: 'localhost',
+        port: 3002,
+        url: 'http://localhost:3002',
+        status: 'active',
+        lastHeartbeat: Date.now(),
+        servers: ['test-server-1', 'test-server-3'],
+      };
+
+      registerNode(node1);
+      registerNode(node2);
+
+      const server1Replicas = getServerReplicas('test-server-1');
+      expect(server1Replicas.length).toBeGreaterThanOrEqual(2);
+      expect(server1Replicas.map(r => r.nodeId)).toContain('node-replica-1');
+      expect(server1Replicas.map(r => r.nodeId)).toContain('node-replica-2');
+    });
+  });
+
+  describe('Session Affinity', () => {
+    beforeEach(() => {
+      loadSettings.mockReturnValue({
+        mcpServers: {},
+        systemConfig: {
+          cluster: {
+            enabled: true,
+            mode: 'coordinator',
+            stickySession: {
+              enabled: true,
+              strategy: 'consistent-hash',
+            },
+          },
+        },
+      });
+    });
+
+    it('should maintain session affinity with consistent hash', () => {
+      const node1: ClusterNode = {
+        id: 'node-affinity-1',
+        name: 'Node 1',
+        host: 'localhost',
+        port: 3001,
+        url: 'http://localhost:3001',
+        status: 'active',
+        lastHeartbeat: Date.now(),
+        servers: ['server1'],
+      };
+
+      registerNode(node1);
+
+      const sessionId = 'test-session-consistent-hash';
+      const firstNode = getNodeForSession(sessionId);
+      const secondNode = getNodeForSession(sessionId);
+
+      expect(firstNode).toBeTruthy();
+      expect(secondNode).toBeTruthy();
+      expect(firstNode?.id).toBe(secondNode?.id);
+    });
+
+    it('should create and retrieve session affinity', () => {
+      const node1: ClusterNode = {
+        id: 'node-affinity-2',
+        name: 'Node 1',
+        host: 'localhost',
+        port: 3001,
+        url: 'http://localhost:3001',
+        status: 'active',
+        lastHeartbeat: Date.now(),
+        servers: ['server1'],
+      };
+
+      registerNode(node1);
+
+      const sessionId = 'test-session-retrieve';
+      const selectedNode = getNodeForSession(sessionId);
+      
+      const affinity = getSessionAffinity(sessionId);
+      expect(affinity).toBeTruthy();
+      expect(affinity?.sessionId).toBe(sessionId);
+      expect(affinity?.nodeId).toBe(selectedNode?.id);
+    });
+
+    it('should remove session affinity', () => {
+      const node1: ClusterNode = {
+        id: 'node-affinity-3',
+        name: 'Node 1',
+        host: 'localhost',
+        port: 3001,
+        url: 'http://localhost:3001',
+        status: 'active',
+        lastHeartbeat: Date.now(),
+        servers: ['server1'],
+      };
+
+      registerNode(node1);
+
+      const sessionId = 'test-session-remove';
+      getNodeForSession(sessionId);
+      
+      let affinity = getSessionAffinity(sessionId);
+      expect(affinity).toBeTruthy();
+
+      removeSessionAffinity(sessionId);
+      affinity = getSessionAffinity(sessionId);
+      expect(affinity).toBeNull();
+    });
+  });
+
+  describe('Cluster Statistics', () => {
+    beforeEach(() => {
+      loadSettings.mockReturnValue({
+        mcpServers: {},
+        systemConfig: {
+          cluster: {
+            enabled: true,
+            mode: 'coordinator',
+          },
+        },
+      });
+    });
+
+    it('should return cluster statistics', () => {
+      const node1: ClusterNode = {
+        id: 'node-stats-1',
+        name: 'Node 1',
+        host: 'localhost',
+        port: 3001,
+        url: 'http://localhost:3001',
+        status: 'active',
+        lastHeartbeat: Date.now(),
+        servers: ['unique-server-1', 'unique-server-2'],
+      };
+
+      registerNode(node1);
+
+      const stats = getClusterStats();
+      expect(stats.nodes).toBeGreaterThanOrEqual(1);
+      expect(stats.activeNodes).toBeGreaterThanOrEqual(1);
+      expect(stats.servers).toBeGreaterThanOrEqual(2);
+    });
+  });
+});

tests/services/openApiGeneratorService.test.ts

@@ -65,6 +65,27 @@ describe('OpenAPI Generator Service', () => {
       expect(spec).toHaveProperty('paths');
       expect(typeof spec.paths).toBe('object');
     });
+
+    it('should URL-encode server and tool names with slashes in paths', async () => {
+      const spec = await generateOpenAPISpec();
+
+      // Check if any paths contain URL-encoded values
+      // Paths with slashes in server/tool names should be encoded
+      const paths = Object.keys(spec.paths);
+
+      // If there are any servers with slashes, verify encoding
+      // e.g., "com.atlassian/atlassian-mcp-server" should become "com.atlassian%2Fatlassian-mcp-server"
+      for (const path of paths) {
+        // Path should not have unencoded slashes in the middle segments
+        // Valid format: /tools/{encoded-server}/{encoded-tool}
+        const pathSegments = path.split('/').filter((s) => s.length > 0);
+        if (pathSegments[0] === 'tools' && pathSegments.length >= 3) {
+          // The server name (segment 1) and tool name (segment 2+) should not create extra segments
+          // If properly encoded, there should be exactly 3 segments: ['tools', serverName, toolName]
+          expect(pathSegments.length).toBe(3);
+        }
+      }
+    });
   });
 
   describe('getToolStats', () => {

tests/utils/parameterConversion.test.ts

@@ -0,0 +1,259 @@
+import { convertParametersToTypes } from '../../src/utils/parameterConversion.js';
+
+describe('Parameter Conversion Utilities', () => {
+  describe('convertParametersToTypes', () => {
+    it('should convert string to number when schema type is number', () => {
+      const params = { count: '42' };
+      const schema = {
+        type: 'object',
+        properties: {
+          count: { type: 'number' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.count).toBe(42);
+      expect(typeof result.count).toBe('number');
+    });
+
+    it('should convert string to integer when schema type is integer', () => {
+      const params = { age: '25' };
+      const schema = {
+        type: 'object',
+        properties: {
+          age: { type: 'integer' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.age).toBe(25);
+      expect(typeof result.age).toBe('number');
+      expect(Number.isInteger(result.age)).toBe(true);
+    });
+
+    it('should convert string to boolean when schema type is boolean', () => {
+      const params = { enabled: 'true', disabled: 'false', flag: '1' };
+      const schema = {
+        type: 'object',
+        properties: {
+          enabled: { type: 'boolean' },
+          disabled: { type: 'boolean' },
+          flag: { type: 'boolean' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.enabled).toBe(true);
+      expect(result.disabled).toBe(false);
+      expect(result.flag).toBe(true);
+    });
+
+    it('should convert comma-separated string to array when schema type is array', () => {
+      const params = { tags: 'one,two,three' };
+      const schema = {
+        type: 'object',
+        properties: {
+          tags: { type: 'array' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(Array.isArray(result.tags)).toBe(true);
+      expect(result.tags).toEqual(['one', 'two', 'three']);
+    });
+
+    it('should parse JSON string to object when schema type is object', () => {
+      const params = { config: '{"key": "value", "nested": {"prop": 123}}' };
+      const schema = {
+        type: 'object',
+        properties: {
+          config: { type: 'object' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(typeof result.config).toBe('object');
+      expect(result.config).toEqual({ key: 'value', nested: { prop: 123 } });
+    });
+
+    it('should keep values unchanged when they already have the correct type', () => {
+      const params = { count: 42, enabled: true, tags: ['a', 'b'] };
+      const schema = {
+        type: 'object',
+        properties: {
+          count: { type: 'number' },
+          enabled: { type: 'boolean' },
+          tags: { type: 'array' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.count).toBe(42);
+      expect(result.enabled).toBe(true);
+      expect(result.tags).toEqual(['a', 'b']);
+    });
+
+    it('should keep string values unchanged when schema type is string', () => {
+      const params = { name: 'John Doe' };
+      const schema = {
+        type: 'object',
+        properties: {
+          name: { type: 'string' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.name).toBe('John Doe');
+      expect(typeof result.name).toBe('string');
+    });
+
+    it('should handle parameters without schema definition', () => {
+      const params = { unknown: 'value' };
+      const schema = {
+        type: 'object',
+        properties: {
+          known: { type: 'string' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.unknown).toBe('value');
+    });
+
+    it('should return original params when schema has no properties', () => {
+      const params = { key: 'value' };
+      const schema = { type: 'object' };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result).toEqual(params);
+    });
+
+    it('should return original params when schema is null or undefined', () => {
+      const params = { key: 'value' };
+
+      const resultNull = convertParametersToTypes(params, null as any);
+      const resultUndefined = convertParametersToTypes(params, undefined as any);
+
+      expect(resultNull).toEqual(params);
+      expect(resultUndefined).toEqual(params);
+    });
+
+    it('should handle invalid number conversion gracefully', () => {
+      const params = { count: 'not-a-number' };
+      const schema = {
+        type: 'object',
+        properties: {
+          count: { type: 'number' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      // When conversion fails, it should keep original value
+      expect(result.count).toBe('not-a-number');
+    });
+
+    it('should handle invalid JSON string for object gracefully', () => {
+      const params = { config: '{invalid json}' };
+      const schema = {
+        type: 'object',
+        properties: {
+          config: { type: 'object' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      // When JSON parsing fails, it should keep original value
+      expect(result.config).toBe('{invalid json}');
+    });
+
+    it('should handle mixed parameter types correctly', () => {
+      const params = {
+        name: 'Test',
+        count: '10',
+        price: '19.99',
+        enabled: 'true',
+        tags: 'tag1,tag2',
+        config: '{"nested": true}',
+      };
+      const schema = {
+        type: 'object',
+        properties: {
+          name: { type: 'string' },
+          count: { type: 'integer' },
+          price: { type: 'number' },
+          enabled: { type: 'boolean' },
+          tags: { type: 'array' },
+          config: { type: 'object' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.name).toBe('Test');
+      expect(result.count).toBe(10);
+      expect(result.price).toBe(19.99);
+      expect(result.enabled).toBe(true);
+      expect(result.tags).toEqual(['tag1', 'tag2']);
+      expect(result.config).toEqual({ nested: true });
+    });
+
+    it('should handle empty string values', () => {
+      const params = { name: '', count: '', enabled: '' };
+      const schema = {
+        type: 'object',
+        properties: {
+          name: { type: 'string' },
+          count: { type: 'number' },
+          enabled: { type: 'boolean' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.name).toBe('');
+      // Empty string should remain as empty string for number (NaN check keeps original)
+      expect(result.count).toBe('');
+      // Empty string converts to false for boolean
+      expect(result.enabled).toBe(false);
+    });
+
+    it('should handle array that is already an array', () => {
+      const params = { tags: ['existing', 'array'] };
+      const schema = {
+        type: 'object',
+        properties: {
+          tags: { type: 'array' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.tags).toEqual(['existing', 'array']);
+    });
+
+    it('should handle object that is already an object', () => {
+      const params = { config: { key: 'value' } };
+      const schema = {
+        type: 'object',
+        properties: {
+          config: { type: 'object' },
+        },
+      };
+
+      const result = convertParametersToTypes(params, schema);
+
+      expect(result.config).toEqual({ key: 'value' });
+    });
+  });
+});