diff --git a/CLAUDE.md b/CLAUDE.md
index 4643345..531a613 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -89,11 +89,11 @@ Static HTML/CSS/JS. No build step. No external CDN. The `pages.yml` workflow cop
 | CFX MCP | MCP Server | 0 | 0 | 0 |
 | Blender Developer Tools | Plugin | 12 | 6 | 0 |
 | Local AI MCP | MCP Server | 0 | 0 | 16 |
-| Screencast MCP | MCP Server | 0 | 0 | 10 |
+| Screencast MCP | MCP Server | 0 | 0 | 25 |
 <!-- registry:tools:end -->
 
 <!-- registry:stats:start -->
-**Totals:** 189 skills, 77 rules, 378 MCP tools across 11 repos
+**Totals:** 189 skills, 77 rules, 419 MCP tools across 14 repos
 <!-- registry:stats:end -->
 
 ## Development Workflow
diff --git a/README.md b/README.md
index 865cb3b..9884f9e 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
 
 <!-- registry:stats:start -->
 <p align="center">
- 11 repos &nbsp;&bull;&nbsp; 189 skills &nbsp;&bull;&nbsp; 77 rules &nbsp;&bull;&nbsp; 378 MCP tools
+ 14 repos &nbsp;&bull;&nbsp; 189 skills &nbsp;&bull;&nbsp; 77 rules &nbsp;&bull;&nbsp; 419 MCP tools
 </p>
 <!-- registry:stats:end -->
 
