fix(reading): add multi-chart evidence guardrails

ai_interpreter.py

@@ -1053,31 +1053,71 @@ class AIInterpreter:
                 has_guansha = '正官' in ten_gods or '七杀' in ten_gods
 
                 if has_guansha:
-                    # 推断官煞类型：正官格、七杀格、官杀混杂等
+                    # 推断官煞类型：正官格、七杀格、官杀混杂等。
+                    # ``ditianshi_complete`` 的知识库键是“官杀混杂格”，
+                    # 且字段名是 condition/treatment/outcome；旧代码传入
+                    # “官杀混杂”并读取另一套字段，导致 6/9 张有官杀的盘
+                    # 静默没有正文。
                     guansha_type = None
                     if '正官' in ten_gods and '七杀' not in ten_gods:
                         guansha_type = '正官格'
                     elif '七杀' in ten_gods and '正官' not in ten_gods:
                         guansha_type = '七杀格'
                     elif '正官' in ten_gods and '七杀' in ten_gods:
-                        guansha_type = '官杀混杂'
+                        guansha_type = '官杀混杂格'
 
                     if guansha_type:
                         guansha_info = get_guansha_analysis(guansha_type)
+                        # The complete classical table has specialist entries
+                        # for mixed/treated patterns, but not a bare 正官格 or
+                        # 七杀格 key.  Keep those two outputs as an explicit,
+                        # non-deterministic structural prompt rather than
+                        # silently dropping the chapter.
+                        if not guansha_info:
+                            guansha_info = {
+                                'condition': (
+                                    '命局出现正官信号；仍需结合月令、根气、印财食伤与日主强弱，'
+                                    '不能只凭一颗官星定格。'
+                                    if guansha_type == '正官格' else
+                                    '命局出现七杀信号；仍需结合月令、根气、制化与日主强弱，'
+                                    '不能只凭一颗七杀定吉凶。'
+                                ),
+                                'treatment': (
+                                    '先看官杀是否清纯有根，再看印比护身、食伤制化与岁运变化；'
+                                    '把它当作观察规则/压力/责任的入口。'
+                                ),
+                                'outcome': (
+                                    '这是传统理论的结构提示，不是职位、财富或事件保证；'
+                                    '用现实中的组织关系、责任压力与反馈核对。'
+                                ),
+                            }
                         if guansha_info:
                             interpretation += "**【关煞分析】**\n"
-                            interpretation += f"**官煞性质：**{guansha_info.get('characteristics', '')}\n"
-                            interpretation += f"**制化方法：**{guansha_info.get('control_method', '')}\n"
-                            interpretation += f"**实战应用：**{guansha_info.get('practical_use', '')}\n\n"
-
-            # 🔥 3. 疾病分析 (get_disease_by_wuxing)
-            day_master_element = self.day_master_element
+                            interpretation += f"**官煞性质：**{guansha_info.get('characteristics') or guansha_info.get('condition', '')}\n"
+                            interpretation += f"**制化方法：**{guansha_info.get('control_method') or guansha_info.get('treatment', '')}\n"
+                            interpretation += f"**实战应用：**{guansha_info.get('practical_use') or guansha_info.get('outcome', '')}\n\n"
+
+            # 🔥 3. 五行身心象意提示 (get_disease_by_wuxing)
+            # BaZiCalculator stores the day-master element in English
+            # (``wood``/``fire``/...), while the classical knowledge table is
+            # keyed by Chinese names (``木``/``火``/...).  Passing the English
+            # value silently returned an empty section for every chart.
+            element_names = {
+                'wood': '木',
+                'fire': '火',
+                'earth': '土',
+                'metal': '金',
+                'water': '水',
+            }
+            day_master_element = element_names.get(self.day_master_element, self.day_master_element)
             disease_info = get_disease_by_wuxing(day_master_element)
             if disease_info:
-                interpretation += "**【健康隐患（滴天髓疾病篇）】**\n"
-                interpretation += f"**易患疾病：**{disease_info.get('diseases', '')}\n"
-                interpretation += f"**病因分析：**{disease_info.get('causes', '')}\n"
-                interpretation += f"**调养建议：**{disease_info.get('remedies', '')}\n\n"
+                interpretation += "**【传统身心象意提示】**\n"
+                interpretation += f"**传统对应部位：**{disease_info.get('organs', '')}\n"
+                interpretation += f"**可能敏感主题：**{disease_info.get('diseases', '')}\n"
+                interpretation += f"**命理象意解释：**{disease_info.get('causes', '')}\n"
+                interpretation += f"**日常保养提醒：**{disease_info.get('remedies', '')}\n"
+                interpretation += "以上是传统象意提示，不是医学诊断；如有症状请以合格医疗人员的判断为准。\n\n"
 
             # 如果没有任何分析结果，返回空
             #
