Test clean S/R as production rank overlay

tests/unit/test_backtest_service.py

@@ -169,6 +169,40 @@ def test_residual_high_vol_blend_is_research_only_rank():
     assert cands[0][bt.RESIDUAL_HIGH_VOL_BLEND_60_40_KEY] == 72.0
 
 
+def test_structural_overlay_is_a_frozen_five_percent_rank_nudge():
+    cands = [
+        {
+            bt.RESIDUAL_HIGH_VOL_BLEND_80_20_KEY: 80.0,
+            "structural_overlay_pass": True,
+        },
+        {
+            bt.RESIDUAL_HIGH_VOL_BLEND_80_20_KEY: 80.0,
+            "structural_overlay_pass": False,
+        },
+        {bt.RESIDUAL_HIGH_VOL_BLEND_80_20_KEY: 80.0},
+    ]
+
+    bt._assign_structural_overlay_score(cands)
+
+    assert bt.STRUCTURAL_OVERLAY_WEIGHT == 0.05
+    assert cands[0][bt.STRUCTURAL_OVERLAY_SCORE_KEY] == pytest.approx(81.0)
+    assert cands[1][bt.STRUCTURAL_OVERLAY_SCORE_KEY] == pytest.approx(76.0)
+    assert cands[2][bt.STRUCTURAL_OVERLAY_SCORE_KEY] is None
+
+
+def test_structural_overlay_monitor_strategy_is_opt_in(monkeypatch):
+    monkeypatch.setenv("BACKTEST_SR_VARIANT", "production_control")
+    assert bt._portfolio_monitor_strategies() == bt.PORTFOLIO_MONITOR_STRATEGIES
+
+    monkeypatch.setenv("BACKTEST_SR_VARIANT", bt.STRUCTURAL_OVERLAY_VARIANT)
+    strategies = bt._portfolio_monitor_strategies()
+    overlay = strategies[-1]
+    assert overlay["strategy"] == bt.STRUCTURAL_OVERLAY_PORTFOLIO_STRATEGY
+    assert overlay["ranking_key"] == bt.STRUCTURAL_OVERLAY_SCORE_KEY
+    assert overlay["use_live_config"] is True
+    assert overlay["is_production"] is False
+
+
 def test_strategy_variants_keep_only_current_research_candidates():
     variants = {cfg["variant"]: cfg for cfg in bt.STRATEGY_VARIANTS}
 
@@ -767,6 +801,7 @@ def test_sr_research_variant_is_explicit_and_validated(monkeypatch):
         "rewrite_range504_legacy_primary",
         "rewrite_range504_structural_legacy_primary",
         "rewrite_range504_structural_primary2",
+        "production_structural_overlay",
     ):
         monkeypatch.setenv("BACKTEST_SR_VARIANT", variant)
         assert bt._sr_research_variant() == variant
@@ -782,6 +817,7 @@ def test_range_factor_detector_mapping_is_explicit():
         "rewrite_range504_structural_legacy_primary"
     ) == "rewrite"
     assert bt._sr_detector_variant("rewrite_range504_structural_primary2") == "rewrite"
+    assert bt._sr_detector_variant("production_structural_overlay") == "production_control"
     assert bt._sr_detector_variant("soft_zones_legacy_primary") == "soft_zones"
 
 
@@ -816,6 +852,47 @@ def test_residual_arms_change_only_the_primary_rr_floor():
         "rewrite_range504_structural_primary2",
         activation,
     ) == 2.0
+    assert bt._primary_min_rr_for_variant(
+        "production_structural_overlay",
+        activation,
+    ) == 1.5
+
+
+def test_structural_overlay_tags_production_geometry_without_replacing_it(monkeypatch):
+    production = {
+        "direction": "long",
+        "meets_core": True,
+        "rr": 2.2,
+        "target": 111.0,
+        "primary_sources": ["volume_profile"],
+        "gate_level_count": 53,
+    }
+    structural = {
+        "direction": "long",
+        "meets_core": True,
+        "rr": 2.8,
+        "target": 114.0,
+        "primary_sources": ["pivot_point"],
+        "gate_level_count": 14,
+    }
+
+    def fake_window_setups(*args, sr_variant=None, **kwargs):
+        if sr_variant == "production_control":
+            return [production]
+        assert sr_variant == bt.STRUCTURAL_OVERLAY_SOURCE_VARIANT
+        return [structural]
+
+    monkeypatch.setattr(bt, "_window_setups", fake_window_setups)
+    rows = bt._structural_overlay_window_setups([], {}, {})
+
+    assert len(rows) == 1
+    assert rows[0]["target"] == production["target"]
+    assert rows[0]["rr"] == production["rr"]
+    assert rows[0]["structural_overlay_pass"] is True
+    assert rows[0]["structural_overlay_rr"] == structural["rr"]
+    assert rows[0]["structural_overlay_sources"] == ["pivot_point"]
+    assert rows[0]["structural_overlay_gate_level_count"] == 14
+    assert production.get("structural_overlay_pass") is None
 
 
 @pytest.mark.parametrize(