diff --git a/.codex/config.toml b/.codex/config.toml
new file mode 100644
index 00000000..86e5e199
--- /dev/null
+++ b/.codex/config.toml
@@ -0,0 +1,3 @@
+[mcp_servers.gitnexus]
+command = "npx"
+args = ["-y", "gitnexus@1.6.12", "mcp"]
diff --git a/.gitignore b/.gitignore
index d28c6882..b3fc5ff3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,6 @@ packages/db/gen/
 # Runtime artifacts
 .pts-reports/
 __pycache__/
+
+# GitNexus local index
+.gitnexus/
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 00000000..afe364b8
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "gitnexus": {
+      "command": "npx",
+      "args": ["-y", "gitnexus@1.6.12", "mcp"]
+    }
+  }
+}