@@ -1703,27 +1743,79 @@ class AIInterpreter:
 
     # ========== 神煞解读 ==========
 
+    @staticmethod
+    def _spirit_theme(name: str, auspicious: bool) -> str:
+        """Return a bounded, reader-facing theme instead of raw old断语."""
+        themes = {
+            '天乙贵人': '支持网络、协作与困难中的转圜',
+            '红鸾': '关系连接与表达好感的机会',
+            '天喜': '关系连接与共同庆祝的机会',
+            '禄神': '收入、资源管理与稳定回报',
+            '福星': '顺势感、支持感与资源出现',
+            '金舆': '物质资源、责任角色与生活安排',
+            '太极贵人': '学习、钻研与独特方法',
+            '学堂': '学习、表达与知识传递',
+            '国印': '责任、组织角色与影响力',
+            '羊刃': '行动强度、边界与冲动管理',
+            '空亡': '不确定性、落空感与计划复核',
+            '灾煞': '安全意识、意外预案与风险边界',
+            '白虎': '高强度、工具或出行场景的安全边界',
+            '孤辰': '独处需求、关系边界与沟通方式',
+            '寡宿': '独处需求、亲密关系节奏与支持',
+            '元辰': '误解、反复与信息核对',
+            '阴阳差错': '关系沟通、期待差异与共同规则',
+            '十恶大败': '财务边界、承诺核对与风险复盘',
+            '魁罡': '强势表达、责任承担与柔性协作',
+            '六厄': '身心节奏、日常照护与专业咨询边界',
+            '勾煞': '合同、纠纷与沟通留痕',
+            '绞煞': '牵连、边界与问题拆解',
+        }
+        return themes.get(name, '传统神煞名目仅作辅助提示，以现实中可观察的行为和反馈为准')
+
+    @staticmethod
+    def _unique_spirits(items: Any) -> List[Dict[str, Any]]:
+        """按神煞名称去重，避免同一神煞在四柱重复放大。"""
+        def strength(item: Dict[str, Any]) -> float:
+            try:
+                return float(item.get('strength', 0) or 0)
+            except (TypeError, ValueError):
+                return 0.0
+
+        unique: Dict[str, Dict[str, Any]] = {}
+        for item in items or []:
+            if not isinstance(item, dict):
+                continue
+            name = str(item.get('name') or '').strip()
+            if not name:
+                continue
+            previous = unique.get(name)
+            if previous is None or strength(item) > strength(previous):
+                unique[name] = item
+        return sorted(unique.values(), key=lambda item: (-strength(item), item.get('name', '')))
+
     def _interpret_auspicious_spirits(self) -> str:
         """吉神解读"""
         if not self.shensha:
             return ''
 
-        auspicious = self.shensha.get('auspicious_gods', [])
+        auspicious = self._unique_spirits(self.shensha.get('auspicious_gods', []))
 
         if not auspicious:
-            return '你的八字中吉神较少，需要多积德行善、广结善缘。'
+            return '当前未见明显吉神标记；这不等于缺少机会，仍以现实中的支持、行动与反馈为准。'
 
         interpretation = f"**吉神数量：**{len(auspicious)}个\n\n"
 
-        for god in auspicious[:5]:  # 最多显示5个
+        for god in auspicious[:3]:
             name = god.get('name', '')
             name_en = god.get('name_en', '')
-            effect = god.get('effect', '')
-            description = god.get('description', '')
+            position = god.get('position_cn') or god.get('position') or '命局'
 
             interpretation += f"**{name}（{name_en}）**\n"
-            interpretation += f"作用：{self._phase_safe_text(effect)}\n"
-            interpretation += f"{self._phase_safe_text(description[:100])}...\n\n"
+            interpretation += f"出现位置：{position}\n"
+            interpretation += f"传统主题：{self._spirit_theme(name, True)}\n"
+            interpretation += '现实行动：记录哪些支持或资源确实出现，再决定是否保留这套做法。\n\n'
+
+        interpretation += '神煞只作辅助象意，不单独决定吉凶；请用现实反馈复核。\n'
 
         return interpretation
 
