diff --git a/.gitignore b/.gitignore
index 38cb376d8a..9790f6475a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ yarn-error.log
 
 .vscode/*
 !.vscode/settings.json
+
+.claude/settings.local.json
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 0000000000..5dafe2a83c
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,10 @@
+{
+  "mcpServers": {
+    "rust-analyzer": {
+      "command": "rust-analyzer-mcp"
+    },
+    "crates": {
+      "command": "crates-mcp"
+    }
+  }
+}
diff --git a/CLAUDE.md b/CLAUDE.md
index 0f043c768c..eb510fb010 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -80,3 +80,9 @@ Treat these rules as **mandatory guidance** that you must follow for all code ch
 # Code Formatting
 
 **ALWAYS** run `cargo fmt` before committing any Rust code changes to ensure consistent formatting across the codebase.
+
+# Rust Documentation
+
+Use rust-analyzer-mcp for local code (hover, definitions, diagnostics at file positions).
+Use crates-mcp for external crate docs.
+Never use WebFetch for docs.rs or crates.io when these MCPs are available.