diff --git a/compatibility.json b/compatibility.json
index cac0ad6..4f1bd22 100644
--- a/compatibility.json
+++ b/compatibility.json
@@ -11,7 +11,7 @@
   },
   "hostedMcp": {
     "url": "https://mcp.agentmail.to/mcp",
-    "source": "https://github.com/agentmail-to/agentmail-manufact-mcp"
+    "source": "https://github.com/agentmail-to/agentmail-mcp"
   },
   "specifications": {
     "openapi": "https://docs.agentmail.to/openapi.json",
diff --git a/scripts/validate_repo.py b/scripts/validate_repo.py
index a5000fe..33dd95b 100644
--- a/scripts/validate_repo.py
+++ b/scripts/validate_repo.py
@@ -145,6 +145,11 @@ def check_path(owner: str, value: object) -> None:
 stale_patterns = {
     '"AGENTMAIL_API_KEY": ""': "empty API-key override",
     'https://mcp.agentmail.to"': "hosted MCP URL missing /mcp",
+    "https://github.com/agentmail-to/agentmail-manufact-mcp": "retired hosted-source repository",
+    "https://github.com/agentmail-to/agentmail-smithery-mcp": "retired Smithery-source repository",
+    "@agentmail/mcp": "nonexistent npm package",
+    "https://agentmail.run.tools": "retired Smithery deployment",
+    "https://server.smithery.ai/agentmail": "retired Registry endpoint",
     "[TODO:": "unresolved skill placeholder",
 }
 
diff --git a/skills/agentmail-mcp/SKILL.md b/skills/agentmail-mcp/SKILL.md
index a7ba413..c7bc00e 100644
--- a/skills/agentmail-mcp/SKILL.md
+++ b/skills/agentmail-mcp/SKILL.md
@@ -71,4 +71,4 @@ The hosted server covers core inbox, message, thread, search, draft, attachment,
 - A 401 with OAuth usually means the sign-in is incomplete or the session expired.
 - A 401 with API-key auth usually means `AGENTMAIL_API_KEY` was not available to the client process or the key was revoked.
 - Use the full `am_` key value and prefer the narrowest suitable organization, pod, or inbox scope.
-- The published local `agentmail-mcp` package may lag the hosted API. Use it only after verifying its installed SDK and toolkit versions against the required features.
+- For a stdio-only client, use the supported npm or PyPI `agentmail-mcp` compatibility bridge. Both discover tools dynamically from the hosted server.