@@ -1732,27 +1824,26 @@ class AIInterpreter:
         if not self.shensha:
             return ''
 
-        inauspicious = self.shensha.get('inauspicious_gods', [])
+        inauspicious = self._unique_spirits(self.shensha.get('inauspicious_gods', []))
 
         if not inauspicious:
             return '当前可见的凶煞信号较少；仍应以现实风险和健康建议为准。'
 
         interpretation = f"**凶煞数量：**{len(inauspicious)}个\n\n"
 
-        for god in inauspicious[:5]:  # 最多显示5个
+        for god in inauspicious[:3]:
             name = god.get('name', '')
             name_en = god.get('name_en', '')
-            effect = god.get('effect', '')
-            description = god.get('description', '')
-            remedy = god.get('remedy', '')
+            position = god.get('position_cn') or god.get('position') or '命局'
 
             interpretation += f"**{name}（{name_en}）**\n"
-            interpretation += f"影响：{self._phase_safe_text(effect)}\n"
-            interpretation += f"{self._phase_safe_text(description[:100])}...\n"
-            if remedy:
-                interpretation += f"化解方法：{self._phase_safe_text(remedy)}\n"
+            interpretation += f"出现位置：{position}\n"
+            interpretation += f"传统主题：{self._spirit_theme(name, False)}\n"
+            interpretation += '现实行动：把它当作一个风险核验点，保留边界与记录，必要时寻求合格专业支持。\n'
             interpretation += "\n"
 
+        interpretation += '神煞只作辅助象意，不单独决定吉凶；不替代医疗、法律或财务判断。\n'
+
         return interpretation
 
     # ========== 人生规划 ==========

case_matcher.py

@@ -129,26 +129,26 @@ FEMALE_PRINCIPLES = {
     "夫星得用": {
         "category": "marriage_good",
         "conditions": ["官星清透", "财生官旺", "印护夫星"],
-        "interpretation": "婚姻运势良好，夫妻和谐，丈夫事业有成。",
-        "advice": ["珍惜幸福", "支持丈夫但保持自我", "共同决策平等相处"]
+        "interpretation": "传统象意更强调伴侣关系中的协作与共同目标；它不证明配偶的职业、财富或婚姻结果。",
+        "advice": ["把期待说清楚", "支持彼此但保持自我", "共同决策、平等相处"]
     },
     "伤官见官": {
         "category": "marriage_bad",
         "conditions": ["伤官旺盛", "官星受克", "多合多冲"],
-        "interpretation": "婚姻可能有波折，容易与伴侣产生矛盾。需要修炼情商。",
-        "advice": ["学习沟通技巧", "控制情绪", "专注事业成就", "晚婚更佳"]
+        "interpretation": "传统象意提示沟通、边界与权责更容易出现张力；它不等于必然分手或婚姻失败。",
+        "advice": ["把分歧具体化", "先冷静再讨论", "为关系保留共同规则"]
     },
     "食神吐秀": {
         "category": "children_good",
         "conditions": ["食神有力", "子女宫吉"],
-        "interpretation": "子女运势好，教育成功，子女有出息。",
-        "advice": ["重视教育投入", "培养孩子独立性", "不过度溺爱"]
+        "interpretation": "传统象意更适合读作照护、教养与创造性亲子互动的资源；它不能证明子女数量、健康或成就。",
+        "advice": ["重视稳定陪伴", "培养彼此独立性", "不过度替对方做决定"]
     },
     "子女宫受克": {
         "category": "children_bad",
         "conditions": ["时柱受冲克", "食伤被制"],
-        "interpretation": "与子女缘分可能较浅，或生育有困难。",
-        "advice": ["现代可接受丁克", "考虑医学辅助或收养", "把精力投入其他领域"]
+        "interpretation": "传统象意提示亲子角色、照护边界或家庭节奏需要更多沟通与支持；不能据此推断生育能力或是否生育。",
+        "advice": ["提前讨论照护边界", "需要时寻求专业支持", "把精力投入可验证的家庭安排"]
     }
 }
 

experiments/baseline_density.py

@@ -17,10 +17,11 @@
 1. 必须用 BaZiCalculator.calculate_bazi_complete(include_dayun=True)。
    用 calculate_bazi() 拿不到大运→拿不到流年→风险年恒为 0，
    会得到一份「全 0」的漂亮结果。全 0 是 harness 坏了，不是发现。