@@ -66,7 +66,7 @@ flowchart LR
 | **CFX MCP** | MCP Server | - | - | 0 | [![Repo](https://img.shields.io/badge/repo-blue?logo=github)](https://github.com/TMHSDigital/cfx-mcp) |
 | **Blender Developer Tools** | Plugin | 12 | 6 | 0 | [![Repo](https://img.shields.io/badge/repo-blue?logo=github)](https://github.com/TMHSDigital/Blender-Developer-Tools) |
 | **Local AI MCP** | MCP Server | - | - | 16 | [![Repo](https://img.shields.io/badge/repo-blue?logo=github)](https://github.com/TMHSDigital/local-ai-mcp) [![Docs](https://img.shields.io/badge/docs-7c3aed)](https://tmhsdigital.github.io/local-ai-mcp/) [![npm](https://img.shields.io/badge/npm-cb3837?logo=npm&logoColor=white)](https://www.npmjs.com/package/@tmhs/local-ai-mcp) |
-| **Screencast MCP** | MCP Server | - | - | 10 | [![Repo](https://img.shields.io/badge/repo-blue?logo=github)](https://github.com/TMHSDigital/screencast-mcp) [![Docs](https://img.shields.io/badge/docs-7c3aed)](https://tmhsdigital.github.io/screencast-mcp/) |
+| **Screencast MCP** | MCP Server | - | - | 25 | [![Repo](https://img.shields.io/badge/repo-blue?logo=github)](https://github.com/TMHSDigital/screencast-mcp) [![Docs](https://img.shields.io/badge/docs-7c3aed)](https://tmhsdigital.github.io/screencast-mcp/) |
 <!-- registry:tools:end -->
 
 <details>
diff --git a/docs/index.html b/docs/index.html
index 1594cd3..5fb692e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -103,6 +103,12 @@
     .card-badge{font-size:.6875rem;font-weight:600;text-transform:uppercase;letter-spacing:.04em;padding:.2rem .5rem;border-radius:4px;white-space:nowrap;flex-shrink:0}
     .badge-plugin{background:rgba(124,58,237,.2);color:var(--accent-light)}
     .badge-mcp{background:rgba(63,185,80,.2);color:var(--green)}
+    .card-badges{display:flex;gap:.375rem;flex-wrap:wrap;justify-content:flex-end;flex-shrink:0}
+    .badge-status{text-transform:capitalize}
+    .badge-status-experimental{background:rgba(210,153,34,.18);color:#d29922}
+    .badge-status-beta{background:rgba(88,166,255,.18);color:var(--blue)}
+    .badge-status-maintenance{background:rgba(139,148,158,.2);color:var(--text-dim)}
+    .badge-status-deprecated{background:rgba(248,81,73,.18);color:#f85149}
     .card-description{color:var(--text-dim);font-size:.875rem;margin-bottom:1rem;flex-grow:1}
     .card-stats{display:flex;gap:1rem;margin-bottom:1rem;flex-wrap:wrap}
     .card-stat{font-size:.8125rem;color:var(--text-muted);display:flex;align-items:center;gap:.25rem}
@@ -338,7 +344,7 @@ <h3>Scaffold Generator</h3>
   </button>
 
   <script id="registry-data" type="application/json">
-[{"name":"CFX Developer Tools","repo":"TMHSDigital/CFX-Developer-Tools","slug":"cfx-developer-tools","description":"AI-powered Cursor IDE plugin for FiveM and RedM resource development","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/CFX-Developer-Tools/","skills":9,"rules":6,"mcpTools":6,"extras":{"snippets":24,"templates":11,"natives":12000,"events":101},"topics":["fivem","redm","cfx","lua","game-development"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"mkdocs","hasCI":true},{"name":"Unity Developer Tools","repo":"TMHSDigital/Unity-Developer-Tools","slug":"unity-developer-tools","description":"Cursor IDE plugin for Unity game development with URP, HDRP, and Built-in render pipeline support","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Unity-Developer-Tools/","skills":18,"rules":8,"mcpTools":4,"extras":{"snippets":20,"templates":5},"topics":["unity","game-development","csharp","urp","hdrp"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"mkdocs","hasCI":true},{"name":"Docker Developer Tools","repo":"TMHSDigital/Docker-Developer-Tools","slug":"docker-developer-tools","description":"Cursor IDE plugin for Docker workflows with container management, Compose, and Dockerfile support","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Docker-Developer-Tools/","skills":17,"rules":10,"mcpTools":150,"extras":{},"npm":"@tmhs/docker-mcp","topics":["docker","containers","devops","docker-compose","dockerfile"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Home Lab Developer Tools","repo":"TMHSDigital/Home-Lab-Developer-Tools","slug":"home-lab-developer-tools","description":"Home lab and Raspberry Pi workflows for Cursor with Docker Compose, monitoring, DNS, networking, and security","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Home-Lab-Developer-Tools/","skills":22,"rules":11,"mcpTools":50,"extras":{},"npm":"@tmhs/homelab-mcp","topics":["homelab","raspberry-pi","infrastructure","docker-compose","monitoring"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Mobile App Developer Tools","repo":"TMHSDigital/Mobile-App-Developer-Tools","slug":"mobile-app-developer-tools","description":"Cursor plugin for mobile app development with React Native, Expo, and Flutter support","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Mobile-App-Developer-Tools/","skills":43,"rules":12,"mcpTools":36,"extras":{},"npm":"@tmhs/mobile-mcp","topics":["react-native","expo","flutter","mobile-development","typescript"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Plaid Developer Tools","repo":"TMHSDigital/Plaid-Developer-Tools","slug":"plaid-developer-tools","description":"Cursor plugin and MCP companion for building on the Plaid API","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Plaid-Developer-Tools/","skills":17,"rules":7,"mcpTools":30,"extras":{},"topics":["plaid","fintech","banking","open-banking","plaid-api"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Monday Cursor Plugin","repo":"TMHSDigital/Monday-Cursor-Plugin","slug":"monday-cursor-plugin","description":"Cursor IDE plugin for Monday.com with boards, items, sprints, docs, dashboards, and GraphQL","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Monday-Cursor-Plugin/","skills":21,"rules":8,"mcpTools":45,"extras":{},"topics":["monday","project-management","graphql","productivity","work-management"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Steam Cursor Plugin","repo":"TMHSDigital/Steam-Cursor-Plugin","slug":"steam-cursor-plugin","description":"Steam and Steamworks integration for Cursor IDE for game developers, modders, and power users","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Steam-Cursor-Plugin/","skills":30,"rules":9,"mcpTools":25,"extras":{},"topics":["steam","steamworks","game-development","modding","steam-workshop"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Steam MCP Server","repo":"TMHSDigital/steam-mcp","slug":"steam-mcp","description":"MCP server for Steam and Steamworks APIs with store data, player stats, reviews, achievements, and workshop tools","type":"mcp-server","homepage":"https://www.npmjs.com/package/@tmhs/steam-mcp","skills":0,"rules":0,"mcpTools":25,"extras":{},"npm":"@tmhs/steam-mcp","topics":["steam","mcp-server","steamworks","game-development","npm"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"none","hasCI":true},{"name":"Developer Tools MCP","repo":"TMHSDigital/Developer-Tools-MCP","slug":"developer-tools-mcp","description":"MCP server providing agent-callable read and write access to the TMHSDigital developer-tools ecosystem: registry, fleet status, drift checking, and standards management","type":"mcp-server","homepage":"https://tmhsdigital.github.io/Developer-Tools-MCP/","skills":0,"rules":0,"mcpTools":7,"extras":{},"topics":["mcp-server","developer-tools","ecosystem","registry","typescript"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"CFX MCP","repo":"TMHSDigital/cfx-mcp","slug":"cfx-mcp","description":"MCP server providing agent-callable tools for CFX/FiveM resource development, server management, and community platform integration.","type":"mcp-server","homepage":"","skills":0,"rules":0,"mcpTools":0,"extras":{},"topics":[],"status":"experimental","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"none","hasCI":true},{"name":"Blender Developer Tools","repo":"TMHSDigital/Blender-Developer-Tools","slug":"blender-developer-tools","description":"Cursor and Claude Code skills, rules, snippets, and templates for Blender Python add-on and scripting development","type":"cursor-plugin","homepage":"","skills":12,"rules":6,"mcpTools":0,"extras":{"snippets":17,"templates":2},"topics":["blender","python","bpy","3d","addon-development"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"none","hasCI":true},{"name":"Local AI MCP","repo":"TMHSDigital/local-ai-mcp","slug":"local-ai-mcp","description":"Unified MCP server for managing local model runtimes (Ollama, LM Studio, and more): provider-agnostic discovery, lifecycle, hardware-fit, and delegated inference.","type":"mcp-server","homepage":"https://tmhsdigital.github.io/local-ai-mcp/","skills":0,"rules":0,"mcpTools":16,"extras":{},"topics":["mcp","model-context-protocol","ollama","lm-studio","local-llm"],"status":"experimental","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true,"npm":"@tmhs/local-ai-mcp"},{"name":"Screencast MCP","repo":"TMHSDigital/screencast-mcp","slug":"screencast-mcp","description":"MCP server for Windows screen recording, frame sampling, and minimal ffmpeg edits (capture, watch, trim/concat/convert).","type":"mcp-server","homepage":"https://tmhsdigital.github.io/screencast-mcp/","skills":0,"rules":0,"mcpTools":10,"extras":{},"topics":["mcp-server","developer-tools","screen-recording","ffmpeg","windows"],"status":"beta","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true}]
+[{"name":"CFX Developer Tools","repo":"TMHSDigital/CFX-Developer-Tools","slug":"cfx-developer-tools","description":"AI-powered Cursor IDE plugin for FiveM and RedM resource development","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/CFX-Developer-Tools/","skills":9,"rules":6,"mcpTools":6,"extras":{"snippets":24,"templates":11,"natives":12000,"events":101},"topics":["fivem","redm","cfx","lua","game-development"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"mkdocs","hasCI":true},{"name":"Unity Developer Tools","repo":"TMHSDigital/Unity-Developer-Tools","slug":"unity-developer-tools","description":"Cursor IDE plugin for Unity game development with URP, HDRP, and Built-in render pipeline support","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Unity-Developer-Tools/","skills":18,"rules":8,"mcpTools":4,"extras":{"snippets":20,"templates":5},"topics":["unity","game-development","csharp","urp","hdrp"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"mkdocs","hasCI":true},{"name":"Docker Developer Tools","repo":"TMHSDigital/Docker-Developer-Tools","slug":"docker-developer-tools","description":"Cursor IDE plugin for Docker workflows with container management, Compose, and Dockerfile support","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Docker-Developer-Tools/","skills":17,"rules":10,"mcpTools":150,"extras":{},"npm":"@tmhs/docker-mcp","topics":["docker","containers","devops","docker-compose","dockerfile"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Home Lab Developer Tools","repo":"TMHSDigital/Home-Lab-Developer-Tools","slug":"home-lab-developer-tools","description":"Home lab and Raspberry Pi workflows for Cursor with Docker Compose, monitoring, DNS, networking, and security","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Home-Lab-Developer-Tools/","skills":22,"rules":11,"mcpTools":50,"extras":{},"npm":"@tmhs/homelab-mcp","topics":["homelab","raspberry-pi","infrastructure","docker-compose","monitoring"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Mobile App Developer Tools","repo":"TMHSDigital/Mobile-App-Developer-Tools","slug":"mobile-app-developer-tools","description":"Cursor plugin for mobile app development with React Native, Expo, and Flutter support","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Mobile-App-Developer-Tools/","skills":43,"rules":12,"mcpTools":36,"extras":{},"npm":"@tmhs/mobile-mcp","topics":["react-native","expo","flutter","mobile-development","typescript"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Plaid Developer Tools","repo":"TMHSDigital/Plaid-Developer-Tools","slug":"plaid-developer-tools","description":"Cursor plugin and MCP companion for building on the Plaid API","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Plaid-Developer-Tools/","skills":17,"rules":7,"mcpTools":30,"extras":{},"topics":["plaid","fintech","banking","open-banking","plaid-api"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Monday Cursor Plugin","repo":"TMHSDigital/Monday-Cursor-Plugin","slug":"monday-cursor-plugin","description":"Cursor IDE plugin for Monday.com with boards, items, sprints, docs, dashboards, and GraphQL","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Monday-Cursor-Plugin/","skills":21,"rules":8,"mcpTools":45,"extras":{},"topics":["monday","project-management","graphql","productivity","work-management"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Steam Cursor Plugin","repo":"TMHSDigital/Steam-Cursor-Plugin","slug":"steam-cursor-plugin","description":"Steam and Steamworks integration for Cursor IDE for game developers, modders, and power users","type":"cursor-plugin","homepage":"https://tmhsdigital.github.io/Steam-Cursor-Plugin/","skills":30,"rules":9,"mcpTools":25,"extras":{},"topics":["steam","steamworks","game-development","modding","steam-workshop"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"Steam MCP Server","repo":"TMHSDigital/steam-mcp","slug":"steam-mcp","description":"MCP server for Steam and Steamworks APIs with store data, player stats, reviews, achievements, and workshop tools","type":"mcp-server","homepage":"https://www.npmjs.com/package/@tmhs/steam-mcp","skills":0,"rules":0,"mcpTools":25,"extras":{},"npm":"@tmhs/steam-mcp","topics":["steam","mcp-server","steamworks","game-development","npm"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"none","hasCI":true},{"name":"Developer Tools MCP","repo":"TMHSDigital/Developer-Tools-MCP","slug":"developer-tools-mcp","description":"MCP server providing agent-callable read and write access to the TMHSDigital developer-tools ecosystem: registry, fleet status, drift checking, and standards management","type":"mcp-server","homepage":"https://tmhsdigital.github.io/Developer-Tools-MCP/","skills":0,"rules":0,"mcpTools":7,"extras":{},"topics":["mcp-server","developer-tools","ecosystem","registry","typescript"],"status":"active","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true},{"name":"CFX MCP","repo":"TMHSDigital/cfx-mcp","slug":"cfx-mcp","description":"MCP server providing agent-callable tools for CFX/FiveM resource development, server management, and community platform integration.","type":"mcp-server","homepage":"","skills":0,"rules":0,"mcpTools":0,"extras":{},"topics":[],"status":"experimental","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"none","hasCI":true},{"name":"Blender Developer Tools","repo":"TMHSDigital/Blender-Developer-Tools","slug":"blender-developer-tools","description":"Cursor and Claude Code skills, rules, snippets, and templates for Blender Python add-on and scripting development","type":"cursor-plugin","homepage":"","skills":12,"rules":6,"mcpTools":0,"extras":{"snippets":17,"templates":2},"topics":["blender","python","bpy","3d","addon-development"],"status":"active","language":"Python","license":"CC-BY-NC-ND-4.0","pagesType":"none","hasCI":true},{"name":"Local AI MCP","repo":"TMHSDigital/local-ai-mcp","slug":"local-ai-mcp","description":"Unified MCP server for managing local model runtimes (Ollama, LM Studio, and more): provider-agnostic discovery, lifecycle, hardware-fit, and delegated inference.","type":"mcp-server","homepage":"https://tmhsdigital.github.io/local-ai-mcp/","skills":0,"rules":0,"mcpTools":16,"extras":{},"topics":["mcp","model-context-protocol","ollama","lm-studio","local-llm"],"status":"experimental","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true,"npm":"@tmhs/local-ai-mcp"},{"name":"Screencast MCP","repo":"TMHSDigital/screencast-mcp","slug":"screencast-mcp","description":"MCP server for Windows screen recording, frame sampling, and minimal ffmpeg edits (capture, watch, trim/concat/convert).","type":"mcp-server","homepage":"https://tmhsdigital.github.io/screencast-mcp/","skills":0,"rules":0,"mcpTools":25,"extras":{},"topics":["mcp-server","developer-tools","screen-recording","ffmpeg","windows"],"status":"beta","language":"TypeScript","license":"CC-BY-NC-ND-4.0","pagesType":"static","hasCI":true}]
 </script>
 
   <script id="search-index" type="application/json">
@@ -400,9 +406,13 @@ <h3>Scaffold Generator</h3>
     function getEmbeddedRegistry(){var el=document.getElementById('registry-data');if(el){try{return JSON.parse(el.textContent)}catch(e){}}return[]}
     function boot(tools){renderStats(tools);renderCards(tools);setupFilters(tools);setupSearch(tools)}
 
-    /* Animated stat counters */
+    /* Animated stat counters.
+       Counts every non-archived tool, mirroring aggregate_stats in
+       scripts/sync_from_registry.py so the hero, README, CLAUDE.md, and the
+       GitHub About line all derive from one rule. Keep the two in sync. */
     function renderStats(tools){
-      var t=tools.reduce(function(a,x){a.skills+=x.skills||0;a.rules+=x.rules||0;a.mcp+=x.mcpTools||0;a.repos++;return a},{skills:0,rules:0,mcp:0,repos:0});
+      var counted=tools.filter(function(x){return (x.status||'active')!=='archived'});
+      var t=counted.reduce(function(a,x){a.skills+=x.skills||0;a.rules+=x.rules||0;a.mcp+=x.mcpTools||0;a.repos++;return a},{skills:0,rules:0,mcp:0,repos:0});
       var targets={repos:t.repos,skills:t.skills,rules:t.rules,mcp:t.mcp};
       var prefersReduce=window.matchMedia('(prefers-reduced-motion: reduce)').matches;
       ['repos','skills','rules','mcp'].forEach(function(k){
@@ -441,9 +451,13 @@ <h3>Scaffold Generator</h3>
 
         var header=el('div','card-header');
         header.appendChild(el('span','card-title',tool.name||''));
+        var badges=el('div','card-badges');
         var badgeCls=tool.type==='mcp-server'?'card-badge badge-mcp':'card-badge badge-plugin';
         var badgeText=tool.type==='mcp-server'?'MCP Server':'Plugin';
-        header.appendChild(el('span',badgeCls,badgeText));
+        badges.appendChild(el('span',badgeCls,badgeText));
+        var status=tool.status||'active';
+        if(status!=='active')badges.appendChild(el('span','card-badge badge-status badge-status-'+status,status));
+        header.appendChild(badges);
         card.appendChild(header);
 
         card.appendChild(el('p','card-description',tool.description||''));
diff --git a/registry.json b/registry.json
index 735cd23..45b220c 100644
--- a/registry.json
+++ b/registry.json
@@ -330,7 +330,7 @@
     "homepage": "https://tmhsdigital.github.io/screencast-mcp/",
     "skills": 0,
     "rules": 0,
-    "mcpTools": 10,
+    "mcpTools": 25,
     "extras": {},
     "topics": [
       "mcp-server",
diff --git a/scripts/sync_from_registry.py b/scripts/sync_from_registry.py
index 623960d..def878c 100644
--- a/scripts/sync_from_registry.py
+++ b/scripts/sync_from_registry.py
@@ -162,8 +162,13 @@ def render_readme_descriptions(entries: list[dict[str, Any]]) -> str:
 
 
 def aggregate_stats(entries: list[dict[str, Any]]) -> dict[str, int]:
-    counted_statuses = {"active", "maintenance"}
-    visible = [e for e in entries if e.get("status", "active") in counted_statuses]
+    # Count every non-archived tool. Experimental, beta, and deprecated tools
+    # are real and visible in the catalog, so they count toward the totals; the
+    # hero JS in docs/index.html applies the same rule. Keep the two in sync.
+    excluded_statuses = {"archived"}
+    visible = [
+        e for e in entries if e.get("status", "active") not in excluded_statuses
+    ]
     return {
         "repos": len(visible),
         "skills": sum(int(e.get("skills") or 0) for e in visible),
diff --git a/tests/test_registry_manifest_counts.py b/tests/test_registry_manifest_counts.py
new file mode 100644
index 0000000..537e242
--- /dev/null
+++ b/tests/test_registry_manifest_counts.py
@@ -0,0 +1,63 @@
+"""Guard against the registry's ``mcpTools`` count drifting from a tool repo's
+actual ``mcp-tools.json`` manifest (finding D4: screencast-mcp was recorded as
+10 in the registry while its manifest and server registered 25).
+
+The registry is the catalog's source of truth, but the manifest is the tool's
+shipped contract; when both are present they must agree. This test compares the
+two for every tool repo that is checked out as a sibling of the meta-repo. It
+skips when no sibling checkouts exist - in the meta-repo's own CI the tool
+repos are not cloned, so full-fleet validation is expected to run CI-side where
+the repos can be cloned (e.g. a fleet job that checks out each repo).
+"""
+
+import json
+from pathlib import Path
+
+import pytest
+
+REPO_ROOT = Path(__file__).resolve().parent.parent
+# Tool repos are checked out as siblings of the meta-repo (C:\Dev\<repo-name>).
+DEV_ROOT = REPO_ROOT.parent
+
+
+def _load_registry() -> list[dict]:
+    return json.loads((REPO_ROOT / "registry.json").read_text(encoding="utf-8"))
+
+
+def _sibling_checkout(repo_field: str) -> Path | None:
+    name = repo_field.split("/")[-1]
+    candidate = DEV_ROOT / name
+    return candidate if candidate.is_dir() else None
+
+
+def test_registry_mcptools_matches_local_manifests():
+    mismatches = []
+    checked = []
+    for entry in _load_registry():
+        repo_dir = _sibling_checkout(entry.get("repo", ""))
+        if repo_dir is None:
+            continue
+        manifest = repo_dir / "mcp-tools.json"
+        if not manifest.is_file():
+            continue
+        try:
+            tools = json.loads(manifest.read_text(encoding="utf-8"))
+        except (ValueError, OSError):
+            continue
+        if not isinstance(tools, list):
+            continue
+        checked.append(entry["slug"])
+        declared = int(entry.get("mcpTools") or 0)
+        if len(tools) != declared:
+            mismatches.append((entry["slug"], declared, len(tools)))
+
+    if not checked:
+        pytest.skip(
+            "no sibling tool checkouts with mcp-tools.json found; full-fleet "
+            "validation runs CI-side where repos can be cloned"
+        )
+
+    assert not mismatches, "registry mcpTools != manifest length: " + ", ".join(
+        f"{slug}: registry={declared} manifest={actual}"
+        for slug, declared, actual in mismatches
+    )