dsh-metaphysics 0.34.0 → 0.46.5

package/engine/ziwei.js

@@ -74,12 +74,182 @@ export const MUTAGEN = {
   癸: { 破军: '禄', 巨门: '权', 太阴: '科', 贪狼: '忌' },
 };
 
+// ── 流派开关 ──────────────────────────────────────────────────
+// 默认值对齐本插件既有盘面：亮度用内置通行表，庚干用阳武阴同，
+// 天马按年支、魁钺用全书理解一、天使天伤不换、长生按现有五行局表、
+// 晚子时仍算当日；天空/截空旬空默认不排（旧盘没有这两组星，保持 49 颗）。
+// 其余选项只在显式指定时改变盘面，不影响默认输出。
+export const ZIWEI_SCHOOL_DEFAULTS = Object.freeze({
+  brightnessSchool: 'default',
+  gengYearSihua: 'GYWYT',
+  tianmaSchool: 'year-branch',
+  tiankongSchool: 'off',
+  jiekongSchool: 'off',
+  kuiyueSchool: 'qs1',
+  tianshiTianshang: 'normal',
+  changshengSchool: 'yin-yang-shun-ni',
+  lateZishi: 'current-day',
+});
+
+export const ZIWEI_SCHOOL_OPTIONS = Object.freeze({
+  brightnessSchool: ['default', 'QS', 'XD1', 'ZZ', 'XD2'],
+  gengYearSihua: ['GYWYT', 'GYWTY', 'GYWFT', 'GYWFX', 'GYWTX'],
+  tianmaSchool: ['year-branch', 'month-branch'],
+  tiankongSchool: ['off', 'normal', 'shun-jia-shi'],
+  jiekongSchool: ['off', 'double', 'single', 'zhanyan'],
+  kuiyueSchool: ['qs1', 'qs2', 'zhong-yiming', 'network'],
+  tianshiTianshang: ['normal', 'zhongzhou'],
+  changshengSchool: ['yin-yang-shun-ni', 'shui-tu', 'huo-tu'],
+  lateZishi: ['current-day', 'next-day', 'all-current', 'day-cur-time-next'],
+});
+
+export function ziweiSchoolsOf(input = {}) {
+  const nested = input.schools && typeof input.schools === 'object' ? input.schools : {};
+  const out = {};
+  for (const [key, allowed] of Object.entries(ZIWEI_SCHOOL_OPTIONS)) {
+    const raw = input[key] !== undefined ? input[key] : nested[key];
+    out[key] = allowed.includes(raw) ? raw : ZIWEI_SCHOOL_DEFAULTS[key];
+  }
+  return out;
+}
+
+// 亮度表按流派取值：数值 1–7 按各派档位换成中文。
+// QS / XD1 为七档（1庙…7陷），ZZ / XD2 为五档（1庙 2旺 3平 4闲 5陷）。
+const BRIGHTNESS_LEVELS_7 = ['', '庙', '旺', '得', '利', '平', '不', '陷'];
+const BRIGHTNESS_LEVELS_5 = ['', '庙', '旺', '平', '闲', '陷'];
+export const BRIGHTNESS_SCHOOLS = {
+  QS: {
+    levels: BRIGHTNESS_LEVELS_7,
+    rows: {
+      紫微: [5, 1, 2, 2, 3, 2, 1, 1, 2, 2, 3, 2],
+      天机: [1, 7, 3, 2, 4, 5, 1, 7, 3, 2, 4, 5],
+      太阳: [7, 6, 2, 1, 2, 2, 2, 3, 3, 5, 6, 7],
+      武曲: [2, 1, 3, 4, 1, 5, 2, 1, 3, 4, 1, 5],
+      天同: [2, 6, 4, 5, 5, 1, 7, 6, 2, 5, 5, 1],
+      廉贞: [5, 4, 1, 5, 4, 7, 5, 4, 1, 5, 4, 7],
+      天府: [1, 1, 1, 3, 1, 3, 2, 1, 3, 2, 1, 3],
+      太阴: [1, 1, 2, 7, 7, 7, 6, 6, 4, 2, 2, 1],
+      贪狼: [2, 1, 5, 4, 1, 7, 2, 1, 5, 4, 1, 7],
+      巨门: [2, 6, 1, 1, 7, 2, 2, 6, 1, 1, 7, 2],
+      天相: [1, 1, 1, 7, 3, 3, 1, 3, 1, 7, 3, 3],
+      天梁: [1, 2, 1, 1, 1, 3, 1, 2, 7, 3, 1, 7],
+      七杀: [2, 1, 1, 2, 1, 5, 2, 1, 1, 2, 1, 5],
+      破军: [1, 2, 3, 7, 2, 5, 1, 2, 3, 7, 2, 5],
+    },
+  },
+  XD1: {
+    levels: BRIGHTNESS_LEVELS_7,
+    rows: {
+      紫微: [5, 1, 1, 2, 3, 2, 1, 1, 2, 2, 3, 2],
+      天机: [1, 7, 3, 2, 4, 5, 1, 7, 3, 2, 4, 5],
+      太阳: [7, 6, 2, 1, 2, 2, 1, 3, 4, 5, 7, 7],
+      武曲: [2, 1, 3, 4, 1, 5, 2, 1, 3, 4, 1, 5],
+      天同: [2, 6, 4, 1, 5, 1, 7, 6, 2, 5, 5, 1],
+      廉贞: [5, 4, 1, 5, 4, 7, 5, 4, 1, 5, 4, 7],
+      天府: [1, 1, 1, 3, 2, 3, 2, 1, 3, 2, 2, 3],
+      太阴: [1, 1, 6, 7, 7, 7, 7, 5, 4, 2, 2, 1],
+      贪狼: [2, 1, 5, 3, 1, 7, 2, 1, 5, 4, 1, 7],
+      巨门: [2, 6, 1, 1, 5, 5, 2, 5, 1, 1, 5, 2],
+      天相: [1, 1, 1, 7, 5, 3, 3, 3, 1, 7, 3, 3],
+      天梁: [1, 2, 1, 2, 1, 7, 1, 2, 7, 3, 1, 7],
+      七杀: [2, 1, 1, 2, 3, 5, 2, 1, 1, 2, 1, 5],
+      破军: [1, 2, 3, 7, 2, 5, 1, 2, 3, 7, 2, 5],
+    },
+  },
+  ZZ: {
+    levels: BRIGHTNESS_LEVELS_5,
+    rows: {
+      紫微: [3, 1, 1, 2, 5, 2, 1, 1, 2, 3, 4, 2],
+      天机: [1, 5, 2, 2, 1, 3, 1, 5, 3, 2, 1, 3],
+      太阳: [5, 5, 2, 1, 2, 2, 1, 3, 4, 4, 5, 5],
+      武曲: [2, 1, 4, 5, 1, 3, 2, 1, 3, 2, 1, 3],
+      天同: [2, 5, 4, 1, 3, 1, 5, 5, 2, 3, 3, 1],
+      廉贞: [3, 2, 1, 4, 2, 5, 3, 1, 1, 3, 2, 5],
+      天府: [1, 1, 1, 3, 1, 3, 2, 1, 3, 5, 1, 2],
+      太阴: [1, 1, 4, 5, 4, 5, 5, 3, 3, 2, 2, 1],
+      贪狼: [2, 1, 3, 4, 1, 5, 2, 1, 3, 3, 1, 5],
+      巨门: [2, 2, 1, 1, 3, 3, 2, 5, 1, 1, 2, 2],
+      天相: [1, 1, 1, 5, 2, 3, 2, 4, 1, 5, 4, 3],
+      天梁: [1, 2, 1, 1, 2, 5, 1, 2, 5, 4, 2, 5],
+      七杀: [2, 1, 1, 5, 2, 3, 2, 2, 1, 4, 1, 3],
+      破军: [1, 2, 5, 2, 2, 4, 1, 1, 5, 5, 2, 3],
+    },
+  },
+  XD2: {
+    levels: BRIGHTNESS_LEVELS_5,
+    rows: {
+      紫微: [4, 1, 1, 2, 4, 2, 1, 1, 2, 3, 5, 2],
+      天机: [1, 5, 2, 2, 2, 3, 1, 5, 2, 2, 2, 3],
+      太阳: [5, 5, 2, 1, 2, 2, 1, 2, 3, 3, 5, 5],
+      武曲: [2, 1, 3, 5, 1, 3, 2, 1, 3, 2, 1, 3],
+      天同: [2, 5, 3, 1, 2, 1, 5, 5, 2, 3, 3, 1],
+      廉贞: [3, 2, 1, 4, 2, 5, 3, 1, 1, 3, 2, 5],
+      天府: [2, 1, 1, 3, 1, 2, 2, 1, 2, 3, 1, 2],
+      太阴: [1, 1, 5, 5, 5, 5, 5, 5, 2, 2, 1, 1],
+      贪狼: [2, 1, 3, 2, 1, 5, 2, 1, 3, 2, 1, 5],
+      巨门: [2, 5, 1, 2, 5, 1, 2, 5, 1, 2, 5, 1],
+      天相: [1, 1, 1, 5, 2, 3, 2, 3, 1, 5, 5, 3],
+      天梁: [1, 2, 1, 1, 2, 5, 1, 2, 5, 3, 2, 5],
+      七杀: [2, 2, 1, 5, 1, 3, 2, 2, 1, 3, 1, 3],
+      破军: [1, 1, 5, 2, 2, 3, 1, 1, 5, 5, 2, 3],
+    },
+  },
+};
+
+export function schoolBrightness(name, branchIndex, school = 'default') {
+  const table = BRIGHTNESS_SCHOOLS[school];
+  if (!table || !table.rows[name]) return BRIGHTNESS[name] ? BRIGHTNESS[name][fix(branchIndex)] : undefined;
+  const level = table.rows[name][fix(branchIndex)];
+  return level ? table.levels[level] : undefined;
+}
+
+// 庚干四化五变体
+const GENG_MUTAGEN = {
+  GYWYT: { 太阳: '禄', 武曲: '权', 太阴: '科', 天同: '忌' },
+  GYWTY: { 太阳: '禄', 武曲: '权', 天同: '科', 太阴: '忌' },
+  GYWFT: { 太阳: '禄', 武曲: '权', 天府: '科', 天同: '忌' },
+  GYWFX: { 太阳: '禄', 武曲: '权', 天府: '科', 天相: '忌' },
+  GYWTX: { 太阳: '禄', 武曲: '权', 天同: '科', 天相: '忌' },
+};
+
+function mutagenOf(stem, schools) {
+  if (stem === '庚') return GENG_MUTAGEN[schools.gengYearSihua] || MUTAGEN.庚;
+  return MUTAGEN[stem] ?? {};
+}
+
+// 安魁钺四派：差异集中在庚辛壬癸年
+export const KUI_YUE_SCHOOLS = {
+  qs2: {
+    甲: [1, 7], 戊: [1, 7], 庚: [6, 2], 乙: [0, 8], 己: [0, 8],
+    丙: [11, 9], 丁: [11, 9], 辛: [6, 2], 壬: [5, 3], 癸: [5, 3],
+  },
+  'zhong-yiming': {
+    甲: [1, 7], 戊: [1, 7], 庚: [2, 6], 乙: [0, 8], 己: [0, 8],
+    丙: [11, 9], 丁: [11, 9], 辛: [2, 6], 壬: [5, 3], 癸: [5, 3],
+  },
+  network: {
+    甲: [1, 7], 戊: [1, 7], 庚: [1, 7], 乙: [0, 8], 己: [0, 8],
+    丙: [11, 9], 丁: [11, 9], 辛: [6, 2], 壬: [3, 5], 癸: [3, 5],
+  },
+};
+
+// 截空（按生年干）：single 单星、double 正副双星、zhanyan 占验派
+const JIEKONG = {
+  single: { 甲: 8, 乙: 6, 丙: 4, 丁: 2, 戊: 0, 己: 9, 庚: 7, 辛: 5, 壬: 3, 癸: 1 },
+  double: {
+    甲: [8, 9], 乙: [7, 6], 丙: [4, 5], 丁: [3, 2], 戊: [0, 1],
+    己: [9, 8], 庚: [6, 7], 辛: [5, 4], 壬: [2, 3], 癸: [1, 0],
+  },
+  zhanyan: { 甲: 8, 乙: 6, 丙: 4, 丁: 2, 戊: 10, 己: 9, 庚: 7, 辛: 5, 壬: 3, 癸: 11 },
+};
+
 // 年干系
 export const LUCUN = { 甲: 2, 乙: 3, 丙: 5, 丁: 6, 戊: 5, 己: 6, 庚: 8, 辛: 9, 壬: 11, 癸: 0 };
 export const KUI_YUE = {
   甲: [1, 7], 戊: [1, 7], 庚: [1, 7], 乙: [0, 8], 己: [0, 8],
   丙: [11, 9], 丁: [11, 9], 辛: [6, 2], 壬: [3, 5], 癸: [3, 5],
 };