-2. 只能测 analyze_*() 公开方法。直接调 _analyze_*_years() 会绕过
-   _focus_years 里的 [:3] 封顶，量到的是封顶前的数（约 40%），
-   跟用户实际读到的（25%）差一倍。
-3. 分母是**当前大运窗口长度**，不是一辈子。用户读的是这 12 年。
+2. 用户实际看到的是 analyze_*() 的公开输出；它会先裁到当前窗口，再按显著度
+   封顶。基线必须同时报告「窗口内候选」与「最终呈现」，否则封顶会被误读成
+   命理分辨力。
+3. 分母是**当前大运窗口长度**，不是一辈子。用户读的是这 12 年；窗口内
+   被隐藏的候选不能悄悄算进命中率。
 
 用法
 ----
@@ -37,6 +38,7 @@ from dayun_analyzer import DayunAnalyzer
 from marriage_analyzer import MarriageAnalyzer
 from official_analyzer import OfficialAnalyzer
 from legal_risk_analyzer import LegalRiskAnalyzer
+from fortune_window import filter_to_window
 
 CHARTS = [('小鱼','1981-10-04','20:38','female'),('林磊','1983-12-13','13:15','female'),
           ('Jason','1978-10-30','10:00','male'),('C4','2008-07-31','21:00','female'),
@@ -44,10 +46,37 @@ CHARTS = [('小鱼','1981-10-04','20:38','female'),('林磊','1983-12-13','13:15
           ('C7','2013-05-13','03:40','male'),('C8','1990-01-08','06:30','male'),
           ('C9','1980-06-07','17:30','female')]
 NOW = 2026
+DOM = ['婚姻风险','官非风险','升迁','灾劫']
 
 def ages(lst):
     return sorted({e['age'] for e in (lst or []) if isinstance(e, dict) and 'age' in e})
 
+
+class _NoCapList(list):
+    """诊断用列表：让婚姻模块跳过展示层 [:3]，保留候选供对照。
+
+    MarriageAnalyzer 的「全局最多 20 条 + 当前窗口最多 3 条」逻辑目前写在
+    一个方法里，没有单独的 raw API。这个小替身只在本实验中使用，不能进入
+    生产路径；结果应理解为“模块内部全局筛选之后、窗口展示封顶之前”的候选。
+    """
+
+    def __len__(self):
+        actual = super().__len__()
+        return min(actual, 3)
+
+
+def marriage_candidates_before_window(chart, dayun):
+    """读取婚姻模块的窗口前候选，不改变生产方法。"""
+    import fortune_window
+
+    original_filter = fortune_window.filter_to_window
+    try:
+        fortune_window.filter_to_window = lambda entries, window, age_key='age': _NoCapList(entries or [])
+        diagnostic = MarriageAnalyzer(chart, dayun).analyze_marriage()
+    finally:
+        fortune_window.filter_to_window = original_filter
+    return (diagnostic.get('marriage_fortune_years') or {}).get('risk_years') or []
+
 def collect(name, date, time, gender):
     chart = BaZiCalculator.calculate_bazi_complete(birth_date=date, birth_time=time,
         gender=gender, is_lunar=False, include_dayun=True, num_dayun=12)
@@ -66,11 +95,23 @@ def collect(name, date, time, gender):
          '官非风险': ages(off.get('official_risk_years')),
          '升迁':     ages(off.get('promotion_years')),
          '灾劫':     ages(leg.get('disaster_years'))}
+    # 诊断层：公开输出以外，量出窗口内原本有多少候选。这里不把候选当作
+    # “预测命中”，只是为了识别 [:3] 封顶造成的密度变化。
+    off_analyzer = OfficialAnalyzer(chart, genju, dayun)
+    leg_analyzer = LegalRiskAnalyzer(chart, genju, dayun)
+    raw_entries = {
+        '婚姻风险': marriage_candidates_before_window(chart, dayun),
+        '官非风险': off_analyzer._analyze_official_risk_years(),
+        '升迁': off_analyzer._analyze_promotion_years(),
+        '灾劫': leg_analyzer._predict_disaster_years(),
+    }
+    raw_window = {x: ages(filter_to_window(raw_entries[x], (lo, hi))) for x in DOM}
     return {'name': name, 'by': int(date[:4]), 'age': age, 'win': (lo, hi),
-            'len': (hi - lo + 1) if lo else None, 'd': d}
+            'len': (hi - lo + 1) if lo else None, 'd': d,
+            'raw_window': raw_window,
+            'raw_total': {x: sum(1 for _ in raw_entries[x]) for x in DOM}}
 
 R = [collect(*c) for c in CHARTS]
