Add files using upload-large-folder tool

src/ctx_monitor.py

@@ -1714,10 +1714,18 @@ def _read_sidecar_file(path: Path) -> dict | None:
 def _load_sidecar(slug: str, entity_type: str | None = None) -> dict | None:
     if not _is_safe_slug(slug):
         return None
-    for path in (
+    paths = [
         _sidecar_dir() / f"{slug}.json",
         _sidecar_dir() / "mcp" / f"{slug}.json",
-    ):
+    ]
+    if entity_type is not None:
+        suffixes = [entity_type]
+        if entity_type == "mcp-server":
+            suffixes.append("mcp")
+        for suffix in suffixes:
+            paths.append(_sidecar_dir() / f"{slug}-{suffix}.json")
+
+    for path in paths:
         if not path.exists():
             continue
         sidecar = _read_sidecar_file(path)
@@ -1725,7 +1733,7 @@ def _load_sidecar(slug: str, entity_type: str | None = None) -> dict | None:
             continue
         if entity_type is None or _sidecar_entity_type(sidecar) == entity_type:
             return sidecar
-    if entity_type is not None:
+    if entity_type is not None and _SIDECAR_INDEX_CACHE_VALUE is not None:
         return _sidecar_index().get((slug, entity_type))
     return None
 

src/tests/test_ctx_monitor.py

@@ -766,6 +766,20 @@ def test_load_sidecar_can_disambiguate_duplicate_slug(fake_claude: Path) -> None
     assert harness["grade"] == "A"
 
 
+def test_load_sidecar_typed_miss_does_not_build_global_index(
+    fake_claude: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    _write_sidecar(fake_claude, "unrelated", {"slug": "unrelated"})
+    monkeypatch.setattr(
+        cm,
+        "_sidecar_index",
+        lambda: (_ for _ in ()).throw(AssertionError("cold full sidecar scan")),
+    )
+
+    assert cm._load_sidecar("missing", entity_type="skill") is None
+
+
 def test_monitor_post_requires_token(
     fake_claude: Path, monkeypatch: pytest.MonkeyPatch,
 ) -> None:

src/tests/test_ctx_monitor_3type.py

@@ -220,7 +220,9 @@ def test_wiki_index_sampling_is_sorted_by_slug(wiki_3type: Path) -> None:
 
 def test_wiki_entity_page_marks_truncated_body_and_frontmatter(
     wiki_3type: Path,
+    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
+    monkeypatch.setattr(_cm, "_render_entity_subgraph", lambda *_, **__: "")
     long_description = "x" * 160
     long_body = "body-line\n" * 1400
     (wiki_3type / "entities" / "skills" / "long-page.md").write_text(