+KUI_YUE_SCHOOLS.qs1 = KUI_YUE;
 
 /** 命主：按命宫地支 */
 export const MING_ZHU = {
@@ -192,12 +362,31 @@ export function xiaoxianAge(branchIndex, triad, gender) {
 
 // ── 主流程 ────────────────────────────────────────────────────
 
+/**
+ * 闰月口径：split 按日切分（1–15 归本月、16 起归次月，主流排盘默认）、
+ * next 整月归次月、prev 整月归本月。`leapAsNext: true` 是 next 的旧写法。
+ */
+export const LEAP_POLICIES = ['split', 'next', 'prev'];
+
+export function leapPolicyOf(input) {
+  if (input && LEAP_POLICIES.includes(input.leapMonth)) return input.leapMonth;
+  return input && input.leapAsNext ? 'next' : 'split';
+}
+
+export function effectiveLunarMonth(raw, policy) {
+  if (!raw || !raw.isLeap) return raw ? raw.month : 0;
+  if (policy === 'next') return (raw.month % 12) + 1;
+  if (policy === 'split') return raw.day <= 15 ? raw.month : (raw.month % 12) + 1;
+  return raw.month;
+}
+
 /**
  * 排紫微斗数命盘
- * @param {object} input { year,month,day,hour,minute, gender, leapAsNext? }
+ * @param {object} input { year,month,day,hour,minute, gender, leapMonth? }
  */
 export function buildZiwei(input) {
   assertCivil(input);
+  const schools = ziweiSchoolsOf(input);
   const { year: cy, month: cm, day: cd, hour: ch = 0, minute: cmin = 0, gender = 'male' } = input;
   const useTrueSolar = input.trueSolar !== false;
   const geo = input.geo || (input.address ? resolveAddress(input.address) : null);
@@ -212,7 +401,9 @@ export function buildZiwei(input) {
     ? applyTrueSolar(civilJd, longitude)
     : { offsetMinutes: 0, jd: civilJd, note: '未启用真太阳时' };
   // 紫微按「时辰」起盘：真太阳时若跨时辰/跨日，命盘随之改变
-  const eff = jdToParts(solar.jd);
+  // 晚子时 next-day：23:00 后起盘日顺延一日，只改起盘日，不改真太阳时显示
+  let eff = jdToParts(solar.jd);
+  if (schools.lateZishi === 'next-day' && eff.hour >= 23) eff = jdToParts(solar.jd + 1);
   const year = eff.year;
   const month = eff.month;
   const day = eff.day;
@@ -220,9 +411,8 @@ export function buildZiwei(input) {
   const minute = eff.minute;
 
   const lunarRaw = solarToLunar(year, month, day);
-  const lunarMonth = lunarRaw.isLeap && input.leapAsNext
-    ? (lunarRaw.month % 12) + 1
-    : lunarRaw.month;
+  const leapPolicy = leapPolicyOf(input);
+  const lunarMonth = effectiveLunarMonth(lunarRaw, leapPolicy);
   const lunarDay = lunarRaw.day;
 
   const hb = hourBranchIndex(hour, minute);
@@ -232,6 +422,10 @@ export function buildZiwei(input) {
   const yearStem = yearGanzhi.stem;
   const yb = BRANCHES.indexOf(yearGanzhi.branch);
   const triad = triadOf(yb);
+  // 大限顺逆：阳男阴女顺行、阴男阳女逆行（天伤天使的中州派互换也要用它）
+  const yearYang = STEMS.indexOf(yearStem) % 2 === 0;
+  const forward = (yearYang && gender === 'male') || (!yearYang && gender === 'female');
+  const kuiyueTable = KUI_YUE_SCHOOLS[schools.kuiyueSchool] || KUI_YUE;
 
   // 命宫 / 身宫
   const soulIndex = fix(2 + (lunarMonth - 1) - hb);
@@ -247,12 +441,12 @@ export function buildZiwei(input) {
 
   // 星曜落宫
   const starsByBranch = Array.from({ length: 12 }, () => []);
-  // 安星：主星顺带记下所在宫的庙旺得利平不陷（BRIGHTNESS 以地支序索引，与 fix(branch) 一致）
+  // 安星：主星顺带记下所在宫的庙旺得利平不陷（亮度可按流派切换，默认用内置通行表）
   const put = (branch, name, type) => {
     const idx = fix(branch);
     const star = { name, type };
     if (type === '主星' && BRIGHTNESS[name]) {
-      const b = BRIGHTNESS[name][idx];
+      const b = schoolBrightness(name, idx, schools.brightnessSchool);
       if (b) star.brightness = b;
     }
     starsByBranch[idx].push(star);
@@ -278,7 +472,7 @@ export function buildZiwei(input) {
   put(lucun, '禄存', '吉星');
   put(lucun + 1, '擎羊', '煞星');
   put(lucun - 1, '陀罗', '煞星');
-  const [kui, yue] = KUI_YUE[yearStem];
+  const [kui, yue] = kuiyueTable[yearStem];
   put(kui, '天魁', '吉星');
   put(yue, '天钺', '吉星');
 
@@ -290,7 +484,11 @@ export function buildZiwei(input) {
   put(6 + yb, '天虚', '煞星');
   put(4 + yb, '龙池', '吉星');
   put(10 - yb, '凤阁', '吉星');
-  put(TIANMA[triad], '天马', '吉星');
+  // 天马：默认按年支三合，可切生月三合（正月起寅）
+  const maTriad = schools.tianmaSchool === 'month-branch'
+    ? triadOf(fix(2 + (lunarMonth - 1)))
+    : triad;
+  put(TIANMA[maTriad], '天马', '吉星');
   put(XIANCHI[triad], '咸池', '煞星');
   put(HUAGAI[triad], '华盖', '杂曜');
   const dirGroup = directionOf(yb);
@@ -298,6 +496,25 @@ export function buildZiwei(input) {
   put(GUASU[dirGroup], '寡宿', '煞星');
   put(posuIndex(yb), '破碎', '煞星');
 
+  // 空曜（默认不排，旧盘保持 49 颗）
+  if (schools.tiankongSchool !== 'off') {
+    put(schools.tiankongSchool === 'shun-jia-shi' ? yb + hb : yb + 1, '天空', '杂曜');
+  }
+  if (schools.jiekongSchool !== 'off') {
+    const jk = JIEKONG[schools.jiekongSchool][yearStem];
+    if (Array.isArray(jk)) {
+      put(jk[0], '截空', '杂曜');
+      put(jk[1], '副截', '杂曜');
+    } else {
+      put(jk, '截空', '杂曜');
+    }
+    // 旬空：本旬十日所空两支（年干支所在旬的末两位）
+    const nianIndex = (((lunarRaw.lunarYear - 4) % 60) + 60) % 60;
+    const decadeStart = nianIndex - (nianIndex % 10);
+    put(decadeStart + 10, '旬空', '杂曜');
+    put(decadeStart + 11, '副旬', '杂曜');
+  }
+
   // 月系
   put(9 + (lunarMonth - 1), '天刑', '煞星');  // 酉起正月顺行
   put(1 + (lunarMonth - 1), '天姚', '煞星');  // 丑起正月顺行
@@ -314,12 +531,13 @@ export function buildZiwei(input) {
   put(11 + hb, '地劫', '煞星');   // 亥宫起子时，顺行
   put(11 - hb, '地空', '煞星');   // 亥宫起子时，逆行
 
-  // 固定宫位：天伤恒在交友，天使恒在疾厄
-  put(soulIndex - 7, '天伤', '杂曜');
-  put(soulIndex - 5, '天使', '杂曜');
+  // 固定宫位：天伤恒在交友、天使恒在疾厄；中州派阴男阳女互换
+  const swapTianshi = schools.tianshiTianshang === 'zhongzhou' && !forward;
+  put(soulIndex - (swapTianshi ? 5 : 7), '天伤', '杂曜');
+  put(soulIndex - (swapTianshi ? 7 : 5), '天使', '杂曜');
 
-  // 生年四化
-  const mutagenMap = MUTAGEN[yearStem] ?? {};
+  // 生年四化（庚干按所选变体）
+  const mutagenMap = mutagenOf(yearStem, schools);
   for (const list of starsByBranch) {
     for (const star of list) {
       if (mutagenMap[star.name]) star.mutagen = mutagenMap[star.name];
@@ -330,13 +548,14 @@ export function buildZiwei(input) {
   const palaceNames = [];
   for (let i = 0; i < 12; i++) palaceNames[fix(soulIndex - i)] = PALACE_NAMES[i];
 
-  // 大限：阳男阴女顺行、阴男阳女逆行
-  const yearYang = STEMS.indexOf(yearStem) % 2 === 0;
-  const forward = (yearYang && gender === 'male') || (!yearYang && gender === 'female');
+  // 大限：阳男阴女顺行、阴男阳女逆行（forward 已在安星前算好）
   const startAge = bureau.number;
 
   // 十二神（长生/博士 随大限顺逆，将前/岁前 恒顺行）
-  const csStart = CHANGSHENG_START[bureau.number];
+  // 土五局长生起点按流派：默认申，河洛/火土派取寅
+  const csStart = schools.changshengSchool === 'huo-tu' && bureau.number === 5
+    ? 2
+    : CHANGSHENG_START[bureau.number];
   const shenshaAt = (branch) => {
     const d = forward ? 1 : -1;
     return {
@@ -442,8 +661,8 @@ export function buildZiwei(input) {
       liulu: BRANCHES[lu],
       liuyang: BRANCHES[fix(lu + 1)],
       liutuo: BRANCHES[fix(lu - 1)],
-      liukui: BRANCHES[KUI_YUE[gz.stem][0]],
-      liuyue: BRANCHES[KUI_YUE[gz.stem][1]],
+      liukui: BRANCHES[kuiyueTable[gz.stem][0]],
+      liuyue: BRANCHES[kuiyueTable[gz.stem][1]],
       mutagen: Object.entries(MUTAGEN[gz.stem] ?? {}).map(([s, k]) => `${s}化${k}`),
       daxian: dxPalace
         ? { palace: dxPalace.palace, start: dxPalace.daxian.start, end: dxPalace.daxian.end }
@@ -457,13 +676,16 @@ export function buildZiwei(input) {
     input: {
       year: cy, month: cm, day: cd, hour: ch, minute: cmin,
       gender,
-      leapAsNext: Boolean(input.leapAsNext),
+      leapMonth: leapPolicy,
+      leapAsNext: leapPolicy === 'next',
       longitude: longitude ?? null,
       address: input.address || null,
       geo,
       trueSolar: useTrueSolar,
       dst: { applied: !!dst.applied, note: dst.note || null },
+      schools: { ...schools },
     },
+    schools: { ...schools },
     solarTime: {
       civilText: `${cy}-${String(cm).padStart(2, '0')}-${String(cd).padStart(2, '0')} ${String(ch).padStart(2, '0')}:${String(cmin).padStart(2, '0')}`,
       trueSolarText: formatJd(solar.jd),
@@ -473,10 +695,16 @@ export function buildZiwei(input) {
     lunar: {
       year: lunarRaw.lunarYear,
       month: lunarMonth,
+      monthRaw: lunarRaw.month,
       day: lunarDay,
       isLeap: lunarRaw.isLeap,
+      leapPolicy,
       monthStart: lunarRaw.monthStart,
-      ...(lunarRaw.isLeap ? { note: '闰月按本月起盘（可用 leapAsNext 改为按次月）' } : {}),
+      ...(lunarRaw.isLeap ? {
+        note: leapPolicy === 'split'
+          ? `闰${lunarRaw.month}月按日切分：1–15 按本月、16 起按次月；本盘闰月${lunarDay}日按${lunarMonth}月`
+          : leapPolicy === 'next' ? '闰月整月按次月起盘' : '闰月整月按本月起盘',
+      } : {}),
     },
     hourBranch,
     yearGanzhi: yearGanzhi.name,
@@ -512,12 +740,14 @@ export function buildZiwei(input) {
     },
     rules: {
       ziweiPlacement: '借数法：局数除日数取商，商数自寅宫顺行，借数奇逆偶顺',
-      mutagen: '生年四化用中州派常用表；庚干各派有异（有以天同化科、太阴化忌者）',
-      leapMonth: '闰月默认按本月，可切换为按次月',
+      mutagen: '生年四化用中州派常用表；庚干可按流派切换（默认阳武阴同，另有同科阴忌、府科、府科相忌、同科相忌）',
+      schools: `流派开关：亮度 ${schools.brightnessSchool}、庚干四化 ${schools.gengYearSihua}、天马 ${schools.tianmaSchool}、天空 ${schools.tiankongSchool}、截空 ${schools.jiekongSchool}、魁钺 ${schools.kuiyueSchool}、天伤天使 ${schools.tianshiTianshang}、长生 ${schools.changshengSchool}、晚子时 ${schools.lateZishi}；庚干四化只作用于生年四化`,
+      leapMonth: '闰月默认按日切分（1–15 归本月、16 起归次月，主流排盘口径）；可传 leapMonth: next（整月归次月）或 prev（整月归本月），leapAsNext: true 等同 next',
       auxStars: '火铃按年支三合起点顺数至生时；羊陀夹禄存；魁钺按年干；地空亥起子时逆行、地劫顺行；三台八座随辅弼；恩光天贵随昌曲退一位；台辅封诰按时支',
       shensha: '长生、博士随大限顺逆；将前、岁前恒顺行；天伤恒在交友、天使恒在疾厄',
       masters: '命主按命宫地支，身主按生年地支',
       liunian: '流年命宫取该年地支宫；三方四正为本宫与 +4/+8/+6；并给该年所属大限与小限',
+      flyComposite: '三方四正取本宫、对宫与两个三合宫共四宫，四宫宫干各化禄权科忌共 16 条，按落宫归堆标会聚（双忌会、禄忌同宫、三化会、自化）；只描会照，不折吉凶',
       changqu: '昌曲落宫只由时支决定，故与丑未的关系（夹/三合/同宫/无关）是结构性结论；absorb 的「清/杂」是启发式标记，依据昌曲化忌与会煞，不是断语',
     },
   };
@@ -526,14 +756,16 @@ export function buildZiwei(input) {
   chart.daxianList = daxianList(chart);
   chart.fly = flyStars(chart);
   chart.flyChains = flyChains(chart, { from: '命宫' });
+  chart.flyComposite = flyComposite(chart, { from: '命宫' });
   enrichLiunian(chart);
   // 流月/流日/流时：默认按本机当前时刻，可用 asOf 指定（如 "2026-10-22T16:00"）
   chart.flow = flowOf(chart, input.asOf);
   chart.patternSummary = {
     count: chart.patterns.length,
     good: chart.patterns.filter((p) => p.tone === 'good').map((p) => p.name),
+    neutral: chart.patterns.filter((p) => p.tone === 'neutral').map((p) => p.name),
     bad: chart.patterns.filter((p) => p.tone === 'bad').map((p) => p.name),
-    note: '格局只描述结构，不作吉凶断语；同一命盘可并存吉格与忌格',
+    note: '格局只描述结构，不作吉凶断语；同一命盘可并存吉格、中性结构与忌格',
   };
   return chart;
 }
@@ -575,19 +807,18 @@ export function detectPatterns(chart) {
 
   const lu = starBranchOf(chart, '禄存');
   const ma = starBranchOf(chart, '天马');
-  if (lu >= 0 && ma >= 0 && (lu === ma || fix(lu - ma) === 6)) add('禄马交驰', `禄存在${chart.ziwei && BRANCHES[lu]}，天马在${BRANCHES[ma]}`);
+  if (lu >= 0 && ma >= 0 && (lu === ma || fix(lu - ma) === 6)) add('禄马交驰', `禄存在${BRANCHES[lu]}，天马在${BRANCHES[ma]}`);
 
   const huo = starBranchOf(chart, '火星');
   const ling = starBranchOf(chart, '铃星');
   if (fix(soulIdx - 1) === huo && fix(soulIdx + 1) === ling) add('火铃夹命', '火星在命宫前一宫、铃星在后一宫夹命');
   if (fix(soulIdx - 1) === ling && fix(soulIdx + 1) === huo) add('火铃夹命', '铃星与火星夹命');
 
+  // 擎羊在禄存 +1、陀罗在禄存 -1，两星只能夹「禄存」那一宫；
+  // 所以「羊陀夹忌」实际就是化忌与禄存同宫，按左右两侧去找永远找不到。
   const ji = chart.palaces.find((p) => p.stars.some((s) => s.mutagen === '忌'));
-  if (ji) {
-    const jb = BRANCHES.indexOf(ji.branch);
-    if (fix(jb - 1) === starBranchOf(chart, '擎羊') && fix(jb + 1) === starBranchOf(chart, '陀罗')) {
-      add('羊陀夹忌', `化忌在${ji.branch}，擎羊陀罗夹之`);
-    }
+  if (ji && lu >= 0 && BRANCHES.indexOf(ji.branch) === lu) {
+    add('羊陀夹忌', `化忌与禄存在${ji.branch}同宫，擎羊陀罗夹之`);
   }
 
   // 铃昌陀武：四星会于命宫三方四正
@@ -605,10 +836,14 @@ export function detectPatterns(chart) {
   // ── 以下为扩展格局（条件都是星位判断，evidence 写明落在哪宫）──
   const inSoul = (name) => soul.stars.some((s) => s.name === name);
   const nearStar = (name) => near.has(name);
+  // 「夹」只要求两星分居命宫前后，不分左右——日月、左右、魁钺本来就没有固定左右；
+  // 旧写法只认一种顺序，昌曲夹命与羊陀夹命因此从未命中，日月/左右/魁钺也漏掉一半。
   const jia = (a, b) => {
     const ba = starBranchOf(chart, a);
     const bb = starBranchOf(chart, b);
-    return ba >= 0 && bb >= 0 && fix(ba + 1) === soulIdx && fix(bb - 1) === soulIdx;
+    if (ba < 0 || bb < 0) return false;
+    return (fix(ba + 1) === soulIdx && fix(bb - 1) === soulIdx)
+      || (fix(bb + 1) === soulIdx && fix(ba - 1) === soulIdx);
   };
   const mutagensIn = (indices) => {
     const set = new Set();
@@ -642,7 +877,7 @@ export function detectPatterns(chart) {
   if (jia('左辅', '右弼')) add('左右夹命', '左辅、右弼夹命宫');
   if (jia('文昌', '文曲')) add('昌曲夹命', '文昌、文曲夹命宫');
   if (jia('天魁', '天钺')) add('魁钺夹命', '天魁、天钺夹命宫');
-  if (jia('擎羊', '陀罗')) add('羊陀夹命', '擎羊、陀罗夹命宫');
+  if (jia('擎羊', '陀罗')) add('羊陀夹命', `禄存在${BRANCHES[soulIdx]}守命，擎羊陀罗前后夹之`);
 
   // 四化
   const muts = mutagensIn(sanfang);
@@ -657,9 +892,13 @@ export function detectPatterns(chart) {
   const lianzhen = starBranchOf(chart, '廉贞');
   const tianxiang = starBranchOf(chart, '天相');
   const qingyang = starBranchOf(chart, '擎羊');
-  if (lianzhen >= 0 && qingyang >= 0 && tianxiang >= 0
-    && fix(lianzhen + 1) === tianxiang && fix(qingyang - 1) === tianxiang) {
-    add('刑囚夹印', '廉贞与擎羊夹天相（刑囚夹印）');
+  // 天相与廉贞永远隔偶数宫，字面上的「廉贞、擎羊夹天相」不可能成立；
+  // 通行说法取「廉贞天相同守命宫于子午、擎羊同宫」——判的是守命那一宫，其它宫位同宫不算。
+  // 命宫卯酉、廉贞天相对照遇擎羊的变体未纳入。
+  if (lianzhen >= 0 && tianxiang >= 0 && qingyang >= 0
+    && lianzhen === tianxiang && qingyang === tianxiang && tianxiang === soulIdx
+    && (tianxiang === 0 || tianxiang === 6)) {
+    add('刑囚夹印', `廉贞天相同守命宫${BRANCHES[tianxiang]}，擎羊同宫`);
   }
   if (near.has('贪狼') && (near.has('火星') || near.has('铃星'))) {
     add('火贪铃贪', `贪狼与${near.has('火星') ? '火星' : '铃星'}会于命宫三方四正`);
@@ -676,7 +915,7 @@ export function detectPatterns(chart) {
     .map((p) => ({ ...p, tone: PATTERN_TONE[p.name] || 'neutral' }));
 }
 
-const PATTERN_TONE = {
+export const PATTERN_TONE = {
   紫府同宫: 'good', 紫府朝垣: 'good', 君臣庆会: 'good', 极向离明: 'good',
   七杀朝斗: 'good', 英星入庙: 'good', 石中隐玉: 'good', 巨日同宫: 'good',
   日月夹命: 'good', 日月对照: 'good', 左右夹命: 'good', 昌曲夹命: 'good',
@@ -795,6 +1034,102 @@ export function flyChains(chart, { from = '命宫', maxSteps = 12 } = {}) {
   return out;
 }
 
+// ── 三方四正复合飞化：四宫一起飞、看落到同一宫的会聚 ─────────────────
+// 单宫飞化回答「这一宫自己去找谁」；三方四正看的是本宫连同对宫、两个三合宫
+// 四股力同时飞出去，最后在哪一宫会到一起。会在一处的化越多，那一宫被牵动的力道越集中。
+// 只归堆与标会照，不折吉凶：同样是双忌会一宫，落在生年忌和落在生年禄上意思完全不同。
+const PALACE_SUFFIX = (p) => `${p}${String(p).endsWith('宫') ? '' : '宫'}`;
+
+export function flyComposite(chart, { from = '命宫' } = {}) {
+  const palaces = chart.palaces || [];
+  const src = palaces.find((p) => p.palace === from) || palaces[0];
+  if (!src) return null;
+  const names = Array.isArray(src.sanfang) && src.sanfang.length
+    ? [...new Set(src.sanfang)].slice(0, 4)
+    : [src.palace];
+
+  const sources = [];
+  for (const name of names) {
+    const p = palaces.find((x) => x.palace === name);
+    if (!p) continue;
+    sources.push({
+      palace: p.palace,
+      branch: p.branch,
+      stem: p.stem,
+      flies: FLY_TYPES.map((type) => {
+        const star = flyStarOf(p.stem, type);
+        const b = star ? starBranchOf(chart, star) : -1;
+        const target = b >= 0 ? palaces.find((x) => x.branch === BRANCHES[b]) : null;
+        return {
+          type,
+          star,
+          to: target ? target.palace : null,
+          toBranch: target ? target.branch : null,
+          self: !!(target && target.palace === p.palace),
+        };
+      }),
+    });
+  }
+
+  // 16 条飞化按落宫归堆；未上盘的星不计入落点
+  const targets = [];
+  for (const p of palaces) {
+    const incoming = [];
+    for (const s of sources) {
+      for (const f of s.flies) {
+        if (f.to === p.palace) {
+          incoming.push({ from: s.palace, fromBranch: s.branch, fromStem: s.stem, type: f.type, star: f.star, self: f.self });
+        }
+      }
+    }
+    if (!incoming.length) continue;
+    targets.push({
+      palace: p.palace,
+      branch: p.branch,
+      incoming,
+      types: [...new Set(incoming.map((x) => x.type))],
+      count: incoming.length,
+    });
+  }
+  targets.sort((a, b) => b.count - a.count || BRANCHES.indexOf(a.branch) - BRANCHES.indexOf(b.branch));
+
+  const jiAt = (t) => t.incoming.filter((x) => x.type === '忌').length;
+  const groups = {
+    doubleJi: targets.filter((t) => jiAt(t) >= 2),
+    luJi: targets.filter((t) => t.types.includes('禄') && t.types.includes('忌')),
+    tripleHua: targets.filter((t) => t.types.length >= 3),
+    selfHua: targets.filter((t) => t.incoming.some((x) => x.self)),
+  };
+
+  const labels = [];
+  for (const t of groups.doubleJi) labels.push(`${['', '', '双忌', '三忌', '四忌'][jiAt(t)] || `${jiAt(t)}忌`}会${PALACE_SUFFIX(t.palace)}`);
+  for (const t of groups.luJi) labels.push(`禄忌同宫${PALACE_SUFFIX(t.palace)}`);
+  const HUA_NUM = { 3: '三化会', 4: '四化会' };
+  for (const t of groups.tripleHua) labels.push(`${HUA_NUM[t.types.length] || `${t.types.length}化会`}${PALACE_SUFFIX(t.palace)}`);
+  for (const t of groups.selfHua) labels.push(`${PALACE_SUFFIX(t.palace)}自化`);
+
+  const byType = {};
+  for (const type of FLY_TYPES) {
+    byType[type] = sources
+      .map((s) => {
+        const f = s.flies.find((x) => x.type === type);
+        return f && f.to ? { from: s.palace, star: f.star, to: f.to, self: f.self } : null;
+      })
+      .filter(Boolean);
+  }
+
+  return {
+    from: src.palace,
+    sanfang: sources.map((s) => s.palace),
+    sources,
+    targets,
+    groups,
+    byType,
+    labels,
+    note: '三方四正取本宫、对宫与两个三合宫共四宫，四宫宫干各化禄权科忌共 16 条飞化，按落宫归堆；只在落宫相同（会照）时标会聚，单条飞出不另立标签。只描会照与方向，不折吉凶，也未叠大限流年四化。',
+  };
+}
+
 // ── 流年四化落宫 ────────────────────────────────────────────
 
 export function enrichLiunian(chart) {
@@ -844,8 +1179,7 @@ export function flowOf(chart, asOf) {
   const MI = a.minute === undefined ? now.getMinutes() : a.minute;
 
   const lr = solarToLunar(Y, M, D);
-  const leapAsNext = Boolean(chart.input && chart.input.leapAsNext);
-  const natalMonth = chart.lunar.isLeap && leapAsNext ? (chart.lunar.month % 12) + 1 : chart.lunar.month;
+  const natalMonth = chart.lunar.month; // 已在起盘时按闰月口径换算过，这里不再二次换月
   const natalHB = BRANCHES.indexOf(chart.hourBranch);
   const hbNow = hourBranchIndex(H, MI);