-DOM = ['婚姻风险','官非风险','升迁','灾劫']
 print('='*86)
 print('Q1 · 上线后的实际密度（analyze_*() 公开方法输出）')
 print('='*86)
@@ -145,3 +186,21 @@ for x in DOM:
           f'落在窗口前半段的比例 {front:.0%}   (n={len(pos)})')
 print()
 print('若随机分布，平均位置应≈0.50、前半段比例应≈50%。')
+
+print()
+print('='*86)
+print('Q5 · 当前窗口候选 vs 实际呈现（上限效应）')
+print('='*86)
+print('候选 = 模块已完成自身规则筛选、但尚未套当前窗口展示上限的年份；')
+print('呈现 = 用户实际拿到的年份。隐藏不是“被验证为错误”，只是展示层封顶。')
+print()
+print(f"{'领域':<10}{'窗��候选':>12}{'实际呈现':>12}{'隐藏':>10}{'呈现率':>10}")
+for x in DOM:
+    raw = sum(len(r['raw_window'][x]) for r in R)
+    shown = sum(len(r['d'][x]) for r in R)
+    hidden = raw - shown
+    ratio = shown / raw if raw else 0
+    print(f"{x:<10}{raw:>12}{shown:>12}{hidden:>10}{ratio:>9.0%}")
+print()
+print('解释：若“窗口候选”远高于“实际呈现”，密度下降来自产品封顶而非规则本身；')
+print('因此在获得真实事件追踪前，逐年模块只能作为阶段提示，不能宣称准确率。')

genju_analyzer.py

@@ -683,14 +683,14 @@ class GenjuAnalyzer:
             base['reading'] = ''
         else:
             base['note'] = (f'两个流派在这张盘上不一致：格局法取「{geju_yongshen}」，'
-                            f'扶抑法主张「{fuyi}」。这是真实存在的分歧，不是计算错误，'
-                            f'我们不替你裁决。')
+                            f'扶抑法主张「{fuyi}」。这是同一命盘的两种读法，不是计算错误；'
+                            f'本报告把口径并列呈现，不把分歧冒充成事实裁决。')
             base['reading'] = (
                 f'这类分歧通常出现在「{label}但格局要求你输出」的命上。'
-                f'可以这样读：格局法说的「{geju_yongshen}」是命局要你交出的成果形态，'
-                f'扶抑法说的「{fuyi}」是你的承载力缺口。'
-                f'两者相冲，意味着你要做的那件事，正在消耗你本来就不够的那部分——'
-                f'不是不能做，是做之前得先把托底的结构搭起来。'
+                f'可以这样读：格局法说的「{geju_yongshen}」描述命局要交出的成果形态，'
+                f'扶抑法说的「{fuyi}」提示承载力与托底资源。两者相冲时，'
+                f'更稳妥的工作假设是先把托底结构搭起来，再逐步验证输出是否可持续——'
+                f'不是不能做，而是先后顺序需要用现实反馈校准。'
             )
         return base
 

test_case_insights_guardrails.py

@@ -0,0 +1,47 @@
+"""六亲/子女洞察的表达边界测试。
+
+当前数据不足以验证子女数量、健康、生育能力或“子女有出息”等结果，
+所以经典案例层只能交付关系主题与可行动的照护建议。
+"""
+
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from ai_interpreter import AIInterpreter
+from bazi_calculator import BaZiCalculator
+from dayun_analyzer import DayunAnalyzer
+from genju_analyzer import GenjuAnalyzer
+from shensha_analyzer import ShenshaAnalyzer
+
+
+CASES = [
+    ('小鱼', '1981-10-04', '20:40', 'female'),
+    ('林磊', '1983-12-13', '13:15', 'female'),
+    ('C4', '2008-07-31', '21:00', 'female'),
+    ('C9', '1980-06-07', '17:30', 'female'),
+]
+
+
+def test_child_and_marriage_case_copy_does_not_claim_outcomes():
+    banned = ('教育成功', '子女有出息', '生育有困难', '子女运势好')
+    for name, date, time, gender in CASES:
+        chart = BaZiCalculator.calculate_bazi_complete(
+            birth_date=date, birth_time=time, gender=gender,
+            is_lunar=False, include_dayun=True, num_dayun=12,
+        )
+        genju = GenjuAnalyzer(chart).analyze_genju()
+        dayun = DayunAnalyzer(chart, genju, current_age=2026 - int(date[:4])).analyze_all_dayun()
+        shensha = ShenshaAnalyzer(chart).analyze_all_shenshas()
+        text = AIInterpreter(chart, shensha, genju, dayun).generate_interpretation(
+            'master', 'zh-CN'
+        )['sections']['case_insights']
+        assert not any(phrase in text for phrase in banned), f'{name}: 出现未验证六亲断言'
+        if '子女' in text or '配偶' in text or '伴侣' in text:
+            assert '不能证明' in text or '不等于' in text, f'{name}: 缺少六亲边界说明'
+
+
+if __name__ == '__main__':
+    test_child_and_marriage_case_copy_does_not_claim_outcomes()
+    print('case insight guardrails: PASS')

