diff --git a/.mcp.json b/.mcp.json
deleted file mode 100644
index 2c06ada..0000000
--- a/.mcp.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "mcpServers": {
-    "github-rag-mcp": {
-      "type": "http",
-      "url": "https://github-rag.smgjp.com/mcp",
-      "alwaysLoad": true,
-      "note": "GitHub RAG MCP. OAuth is required on first use."
-    }
-  }
-}
diff --git a/mcp-server/README.md b/mcp-server/README.md
index 8f4d69d..beb735a 100644
--- a/mcp-server/README.md
+++ b/mcp-server/README.md
@@ -47,7 +47,8 @@ Add the server to your MCP client configuration. Example for Claude Desktop (`cl
   "mcpServers": {
     "github-rag": {
       "command": "npx",
-      "args": ["-y", "github-rag-mcp"]
+      "args": ["-y", "github-rag-mcp"],
+      "alwaysLoad": true
     }
   }
 }
@@ -63,12 +64,15 @@ To target a self-hosted Worker, set the `RAG_WORKER_URL` environment variable:
       "args": ["-y", "github-rag-mcp"],
       "env": {
         "RAG_WORKER_URL": "https://your-worker.example.workers.dev"
-      }
+      },
+      "alwaysLoad": true
     }
   }
 }
 ```
 
+> **Note on `alwaysLoad`:** Recognized by Claude Code v2.1.121+ (released 2026-04-28). When set, the client loads this server's tools at session start instead of deferring them behind a `ToolSearch` round-trip — useful for retrieval servers used on every turn. Older clients silently ignore the field, so it is safe to leave in place. `alwaysLoad` を認識しないクライアント (Claude Desktop など) では無視されるだけで害はない。
+
 ## Configuration
 
 | Variable | Required | Default | Description |