dsh-metaphysics 0.46.5 → 0.50.1

package/engine/interpret.js

@@ -395,6 +395,19 @@ function baziInterpret(r) {
         `⑤ 落到维度：工作看喜用五行与十神权重；感情看配偶星与日支；健康看最旺与最弱的五行。五维度都只是这套推导的应用，不是另一套算法。`,
       ].join('\n'),
     },
+    ...(r.renyuan ? [(() => {
+      const ry = r.renyuan;
+      const table = ry.segments.map((s) => `${s.stem}${s.from}–${s.to}`).join(' / ');
+      const nextSeg = ry.next ? `，第 ${ry.next.from} 日起交 ${ry.next.stem}${ry.next.element}` : '';
+      const outside = ry.inHidden ? '' : ` 表里的 ${ry.active} 不在本柱藏干表中（属余气口径），两表各照原样，不互相改写。`;
+      const beyond = ry.beyond ? ' 你生在第 31 日以后，已超出 30 日表，按本气算，不硬分摊。' : '';
+      return {
+        key: 'renyuan', label: '人元司权',
+        text: `生于${ry.month}月第 ${ry.day} 日（从${ry.term ? ry.term.name : '节'}起算，节当日为第 1 日，日差按本盘所用时刻所在日计）：这一日由 **${ry.active}${ry.activeElement}** 司权，第 ${ry.segment.from}–${ry.segment.to} 日属它${nextSeg}。\n`
+          + '月令这一个月里，余气、中气、本气轮值，不是整月同一个五行当值——所以「月令是什么」，还要看生在第几日。\n'
+          + `**口径**：本插件固定 30 日表（${table}）；另有 7/7/16、9/3/18 等分法，各家不一。分日只作解释层的一层细节，**不改取格**：取格仍按本气、透干与会支判定。${outside}${beyond}`,
+      };
+    })()] : []),
     {
       key: 'timeline', label: '时间窗',
       text: (() => {
@@ -415,6 +428,8 @@ function baziInterpret(r) {
     { key: 'advice', label: '专业建议', text: adviceText },
     (() => {
       const hits = (r.liunian || []).filter((l) => l.suiyun && Array.isArray(l.suiyun.signals) && l.suiyun.signals.length);
+      const e = suiyunClassicOf(r);
+      const src = e ? `\n原文：《${CLASSIC_BOOKS[e.book].name}·${e.chapter}》「${e.quote}」\n白话：${e.plain}` : '';
       return {
         key: 'suiyun', label: '岁运提示',
         text: hits.length
@@ -422,7 +437,7 @@ function baziInterpret(r) {
             const stem = (l.suiyun.dayun || []).map((d) => `第${d.step}步${d.ganzhi}`).join('、');
             return `${l.year} ${l.ganzhi}（${stem || '未到起运'}）：${l.suiyun.signals.map((s) => s.detail).join('；')}`;
           }).join('\n') +
-            '\n读法：岁运并临、运年反吟与流年伏吟/反吟只说明干支层面重复或对冲，传统上当作「变动感较强」的信号；本插件不据此判吉凶，要落到具体年份，仍看该年是否动到用神。'
+            '\n读法：岁运并临、运年反吟与流年伏吟/反吟只说明干支层面重复或对冲，传统上当作「变动感较强」的信号；本插件不据此判吉凶，要落到具体年份，仍看该年是否动到用神。' + src
           : '近十年没有岁运并临、运年反吟或流年伏吟/反吟。「岁运并临主大凶」这类说法流传很广，本插件只把它当变动提示，没有命中就不作额外解读。',
       };
     })(),
@@ -1207,10 +1222,32 @@ function liuyaoInterpret(r, ask) {
       useText.push(`时令对用神：${head}，日辰 ${strength.day ? `${strength.day.branch}（${strength.day.element}）` : '—'}。${body.join('；')}。`);
       useText.push('月建看这一段时令站在哪一边，日辰看当天那股力量是扶还是克；两处同时看，只报状态，不折成分数。');
     }
-    useText.push('这一层只把用神、卦体与时令对起来，应期与成败还要看动爻变化与月建日辰的进退节奏，所以这里不折成分数、不断成败。');
+    useText.push('这一层只把用神、卦体与时令对起来，不折成分数、不断成败；应期另在「应期线索」一节只给触发支与快慢。');
     sections.push({ key: 'yongshen', label: '用神落位与卦体', text: useText.join('\n') });
   }
 
+  // 应期线索：只给触发支与快慢方向，不给日期
+  {
+    const yq = r.yingqi;
+    if (yq && Array.isArray(yq.items) && yq.items.length) {
+      const rows = yq.items.map((it) => {
+        const flags = [
+          it.monthState && it.monthState !== 'unknown' ? `月建${it.monthState}` : '',
+          it.monthChong ? '月破' : '',
+          it.kong ? '旬空' : '',
+        ].filter(Boolean).join('、');
+        return `${it.position}爻${it.branch}${it.element}${flags ? `（${flags}）` : ''}：${it.tempoSay}`;
+      });
+      sections.push({
+        key: 'yingqi',
+        label: '应期线索',
+        text: `应期快慢：${yq.tempoSay}。${rows.join('；')}。可留意的地支：${yq.triggers.map((t) => `${t.branch}（${t.labels.join('、')}）`).join('；')}。` +
+          `${yq.viaFushen ? '用神不上卦，这里的支取自伏神；伏神要先得出才算数。' : ''}` +
+          '这一节只把传统的「逢值、逢冲、逢合」与旬空的出空、冲空摆出来，不换算成具体日期、不排先后、也不判忌神受制；近事以日计、远事以月计，用哪把尺取决于事情本身。',
+      });
+    }
+  }
+
   // 全卦逐爻旺衰：不挑用神，六爻都过一遍，看整张卦的气压在哪一头
   {
     const hs = r.hexStrength;
@@ -1240,7 +1277,7 @@ function liuyaoInterpret(r, ask) {
 
   sections.push({
     key: 'limits', label: '未纳入',
-    text: '本卦没有计算：用神两现时该取哪一爻的权重、伏神出伏的应期（出伏条件已判，应期仍未做）。化进/化退的力重只按月建五态给「得令/失令」这类档位，不折成加权分数，也不叠动变连环；这些都会改变"旺不旺"的判断，所以这里只给取象与方向。',
+    text: '本卦没有计算：用神两现时该取哪一爻的权重、应期的具体日期（只给逢值/逢冲/逢合的触发支与快慢方向）、忌神受制的时点、动变连环。化进/化退的力重只按月建五态给「得令/失令」这类档位，不折成加权分数；这些都会改变"旺不旺"的判断，所以这里只给取象与方向。',
   });
 
   const dimensions = [
@@ -1666,7 +1703,7 @@ const BUILDERS = {
 import { interpretQimen } from './qimen-interpret.js';
 import { buildAnswer, buildPlain, buildGlossary, buildFollowups, dimensionPlain } from './interpret-plain.js';
 import { knowledgeFor, caveatsFor, STATUS_LABEL } from './interpret-knowledge.js';
-import { CLASSIC_BOOKS } from './classics.js';
+import { CLASSIC_BOOKS, suiyunClassicOf } from './classics.js';
 
 /**
  * 给任意体系的解析结果补上「白话四层」：直答 / 说人话 / 每维一句话 / 追问建议。

package/engine/liuyao.js

@@ -66,6 +66,7 @@ const LIUSHEN_START = { 甲: 0, 乙: 0, 丙: 1, 丁: 1, 戊: 2, 己: 3, 庚: 4,
 const ZHI_CHONG_PAIRS = [['子', '午'], ['丑', '未'], ['寅', '申'], ['卯', '酉'], ['辰', '戌'], ['巳', '亥']];
 const ZHI_HE_PAIRS = [['子', '丑'], ['寅', '亥'], ['卯', '戌'], ['辰', '酉'], ['巳', '申'], ['午', '未']];
 const CHONG_OF = Object.fromEntries(ZHI_CHONG_PAIRS.flatMap(([a, b]) => [[a, b], [b, a]]));
+const HE_OF = Object.fromEntries(ZHI_HE_PAIRS.flatMap(([a, b]) => [[a, b], [b, a]]));
 const TRIGRAM_OPPOSITE = { 乾: '巽', 巽: '乾', 坎: '离', 离: '坎', 艮: '坤', 坤: '艮', 震: '兑', 兑: '震' };
 
 // ── 化进神 / 化退神 ────────────────────────────────────────────────
@@ -930,3 +931,102 @@ export function jinTuiPower(result, opts = {}) {
     note: '进退只说这一爻往哪边走；力重是把它放回月建日辰，看有没有托着——得令则进得动、退得慢，失令则进得虚、退得实，月破压过一切。仍不直接定吉凶：用神化进为喜，忌神化进反而是忌。',
   };
 }
+
+// ── 应期线索：只列「该留意哪一支」，不给日期 ─────────────────────────
+// 知识卡 liuyao-yingqi 的承诺是「只作时间窗口的提示」：传统取用神逢值、
+// 逢冲、逢合之期，旬空另等出空、冲空。这里只把这些地支列出来，再按月建给
+// 一个快慢方向；不换算成日期、不排先后、不判忌神受制，也不叠动变连环。
+export const YINGQI_TEMPO = ['偏速', '偏缓', '待解', '未定'];
+const TEMPO_SAY = {
+  偏速: '用神得月令之气，应期偏近',
+  偏缓: '用神失月令之气，应期偏远',
+  待解: '有月破或旬空的用神，先等条件解除',
+  未定: '快慢不定（缺月建，或用神两现而旺衰不一）',
+};
+const TRIGGER_ORDER = ['逢值', '逢冲', '逢合', '出空填实', '冲空'];
+
+/**
+ * 应期线索：用神逢值、逢冲、逢合，旬空另标出空与冲空。
+ * @param {object} result buildLiuyao 的结果
+ * @param {object} useGod yongshenOf 的结果
+ * @param {{monthBranch?: string}} opts
+ */
+export function yingqiWindow(result, useGod, opts = {}) {
+  if (!useGod || !useGod.liuqin) return null;
+  const found = Array.isArray(useGod.found) ? useGod.found : [];
+  const fushen = Array.isArray(useGod.fushen) ? useGod.fushen : [];
+  const viaFushen = !found.length && fushen.length > 0;
+  const source = found.length ? found : fushen;
+  if (!source.length) return null;
+  const monthBranch = opts.monthBranch || null;
+  const monthElement = monthBranch ? zhiElementOf(monthBranch) : null;
+  const kong = Array.isArray(result && result.xunKong)
+    ? result.xunKong
+    : (result && typeof result.xunKong === 'string' ? result.xunKong.split('') : []);
+
+  const items = source.map((l) => {
+    const branch = l.branch;
+    const element = l.element || zhiElementOf(branch);
+    const monthState = monthStateOf(element, monthElement);
+    const isEmpty = kong.includes(branch);
+    const monthChong = !!(monthBranch && CHONG_OF[branch] === monthBranch);
+    const tempo = monthChong ? '待解'
+      : isEmpty ? '待解'
+        : monthState === 'unknown' ? '未定'
+          : (monthState === '旺' || monthState === '相') ? '偏速' : '偏缓';
+    const tempoSay = monthChong ? `遭${monthBranch}冲（月破），先待出月或填实`
+      : isEmpty ? '用神旬空，先待出空填实'
+        : monthState === 'unknown' ? '缺月建，快慢不定'
+          : `月建${monthState}，${tempo === '偏速' ? '应期偏近' : '应期偏远'}`;
+    const triggers = [
+      { branch, labels: ['逢值'] },
+      { branch: CHONG_OF[branch] || null, labels: ['逢冲'] },
+      { branch: HE_OF[branch] || null, labels: ['逢合'] },
+    ];
+    if (isEmpty) {
+      triggers[0].labels.push('出空填实');
+      triggers[1].labels.push('冲空');
+    }
+    return {
+      position: l.position,
+      branch,
+      element,
+      monthState,
+      monthChong,
+      kong: isEmpty,
+      tempo,
+      tempoSay,
+      triggers,
+    };
+  });
+
+  // 用神两现时各爻的支可能不同：按支归并标签，不替谁选主用
+  const merged = new Map();
+  for (const it of items) {
+    for (const t of it.triggers) {
+      if (!t.branch) continue;
+      const cur = merged.get(t.branch) || { branch: t.branch, labels: [] };
+      for (const lb of t.labels) if (!cur.labels.includes(lb)) cur.labels.push(lb);
+      merged.set(t.branch, cur);
+    }
+  }
+  const triggers = [...merged.values()].map((t) => ({
+    branch: t.branch,
+    labels: [...t.labels].sort((a, b) => TRIGGER_ORDER.indexOf(a) - TRIGGER_ORDER.indexOf(b)),
+  }));
+  const tempos = items.map((x) => x.tempo);
+  const tempo = tempos.includes('待解') ? '待解'
+    : tempos.every((t) => t === '偏速') ? '偏速'
+      : tempos.every((t) => t === '偏缓') ? '偏缓' : '未定';
+
+  return {
+    month: monthBranch ? { branch: monthBranch, element: monthElement } : null,
+    viaFushen,
+    tempo,
+    tempoSay: TEMPO_SAY[tempo],
+    items,
+    triggers,
+    labels: [`应期${tempo}`, ...triggers.map((t) => `${t.labels.join('/')}${t.branch}`)],
+    note: '应期只给「该留意哪一支」与快慢方向：用神逢值、逢冲、逢合，旬空另标出空与冲空。不换算成日期、不排先后、不判忌神受制；近事以日计、远事以月计，用哪把尺由事情远近决定，本插件不代选。',
+  };
+}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dsh-metaphysics",
-  "version": "0.46.5",
+  "version": "0.50.1",
   "type": "module",
-  "description": "命理排盘（玄学 xuanxue）for DeepSeek Harness: nineteen systems and eleven quick references (almanac, solar–lunar conversion, …), with climate adjustment (tiaohou), the 120 Qiongtong Baojian entries, 391-char name library with per-character pinyin, Kangxi stroke counts, five-grid (五格/三才) analysis and mechanical phonetics checks, classical quotes (Ziping Zhenquan / Di Tian Sui / San Ming Tong Hui), hexagram body relations (六冲/六合/伏吟/反吟/化进神/化退神) plus yongshen placement (用神落位) with month/day strength (月建日辰旺衰) and whole-hexagram per-line strength (全卦逐爻旺衰) for liuyao, plus an MBTI-style 16-type questionnaire and exact dayun handover dates (交运日) with annual suiyun hints (岁运并临/伏吟反吟), palace conditions (击刑/入墓), month states (旺相休囚死) and stem–palace relations (天盘干与宫生克) for qimen, flying four-transformations with chained flights (四化飞星串连), three-way-four-corner composite flights (三方四正复合飞化), switchable leap-month policy (闰月按日切分/整月归次月/整月归本月) and nine school switches (亮度/庚干四化/天马/天空/截空旬空/魁钺/天伤天使/长生/晚子时) for ziwei, and a bundled offline single-file page (命理排盘.html), and a panel-to-chat handoff that asks the Harness about a finished chart.",
+  "description": "命理排盘（玄学 xuanxue）for DeepSeek Harness: nineteen systems and eleven quick references (almanac, solar–lunar conversion, …), with climate adjustment (tiaohou), the 120 Qiongtong Baojian entries, 391-char name library with per-character pinyin, Kangxi stroke counts, five-grid (五格/三才) analysis and mechanical phonetics checks, classical quotes (Ziping Zhenquan / Di Tian Sui / San Ming Tong Hui), hexagram body relations (六冲/六合/伏吟/反吟/化进神/化退神) plus yongshen placement (用神落位) with month/day strength (月建日辰旺衰) and whole-hexagram per-line strength (全卦逐爻旺衰) and response-time clues (应期线索：逢值/逢冲/逢合 + 月建五态快慢) for liuyao, plus an MBTI-style 16-type questionnaire and exact dayun handover dates (交运日) with annual suiyun hints (岁运并临/伏吟反吟), palace conditions (击刑/入墓), month states (旺相休囚死) and stem–palace relations (天盘干与宫生克) for qimen, flying four-transformations with chained flights (四化飞星串连), three-way-four-corner composite flights (三方四正复合飞化), switchable leap-month policy (闰月按日切分/整月归次月/整月归本月) and nine school switches (亮度/庚干四化/天马/天空/截空旬空/魁钺/天伤天使/长生/晚子时) for ziwei, and a bundled offline single-file page (命理排盘.html), and a panel-to-chat handoff that asks the Harness about a finished chart.",
   "keywords": [
     "玄学",
     "玄学排盘",