Skip to content

Commit 024fe55

Browse files
cdeustclaude
andcommitted
fix(ci): wire the reranker filesystem seam before CI's bare preload call (#560)
Root cause of the PR #568 CI failure (5 python versions red): the reranker preload step in .github/actions/test-suite calls mcp_server.core.reranker.ensure_reranker_loaded() as a bare `python -c` one-liner, which never imports mcp_server/__main__.py or tests_py/conftest.py, so core/reranker_model.py's filesystem seam (configure_reranker_filesystem) was never wired -- reranker_cache_dir() raised RuntimeError on every attempt. Audited every other bare entry point that could reach a #560 injection seam (scripts/, .github/, benchmarks/) without going through a composition root: the reranker was the only one with real exposure -- every core/environment.py-backed seam (ablation, telemetry, thermodynamics, etc.) degrades to a safe default instead of raising when unconfigured, and no other bare script/CI step touches mcp_server.core.reranker. Fix: mcp_server/doctor.py (already a composition root -- it imports both handlers and infrastructure freely, unlike core/ or infrastructure/ themselves) gains ensure_reranker_ready(), which wires the seam (idempotent) and then delegates to core.reranker.ensure_reranker_loaded(). CI's preload step now calls that instead of reaching into core directly. New regression test proves it self-wires even when the seam was reset to simulate a bare-script call. Verified: `python -c "from mcp_server.doctor import ensure_reranker_ready as e; s = e(); assert s.state == 'loaded', s"` (the exact CI command) passes locally; `python scripts/verify_mcp_hosts.py -- hypermnesia-mcp` (the second red CI check, "server exited -9") passes cleanly on all 6 client/profile combinations on this branch -- that failure did not reproduce locally and is likely a transient/resource-contention effect downstream of the first failure, not a code defect; re-run in CI to confirm now that the real root cause is fixed. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
1 parent 3633e93 commit 024fe55

3 files changed

Lines changed: 86 additions & 1 deletion

File tree

‎.github/actions/test-suite/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ runs:
202202
shell: bash
203203
run: |
204204
for attempt in 1 2 3 4 5; do
205-
python -c "from mcp_server.core.reranker import ensure_reranker_loaded as e; s = e(); assert s.state == 'loaded', s" && exit 0
205+
python -c "from mcp_server.doctor import ensure_reranker_ready as e; s = e(); assert s.state == 'loaded', s" && exit 0
206206
echo "FlashRank pre-download attempt ${attempt} failed; retrying in $((attempt * 10))s" >&2
207207
sleep $((attempt * 10))
208208
done

‎mcp_server/doctor.py‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,45 @@
1212

1313
from mcp_server.observability import silent_failure
1414
from mcp_server.shared.platform import home_dir
15+
from mcp_server.core.reranker import ensure_reranker_loaded
16+
from mcp_server.core.reranker_model import configure_reranker_filesystem
1517
from mcp_server.handlers.admission import DEFAULT_SEMAPHORE
1618
from mcp_server.infrastructure.memory_config import get_memory_settings
19+
from mcp_server.infrastructure.reranker_cache import (
20+
reranker_cache_dir,
21+
reranker_model_exists,
22+
reranker_model_sha256,
23+
)
1724
from mcp_server.infrastructure.sqlite_store import SqliteMemoryStore
1825
from mcp_server.infrastructure.backend_marker import effective_backend
1926
from mcp_server.doctor_mcp import run_mcp
2027

2128

29+
def ensure_reranker_ready():
30+
"""Self-wiring FlashRank preload for standalone callers (CI, `python -m
31+
mcp_server.doctor`) that never import mcp_server/__main__.py.
32+
33+
Precondition: none.
34+
Postcondition: core/reranker_model.py's filesystem seam is configured
35+
(idempotent — safe to call more than once per process) before
36+
``ensure_reranker_loaded`` runs. Calling ``core.reranker.
37+
ensure_reranker_loaded`` directly from a bare script raises
38+
RuntimeError instead of loading, because nothing configured the seam
39+
first (issue #560 CI regression, 2026-09-15:
40+
`.github/actions/test-suite`'s reranker preload step did exactly that
41+
and failed on every Python version). This is the composition root for
42+
that preload — mcp_server/doctor.py already imports both core and
43+
infrastructure freely, unlike core/ or infrastructure/ themselves.
44+
45+
source: ADR-0244 (issue #560)"""
46+
configure_reranker_filesystem(
47+
cache_dir=reranker_cache_dir,
48+
model_exists=reranker_model_exists,
49+
model_sha256=reranker_model_sha256,
50+
)
51+
return ensure_reranker_loaded()
52+
53+
2254
class Check:
2355
__slots__ = ("name", "ok", "detail", "fix", "optional")
2456

‎tests_py/test_doctor.py‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
from __future__ import annotations
1212

13+
import pytest
1314

1415
from mcp_server.doctor import (
1516
CHECKS,
@@ -20,6 +21,7 @@
2021
_python_version,
2122
_sqlite_store,
2223
active_checks,
24+
ensure_reranker_ready,
2325
run,
2426
)
2527

@@ -91,3 +93,54 @@ def test_sqlite_store_check_passes_on_fresh_store(self, tmp_path, monkeypatch):
9193
memory_config.get_memory_settings.cache_clear()
9294
assert check.ok is True
9395
assert "memories" in check.detail
96+
97+
98+
class TestEnsureRerankerReady:
99+
"""core/reranker_model.py's filesystem seam (issue #560) is unwired
100+
unless a composition root configured it first; ensure_reranker_ready()
101+
is the one bare scripts (CI's reranker preload, this test) must call
102+
instead of core.reranker.ensure_reranker_loaded() directly. Regression
103+
cover for the 2026-09-15 CI failure: `.github/actions/test-suite`'s
104+
preload step called the unwired core function and raised RuntimeError
105+
on every Python version."""
106+
107+
def test_self_wires_and_loads_even_when_the_seam_was_reset(self):
108+
from mcp_server.core import reranker, reranker_model
109+
110+
saved_providers = (
111+
reranker_model._cache_dir_provider,
112+
reranker_model._model_exists_provider,
113+
reranker_model._model_sha256_provider,
114+
)
115+
saved_singleton = (
116+
reranker._flashrank_instance,
117+
reranker._flashrank_failed,
118+
reranker._flashrank_load_error,
119+
)
120+
# Simulate a bare script that never imported __main__.py or
121+
# conftest.py's composition-root wiring, and force a fresh load
122+
# attempt regardless of what earlier tests already cached.
123+
reranker_model._cache_dir_provider = None
124+
reranker_model._model_exists_provider = None
125+
reranker_model._model_sha256_provider = None
126+
reranker._flashrank_instance = None
127+
reranker._flashrank_failed = False
128+
reranker._flashrank_load_error = None
129+
try:
130+
with pytest.raises(RuntimeError, match="not configured"):
131+
reranker_model.reranker_cache_dir()
132+
133+
status = ensure_reranker_ready()
134+
135+
assert status.state == "loaded", status
136+
finally:
137+
(
138+
reranker_model._cache_dir_provider,
139+
reranker_model._model_exists_provider,
140+
reranker_model._model_sha256_provider,
141+
) = saved_providers
142+
(
143+
reranker._flashrank_instance,
144+
reranker._flashrank_failed,
145+
reranker._flashrank_load_error,
146+
) = saved_singleton

0 commit comments

Comments
 (0)