test_master_multi_chart.py

@@ -0,0 +1,123 @@
+"""大师版跨命盘契约测试。
+
+这组测试不判断哪一派命理“正确”，只锁产品承诺：大师层应把已实现的
+经典模块真正交付出来，而且不能因为某个知识表的键名不一致而静默消失。
+"""
+
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from ai_interpreter import AIInterpreter
+from bazi_calculator import BaZiCalculator
+from dayun_analyzer import DayunAnalyzer
+from genju_analyzer import GenjuAnalyzer
+from shensha_analyzer import ShenshaAnalyzer
+
+
+CASES = [
+    ('小鱼', '1981-10-04', '20:40', 'female'),
+    ('林磊', '1983-12-13', '13:15', 'female'),
+    ('Jason', '1978-10-30', '10:00', 'male'),
+    ('C4', '2008-07-31', '21:00', 'female'),
+    ('C5', '2012-04-09', '07:30', 'male'),
+    ('C6', '2014-04-15', '16:30', 'male'),
+    ('C7', '2013-05-13', '03:40', 'male'),
+    ('C8', '1990-01-08', '06:30', 'male'),
+    ('C9', '1980-06-07', '17:30', 'female'),
+]
+
+
+def _master(name, date, time, gender):
+    chart = BaZiCalculator.calculate_bazi_complete(
+        birth_date=date,
+        birth_time=time,
+        gender=gender,
+        is_lunar=False,
+        include_dayun=True,
+        num_dayun=12,
+    )
+    genju = GenjuAnalyzer(chart).analyze_genju()
+    dayun = DayunAnalyzer(chart, genju, current_age=2026 - int(date[:4])).analyze_all_dayun()
+    shensha = ShenshaAnalyzer(chart).analyze_all_shenshas()
+    return AIInterpreter(chart, shensha, genju, dayun).generate_interpretation('master', 'zh-CN')
+
+
+def test_master_sections_are_non_empty_across_reference_charts():
+    """每张参考盘都应真正拿到经典深层洞察，而不是只返回标题或直接省略。"""
+    required = {
+        'personality', 'career', 'wealth', 'marriage', 'health', 'overall',
+        'tiaohou_analysis', 'shishen_analysis', 'case_insights',
+        'dayun_overview', 'life_stages', 'turning_points', 'ten_year_fortunes',
+        'life_curve_detailed', 'key_ages_analysis', 'life_planning',
+        'ditianshi_insights',
+    }
+
+    for name, date, time, gender in CASES:
+        result = _master(name, date, time, gender)
+        sections = result['sections']
+        missing = required - set(sections)
+        assert not missing, f'{name}: 大师版缺少章节 {sorted(missing)}'
+        empty = [key for key in required if len(str(sections.get(key, '')).strip()) < 30]
+        assert not empty, f'{name}: 大师版章节为空壳 {empty}'
+        assert result['word_count'] > 2500, f'{name}: 大师版内容异常过短'
+
+
+def test_master_health_symbolism_is_explicitly_non_diagnostic():
+    """经典疾病篇只作为传统象意提示，不应伪装成医学诊断。"""
+    for name, date, time, gender in CASES:
+        result = _master(name, date, time, gender)
+        text = result['sections']['ditianshi_insights']
+        assert '传统身心象意提示' in text, name
+        assert '不是医学诊断' in text, name
+
+
+def test_guansha_branch_has_non_empty_evidence_when_present():
+    """官杀归一后，6/9 参考盘应真正拿到内容而不是空标题。
+
+    The classical table uses ``condition/treatment/outcome`` while the
+    renderer exposes reader-facing labels.  This catches both the old
+    ``官杀混杂`` vs ``官杀混杂格`` key mismatch and empty-field regressions.
+    """
+    seen = 0
+    for name, date, time, gender in CASES:
+        result = _master(name, date, time, gender)
+        text = result['sections']['ditianshi_insights']
+        chart = BaZiCalculator.calculate_bazi_complete(
+            birth_date=date, birth_time=time, gender=gender,
+            is_lunar=False, include_dayun=True, num_dayun=12,
+        )
+        stats = GenjuAnalyzer(chart).analyze_genju()['ten_gods_stats']
+        expected = '正官' in stats or '七杀' in stats
+        present = '**【关煞分析】**' in text
+        assert present == expected, f'{name}: 官杀存在性与章节输出不一致'
+        if present:
+            seen += 1
+            for label in ('官煞性质', '制化方法', '实战应用'):
+                line = next((ln for ln in text.splitlines() if ln.startswith(f'**{label}：**')), '')
+                assert len(line) > len(label) + 6, f'{name}: {label} 为空壳'
+    assert seen == 6, f'参考盘官杀章节数量漂移：{seen}/9'
+
+
+def test_spirit_sections_are_deduped_and_boundaried():
+    """神煞只交付位置+主题+核验动作，不把旧断语当成结果。"""
+    banned = (
+        '子女发达', '一生富贵', '一生多灾多难', '血光、凶灾、手术',
+        '逢凶化吉', '能掌实权', '学业有成',
+    )
+    for name, date, time, gender in CASES:
+        sections = _master(name, date, time, gender)['sections']
+        for key in ('auspicious_spirits', 'inauspicious_spirits'):
+            text = sections.get(key, '')
+            assert text, f'{name}: {key} 不应为空壳'
+            assert not any(phrase in text for phrase in banned), f'{name}: {key} 泄漏绝对断语'
+            assert '神煞只作辅助象意' in text, f'{name}: {key} 缺少边界说明'
+            names = [line for line in text.splitlines() if line.startswith('**') and '（' in line]
+            assert len(names) <= 3, f'{name}: {key} 未限制展示数量'
+
+
+if __name__ == '__main__':
+    test_master_sections_are_non_empty_across_reference_charts()
+    test_master_health_symbolism_is_explicitly_non_diagnostic()
+    print('master multi-chart contract: PASS')

