fix: load MCP config from settings.json and support mcpServers key

- Read mcp.config_path from settings.json when --mcp-config not given
- Also check global_settings in server lifespan as fallback
- Support Claude Desktop format "mcpServers" key in addition to "servers"

Author: jundot

omlx/cli.py

@@ -114,9 +114,11 @@ def serve_command(args):
     print(f"Max process memory: {settings.memory.max_process_memory}")
 
     # Store MCP config path for FastAPI startup
-    if args.mcp_config:
-        print(f"MCP config: {args.mcp_config}")
-        os.environ["OMLX_MCP_CONFIG"] = args.mcp_config
+    # Priority: CLI arg > settings.json
+    mcp_config = args.mcp_config or settings.mcp.config_path
+    if mcp_config:
+        print(f"MCP config: {mcp_config}")
+        os.environ["OMLX_MCP_CONFIG"] = mcp_config
 
     # Determine paged SSD cache directory
     # Priority: --no-cache > CLI arg > settings file

omlx/mcp/config.py

@@ -114,7 +114,8 @@ def validate_config(data: Dict[str, Any]) -> MCPConfig:
         raise ValueError("MCP config must be a dictionary")
 
     # Validate servers section
-    servers_data = data.get("servers", {})
+    # Support both oMLX ("servers") and Claude Desktop ("mcpServers") format
+    servers_data = data.get("servers") or data.get("mcpServers", {})
     if not isinstance(servers_data, dict):
         raise ValueError("'servers' must be a dictionary")
 

omlx/server.py

@@ -323,7 +323,10 @@ async def _ttl_check_loop():
         ttl_task = asyncio.create_task(_ttl_check_loop())
 
     # Initialize MCP if config provided
+    # Priority: env var > settings.json
     mcp_config = os.environ.get("OMLX_MCP_CONFIG")
+    if not mcp_config and _server_state.global_settings:
+        mcp_config = _server_state.global_settings.mcp.config_path
     if mcp_config:
         await init_mcp(mcp_config)