diff --git a/bin/mcp-server b/bin/mcp-server
new file mode 100755
index 0000000..355874e
--- /dev/null
+++ b/bin/mcp-server
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+"""Wrapper for grammar-inference MCP server.
+
+Ensures the correct bex module is loaded regardless of CWD.
+"""
+import sys
+import os
+
+GIE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+sys.path.insert(0, GIE_DIR)
+# Remove any conflicting paths
+sys.path = [p for p in sys.path if p != '']
+
+from bex.mcp_server import main
+main()