fix(yogas): lunar and solar yogas count only the five true planets; retire duplicate rules (upstream 2dd6062a)

bvr_002..004 (Sunaphaa/Anaphaa/Duradhara) and bvr_016..018 (Vesi/Vosi/
Ubhayachara) take upstream yinduzhanxing 2dd6062a's logic (Mars..Saturn
only). kemadruma_yoga also ignores the nodes (product decision: classical
definition; upstream still counts them). The six lunar/solar duplicates of
upstream's RETIRED_RULE_IDS are retired; upstream's four other retirements
are out of scope. TASK-upstream-sync4-20261002 T5.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01N4f2nya58RoRu4yEmJgRGE

tests/test_yoga_expr_compile_cache.py

@@ -161,7 +161,11 @@ def _globals_for(engine: YogaEngine, chart_index: int) -> dict:
 # ---------------------------------------------------------------------------
 def test_cached_compile_matches_pre_change_behaviour_for_every_rule_expression(engine) -> None:
     """全部 192 条去重表达式，缓存版与参照版在三张示例盘上逐条同值。"""
-    assert len(RULE_EXPRESSIONS) >= 190, "规则表表达式数量异常，等价证明的覆盖面不足"
+    # 原值: >= 190
+    # 新值: >= 184
+    # 原因: TASK-upstream-sync4-20261002 T5：bvr_002～004、bvr_016～018 六条从 custom 表达式改为
+    #       声明式 has_planet_in_house_from（上游 2dd6062a），表达式条数相应减少；等价证明仍覆盖其余全部表达式
+    assert len(RULE_EXPRESSIONS) >= 184, "规则表表达式数量异常，等价证明的覆盖面不足"
 
     mismatches = []
     for chart_index in range(len(SAMPLE_CHARTS)):