test_ten_gods_naming.py

@@ -40,6 +40,16 @@ CASES = [
 
 FULL_NAMES = {'比肩', '劫财', '食神', '伤官', '正财', '偏财', '正官', '七杀', '正印', '偏印'}
 ABBREVS = {'比', '劫', '食', '伤', '财', '才', '官', '杀', '印', '枭'}
+# Independent oracle for the public naming contract.  Do not derive this from
+# GenjuAnalyzer: a bijective but semantically swapped production map must fail
+# the test rather than redefining the expected answer.
+EXPECTED_FULL_NAMES = {
+    '比': '比肩', '劫': '劫财',
+    '食': '食神', '伤': '伤官',
+    '财': '正财', '才': '偏财',
+    '官': '正官', '杀': '七杀',
+    '印': '正印', '枭': '偏印',
+}
 
 
 def _stats(date, time, gender):
@@ -118,9 +128,13 @@ def test_normalisation_is_a_faithful_one_to_one_rename():
                     raw[god] += 1
 
         mapping = GenjuAnalyzer._TEN_GOD_FULL_NAME
+        assert mapping == EXPECTED_FULL_NAMES, (
+            f'{name}: 简写到全称的语义映射发生漂移\n'
+            f'  期望 {EXPECTED_FULL_NAMES}\n  实际 {mapping}'
+        )
         expected = Counter()
         for abbrev, n in raw.items():
-            expected[mapping.get(abbrev, abbrev)] += n
+            expected[EXPECTED_FULL_NAMES.get(abbrev, abbrev)] += n
 
         actual = Counter(GenjuAnalyzer(chart).analyze_genju()['ten_gods_stats'])
         assert actual == expected, f'{name}: 归一后分布对不上\n  原始 {dict(raw)}\n  期望 {dict(expected)}\n  实际 {dict(actual)}'