dsh-metaphysics 0.22.0 → 0.38.2

package/client.js

@@ -1,5 +1,6 @@
 window.__ModuleLoader__.load({
   id: 'dsh-metaphysics',
+  version: '0.38.2',
   factory(require) {
     const React = (function () {
       try { return require('react'); } catch (e) { return globalThis.React; }
@@ -746,7 +747,7 @@ function resolveAddress(input) {
 
 const DETAIL = /(区|县|镇|乡|村|小区|街道|路|号|巷|弄|组|队)/;
 
-const USER_AGENT = 'dsh-metaphysics/0.22.0 (+https://github.com/xuanfu-web/dsh-metaphysics)';
+const USER_AGENT = 'dsh-metaphysics/0.23.0 (+https://github.com/xuanfu-web/dsh-metaphysics)';
 
 async function onlineLookup(text, { timeoutMs = 2500 } = {}) {
   if (typeof fetch !== 'function') return null;
@@ -2509,6 +2510,379 @@ function qtLine(e) {
 return { QT_BRANCHES, QT_MONTHS, QT_BASE_URL, QT_NOTE, QT, qtOf, qtLine };
 })();
 
+__mods.classics = (function () {
+
+const CLASSIC_BOOKS = {
+  ziping: { name: '子平真诠', author: '清·沈孝瞻', base: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/' },
+  ditian: { name: '滴天髓', author: '明·京图（通行本）', base: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/' },
+  sanming: { name: '三命通会', author: '明·万民英', base: 'https://www.diancang.xyz/xuanxuewushu/sanmingtonghui/' },
+};
+
+const CLASSICS = [
+  {
+    id: 'zp-yongshen',
+    book: 'ziping',
+    chapter: '八、论用神',
+    scene: '用神',
+    tags: [],
+    quote: '八字用神，专求月令，以日干配月令地支，而生克不同，格局分焉。财官印食，此用神之善而顺用之者也；煞伤劫刃，用神之不善而逆用之者也。',
+    plain: '用神从月令里找：财、官、印、食四吉神顺用（生之护之），煞、伤、劫、刃四凶神逆用（制之化之）。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53628.html',
+  },
+  {
+    id: 'zp-zhenguan',
+    book: 'ziping',
+    chapter: '三十一、论正官',
+    scene: '格局',
+    tags: ['正官'],
+    quote: '以刑冲破害为忌，则以生之护之为喜矣。存其喜而去其忌则贵，而贵之中又有高低者，何也？',
+    plain: '正官格最忌刑冲破害，喜财生官、印护官；去忌存喜才谈得上贵，贵的层次还要看财印是否并透、有无伤官七煞混杂。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53651.html',
+  },
+  {
+    id: 'zp-cai',
+    book: 'ziping',
+    chapter: '三十三、论财',
+    scene: '格局',
+    tags: ['财'],
+    quote: '财为我克，使用之物也，以能生官，所以为美。为财帛，为妻妾，为才能，为驿马，皆财类也。',
+    plain: '财是我所克、能为我用之物，因能生官而美；它同时代表钱财、配偶、才能、走动，不只「钱」一项。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53653.html',
+  },
+  {
+    id: 'zp-yin',
+    book: 'ziping',
+    chapter: '三十五、论印绶',
+    scene: '格局',
+    tags: ['印'],
+    quote: '印绶喜其生身，正偏同为美格，故财与印不分偏正，同为一格而论之。',
+    plain: '印能生身，正印偏印都算美格，不分偏正而论；印格的关键在身印强弱与官杀、食伤、财的配合。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53655.html',
+  },
+  {
+    id: 'zp-shishen',
+    book: 'ziping',
+    chapter: '三十七、论食神',
+    scene: '格局',
+    tags: ['食神'],
+    quote: '食神本属泄气，以其能生正财，所以喜之。故食神生财，美格也。财要有根，不必偏正叠出，如身强食旺而财透，大贵之格。',
+    plain: '食神本是泄气，可贵在能生财；食神生财要财有根，身强、食旺、财透三者齐，格局才大。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53657.html',
+  },
+  {
+    id: 'zp-pianguan',
+    book: 'ziping',
+    chapter: '三十九、论偏官',
+    scene: '格局',
+    tags: ['七杀', '偏官'],
+    quote: '煞以攻身，似非美物，百大贵之格，多存七煞。盖控制得宜，煞为我用，如大英雄大豪杰，似难驾驭，而处之有方，则惊天动地之功，忽焉而就。',
+    plain: '七煞攻身，看着不美，但大贵之格多有七煞——能控制住就为我所用，像驾驭豪杰，处之有方就能成大事。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53659.html',
+  },
+  {
+    id: 'zp-shangguan',
+    book: 'ziping',
+    chapter: '四十一、论伤官',
+    scene: '格局',
+    tags: ['伤官'],
+    quote: '伤官虽非吉神，实为秀气，故文人学士，多于伤官格内得之。而夏木见水，冬金见火，则又为秀之尤秀者也。',
+    plain: '伤官不是吉神，却是秀气所在，文人多出伤官格；夏木得水、冬金得火，是秀气里更秀的两种。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53661.html',
+  },
+  {
+    id: 'zp-yangren',
+    book: 'ziping',
+    chapter: '四十三、论阳刃',
+    scene: '格局',
+    tags: ['劫财', '阳刃'],
+    quote: '阳刃者，劫我正财之神，乃正财之七煞也。禄前一位，惟五阳有之，故为阳刃。不曰劫而曰刃，劫之甚也。刃宜伏制，官煞皆宜，财印相随，尤为贵显。',
+    plain: '阳刃是劫财之极（只有五阳干有），宜用官煞制伏；财印相随而不相碍，格局更显。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53663.html',
+  },
+  {
+    id: 'zp-lujie',
+    book: 'ziping',
+    chapter: '四十五、论建禄月劫',
+    scene: '格局',
+    tags: ['比肩', '建禄', '月劫'],
+    quote: '故建禄与月劫，可同一格，不必加分，皆以透干支，别取财官煞食为用。',
+    plain: '建禄、月劫同看一格，月令本身不算用神，要另看透出的财官煞食取用。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53665.html',
+  },
+  {
+    id: 'zp-qihou',
+    book: 'ziping',
+    chapter: '十四、论用神配气候得失',
+    scene: '调候',
+    tags: [],
+    quote: '论命惟以月令用神为主，然亦须配气候而互参之。譬如英雄豪杰，生得其时，自然事半功倍；遭时不顺，虽有奇才，成功不易。',
+    plain: '月令用神为主，但必须配气候参看；同样的格局，生在得时的气候里事半功倍，逆着气候就费劲。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53634.html',
+  },
+  {
+    id: 'zp-chengbai',
+    book: 'ziping',
+    chapter: '九、论用神成败救应',
+    scene: '格局',
+    tags: [],
+    quote: '成中有败，必是带忌；败中有成，全凭救应。',
+    plain: '成格不等于一路顺：成中带忌（官逢财又逢伤、官被合之类）就打了折；败格也未必无救——印来解伤、合来清煞，败中还能转成。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53629.html',
+  },
+  {
+    id: 'zp-bianhua',
+    book: 'ziping',
+    chapter: '十、论用神变化',
+    scene: '格局',
+    tags: [],
+    quote: '故若丁生亥月，本为正官，支全卯未，则化为印。己生申月，本属伤官。藏庚透壬，则化为财。凡此之类皆用神之变化也。',
+    plain: '用神本从月令取，但月令藏干不一：丁生亥月本为正官，支会卯未就化为印；己生申月本属伤官，庚藏壬透就化为财。起点相同，合化一变，取用也跟着变（原文只说变化之由，不断定某盘必化）。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/zipingzhenquan/53630.html',
+  },
+  {
+    id: 'dt-hannuan',
+    book: 'ditian',
+    chapter: '通神论·寒暖',
+    scene: '调候',
+    tags: [],
+    quote: '天道有寒暖，生育万物，人道行之，不可过也。',
+    plain: '天有寒暖才能生养万物，人命里寒暖也不能过——过寒过热都要调。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'dt-zaoshi',
+    book: 'ditian',
+    chapter: '通神论·燥湿',
+    scene: '调候',
+    tags: [],
+    quote: '地道有燥湿，生成品汇，人道得之，不可偏也。',
+    plain: '地有燥湿才有品类生成，人命得燥湿之气也不能偏。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'dt-shuaiwang',
+    book: 'ditian',
+    chapter: '通神论·衰旺',
+    scene: '调候',
+    tags: [],
+    quote: '能知旺衰之真机，其于三命之奥，思过半矣。',
+    plain: '真正看懂旺衰的机关，命理之奥就过了一半——旺衰不是数个数，要看真机。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'dt-zhonghe',
+    book: 'ditian',
+    chapter: '通神论·中和',
+    scene: '调候',
+    tags: [],
+    quote: '既识中和之正理，而于五行之妙，有全能焉。',
+    plain: '懂得中和的道理，五行的妙处就都在其中了。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'dt-guansha',
+    book: 'ditian',
+    chapter: '通神论·官杀',
+    scene: '十神',
+    tags: ['正官', '七杀'],
+    quote: '官杀混杂来问我，有可有不可。',
+    plain: '官杀混杂不是一律不好，要看能不能去留取清。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'dt-shangguan',
+    book: 'ditian',
+    chapter: '通神论·伤官',
+    scene: '十神',
+    tags: ['伤官'],
+    quote: '伤官见官最难辨，可见不可见。',
+    plain: '伤官见官是最难分辨的一条：有的能见，有的不能见，不能一句「伤官见官为祸百端」了事。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'dt-yueling',
+    book: 'ditian',
+    chapter: '通神论·月令',
+    scene: '用神',
+    tags: [],
+    quote: '月令乃提纲之府，譬之宅也，人元为用事之神，宅之定向也，不可以不卜。',
+    plain: '月令像宅子，藏干是用事之神，像宅子的朝向，必须细看。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'dt-tiyong',
+    book: 'ditian',
+    chapter: '通神论·体用',
+    scene: '用神',
+    tags: [],
+    quote: '道有体用，不可以一端论也，要在扶之抑之得其宜。',
+    plain: '体用不能只看一头，关键是扶抑得宜。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'dt-jingshen',
+    book: 'ditian',
+    chapter: '通神论·精神',
+    scene: '用神',
+    tags: [],
+    quote: '人有精神，不可以一偏求也，要在损之益之得其中。',
+    plain: '看精神不能偏执一端，要在损益之间求其中。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/ditiansui/153091.html',
+  },
+  {
+    id: 'smt-zhenguan',
+    book: 'sanming',
+    chapter: '卷五·论正官',
+    scene: '格局',
+    tags: ['正官'],
+    quote: '正官者，乃甲见辛、乙见庚之例。阴阳配合，相制有用，成其道也。故正官为六格之首，止许一位，多则不宜。',
+    plain: '正官取「克我而阴阳相配」，有制而能成用；六格以正官居首，只宜一位，多见就杂。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/sanmingtonghui/7582.html',
+  },
+  {
+    id: 'smt-zhengcai',
+    book: 'sanming',
+    chapter: '卷六·论正财',
+    scene: '格局',
+    tags: ['财'],
+    quote: '正财者，乃甲见己、乙见戊之例。受我克制，为我之妻，譬人娶妻，妻赍财嫁我，我必精神康强，而后可享用，若衰微不振，虽妻财丰厚，但能目视，终不得用。',
+    plain: '正财是我克制之物，古人以「娶妻带财」作比：自身精神康强才受用得起，身弱不振，财再厚也只是看着。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/sanmingtonghui/7645.html',
+  },
+  {
+    id: 'smt-yinshou',
+    book: 'sanming',
+    chapter: '卷六·论印绶',
+    scene: '格局',
+    tags: ['印'],
+    quote: '印绶者，乃五行生我之名。如甲乙在亥子月，丙丁在寅卯月之类，乃我气之源，为生气，为父母，能护我官星，使无伤克',
+    plain: '印是生我之气，像源头与父母：它能护住官星，使官不受伤克；反过来说，印重就怕财来破。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/sanmingtonghui/7655.html',
+  },
+  {
+    id: 'smt-shishen',
+    book: 'sanming',
+    chapter: '卷六·论食神',
+    scene: '格局',
+    tags: ['食神'],
+    quote: '凡命遇财煞之地，食神旺相，煞被食制，不敢为祸，财被食生，充裕不竭，故食神一名寿星，一名爵星，良有以也。',
+    plain: '食神旺，一头制煞、一头生财：煞被制住不敢为祸，财被生起不至枯竭；所以食神又叫寿星、爵星。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/sanmingtonghui/7663.html',
+  },
+  {
+    id: 'smt-shangguan',
+    book: 'sanming',
+    chapter: '卷六·论伤官',
+    scene: '格局',
+    tags: ['伤官'],
+    quote: '伤官虽凶，乃我所生，自家之物，伤尽则能生财，财旺则能生官，造化展转有情。',
+    plain: '伤官虽称凶，却是我自己生出来的：伤尽（柱中不见官星）反能生财，财旺再生官，辗转还是有情。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/sanmingtonghui/7662.html',
+  },
+  {
+    id: 'smt-yangren',
+    book: 'sanming',
+    chapter: '卷六·论阳刃',
+    scene: '格局',
+    tags: ['阳刃', '劫财'],
+    quote: '阳者，阴阳之阳，刃者，刀刃之刃，即禄前一位，言旺越其分，故险。',
+    plain: '阳刃指禄前一位，旺过了本分，所以险；甲丙戊庚壬五阳干才有刃，阴干见伤官同论。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/sanmingtonghui/7671.html',
+  },
+  {
+    id: 'smt-jianlu',
+    book: 'sanming',
+    chapter: '卷六·论建禄',
+    scene: '格局',
+    tags: ['建禄', '比肩', '月劫'],
+    quote: '凡命月令建禄，难招祖业，必主平生见财不聚，却病少寿长，行运再见比肩，克妻妨父损子',
+    plain: '月令建禄是日主临官之地，身旺而财官难取：古说难承祖业、见财不聚，但病少寿长；再走比肩运，古书说克妻妨父损子（属于旧说的重话，本插件只记原文、不作断语）。',
+    url: 'https://www.diancang.xyz/xuanxuewushu/sanmingtonghui/7672.html',
+  },
+];
+
+const BY_ID = CLASSICS.reduce((m, e) => { m[e.id] = e; return m; }, {});
+
+const GEJU_KEY = {
+  正官格: '正官',
+  七杀格: '七杀',
+  偏官格: '偏官',
+  正财格: '财',
+  偏财格: '财',
+  正印格: '印',
+  偏印格: '印',
+  食神格: '食神',
+  伤官格: '伤官',
+  阳刃格: '阳刃',
+  月劫格: '月劫',
+  建禄格: '建禄',
+};
+
+function classicOf(id) {
+  return BY_ID[id] || null;
+}
+
+function tagOf(gejuName) {
+  const name = String(gejuName || '');
+  if (GEJU_KEY[name]) return GEJU_KEY[name];
+  const bare = name.replace(/格$/, '');
+  return GEJU_KEY[bare + '格'] || bare;
+}
+
+function pick(tag, book) {
+  return CLASSICS.find((e) => e.scene === '格局' && e.tags.includes(tag) && (!book || e.book === book)) || null;
+}
+
+function chapterTitle(e) {
+  return e.chapter.replace(/^.*[、·]/, '').replace(/^论/, '');
+}
+
+function classicsFor(r, limit = 5) {
+  if (!r) return [];
+  const out = [];
+  const seen = new Set();
+  const push = (entry, why) => {
+    if (!entry || seen.has(entry.id) || out.length >= limit) return;
+    seen.add(entry.id);
+    out.push({ ...entry, why });
+  };
+  const gejuList = Array.isArray(r.geju) ? r.geju : (r.frame && Array.isArray(r.frame.geju) ? r.frame.geju : []);
+  for (const g of gejuList) {
+    if (!g || (g.kind && g.kind !== '月令格')) continue;
+    const tag = tagOf(g.name);
+    const primary = pick(tag, 'ziping') || pick(tag);
+    if (primary) push(primary, `你的月令格局是「${g.name}」，故取${CLASSIC_BOOKS[primary.book].name}「${chapterTitle(primary)}」一条`);
+    const alt = CLASSICS.find((e) => e.scene === '格局' && e.tags.includes(tag) && (!primary || e.book !== primary.book));
+    if (alt) push(alt, `同是「${g.name}」，${CLASSIC_BOOKS[alt.book].name}「${chapterTitle(alt)}」另有取法，可对照读`);
+  }
+  const cli = r.climate || (r.frame && r.frame.yongshen && (r.frame.yongshen.climate || r.frame.yongshen.tiaohou));
+  if (cli && cli.kind && cli.kind !== '平和') {
+    const cold = !!(cli.cold || cli.kind.indexOf('寒') >= 0);
+    const hot = !!(cli.hot || cli.kind.indexOf('热') >= 0);
+    push(classicOf(cold ? 'dt-hannuan' : 'dt-zaoshi'), `本盘气候判为「${cli.kind}」，故取${CLASSIC_BOOKS.ditian.name}寒暖燥湿一条`);
+    push(classicOf('zp-qihou'), '气候与月令用神要互参，故取子平真诠「用神配气候」一条');
+    if (hot) push(classicOf('dt-hannuan'), '本盘偏热，寒暖一条正对');
+  }
+  const huagi = gejuList.find((g) => g && g.kind === '化气格');
+  const combo = gejuList.find((g) => g && g.kind === '组合');
+  if (huagi) {
+    push(classicOf('zp-bianhua'), `本盘列有「${huagi.name}」：用神由月令合化而变，总纲一位改取${CLASSIC_BOOKS.ziping.name}论用神变化`);
+  } else if (combo) {
+    push(classicOf('zp-chengbai'), `本盘另有「${combo.name}」组合：成格还要看带忌与救应，总纲一位改取${CLASSIC_BOOKS.ziping.name}论用神成败救应`);
+  } else {
+    push(classicOf('zp-yongshen'), '用神从月令取、四吉顺用四凶逆用，是通用总纲');
+  }
+  return out;
+}
+
+function classicsText(rows) {
+  if (!rows || !rows.length) return '';
+  return rows.map((e) => `《${CLASSIC_BOOKS[e.book].name}·${e.chapter}》「${e.quote}」`).join('\n');
+}
+
+return { CLASSIC_BOOKS, CLASSICS, classicOf, classicsFor, classicsText };
+})();
+
 __mods.geju = (function () {
 
 const { judgeClimate, arbitrate } = __mods.tiaohou;
@@ -2849,7 +3223,7 @@ __mods.bazi = (function () {
 const { STEMS, BRANCHES, TERM_NAMES, ganzhiName, dayGanzhiIndex, jdToParts, partsToJd, sexagenaryIndex, termWindow, previousJie, nextJie, equationOfTime, formatJd, xunKongOf } = __mods.calendar;
 const { resolveAddress } = __mods.geo;
 const { computeBaziShensha } = __mods.shensha;
-const { assertCivil } = __mods.validate;
+const { assertCivil, daysInMonth } = __mods.validate;
 const { applyDst } = __mods.dst;
 const { nayinOf } = __mods.nayin;
 const { SANHE } = __mods.sanhe;
@@ -3092,10 +3466,23 @@ function buildBazi(input) {
   let startAgeMonths = Math.round(totalMonths % 12);
   if (startAgeMonths >= 12) { startAgeMonths -= 12; startAgeYears += 1; }
 
+  const JIAO_YEAR_DAYS = 365.2422;
+  const JIAO_SCALE = JIAO_YEAR_DAYS / 3;
+  const jiaoFromTerm = forward ? nextJieTerm : prevJieTerm;
+  const jiaoJd = jd + spanDays * JIAO_SCALE;
+  const jiaoParts = jdToParts(jiaoJd);
+  const addYearsClamped = (p, n) => {
+    const y = p.year + n;
+    return { year: y, month: p.month, day: Math.min(p.day, daysInMonth(y, p.month)), hour: p.hour, minute: p.minute };
+  };
+
   const dayun = [];
+  const dayunWindows = [];
   for (let i = 1; i <= 8; i++) {
     const idx = (((monthIdx + (forward ? i : -i)) % 60) + 60) % 60;
     const g = ganzhiName(idx);
+    const fromJd = partsToJd(addYearsClamped(jiaoParts, (i - 1) * 10));
+    const toJd = partsToJd(addYearsClamped(jiaoParts, i * 10));
     dayun.push({
       step: i,
       startAge: startAgeYears + (i - 1) * 10,
@@ -3104,7 +3491,10 @@ function buildBazi(input) {
       branch: g.branch,
       stemTenGod: tenGod(dayStem, g.stem),
       nayin: nayin(idx),
+      fromDate: formatJd(fromJd),
+      toDate: formatJd(toJd),
     });
+    dayunWindows.push({ step: i, ganzhi: g.name, fromJd, toJd });
   }
 
   const thisYear = Number(input.nowYear) || new Date().getFullYear();
@@ -3245,6 +3635,45 @@ function buildBazi(input) {
     l.luck = scoreLuck(l.ganzhi, frame);
   }
 
+  const NATAL_LABEL = { year: '年柱', month: '月柱', day: '日柱', hour: '时柱' };
+  const stemOvercomes = (a, b) => OVERCOMES[STEM_ELEMENT[a]] === STEM_ELEMENT[b];
+  const tianKeDiChong = (a, b) => {
+    if (typeof a !== 'string' || typeof b !== 'string' || a.length < 2 || b.length < 2) return false;
+    if (!(a[0] in STEM_ELEMENT) || !(b[0] in STEM_ELEMENT)) return false;
+    return (stemOvercomes(a[0], b[0]) || stemOvercomes(b[0], a[0])) && hasPair(BRANCH_CHONG, a[1], b[1]);
+  };
+  const lichunJd = (y) => {
+    const t = termWindow(y, { jieOnly: true }).find((x) => x.index === 2 && jdToParts(x.jd).year === y);
+    return t ? t.jd : partsToJd({ year: y, month: 2, day: 4 });
+  };
+  for (const l of liunian) {
+    const yStart = lichunJd(l.year);
+    const yEnd = lichunJd(l.year + 1);
+    const active = dayunWindows.filter((w) => w.fromJd < yEnd && w.toJd > yStart);
+    const signals = [];
+    for (const w of active) {
+      if (w.ganzhi === l.ganzhi) {
+        signals.push({ type: '岁运并临', target: `第${w.step}步大运`, detail: `大运与流年同为${l.ganzhi}` });
+      } else if (tianKeDiChong(w.ganzhi, l.ganzhi)) {
+        signals.push({ type: '运年反吟', target: `第${w.step}步大运`, detail: `大运${w.ganzhi}与流年${l.ganzhi}天克地冲` });
+      }
+    }
+    for (const key of ['year', 'month', 'day', 'hour']) {
+      const g = pillars[key].ganzhi;
+      if (!g) continue;
+      if (l.ganzhi === g) {
+        signals.push({ type: '流年伏吟', target: NATAL_LABEL[key], detail: `流年${l.ganzhi}与${NATAL_LABEL[key]}同干支` });
+      } else if (tianKeDiChong(l.ganzhi, g)) {
+        signals.push({ type: '流年反吟', target: NATAL_LABEL[key], detail: `流年${l.ganzhi}与${NATAL_LABEL[key]}${g}天克地冲` });
+      }
+    }
+    l.suiyun = {
+      dayun: active.map((w) => ({ step: w.step, ganzhi: w.ganzhi })),
+      signals,
+      note: '只标干支重复与天克地冲这类变动信号，不判吉凶；大运按该年立春到次年立春的区间取，交运落在年内时前后两步并列',
+    };
+  }
+
   const p = jdToParts(jd);
 
   const mStemIdx = STEMS.indexOf(pillars.month.stem);
@@ -3299,6 +3728,17 @@ function buildBazi(input) {
       rule: `${isYangYear ? '阳' : '阴'}年${gender === 'male' ? '男' : '女'}${forward ? '顺排' : '逆排'}`,
       startAge: { years: startAgeYears, months: startAgeMonths },
       toNextJieDays: Math.round(spanDays * 100) / 100,
+      jiao: {
+        at: formatJd(jiaoJd),
+        jd: Math.round(jiaoJd * 1e6) / 1e6,
+        scaleDaysPerDay: JIAO_SCALE,
+        yearDays: JIAO_YEAR_DAYS,
+        spanDays: Math.round(spanDays * 1e4) / 1e4,
+        from: { name: jiaoFromTerm.name, time: formatJd(jiaoFromTerm.jd) },
+        frame: solar.offsetMinutes ? '真太阳时' : '平太阳时',
+        offsetMinutes: solar.offsetMinutes,
+        note: '三日折一年：出生到节令的真实间隔按 365.2422/3 放大后加到出生时刻；同一比例即「一日折四月、一时辰折十日」，每步大运在同月同日同时刻换',
+      },
       list: dayun,
     },
     strength,
@@ -3360,8 +3800,133 @@ const GENERATES = { 木: '火', 火: '土', 土: '金', 金: '水', 水: '木' }
 const OVERCOMES = { 木: '土', 土: '水', 水: '火', 火: '金', 金: '木' };
 
 const LIUSHEN = ['青龙', '朱雀', '勾陈', '螣蛇', '白虎', '玄武'];
+const LIUQIN_NAMES = ['父母', '兄弟', '子孙', '妻财', '官鬼'];
 const LIUSHEN_START = { 甲: 0, 乙: 0, 丙: 1, 丁: 1, 戊: 2, 己: 3, 庚: 4, 辛: 4, 壬: 5, 癸: 5 };
 
+const ZHI_CHONG_PAIRS = [['子', '午'], ['丑', '未'], ['寅', '申'], ['卯', '酉'], ['辰', '戌'], ['巳', '亥']];
+const ZHI_HE_PAIRS = [['子', '丑'], ['寅', '亥'], ['卯', '戌'], ['辰', '酉'], ['巳', '申'], ['午', '未']];
+const CHONG_OF = Object.fromEntries(ZHI_CHONG_PAIRS.flatMap(([a, b]) => [[a, b], [b, a]]));
+const TRIGRAM_OPPOSITE = { 乾: '巽', 巽: '乾', 坎: '离', 离: '坎', 艮: '坤', 坤: '艮', 震: '兑', 兑: '震' };
+
+const JIN_TUI_PAIRS = [['寅', '卯'], ['巳', '午'], ['申', '酉'], ['亥', '子'], ['丑', '辰'], ['辰', '未'], ['未', '戌'], ['戌', '丑']];
+const JIN_OF = new Map(JIN_TUI_PAIRS);
+const TUI_OF = new Map(JIN_TUI_PAIRS.map(([a, b]) => [b, a]));
+
+function jinTuiOf(from, to) {
+  if (!from || !to || from === to) return null;
+  if (JIN_OF.get(from) === to) return '进';
+  if (TUI_OF.get(from) === to) return '退';
+  return null;
+}
+
+function pairThirds(branches, table) {
+  const cnt = new Map();
+  for (const b of branches) cnt.set(b, (cnt.get(b) || 0) + 1);
+  const hits = [];
+  for (const [a, b] of table) {
+    const na = cnt.get(a) || 0;
+    const nb = cnt.get(b) || 0;
+    if (!na && !nb) continue;
+    if (na !== 1 || nb !== 1) return null;
+    cnt.set(a, 0);
+    cnt.set(b, 0);
+    hits.push([a, b]);
+  }
+  return hits.length * 2 === branches.length ? hits : null;
+}
+
+function hexBranches(hex) {
+  const inner = NAJIA[hex.lower].inner.slice();
+  const outer = NAJIA[hex.upper].outer.slice();
+  return { inner, outer, all: [...inner, ...outer] };
+}
+
+function hexBody(hex) {
+  const { inner, outer, all } = hexBranches(hex);
+  const chongPairs = pairThirds(all, ZHI_CHONG_PAIRS);
+  const hePairs = pairThirds(all, ZHI_HE_PAIRS);
+  return {
+    name: hex.name,
+    upper: hex.upper,
+    lower: hex.lower,
+    inner,
+    outer,
+    chong: Boolean(chongPairs),
+    he: Boolean(hePairs),
+    chongPairs: chongPairs || [],
+    hePairs: hePairs || [],
+  };
+}
+
+function bodyRelations(ben, bian = null, moving = []) {
+  const b = hexBody(ben);
+  const out = {
+    ben: { name: b.name, chong: b.chong, he: b.he, chongPairs: b.chongPairs, hePairs: b.hePairs, inner: b.inner, outer: b.outer },
+    bian: null,
+    fuYin: { inner: false, outer: false },
+    fanYin: { inner: null, outer: null }, // null 或 { by: ['chong'|'pair'] }
+    yaoFuYin: [],
+    yaoFanYin: [],
+    jinTui: [], // [{ position, from, to, type: '进'|'退' }]
+  };
+  if (!bian) return out;
+
+  const v = hexBody(bian);
+  out.bian = { name: v.name, chong: v.chong, he: v.he, chongPairs: v.chongPairs, hePairs: v.hePairs, inner: v.inner, outer: v.outer };
+
+  for (const side of ['inner', 'outer']) {
+    const x = b[side];
+    const y = v[side];
+    const tri = side === 'inner' ? [ben.lower, bian.lower] : [ben.upper, bian.upper];
+    const changed = tri[0] !== tri[1];
+    if (changed && x.every((z, i) => z === y[i])) {
+      out.fuYin[side] = true;
+      continue;
+    }
+    const by = [];
+    if (changed && x.every((z, i) => CHONG_OF[z] === y[i])) by.push('chong');
+    if (changed && TRIGRAM_OPPOSITE[tri[0]] === tri[1]) by.push('pair');
+    if (by.length) out.fanYin[side] = { by };
+  }
+
+  for (const p of moving) {
+    const i = p - 1;
+    if (!(i >= 0 && i < 6)) continue;
+    const x = i < 3 ? b.inner[i] : b.outer[i - 3];
+    const y = i < 3 ? v.inner[i] : v.outer[i - 3];
+    if (x === y) out.yaoFuYin.push(p);
+    else if (CHONG_OF[x] === y) out.yaoFanYin.push(p);
+    const jt = jinTuiOf(x, y);
+    if (jt) out.jinTui.push({ position: p, from: x, to: y, type: jt });
+  }
+  return out;
+}
+
+function bodyLabels(body) {
+  if (!body || !body.ben) return [];
+  const fuYin = body.fuYin || {};
+  const fanYin = body.fanYin || {};
+  const yaoFuYin = body.yaoFuYin || [];
+  const yaoFanYin = body.yaoFanYin || [];
+  const out = [];
+  if (body.ben.chong) out.push('六冲卦');
+  if (body.ben.he) out.push('六合卦');
+  if (body.bian) {
+    if (body.bian.chong) out.push('变六冲');
+    else if (body.bian.he) out.push('变六合');
+  }
+  const sides = [['inner', '内卦'], ['outer', '外卦']];
+  for (const [k, label] of sides) if (fuYin[k]) out.push(`${label}伏吟`);
+  for (const [k, label] of sides) if (fanYin[k]) out.push(`${label}反吟`);
+  if (yaoFuYin.length) out.push(`爻伏吟 ${yaoFuYin.join('、')}`);
+  if (yaoFanYin.length) out.push(`爻反吟 ${yaoFanYin.join('、')}`);
+  const jin = (body.jinTui || []).filter((x) => x.type === '进').map((x) => x.position);
+  const tui = (body.jinTui || []).filter((x) => x.type === '退').map((x) => x.position);
+  if (jin.length) out.push(`化进神 ${jin.join('、')}`);
+  if (tui.length) out.push(`化退神 ${tui.join('、')}`);
+  return out;
+}
+
 function liuqin(palaceElement, branchElement) {
   if (palaceElement === branchElement) return '兄弟';
   if (GENERATES[branchElement] === palaceElement) return '父母';
@@ -3416,6 +3981,166 @@ function hexagramFromBits(bits) {
   return HEXAGRAM_INDEX.get(`${upper}|${lower}`);
 }
 
+const PURE_BY_PALACE = new Map();
+for (const h of HEXAGRAM_INDEX.values()) if (h.order === 0) PURE_BY_PALACE.set(h.palace, h);
+
+const YONGSHEN_RULES = Object.freeze({
+  wealth: { liuqin: '妻财', ask: '求财、收入、订单' },
+  career: { liuqin: '官鬼', ask: '工作、职位、考核' },
+  health: { liuqin: '官鬼', ask: '病与压力（子孙为医药）' },
+  study: { liuqin: '父母', ask: '考试、证书、文书合同' },
+  love: { liuqin: null, ask: '感情：男看妻财、女看官鬼' },
+  travel: { liuqin: null, ask: '出行以世爻为用，父母为舟车' },
+  general: { liuqin: null, ask: '未指明所问之事' },
+});
+
+const WUXING_SAY = {
+  飞生伏: '飞神生伏神，伏神借得上力',
+  伏生飞: '伏神生飞神，力气往外泄',
+  飞克伏: '飞神克伏神，伏神受压难出',
+  伏克飞: '伏神克飞神，伏神能自出',
+  比和: '飞伏比和，同气相求',
+};
+
+const RELATION_LABEL = {
+  飞生伏: '伏神得飞神生',
+  伏生飞: '伏神泄气于飞神',
+  飞克伏: '伏神受飞神克',
+  伏克飞: '伏神克飞神可出',
+  比和: '飞伏比和',
+};
+
+function wuxingBetween(min, max) {
+  if (GENERATES[max] === min) return '飞生伏';
+  if (GENERATES[min] === max) return '伏生飞';
+  if (OVERCOMES[max] === min) return '飞克伏';
+  if (OVERCOMES[min] === max) return '伏克飞';
+  return '比和';
+}
+
+const sideOf = (position) => (position <= 3 ? 'inner' : 'outer');
+
+function yongshenOf(result, opts = {}) {
+  const r = result && typeof result === 'object' ? result : {};
+  const ben = r.ben && typeof r.ben === 'object' ? r.ben : {};
+  const lines = Array.isArray(ben.lines) ? ben.lines : [];
+  const direction = YONGSHEN_RULES[opts.direction] ? opts.direction : 'general';
+  const rule = YONGSHEN_RULES[direction];
+  const gender = opts.gender === 'female' ? 'female' : 'male';
+  const body = r.body && typeof r.body === 'object' ? r.body : {};
+  const kongArr = Array.isArray(r.xunKong)
+    ? r.xunKong
+    : (typeof r.xunKong === 'string' ? r.xunKong.split('') : []);
+
+  const direct = LIUQIN_NAMES.includes(opts.liuqin) ? opts.liuqin : null;
+  const byShi = !direct && direction === 'travel';
+  const liuqinName = direct || (byShi ? '世' : (direction === 'love' ? (gender === 'female' ? '官鬼' : '妻财') : rule.liuqin));
+  const base = {
+    direction,
+    gender,
+    ask: rule.ask,
+    byShi,
+    liuqin: liuqinName,
+    found: [],
+    missing: false,
+    fushen: [],
+    labels: [],
+  };
+  if (!liuqinName) { base.labels = ['用神未取（未指明所问之事）']; return base; }
+
+  const found = byShi
+    ? lines.filter((l) => l.position === ben.shi)
+    : lines.filter((l) => l.liuqin === liuqinName);
+  base.found = found.map((l) => ({
+    position: l.position,
+    name: l.name,
+    liuqin: l.liuqin,
+    branch: l.branch,
+    element: l.element,
+    ganzhi: l.ganzhi,
+    moving: Boolean(l.moving),
+    liushen: l.liushen,
+    shi: l.position === ben.shi,
+    ying: l.position === ben.ying,
+    kong: kongArr.includes(l.branch),
+  }));
+
+  const labels = [];
+  const label = byShi ? '用神 世爻' : `用神 ${liuqinName}`;
+  labels.push(label);
+  const jin = (body.jinTui || []).filter((x) => x.type === '进').map((x) => x.position);
+  const tui = (body.jinTui || []).filter((x) => x.type === '退').map((x) => x.position);
+  const yaoFu = body.yaoFuYin || [];
+  const yaoFan = body.yaoFanYin || [];
+
+  if (found.length) {
+    labels.push(`${label}在 ${found.map((l) => `${l.position}爻`).join('、')}`);
+    if (found.length > 1) labels.push(`用神两现 ${found.map((l) => l.position).join('、')}`);
+    if (found.some((l) => l.position === ben.shi)) labels.push('用神持世');
+    if (found.some((l) => l.position === ben.ying)) labels.push('用神临应');
+    if (found.some((l) => l.moving)) labels.push('用神发动');
+    if (found.some((l) => kongArr.includes(l.branch))) labels.push('用神空亡');
+    if (found.some((l) => jin.includes(l.position))) labels.push('用神化进神');
+    if (found.some((l) => tui.includes(l.position))) labels.push('用神化退神');
+    if (found.some((l) => yaoFu.includes(l.position))) labels.push('用神爻伏吟');
+    if (found.some((l) => yaoFan.includes(l.position))) labels.push('用神爻反吟');
+  } else {
+    base.missing = true;
+    const palace = String(ben.palace || '').replace(/宫$/, '');
+    const pure = PURE_BY_PALACE.get(palace) || null;
+    if (pure) {
+      for (let i = 0; i < 6; i++) {
+        const isInner = i < 3;
+        const nj = NAJIA[isInner ? pure.lower : pure.upper];
+        const branch = isInner ? nj.inner[i] : nj.outer[i - 3];
+        const gan = isInner ? nj.gan[0] : nj.gan[1];
+        const element = BRANCH_ELEMENT[branch];
+        if (liuqin(pure.palaceElement, element) !== liuqinName) continue;
+        const fei = lines[i] || null;
+        const relation = fei ? wuxingBetween(element, fei.element) : null;
+        base.fushen.push({
+          position: i + 1,
+          liuqin: liuqinName,
+          branch,
+          element,
+          ganzhi: gan + branch,
+          relation,
+          fei: fei ? { position: fei.position, liuqin: fei.liuqin, branch: fei.branch, element: fei.element, ganzhi: fei.ganzhi } : null,
+        });
+      }
+    }
+    if (base.fushen.length) {
+      labels.push(`用神不上卦·伏于 ${base.fushen.map((f) => `${f.position}爻`).join('、')}`);
+      if (base.fushen.length > 1) labels.push(`伏神两现 ${base.fushen.map((f) => f.position).join('、')}`);
+      const rels = [...new Set(base.fushen.map((f) => f.relation).filter(Boolean))];
+      for (const rel of rels) labels.push(RELATION_LABEL[rel] || `伏神${rel}`);
+    } else {
+      labels.push('用神不上卦');
+    }
+  }
+
+  const sides = found.length ? [...new Set(found.map((l) => sideOf(l.position)))] : [];
+  if (body.ben) {
+    if (body.ben.chong) labels.push('用神在六冲卦');
+    if (body.ben.he) labels.push('用神在六合卦');
+    if (body.bian && body.bian.chong) labels.push('用神逢变六冲');
+    if (body.bian && body.bian.he) labels.push('用神逢变六合');
+  }
+  for (const side of sides) {
+    if (body.fuYin && body.fuYin[side]) labels.push(`用神在${side === 'inner' ? '内' : '外'}卦伏吟`);
+    if (body.fanYin && body.fanYin[side]) {
+      const by = (body.fanYin[side].by || []).includes('chong') ? '地支全冲' : '八卦正对';
+      labels.push(`用神在${side === 'inner' ? '内' : '外'}卦反吟`);
+      labels.push(`反吟来源：${by}`);
+    }
+  }
+
+  base.labels = labels;
+  base.relationSay = base.fushen.map((f) => WUXING_SAY[f.relation]).filter(Boolean);
+  base.side = sides.length === 1 ? (sides[0] === 'inner' ? '内卦' : '外卦') : null;
+  return base;
+}
+
 function tossLines(random = Math.random) {
   const lines = [];
   for (let i = 0; i < 6; i++) {
@@ -3531,10 +4256,253 @@ function buildLiuyao(input = {}) {
         lines: bianRows,
       }
       : null,
+    body: (() => {
+      const body = bodyRelations(ben, bian, moving.map((i) => i + 1));
+      body.labels = bodyLabels(body);
+      return body;
+    })(),
+  };
+}
+
+const ZHI_ELEMENT = {
+  子: '水', 丑: '土', 寅: '木', 卯: '木', 辰: '土', 巳: '火',
+  午: '火', 未: '土', 申: '金', 酉: '金', 戌: '土', 亥: '水',
+};
+const ELEMENT_SHENG = { 木: '火', 火: '土', 土: '金', 金: '水', 水: '木' };
+const ELEMENT_KE = { 木: '土', 土: '水', 水: '火', 火: '金', 金: '木' };
+const MONTH_STATE_ORDER = ['旺', '相', '休', '囚', '死'];
+const MONTH_STATE_SAY = {
+  旺: '与月令同气，当令得时',
+  相: '受月令之生，气有余',
+  休: '生月令而气泄，力减',
+  囚: '克月令而力困',
+  死: '被月令所克，气受制',
+};
+const DAY_RELATION_ORDER = ['日生', '日克', '比和', '泄', '耗'];
+const DAY_RELATION_SAY = {
+  日生: '日辰生扶，当天有人托着',
+  日克: '日辰克制，当天被压一头',
+  比和: '与日辰同气，当天得到同类之助',
+  泄: '生扶日辰，气往外走',
+  耗: '克制日辰，力有所耗',
+};
+
+function zhiElementOf(branch) {
+  return ZHI_ELEMENT[branch] || null;
+}
+
+function monthStateOf(element, monthElement) {
+  if (!element || !monthElement) return 'unknown';
+  if (element === monthElement) return '旺';
+  if (ELEMENT_SHENG[monthElement] === element) return '相';
+  if (ELEMENT_SHENG[element] === monthElement) return '休';
+  if (ELEMENT_KE[element] === monthElement) return '囚';
+  if (ELEMENT_KE[monthElement] === element) return '死';
+  return 'unknown';
+}
+
+function dayRelationOf(element, dayElement) {
+  if (!element || !dayElement) return 'unknown';
+  if (element === dayElement) return '比和';
+  if (ELEMENT_SHENG[dayElement] === element) return '日生';
+  if (ELEMENT_KE[dayElement] === element) return '日克';
+  if (ELEMENT_SHENG[element] === dayElement) return '泄';
+  if (ELEMENT_KE[element] === dayElement) return '耗';
+  return 'unknown';
+}
+
+function yongshenStrength(result, useGod, opts = {}) {
+  if (!useGod || !Array.isArray(useGod.found) || !useGod.found.length) return null;
+  const monthBranch = opts.monthBranch || null;
+  const dayBranch = opts.dayBranch || (result && result.dayGanZhi ? result.dayGanZhi.branch : null);
+  if (!monthBranch && !dayBranch) return null;
+  const monthElement = monthBranch ? zhiElementOf(monthBranch) : null;
+  const dayElement = dayBranch ? zhiElementOf(dayBranch) : null;
+  const kong = Array.isArray(result && result.xunKong)
+    ? result.xunKong
+    : (result && typeof result.xunKong === 'string' ? result.xunKong.split('') : []);
+
+  const lines = useGod.found.map((l) => {
+    const element = l.element || zhiElementOf(l.branch);
+    const monthChong = !!(monthBranch && CHONG_OF[l.branch] === monthBranch);
+    const dayChong = !!(dayBranch && CHONG_OF[l.branch] === dayBranch);
+    const monthState = monthStateOf(element, monthElement);
+    const dayRelation = dayRelationOf(element, dayElement);
+    const isEmpty = kong.includes(l.branch);
+    return {
+      position: l.position,
+      branch: l.branch,
+      element,
+      monthState,
+      monthSay: MONTH_STATE_SAY[monthState] || '',
+      monthChong,
+      dayRelation,
+      daySay: DAY_RELATION_SAY[dayRelation] || '',
+      dayChong,
+      kong: isEmpty,
+      moving: !!l.moving,
+      chongTag: monthChong ? '月破'
+        : dayChong ? (isEmpty ? '冲空' : (l.moving ? '逢日辰冲' : '暗动')) : '',
+    };
+  });
+
+  const labels = [];
+  const states = [...new Set(lines.map((l) => l.monthState))].filter((x) => x !== 'unknown');
+  states.sort((a, b) => MONTH_STATE_ORDER.indexOf(a) - MONTH_STATE_ORDER.indexOf(b));
+  for (const st of states) labels.push(`用神月建${st}`);
+  if (lines.some((l) => l.monthChong)) labels.push('用神月破');
+  const rels = [...new Set(lines.map((l) => l.dayRelation))].filter((x) => x !== 'unknown');
+  rels.sort((a, b) => DAY_RELATION_ORDER.indexOf(a) - DAY_RELATION_ORDER.indexOf(b));
+  for (const rel of rels) {
+    labels.push(rel === '日生' ? '用神得日辰生'
+      : rel === '日克' ? '用神受日辰克'
+        : rel === '比和' ? '用神与日辰比和'
+          : rel === '泄' ? '用神泄于日辰' : '用神耗日辰');
+  }
+  for (const tag of [...new Set(lines.map((l) => l.chongTag))].filter(Boolean)) {
+    labels.push(tag === '月破' ? '' : `用神${tag}`);
+  }
+  const clean = labels.filter(Boolean).filter((x, i, arr) => arr.indexOf(x) === i);
+
+  return {
+    month: monthBranch ? { branch: monthBranch, element: monthElement } : null,
+    day: dayBranch ? { branch: dayBranch, element: dayElement } : null,
+    lines,
+    labels: clean,
+    note: '月建主这一段的旺衰，日辰看当天是扶是克；两处都只给状态标签，不折成分数，也不单独断吉凶。',
   };
 }
 
-return { HEXAGRAM_COUNT, hexagramFromBits, tossLines, buildLiuyao };
+function hexagramStrength(result, opts = {}) {
+  const rows = (result && result.ben && Array.isArray(result.ben.lines))
+    ? result.ben.lines
+    : (result && Array.isArray(result.lines) ? result.lines : []);
+  if (!rows.length) return null;
+  const monthBranch = opts.monthBranch || null;
+  const dayBranch = opts.dayBranch || (result.dayGanZhi ? result.dayGanZhi.branch : null);
+  if (!monthBranch && !dayBranch) return null;
+  const monthElement = monthBranch ? zhiElementOf(monthBranch) : null;
+  const dayElement = dayBranch ? zhiElementOf(dayBranch) : null;
+  const kong = Array.isArray(result.xunKong)
+    ? result.xunKong
+    : (typeof result.xunKong === 'string' ? result.xunKong.split('') : []);
+  const shiPos = result.ben ? result.ben.shi : null;
+  const yingPos = result.ben ? result.ben.ying : null;
+
+  const lines = rows.map((l) => {
+    const element = l.element || zhiElementOf(l.branch);
+    const monthChong = !!(monthBranch && CHONG_OF[l.branch] === monthBranch);
+    const dayChong = !!(dayBranch && CHONG_OF[l.branch] === dayBranch);
+    const monthState = monthStateOf(element, monthElement);
+    const dayRelation = dayRelationOf(element, dayElement);
+    const isEmpty = kong.includes(l.branch);
+    return {
+      position: l.position,
+      name: l.name,
+      branch: l.branch,
+      element,
+      liuqin: l.liuqin ?? null,
+      shi: l.position === shiPos,
+      ying: l.position === yingPos,
+      moving: !!l.moving,
+      kong: isEmpty,
+      monthState,
+      monthSay: MONTH_STATE_SAY[monthState] || '',
+      monthChong,
+      dayRelation,
+      daySay: DAY_RELATION_SAY[dayRelation] || '',
+      dayChong,
+      chongTag: monthChong ? '月破'
+        : dayChong ? (isEmpty ? '冲空' : (l.moving ? '逢日辰冲' : '暗动')) : '',
+    };
+  });
+
+  const counts = {};
+  for (const st of MONTH_STATE_ORDER) counts[st] = lines.filter((l) => l.monthState === st).length;
+
+  const labels = [];
+  for (const st of MONTH_STATE_ORDER) if (counts[st]) labels.push(`全卦${st}${counts[st]}爻`);
+  const shiLine = lines.find((l) => l.shi) || null;
+  const yingLine = lines.find((l) => l.ying) || null;
+  if (shiLine && shiLine.monthState !== 'unknown') labels.push(`世爻月建${shiLine.monthState}`);
+  if (yingLine && yingLine.monthState !== 'unknown') labels.push(`应爻月建${yingLine.monthState}`);
+  const tagCount = (tag) => lines.filter((l) => l.chongTag === tag).length;
+  for (const tag of ['月破', '暗动', '冲空', '逢日辰冲']) {
+    const n = tagCount(tag);
+    if (n) labels.push(`${tag}${n}爻`);
+  }
+
+  return {
+    month: monthBranch ? { branch: monthBranch, element: monthElement } : null,
+    day: dayBranch ? { branch: dayBranch, element: dayElement } : null,
+    lines,
+    counts,
+    strongest: lines.filter((l) => l.monthState === '旺').map((l) => l.position),
+    weakest: lines.filter((l) => l.monthState === '死' || l.monthChong).map((l) => l.position),
+    shi: shiLine ? { position: shiLine.position, branch: shiLine.branch, monthState: shiLine.monthState, dayRelation: shiLine.dayRelation } : null,
+    ying: yingLine ? { position: yingLine.position, branch: yingLine.branch, monthState: yingLine.monthState, dayRelation: yingLine.dayRelation } : null,
+    labels,
+    note: '月建主这一段的旺衰、日辰管当天的扶克，六爻逐一给状态；判定与用神旺衰同一套，只多了世应与动爻标记。只报状态、不折分数，也不单独断吉凶。',
+  };
+}
+
+const JIN_VERDICT = { 旺: '后劲足', 相: '后劲足', 休: '后劲有限', 囚: '后劲有限', 死: '进得虚' };
+const TUI_VERDICT = { 旺: '退得缓', 相: '退得缓', 休: '退得实', 囚: '退得实', 死: '退得实' };
+
+function jinTuiPower(result, opts = {}) {
+  const items = result && result.body && Array.isArray(result.body.jinTui) ? result.body.jinTui : [];
+  if (!items.length) return null;
+  const rows = result && result.ben && Array.isArray(result.ben.lines) ? result.ben.lines : [];
+  const monthBranch = opts.monthBranch || null;
+  const dayBranch = opts.dayBranch || (result && result.dayGanZhi ? result.dayGanZhi.branch : null);
+  const monthElement = monthBranch ? zhiElementOf(monthBranch) : null;
+  const dayElement = dayBranch ? zhiElementOf(dayBranch) : null;
+  const kong = Array.isArray(result && result.xunKong)
+    ? result.xunKong
+    : (result && typeof result.xunKong === 'string' ? result.xunKong.split('') : []);
+
+  const lines = items.map((x) => {
+    const line = rows[x.position - 1] || null;
+    const element = (line && line.element) || zhiElementOf(x.from);
+    const monthState = monthStateOf(element, monthElement);
+    const monthChong = !!(monthBranch && CHONG_OF[x.from] === monthBranch);
+    const dayChong = !!(dayBranch && CHONG_OF[x.from] === dayBranch);
+    const dayRelation = dayRelationOf(element, dayElement);
+    const isEmpty = kong.includes(x.from);
+    const verdict = !monthBranch ? '只报趋势'
+      : monthChong ? '月破失据'
+        : ((x.type === '进' ? JIN_VERDICT : TUI_VERDICT)[monthState] || '未定');
+    const monthSay = monthBranch
+      ? `月建${monthBranch}（${monthElement}）对${element}为${monthState}`
+      : '缺月建，只看日辰';
+    const daySay = dayRelation === 'unknown' ? '' : `日辰${dayBranch}（${dayElement}）${dayRelation}`;
+    const extra = [monthChong ? '又遭月破' : '', isEmpty ? '旬空待填' : '', dayChong ? '逢日辰冲' : ''].filter(Boolean);
+    return {
+      position: x.position,
+      from: x.from,
+      to: x.to,
+      type: x.type,
+      element,
+      monthState,
+      monthChong,
+      dayRelation,
+      dayChong,
+      kong: isEmpty,
+      verdict,
+      say: `${x.from}→${x.to}（${x.type}）：${monthSay}${daySay ? `，${daySay}` : ''}${extra.length ? `，${extra.join('、')}` : ''} → ${verdict}`,
+    };
+  });
+
+  return {
+    month: monthBranch ? { branch: monthBranch, element: monthElement } : null,
+    day: dayBranch ? { branch: dayBranch, element: dayElement } : null,
+    lines,
+    labels: lines.map((l) => `${l.position}爻化${l.type}·${l.verdict}`),
+    note: '进退只说这一爻往哪边走；力重是把它放回月建日辰，看有没有托着——得令则进得动、退得慢，失令则进得虚、退得实，月破压过一切。仍不直接定吉凶：用神化进为喜，忌神化进反而是忌。',
+  };
+}
+
+return { jinTuiOf, hexBody, bodyRelations, bodyLabels, HEXAGRAM_COUNT, hexagramFromBits, YONGSHEN_RULES, yongshenOf, tossLines, buildLiuyao, zhiElementOf, monthStateOf, dayRelationOf, yongshenStrength, hexagramStrength, jinTuiPower };
 })();
 
 __mods.ziwei = (function () {
@@ -4011,19 +4979,24 @@ function buildZiwei(input) {
       shensha: '长生、博士随大限顺逆；将前、岁前恒顺行；天伤恒在交友、天使恒在疾厄',
       masters: '命主按命宫地支，身主按生年地支',
       liunian: '流年命宫取该年地支宫；三方四正为本宫与 +4/+8/+6；并给该年所属大限与小限',
+      flyComposite: '三方四正取本宫、对宫与两个三合宫共四宫，四宫宫干各化禄权科忌共 16 条，按落宫归堆标会聚（双忌会、禄忌同宫、三化会、自化）；只描会照，不折吉凶',
       changqu: '昌曲落宫只由时支决定，故与丑未的关系（夹/三合/同宫/无关）是结构性结论；absorb 的「清/杂」是启发式标记，依据昌曲化忌与会煞，不是断语',
     },
   };
 
   chart.patterns = detectPatterns(chart);
   chart.daxianList = daxianList(chart);
+  chart.fly = flyStars(chart);
+  chart.flyChains = flyChains(chart, { from: '命宫' });
+  chart.flyComposite = flyComposite(chart, { from: '命宫' });
   enrichLiunian(chart);
   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;
 }
@@ -4063,7 +5036,7 @@ 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, '铃星');
@@ -4071,11 +5044,8 @@ function detectPatterns(chart) {
   if (fix(soulIdx - 1) === ling && fix(soulIdx + 1) === huo) add('火铃夹命', '铃星与火星夹命');
 
   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}同宫，擎羊陀罗夹之`);
   }
 
   const lctw = ['铃星', '文昌', '陀罗', '武曲'].map((n) => starBranchOf(chart, n));
@@ -4094,7 +5064,9 @@ function detectPatterns(chart) {
   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();
@@ -4125,7 +5097,7 @@ function detectPatterns(chart) {
   if (jia('左辅', '右弼')) add('左右夹命', '左辅、右弼夹命宫');
   if (jia('文昌', '文曲')) add('昌曲夹命', '文昌、文曲夹命宫');
   if (jia('天魁', '天钺')) add('魁钺夹命', '天魁、天钺夹命宫');
-  if (jia('擎羊', '陀罗')) add('羊陀夹命', '擎羊、陀罗夹命宫');
+  if (jia('擎羊', '陀罗')) add('羊陀夹命', `禄存在${BRANCHES[soulIdx]}守命，擎羊陀罗前后夹之`);
 
   const muts = mutagensIn(sanfang);
   if (muts.has('禄') && muts.has('权') && muts.has('科')) add('三奇嘉会', '化禄、化权、化科会于命宫三方四正');
@@ -4138,9 +5110,10 @@ 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('火星') ? '火星' : '铃星'}会于命宫三方四正`);
@@ -4196,6 +5169,162 @@ function daxianList(chart) {
     .sort((a, b) => a.ages[0] - b.ages[0]);
 }
 
+const FLY_TYPES = ['禄', '权', '科', '忌'];
+
+function flyStarOf(stem, type) {
+  const map = MUTAGEN[stem];
+  if (!map) return null;
+  for (const [star, t] of Object.entries(map)) if (t === type) return star;
+  return null;
+}
+
+function flyStars(chart) {
+  const palaces = chart.palaces || [];
+  return palaces.map((p) => ({
+    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),
+      };
+    }),
+  }));
+}
+
+function flyChain(chart, { from = '命宫', type = '忌', maxSteps = 12 } = {}) {
+  const palaces = chart.palaces || [];
+  const start = palaces.find((p) => p.palace === from) || palaces[0];
+  if (!start) return null;
+  const steps = [];
+  const seen = new Set([start.palace]);
+  let cur = start;
+  let ended = 'max';
+  for (let i = 0; i < Math.max(1, maxSteps); i++) {
+    const star = flyStarOf(cur.stem, type);
+    if (!star) { ended = 'no-star'; break; }
+    const b = starBranchOf(chart, star);
+    if (b < 0) { ended = 'off-chart'; break; }
+    const to = palaces.find((x) => x.branch === BRANCHES[b]);
+    steps.push({ from: cur.palace, fromBranch: cur.branch, fromStem: cur.stem, star, type, to: to.palace, toBranch: to.branch });
+    if (seen.has(to.palace)) { ended = 'cycle'; break; }
+    seen.add(to.palace);
+    cur = to;
+  }
+  return {
+    from: start.palace,
+    type,
+    steps,
+    path: [start.palace, ...steps.map((s) => s.to)],
+    ended,
+    closed: ended === 'cycle',
+  };
+}
+
+function flyChains(chart, { from = '命宫', maxSteps = 12 } = {}) {
+  const out = {};
+  for (const type of FLY_TYPES) out[type] = flyChain(chart, { from, type, maxSteps });
+  return out;
+}
+
+const PALACE_SUFFIX = (p) => `${p}${String(p).endsWith('宫') ? '' : '宫'}`;
+
+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),
+        };
+      }),
+    });
+  }
+
+  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 条飞化，按落宫归堆；只在落宫相同（会照）时标会聚，单条飞出不另立标签。只描会照与方向，不折吉凶，也未叠大限流年四化。',
+  };
+}
+
 function enrichLiunian(chart) {
   for (const ln of chart.liunian) {
     const stem = ln.ganzhi[0];
@@ -4298,7 +5427,7 @@ function flowOf(chart, asOf) {
   };
 }
 
-return { PALACE_NAMES, BRIGHTNESS, MUTAGEN, LUCUN, KUI_YUE, MING_ZHU, SHEN_ZHU, triadOf, HUO_START, LING_START, TIANMA, XIANCHI, HUAGAI, JIANGXING, GUCHEN, GUASU, posuIndex, XIAOXIAN_START, CHANGSHENG_NAMES, BOSHI_NAMES, JIANGQIAN_NAMES, SUIQI_NAMES, CHANGSHENG_START, hourBranchIndex, ziweiTianfuIndex, xiaoxianAge, buildZiwei, detectPatterns, daxianList, enrichLiunian, asOfParts, flowOf };
+return { PALACE_NAMES, BRIGHTNESS, MUTAGEN, LUCUN, KUI_YUE, MING_ZHU, SHEN_ZHU, triadOf, HUO_START, LING_START, TIANMA, XIANCHI, HUAGAI, JIANGXING, GUCHEN, GUASU, posuIndex, XIAOXIAN_START, CHANGSHENG_NAMES, BOSHI_NAMES, JIANGQIAN_NAMES, SUIQI_NAMES, CHANGSHENG_START, hourBranchIndex, ziweiTianfuIndex, xiaoxianAge, buildZiwei, detectPatterns, PATTERN_TONE, daxianList, FLY_TYPES, flyStarOf, flyStars, flyChain, flyChains, flyComposite, enrichLiunian, asOfParts, flowOf };
 })();
 
 __mods.tarot = (function () {
@@ -6494,6 +7623,90 @@ function gatePalaceRelation(gate, palace) {
   if (SHENG[pe] === ge) return { type: '宫生门', gate: ge, palace: pe, note: `${pe}生${ge}` };
   return { type: '比和', gate: ge, palace: pe, note: `${ge}与${pe}比和` };
 }
+
+const STEM_ELEMENT = {
+  甲: '木', 乙: '木', 丙: '火', 丁: '火', 戊: '土',
+  己: '土', 庚: '金', 辛: '金', 壬: '水', 癸: '水',
+};
+
+function stemPalaceRelation(stem, palace) {
+  const se = STEM_ELEMENT[stem];
+  const pe = PALACE_ELEMENT[palace];
+  if (!se || !pe) return { type: 'unknown', stem: se || null, palace: pe || null, note: '缺少干或宫的五行，无法判断' };
+  if (KE[se] === pe) return { type: '干克宫', stem: se, palace: pe, note: `${se}克${pe}，天盘干克宫` };
+  if (KE[pe] === se) return { type: '宫克干', stem: se, palace: pe, note: `${pe}克${se}，宫克天盘干` };
+  if (SHENG[se] === pe) return { type: '干生宫', stem: se, palace: pe, note: `${se}生${pe}，干泄气于宫` };
+  if (SHENG[pe] === se) return { type: '宫生干', stem: se, palace: pe, note: `${pe}生${se}，宫来生干` };
+  return { type: '比和', stem: se, palace: pe, note: `${se}与${pe}比和` };
+}
+
+const JI_XING = {
+  戊: { palace: '3', zhi: '卯', basis: '甲子戊，子刑卯' },
+  己: { palace: '2', zhi: '未', basis: '甲戌己，戌刑未' },
+  庚: { palace: '8', zhi: '寅', basis: '甲申庚，申刑寅' },
+  辛: { palace: '9', zhi: '午', basis: '甲午辛，午自刑' },
+  壬: { palace: '4', zhi: '辰', basis: '甲辰壬，辰自刑' },
+  癸: { palace: '4', zhi: '巳', basis: '甲寅癸，寅刑巳' },
+};
+const RU_MU = {
+  乙: { palace: '2', zhi: '未', basis: '乙木墓于未，未在坤二宫' },
+  丙: { palace: '6', zhi: '戌', basis: '丙火墓于戌，戌在乾六宫' },
+  丁: { palace: '6', zhi: '戌', basis: '丁火墓于戌，戌在乾六宫' },
+};
+
+function jiXingOf(palaces) {
+  const out = [];
+  for (const p of palaces || []) {
+    const hit = JI_XING[p.tianPan];
+    if (hit && hit.palace === String(p.palace)) out.push({ palace: p.palace, stem: p.tianPan, zhi: hit.zhi, basis: hit.basis });
+  }
+  return out;
+}
+
+function ruMuOf(palaces) {
+  const out = [];
+  for (const p of palaces || []) {
+    const hit = RU_MU[p.tianPan];
+    if (hit && hit.palace === String(p.palace)) out.push({ palace: p.palace, stem: p.tianPan, zhi: hit.zhi, basis: hit.basis });
+  }
+  return out;
+}
+
+const QIMEN_CONDITION_TABLES = Object.freeze({
+  jiXing: Object.freeze(Object.fromEntries(Object.entries(JI_XING).map(([k, v]) => [k, { ...v }]))),
+  ruMu: Object.freeze(Object.fromEntries(Object.entries(RU_MU).map(([k, v]) => [k, { ...v }]))),
+});
+
+const BRANCH_ELEMENT = {
+  子: '水', 丑: '土', 寅: '木', 卯: '木', 辰: '土', 巳: '火',
+  午: '火', 未: '土', 申: '金', 酉: '金', 戌: '土', 亥: '水',
+};
+function monthState(element, monthElement) {
+  if (!element || !monthElement) return 'unknown';
+  if (element === monthElement) return '旺';
+  if (SHENG[monthElement] === element) return '相';
+  if (SHENG[element] === monthElement) return '休';
+  if (KE[element] === monthElement) return '囚';
+  if (KE[monthElement] === element) return '死';
+  return 'unknown';
+}
+function monthElementOf(branch) {
+  return BRANCH_ELEMENT[branch] || null;
+}
+function groupByState(items, monthElement) {
+  const out = { 旺: [], 相: [], 休: [], 囚: [], 死: [] };
+  for (const it of items || []) {
+    const st = monthState(it.element, monthElement);
+    if (out[st]) out[st].push(it.name);
+  }
+  return out;
+}
+const QIMEN_STATE_TABLES = Object.freeze({
+  gate: Object.freeze({ ...GATE_ELEMENT }),
+  star: Object.freeze({ ...STAR_ELEMENT }),
+  branch: Object.freeze({ ...BRANCH_ELEMENT }),
+  stem: Object.freeze({ ...STEM_ELEMENT }),
+});
 function getDiPan(type, num) {
   const result = {};
   let gong = num;
@@ -6666,6 +7879,9 @@ function buildQimen(input) {
   const maZhi = maMap[hourGz[1]] || '';
   const maGong = ZHI_TO_GONG[maZhi] || '';
 
+  const monthBranch = (snapshot.monthGanZhi || '')[1] || '';
+  const monthElement = BRANCH_ELEMENT[monthBranch] || null;
+
   const centerPalace = {
     palace: '5',
     diPan: diPan['5'] || '',
@@ -6677,7 +7893,11 @@ function buildQimen(input) {
     palaceElement: PALACE_ELEMENT['5'],
     gateElement: null,
     starElement: STAR_ELEMENT['天禽'],
+    stemElement: STEM_ELEMENT[tianPan['5']] || null,
     gateRelation: { type: 'unknown', note: '中宫无门，不参与门宫关系' },
+    stemRelation: stemPalaceRelation(tianPan['5'], '5'),
+    starState: monthState(STAR_ELEMENT['天禽'], monthElement),
+    stemState: monthState(STEM_ELEMENT[tianPan['5']], monthElement),
     kong: false,
     ma: false,
     center: true,
@@ -6694,7 +7914,12 @@ function buildQimen(input) {
     palaceElement: PALACE_ELEMENT[gong],
     gateElement: GATE_ELEMENT[bm.baMen[gong]] || null,
     starElement: STAR_ELEMENT[jx.jiuXing[gong]] || null,
+    stemElement: STEM_ELEMENT[tianPan[gong]] || null,
     gateRelation: gatePalaceRelation(bm.baMen[gong], gong),
+    stemRelation: stemPalaceRelation(tianPan[gong], gong),
+    gateState: monthState(GATE_ELEMENT[bm.baMen[gong]], monthElement),
+    starState: monthState(STAR_ELEMENT[jx.jiuXing[gong]], monthElement),
+    stemState: monthState(STEM_ELEMENT[tianPan[gong]], monthElement),
     kong: kongGong.includes(gong),
     ma: maGong === gong,
   }));
@@ -6722,6 +7947,16 @@ function buildQimen(input) {
     zhiShi: { gate: bm.zhiShiMen, gong: bm.zhiShiGong },
     kongWang: kongZhi,
     ma: { zhi: maZhi, gong: maGong },
+    conditions: {
+      jiXing: jiXingOf(palaces),
+      ruMu: ruMuOf(palaces),
+    },
+    month: { branch: monthBranch, element: monthElement },
+    states: {
+      gate: groupByState(palaces.filter((p) => p.gate).map((p) => ({ name: p.gate, element: p.gateElement })), monthElement),
+      star: groupByState(palaces.map((p) => ({ name: p.star, element: p.starElement })), monthElement),
+      stem: groupByState(palaces.filter((p) => p.tianPan).map((p) => ({ name: p.tianPan, element: p.stemElement })), monthElement),
+    },
     palaces,
     centerPalace,
     rules: [
@@ -6733,7 +7968,7 @@ function buildQimen(input) {
   };
 }
 
-return { buildSnapshot, wuxingRelation, gatePalaceRelation, buildQimen };
+return { buildSnapshot, wuxingRelation, gatePalaceRelation, stemPalaceRelation, jiXingOf, ruMuOf, QIMEN_CONDITION_TABLES, monthState, monthElementOf, groupByState, QIMEN_STATE_TABLES, buildQimen };
 })();
 
 __mods['qimen-interpret'] = (function () {
@@ -6769,6 +8004,18 @@ const YONG_SHEN = {
   travel: { label: '出行', primary: ['九天'], secondary: ['驿马'], note: '出行以九天为主，兼看驿马' },
 };
 
+function stemRelationLine(r) {
+  const groups = new Map();
+  for (const p of r.palaces || []) {
+    const rel = p.stemRelation || null;
+    if (!rel || rel.type === 'unknown' || !p.tianPan) continue;
+    if (!groups.has(rel.type)) groups.set(rel.type, []);
+    groups.get(rel.type).push(`${p.palace}宫${p.tianPan}`);
+  }
+  const order = ['干克宫', '宫克干', '干生宫', '宫生干', '比和'];
+  return order.filter((k) => groups.has(k)).map((k) => `${k} ${groups.get(k).join('、')}`).join('；') || '—';
+}
+
 const REL_TEXT = {
   生: '主体力量流向环境或趋势',
   克: '主体对环境或趋势构成压力、有改造意图',
@@ -6859,15 +8106,36 @@ function interpretQimen(r, opts = {}) {
     else if (rel.type === '宫制门') controlled.push(`${p.palace}宫（宫${rel.palace}克${p.gate}${rel.gate}）`);
   }
   const kongCells = r.palaces.filter((p) => p.kong).map((p) => `${p.palace}宫`);
+  const jiXing = (r.conditions && r.conditions.jiXing) || [];
+  const ruMu = (r.conditions && r.conditions.ruMu) || [];
   sections.push({
     key: 'conditions',
     label: '宫位条件',
     text: `门迫（同宫内门克宫）：${forced.length ? forced.join('、') : '本盘无'}；`
       + `宫制门（宫克门，属「制」不为迫）：${controlled.length ? controlled.join('、') : '无'}。`
+      + `击刑（天盘六仪落刑宫）：${jiXing.length ? jiXing.map((x) => `${x.palace}宫${x.stem}（${x.basis}）`).join('、') : '本盘无'}；`
+      + `入墓（天盘三奇落墓宫）：${ruMu.length ? ruMu.map((x) => `${x.palace}宫${x.stem}（${x.basis}）`).join('、') : '本盘无'}。`
       + (kongCells.length ? `空亡：${kongCells.join('、')}——落空之宫事多不实。` : '无落空之宫。')
-      + `门迫只作宫位条件，不自动等同于用神受制。`,
+      + `这三项都只作宫位条件：门迫、击刑、入墓不自动等同于用神受制，取象时看它们落在哪个符号上。`,
   });
 
+  const mo = r.month || null;
+  const st = r.states || null;
+  if (mo && st) {
+    const order = ['旺', '相', '休', '囚', '死'];
+    const line = (g) => order.filter((k) => g && Array.isArray(g[k]) && g[k].length)
+      .map((k) => `${k} ${g[k].join('、')}`).join('；') || '—';
+    sections.push({
+      key: 'states',
+      label: '月令旺衰',
+      text: `月令 ${mo.branch}（${mo.element}）：`
+        + `门 ${line(st.gate)}。星 ${line(st.star)}。天盘干 ${line(st.stem)}。`
+        + `旺为同月令之气，相为月令所生，休为生月令，囚为克月令，死为月令所克。`
+        + `干宫的落宫关系另算：${stemRelationLine(r)}。`
+        + `这一层只说明门、星、干自身力量强弱，不合吉凶：门旺而宫克门，仍受宫制；星旺而落宫死地，也难全其用。`,
+    });
+  }
+
   if (unresolved.length) {
     sections.push({
       key: 'tendency',
@@ -6881,7 +8149,7 @@ function interpretQimen(r, opts = {}) {
       key: 'tendency',
       label: '最终倾向',
       text: `在当前输入、规则集与所问之事下：若以「${primary.key}」为用神，用神宫对值符宫为「${rel}」，整体${tone}；`
-        + `若${ys.label}实际取另一个候选，或时间范围不同，解读边界随之变化。未决项：月令旺衰未纳入本规则集。`,
+        + `若${ys.label}实际取另一个候选，或时间范围不同，解读边界随之变化。未决项：天盘干与地盘的十干克应（100 组）未纳入本规则集，干宫生克只作落宫条件。`,
     });
   }
 
@@ -7602,6 +8870,407 @@ function buildNumerology(input) {
 return { NUMBER_MEANING, reduceNumber, buildNumerology };
 })();
 
+__mods.mbti = (function () {
+const { fail } = __mods.fail;
+
+const DIMENSIONS = [
+  {
+    key: 'EI',
+    left: 'E',
+    right: 'I',
+    name: '能量方向',
+    leftSay: '向外：和人打交道时来电，边说边想',
+    rightSay: '向内：独处时回血，先想清楚再开口',
+    tie: 'I',
+    note: '不是「会不会社交」，而是社交之后你更有电还是更耗电。',
+  },
+  {
+    key: 'SN',
+    left: 'S',
+    right: 'N',
+    name: '信息接收',
+    leftSay: '具体：先看事实、细节和已有经验',
+    rightSay: '联想：先看模式、隐喻和下一步可能',
+    tie: 'N',
+    note: '不是「聪明与否」，而是你先抓住哪一头。',
+  },
+  {
+    key: 'TF',
+    left: 'T',
+    right: 'F',
+    name: '决策依据',
+    leftSay: '逻辑：先看是否站得住、是否一致',
+    rightSay: '价值：先看人在其中会不会被伤到',
+    tie: 'F',
+    note: '不是「冷血或情绪化」，而是权衡时先放哪把尺子。',
+  },
+  {
+    key: 'JP',
+    left: 'J',
+    right: 'P',
+    name: '生活节奏',
+    leftSay: '收束：先定计划，喜欢事情有个了结',
+    rightSay: '开放：先留着口子，喜欢事情还能变',
+    tie: 'P',
+    note: '不是「勤快或懒散」，而是面对不确定时更愿意钉死还是留着。',
+  },
+];
+
+const QUESTIONS = [
+  { id: 'e1', dim: 'EI', side: 'E', text: '在一个都是陌生人的场合，你会主动找几个人聊起来。' },
+  { id: 's1', dim: 'SN', side: 'S', text: '别人讲一件事，你更关心具体发生了什么、细节对不对得上。' },
+  { id: 't1', dim: 'TF', side: 'T', text: '朋友来问你两难的选择，你会先把利弊摆清楚再谈感受。' },
+  { id: 'j1', dim: 'JP', side: 'J', text: '出门前你习惯把行程和要带的东西先定下来。' },
+  { id: 'e2', dim: 'EI', side: 'I', text: '忙完一整天，你更想一个人安静待着，而不是再约一轮。' },
+  { id: 's2', dim: 'SN', side: 'N', text: '你常从一个现象跳到「再往下可能还会怎样」的联想上。' },
+  { id: 't2', dim: 'TF', side: 'F', text: '做决定时，你更在意这件事对身边人的实际影响。' },
+  { id: 'j2', dim: 'JP', side: 'P', text: '计划临时被打乱，你多半能顺势改，不太难受。' },
+  { id: 'e3', dim: 'EI', side: 'E', text: '想事情的时候，你更习惯说给人听，说着说着就清楚了。' },
+  { id: 's3', dim: 'SN', side: 'S', text: '你更信「做过、验证过」的办法，而不是听起来很新的办法。' },
+  { id: 't3', dim: 'TF', side: 'T', text: '规则一旦定了，哪怕对自己不方便，你也倾向照着走。' },
+  { id: 'j3', dim: 'JP', side: 'J', text: '有一件事没做完，你心里会一直悬着，想先把它收尾。' },
+  { id: 'e4', dim: 'EI', side: 'I', text: '电话响了或有人临时找来，你第一反应是先缓一下再应对。' },
+  { id: 's4', dim: 'SN', side: 'N', text: '你容易被「这背后是什么道理」这类问题勾住。' },
+  { id: 't4', dim: 'TF', side: 'F', text: '别人情绪不好时，你直觉是先接住情绪，而不是先讲道理。' },
+  { id: 'j4', dim: 'JP', side: 'P', text: '你常常边走边看，事到临头再定具体怎么做。' },
+  { id: 'e5', dim: 'EI', side: 'E', text: '人多的场合待久了，你通常越待越有精神。' },
+  { id: 's5', dim: 'SN', side: 'S', text: '你记事情偏向记「原话、原样、当时的情形」。' },
+  { id: 't5', dim: 'TF', side: 'T', text: '和人争论时，你更在意谁的推理有漏洞，而不是谁伤了面子。' },
+  { id: 'j5', dim: 'JP', side: 'J', text: '你喜欢把待办列出来，一条条划掉。' },
+  { id: 'e6', dim: 'EI', side: 'I', text: '有新想法时，你更愿意先自己消化一轮，再拿出去讲。' },
+  { id: 's6', dim: 'SN', side: 'N', text: '比起照现状做好，你更享受把现状改成一个更好的样子。' },
+  { id: 't6', dim: 'TF', side: 'F', text: '要做取舍时，你会想「这样是不是对人不公平」。' },
+  { id: 'j6', dim: 'JP', side: 'P', text: '临出发才收拾行李，你也觉得没什么问题。' },
+];
+
+const FUNCTION_STACKS = {
+  ISTJ: ['Si', 'Te', 'Fi', 'Ne'],
+  ISFJ: ['Si', 'Fe', 'Ti', 'Ne'],
+  INFJ: ['Ni', 'Fe', 'Ti', 'Se'],
+  INTJ: ['Ni', 'Te', 'Fi', 'Se'],
+  ISTP: ['Ti', 'Se', 'Ni', 'Fe'],
+  ISFP: ['Fi', 'Se', 'Ni', 'Te'],
+  INFP: ['Fi', 'Ne', 'Si', 'Te'],
+  INTP: ['Ti', 'Ne', 'Si', 'Fe'],
+  ESTP: ['Se', 'Ti', 'Fe', 'Ni'],
+  ESFP: ['Se', 'Fi', 'Te', 'Ni'],
+  ENFP: ['Ne', 'Fi', 'Te', 'Si'],
+  ENTP: ['Ne', 'Ti', 'Fe', 'Si'],
+  ESTJ: ['Te', 'Si', 'Ne', 'Fi'],
+  ESFJ: ['Fe', 'Si', 'Ne', 'Ti'],
+  ENFJ: ['Fe', 'Ni', 'Se', 'Ti'],
+  ENTJ: ['Te', 'Ni', 'Se', 'Fi'],
+};
+
+const FUNCTIONS = {
+  Si: '内感觉：拿过去的经验当尺子，稳、细、记得住。',
+  Se: '外感觉：对眼前的具体变化反应快，先动手再说。',
+  Ni: '内直觉：把零碎线索收成一个方向感，先看到终局。',
+  Ne: '外直觉：从一个点炸开很多可能，擅长另起一条路。',
+  Ti: '内思考：要自己把逻辑盘通，讲得出为什么才认。',
+  Te: '外思考：要事情跑起来，讲流程、指标和结果。',
+  Fi: '内情感：先问「这符不符合我在意的东西」，价值感很强。',
+  Fe: '外情感：先读空气、先顾关系，擅长把人和在一起。',
+};
+
+const TYPES = {
+  ISTJ: {
+    title: '检查者',
+    keywords: '稳、准、守得住',
+    oneLine: '答应的事会做完，讨厌临时改口和半成品。',
+    strengths: ['流程感强，细节不漏', '说到做到，扛得住长期重复', '遇到混乱先立规矩'],
+    blindspots: ['对「新办法」先起疑，容易错过转弯的机会', '把责任揽太多，难受也说不出口'],
+    work: '适合规则清楚、可累积经验的岗位：审计、运维、法务、工程管理。',
+    love: '表达朴素但稳定，重视承诺；需要对方把需求说明白，别指望你自己猜。',
+    study: '靠体系与刷题推进，把知识整理成清单会明显提速。',
+    growth: '练一件「没有标准答案」的事，容许自己在过程中改主意。',
+  },
+  ISFJ: {
+    title: '守护者',
+    keywords: '暖、细、记得住人',
+    oneLine: '会默默把别人的需要记在心里，然后提前做好。',
+    strengths: ['照顾细节与情绪', '记性好，了解身边人的习惯', '愿意做没人愿意做的收尾'],
+    blindspots: ['习惯先委屈自己，之后积成怨', '对方没察觉你的付出时容易失落'],
+    work: '适合需要耐心与责任心的岗位：护理、教育、行政、客户成功、人事。',
+    love: '用做事表达感情，需要被明确看见与感谢；也要练习直接要。',
+    study: '喜欢有例题、有反馈的学习方式，做学习小组的稳定输出者很合适。',
+    growth: '练习说「这件事我做不到」，先照顾自己的电量。',
+  },
+  INFJ: {
+    title: '提倡者',
+    keywords: '深、理想、看穿人心',
+    oneLine: '关心人为什么这么活，愿意为一个「值得」的目标长期投入。',
+    strengths: ['能从细节里读出动机', '表达有感染力，适合讲清意义', '对长期方向有耐心'],
+    blindspots: ['标准高，容易对现实失望', '想得太深而迟迟不开口，外人看不出你在乎'],
+    work: '适合内容、咨询、教育、公益、产品策略这类「讲清一件事」的岗位。',
+    love: '要的是深谈与理解，浅社交会耗电；需要对方给得起精神上的回应。',
+    study: '适合主题式深挖，写读书笔记与建立自己的框架比刷题更有效。',
+    growth: '把理想拆成这周能交付的一小步，别只在脑子里完成它。',
+  },
+  INTJ: {
+    title: '建筑师',
+    keywords: '远、冷静、自己搭系统',
+    oneLine: '先看清全局再动手，讨厌无效沟通和低效流程。',
+    strengths: ['长期规划清晰', '能独立啃下复杂问题', '对标准挑剔，产品因此更硬'],
+    blindspots: ['说话直，容易让人觉得被否定', '对「慢」和「情绪」耐心不足'],
+    work: '适合战略、研发、系统设计、投资研究这类需要独立判断的岗位。',
+    love: '表达感情偏克制，用解决问题的方式示好；需要对方接受你的独处需求。',
+    study: '自学效率高，适合先建框架再补细节；警惕只读不产出。',
+    growth: '在给方案之前先接一句对方的感受，合作阻力会小很多。',
+  },
+  ISTP: {
+    title: '巧匠',
+    keywords: '手快、冷静、先修再说',
+    oneLine: '遇到问题先上手拆开看，不爱开长会。',
+    strengths: ['动手能力强，现场判断快', '压力下不慌，能抓住关键', '讲实际，不绕弯'],
+    blindspots: ['对长期计划不感兴趣，容易拖到最后', '话少，别人不知道你在想什么'],
+    work: '适合现场性强的岗位：工程、设备、急救、运维、技术支持、手艺型工作。',
+    love: '不擅长说，但会用行动帮忙；需要对方接受你「不解释」的习惯。',
+    study: '边做边学最快，先碰真实设备或真实项目，再回头补理论。',
+    growth: '给重要的事留一个检查点，别全靠临场反应。',
+  },
+  ISFP: {
+    title: '探险家',
+    keywords: '真、敏感、跟着感觉走',
+    oneLine: '在意「这件事对不对味」，不喜欢被安排得太死。',
+    strengths: ['审美与体感准', '待人温和，不强加于人', '在真实情境里学得快'],
+    blindspots: ['不愿冲突，把不满压着', '长期目标容易停在「想」这一步'],
+    work: '适合与美、身体、具体对象打交道的岗位：设计、摄影、餐饮、康复、手作。',
+    love: '用陪伴和小惊喜表达在意，讨厌被审问；需要空间也需要被确认。',
+    study: '先看示例、先动手，理论放在用到的时候补，效率更高。',
+    growth: '给在意的事定一个可交付的日期，把感觉变成作品。',
+  },
+  INFP: {
+    title: '调停者',
+    keywords: '柔、较真、心里有一杆秤',
+    oneLine: '对人真诚，对自己在意的事格外较真，讨厌虚伪。',
+    strengths: ['共情与想象力都好', '写与表达有个人味道', '能为价值观长期坚持'],
+    blindspots: ['容易把「不够好」归到自己身上', '计划性弱，想法多而落地慢'],
+    work: '适合创作、教育、心理、内容、公益这类能表达价值的岗位；强规则环境会耗电。',
+    love: '看重真诚与被理解，愿意为对方调整；需要明确的回应，别长期猜。',
+    study: '靠兴趣驱动，给自己找「为什么学」比逼自己更有效；用短周期输出防拖延。',
+    growth: '把心里的标准写下来，分「必须有」和「有更好」，少一点全或无。',
+  },
+  INTP: {
+    title: '逻辑家',
+    keywords: '想透、好问、自己盘逻辑',
+    oneLine: '喜欢把问题拆到原理层，讨厌「一直这样所以就这样」。',
+    strengths: ['抽象思考强，能发现系统里的漏洞', '学新领域快', '不轻易被权威说服'],
+    blindspots: ['想得多做得少，收尾困难', '指出问题时不修饰，容易树敌'],
+    work: '适合研究、算法、架构、分析、写作这类需要反复推演的岗位。',
+    love: '用分享想法表达亲近，需要对方能聊得深；别让讨论变成辩论。',
+    study: '先弄清原理再练，适合自己搭知识树；给自己设「讲给别人听」的交付点。',
+    growth: '给探索设时间盒，到点就交出一个能用的版本。',
+  },
+  ESTP: {
+    title: '企业家',
+    keywords: '快、敢、临场能打',
+    oneLine: '看到机会先动手，比开会讨论更信现场反馈。',
+    strengths: ['行动快，敢试错', '会看人、会周旋', '压力下反而清醒'],
+    blindspots: ['耐心不足，容易留一堆半成品', '对长期代价估计偏轻'],
+    work: '适合销售、商务、创业、现场运营、竞技类岗位；文牍型工作会闷。',
+    love: '热烈直接，喜欢一起做事；需要对方接受你「说到就到」的节奏。',
+    study: '靠实战与竞赛驱动，做项目比听课有效；需要有人帮你收尾。',
+    growth: '动手前多问一句「三个月后这件事还成立吗」。',
+  },
+  ESFP: {
+    title: '表演者',
+    keywords: '热、会带气氛、活在当下',
+    oneLine: '在人群里自带气氛，喜欢真实可感的体验。',
+    strengths: ['感染力强，能把场子撑起来', '对人和现场的细节敏感', '愿意尝试新鲜事'],
+    blindspots: ['对长期枯燥的事耐力有限', '不太愿意面对冲突背后的结构问题'],
+    work: '适合面向人的岗位：活动、销售、主持、文旅、服务、内容出镜。',
+    love: '表达直接，喜欢一起玩；需要对方给你稳定感，也别把自由当借口。',
+    study: '边玩边学最有效，把知识做成游戏、演示或小组活动。',
+    growth: '留一件「不好玩但重要」的事，按周推进。',
+  },
+  ENFP: {
+    title: '竞选者',
+    keywords: '亮、点子多、对人好奇',
+    oneLine: '对人和可能性都很好奇，容易同时点亮很多盏灯。',
+    strengths: ['联想快，能给人新视角', '真诚热情，容易建立信任', '擅长起头与鼓舞'],
+    blindspots: ['兴趣转移快，收尾吃力', '情绪起伏大，容易被细节拖垮'],
+    work: '适合创意、品牌、内容、培训、早期项目这类需要不断开新局的地方。',
+    love: '需要新鲜感与被看见，愿意为对方想很多；要练习把承诺落到实处。',
+    study: '用主题和讨论驱动，找学习搭子比一个人硬啃有效。',
+    growth: '同时只开三条线，其余写进「以后再说」清单。',
+  },
+  ENTP: {
+    title: '辩论家',
+    keywords: '机敏、爱拆、想法往外冒',
+    oneLine: '喜欢把既有说法掰开看，享受把问题换个角度。',
+    strengths: ['反应快，能现场找到漏洞', '对新领域上手快', '擅长把复杂事讲得好玩'],
+    blindspots: ['为辩而辩，容易伤人', '起头多、收尾少'],
+    work: '适合咨询、产品、创业、策略、媒体这类需要不断破局的地方。',
+    love: '用斗嘴表达亲近，需要对方接得住；别把关系也当成辩论场。',
+    study: '讨论与质疑中理解最快，适合做分享者；给自己定交付时间。',
+    growth: '挑一件「不新但重要」的事，把它做完再开下一个。',
+  },
+  ESTJ: {
+    title: '总经理',
+    keywords: '务实、能扛、把事推到底',
+    oneLine: '目标定了就拆任务、定人、定时间，讨厌含糊。',
+    strengths: ['组织与推进力强', '标准清楚，团队知道该做什么', '对结果负责'],
+    blindspots: ['节奏太紧，忽视人的感受', '对新方法的容忍度低'],
+    work: '适合管理、运营、项目、供应链、政务这类要「把事办成」的岗位。',
+    love: '用承担责任表达在意，需要对方直接说需求；记得留不安排的时间。',
+    study: '目标拆解 + 打卡推进最有效，适合带小组复习。',
+    growth: '在下判断前多问一句「有没有我没想到的难处」。',
+  },
+  ESFJ: {
+    title: '执政官',
+    keywords: '周到、热络、把人放在心上',
+    oneLine: '习惯先照顾气氛和关系，让事情在人情里办成。',
+    strengths: ['组织人际与活动', '记得住每个人的状况', '愿意为集体做脏活累活'],
+    blindspots: ['太在意别人评价，容易内耗', '对「不合群」的选项排斥'],
+    work: '适合人力、行政、教育、客户、医护、社群运营这类以人为中心的岗位。',
+    love: '投入、周到，需要明确的回应与稳定；别把照顾变成控制。',
+    study: '在小组里学得最好，讲给别人听会记得更牢。',
+    growth: '练习在不解释的情况下做一次自己的选择。',
+  },
+  ENFJ: {
+    title: '主人公',
+    keywords: '暖、会带人、看得见潜力',
+    oneLine: '天然想把人和事往好的方向推，愿意为别人多走一步。',
+    strengths: ['洞察他人需求', '善于组织与鼓舞', '把长期关系经营得住'],
+    blindspots: ['过度承担别人的情绪', '为了和谐压下自己的判断'],
+    work: '适合教育、管理、培训、公益、品牌这类「带人成长」的岗位。',
+    love: '投入且会照顾，需要对方也主动；别把付出当成默认义务。',
+    study: '教别人是最好的学法，适合做学习小组的组织者。',
+    growth: '把「我该帮」和「不该我扛」分开，先照顾自己的电量。',
+  },
+  ENTJ: {
+    title: '指挥官',
+    keywords: '决断、看清、把盘做大',
+    oneLine: '看得远也敢拍板，喜欢把资源调到最该去的地方。',
+    strengths: ['目标与路径清楚', '能在压力下决断', '擅长组织复杂局面'],
+    blindspots: ['节奏压人，忽略情绪成本', '把「效率」当成唯一标准'],
+    work: '适合管理、创业、投资、战略、大型项目这类要定方向并扛结果的岗位。',
+    love: '用规划和承担表达在意，需要对方能对话；记得把「安排」换成「商量」。',
+    study: '先建目标与评估标准，按里程碑推进；警惕只搭框架不落细节。',
+    growth: '定期问自己「这件事赢了，人会怎样」，把人的成本算进去。',
+  },
+};
+
+const SCALE_SAY = {
+  1: '完全不像',
+  2: '不太像',
+  3: '说不准',
+  4: '有点像',
+  5: '很像我',
+};
+
+function mbtiPaper() {
+  return {
+    system: 'mbti',
+    needAnswers: true,
+    scale: SCALE_SAY,
+    total: QUESTIONS.length,
+    dimensions: DIMENSIONS.map((d) => ({ key: d.key, name: d.name, left: d.left, right: d.right, leftSay: d.leftSay, rightSay: d.rightSay, note: d.note })),
+    questions: QUESTIONS.map((q, i) => ({ no: i + 1, id: q.id, dim: q.dim, text: q.text })),
+    note: '这是一份 MBTI 风格的问卷（不是官方 MBTI 量表）：每题按 1（完全不像我）到 5（很像我）打分，把 24 个分数按顺序交给 answers 即可出类型。题目只作自我参照，不适合用来评价别人的能力或做招聘、晋升等决定。',
+  };
+}
+
+function normalizeAnswers(answers) {
+  if (!Array.isArray(answers)) {
+    throw fail('E_INPUT', 'answers 必须是数组：每题 1–5 分，按 questions 的顺序给；答题前先不带 answers 调一次，拿到题目');
+  }
+  if (answers.length > QUESTIONS.length) {
+    throw fail('E_INPUT', `answers 最多 ${QUESTIONS.length} 个（对应 ${QUESTIONS.length} 题），收到 ${answers.length} 个`);
+  }
+  const out = [];
+  for (let i = 0; i < QUESTIONS.length; i += 1) {
+    const raw = answers[i];
+    if (raw === undefined || raw === null || raw === '') {
+      out.push(null);
+      continue;
+    }
+    const v = Number(raw);
+    if (!Number.isInteger(v) || v < 1 || v > 5) {
+      throw fail('E_RANGE', `第 ${i + 1} 题的分值必须是 1–5 的整数（1 完全不像，5 很像我），收到「${raw}」`);
+    }
+    out.push(v);
+  }
+  return out;
+}
+
+function strengthOf(pct, answered) {
+  if (!answered) return '未作答';
+  if (pct <= 0.12) return '临界';
+  if (pct <= 0.3) return '轻微';
+  if (pct <= 0.6) return '明显';
+  return '很强';
+}
+
+function buildMbti(input = {}) {
+  const answers = normalizeAnswers(input.answers);
+  const answeredAll = answers.filter((v) => v !== null).length;
+  if (answeredAll < 12) {
+    throw fail('E_INPUT', `至少答 ${12} 题才能出口径（现答 ${answeredAll} 题）；可以先不带 answers 调一次，把题目发给用户逐题打分`);
+  }
+  const dims = DIMENSIONS.map((d) => {
+    let sum = 0;
+    let answered = 0;
+    QUESTIONS.forEach((q, i) => {
+      const v = answers[i];
+      if (v === null || q.dim !== d.key) return;
+      answered += 1;
+      sum += (v - 3) * (q.side === d.left ? 1 : -1);
+    });
+    const maxAbs = answered * 2;
+    const pct = maxAbs ? Math.abs(sum) / maxAbs : 0;
+    const picked = sum > 0 ? d.left : sum < 0 ? d.right : d.tie;
+    return {
+      key: d.key,
+      name: d.name,
+      left: d.left,
+      right: d.right,
+      leftSay: d.leftSay,
+      rightSay: d.rightSay,
+      note: d.note,
+      sum,
+      answered,
+      maxAbs,
+      pct: Math.round(pct * 1000) / 1000,
+      picked,
+      strength: strengthOf(pct, answered),
+      tie: sum === 0,
+    };
+  });
+  const type = dims.map((d) => d.picked).join('');
+  const profile = TYPES[type];
+  if (!profile) throw fail('E_SYSTEM', `内部错误：类型 ${type} 没有对应文案`);
+  const stack = (FUNCTION_STACKS[type] || []).map((f) => ({ code: f, say: FUNCTIONS[f] || '' }));
+  return {
+    system: 'mbti',
+    type,
+    title: profile.title,
+    keywords: profile.keywords,
+    oneLine: profile.oneLine,
+    dims: dims.map(({ sum, maxAbs, answered, ...rest }) => ({ ...rest, sum, maxAbs, answered })),
+    profile: {
+      title: profile.title,
+      keywords: profile.keywords,
+      oneLine: profile.oneLine,
+      strengths: profile.strengths.slice(),
+      blindspots: profile.blindspots.slice(),
+      work: profile.work,
+      love: profile.love,
+      study: profile.study,
+      growth: profile.growth,
+      stack,
+    },
+    answered: answeredAll,
+    skipped: QUESTIONS.length - answeredAll,
+    total: QUESTIONS.length,
+    note: '四维各 6 题、李克特 1–5 计分，按维度净分取字母（平手时取 I / N / F / P 一侧并标「临界」）。这是 MBTI 风格的问卷测算，不是官方量表；类型只作自我参照，不是能力评价，也不用它给人下结论。',
+  };
+}
+
+return { DIMENSIONS, QUESTIONS, FUNCTION_STACKS, FUNCTIONS, TYPES, mbtiPaper, buildMbti };
+})();
+
 __mods.chenggu = (function () {
 const { solarToLunar } = __mods.lunar;
 const { ganzhiName, toJDN, dayGanzhiIndex } = __mods.calendar;
@@ -8132,6 +9801,89 @@ const STRENGTH_PLAIN = {
   身弱: '底子偏薄，先修恢复力再谈冲刺，硬撑的性价比最低',
 };
 
+const PLAIN_BODY = {
+  六冲卦: '这一卦是「六冲」，事情起落快，急事反而好办，拖久了的人事容易散。',
+  六合卦: '这一卦是「六合」，容易谈成，也容易黏住不放。',
+  变六冲: '往下走会散，收尾别拖。',
+  变六合: '往下走会合，事情倾向于延续下去。',
+  内卦伏吟: '事情卡在原地打转，想动但动不了。',
+  外卦伏吟: '外面那层没变，看起来在动，其实格局照旧。',
+  内卦反吟: '反复在自己这一头，改了又改回来。',
+  外卦反吟: '外面反复，对方或环境会来回拉扯。',
+  化进神: '有一爻在往上走，顺着这股劲推比往回拉顺。',
+  化退神: '有一爻在往后退，别按原来的势头硬推。',
+};
+
+function usePlainOf(ug) {
+  if (!ug || !ug.liuqin) return '';
+  if (ug.found.length) {
+    const pos = ug.found.map((f) => `第${f.position}爻`).join('、');
+    const moving = ug.found.some((f) => f.moving);
+    const who = ug.byShi ? '代表你自己' : `就是「${ug.liuqin}」这一类事`;
+    return `你问的这件事，在卦里对应${pos}${who}——${moving ? '这一爻还在动，说明事情正在推进' : '这一爻没动，先按现状看'}。`;
+  }
+  if (ug.fushen.length) {
+    const f = ug.fushen[0];
+    return `你问的这件事，卦面上没有直接露出来，得往深处找：它藏在第${f.position}爻下面（伏神），与上面的关系是「${f.relation || '—'}」，要借力才出得来。`;
+  }
+  return '';
+}
+
+function useStrengthPlain(st) {
+  if (!st || !st.lines || !st.lines.length) return '';
+  const dead = st.lines.filter((l) => /死|囚/.test(l.monthState) || l.monthChong);
+  const live = st.lines.filter((l) => /旺|相/.test(l.monthState));
+  const when = st.month && st.month.branch ? `眼下这阵子（${st.month.branch}月）` : '起卦这段日子';
+  if (dead.length && !live.length) return `${when}对这件事不太帮忙，气有点被压着——先别急着硬推，等风向转。`;
+  if (live.length && !dead.length) return `${when}对这件事是帮着的，气正在往上走，能推就趁现在。`;
+  return `${when}对这件事有帮有压，一半的力要自己挣——结果更看你怎么走。`;
+}
+
+function jinTuiPlain(r) {
+  const jp = r && r.jinTuiPower;
+  if (!jp || !Array.isArray(jp.lines) || !jp.lines.length) return '';
+  const sayOf = (l) => (l.verdict === '后劲足' ? '时令托着，后劲足'
+    : l.verdict === '后劲有限' ? '时令不太托，后劲有限'
+      : l.verdict === '进得虚' ? '时令最背，进也是虚进'
+        : l.verdict === '退得缓' ? '时令还托着，退得慢'
+          : l.verdict === '退得实' ? '时令也不托，退得实'
+            : l.verdict === '月破失据' ? '又正好逢月破，进退都站不稳'
+              : '缺月建，先只当方向看');
+  return `动爻的进退还要看时令：${jp.lines.map((l) => `${l.position}爻${l.from}→${l.to}${l.type}，${sayOf(l)}`).join('；')}。`;
+}
+
+function hexStrengthPlain(hs) {
+  if (!hs || !hs.counts) return '';
+  const up = (hs.counts.旺 || 0) + (hs.counts.相 || 0);
+  const down = (hs.counts.囚 || 0) + (hs.counts.死 || 0);
+  const when = hs.month && hs.month.branch ? `按${hs.month.branch}月这段时令看` : '按起卦这天看';
+  const shi = hs.shi && hs.shi.monthState !== 'unknown' ? `代表你的世爻在${hs.shi.monthState}` : '';
+  if (up >= 4 && down === 0) return `${when}，整张卦六爻的气多数是顺的，${shi}，眼下算是好推的时候。`;
+  if (down >= 4 && up === 0) return `${when}，整张卦六爻的气多数被压着，${shi}，这几天更适合等而不是冲。`;
+  return `${when}，整张卦六爻有顺有逆（旺相 ${up} 爻、囚死 ${down} 爻）${shi ? `，${shi}` : ''}，成不成要看具体哪一爻在动。`;
+}
+
+function flyCompositePlain(fc) {
+  if (!fc || !Array.isArray(fc.targets)) return '';
+  const hub = fc.targets.find((t) => t.count >= 2);
+  const self = fc.groups && fc.groups.selfHua && fc.groups.selfHua.length
+    ? '其中有的宫自己化出去又落回自己，容易表现为「想得多、落得少」。'
+    : '';
+  if (!hub) return `把命宫连同对宫、两个三合宫一起看，四股力飞出去没有挤到同一处，这几件事之间牵连不深。${self}`;
+  return `把命宫连同对宫与两个三合宫一起看，${hub.incoming.length} 股力最后挤在「${String(hub.palace).replace(/宫$/, '')}」这件事上——这件事会把好几个方面的劲都吸过来。${self}`;
+}
+
+function bodyPlainOf(labels) {
+  const keyOf = (l) => Object.keys(PLAIN_BODY).find((k) => l === k || l.startsWith(`${k} `)) || '';
+  const primary = labels.find((l) => keyOf(l));
+  const main = primary ? PLAIN_BODY[keyOf(primary)] : '';
+  const extra = labels
+    .filter((l) => l !== primary && /^化[进退]神 /.test(l))
+    .map((l) => PLAIN_BODY[keyOf(l)])
+    .filter(Boolean);
+  return main + extra.join('');
+}
+
 const DIR_SECTION = {
   wealth: '「工作与职业选择」与「时间窗」',
   career: '「事业发展」与「时间窗」',
@@ -8174,22 +9926,31 @@ function buildAnswer(r, ask, ctx = {}) {
     const body = r.body || {};
     const bureau = r.bureau || {};
     const md = r.lifeMaster || '';
+    const ji = r.flyChains && r.flyChains.忌;
+    const plainFly = ji && ji.steps.length
+      ? `还有一条线值得留意：${ji.path.map((p) => p.replace(/宫$/, '')).join(' → ')}——这几件事在你身上是连着转的，一件卡住，容易牵动下一件。`
+      : '';
     return [
       head + `先说结论：你的命宫落${s(soul.branch, '—')}宫` +
         `${bureau.name ? `、${bureau.name}` : ''}${md ? `，命主${md}` : ''}` +
         `${body.lands ? `，身宫落在「${body.lands}」——这张盘的重心在这件事上` : ''}。`,
+      plainFly,
+      flyCompositePlain(r.flyComposite),
       `具体到你问的这件事，重点看${where}。`,
-    ].join('');
+    ].filter(Boolean).join('');
   }
 
   if (r.system === 'liuyao') {
     const ben = r.ben || {};
     const moving = (r.cast && r.cast.movingPositions) || [];
     const bian = r.bian || {};
+    const labels = (r.body && Array.isArray(r.body.labels)) ? r.body.labels : [];
+    const plainBody = bodyPlainOf(labels);
     return [
       head + `先说结论：本卦是${s(ben.name, '—')}` +
         `${ben.palace ? `（${ben.palace}）` : ''}` +
-        `${moving.length ? `，第 ${moving.join('、')} 爻动，变为${s(bian.name, '—')}` : '，六爻安静没有动爻'}。`,
+        `${moving.length ? `，第 ${moving.join('、')} 爻动，变为${s(bian.name, '—')}` : '，六爻安静没有动爻'}。` +
+        `${plainBody}${usePlainOf(r.useGod)}${useStrengthPlain(r.useGodStrength)}${jinTuiPlain(r)}${hexStrengthPlain(r.hexStrength)}`,
       '断卦的落点在「世爻」（代表你）和「动爻」（事情的推动点），下面「看盘顺序」就按这个次序展开。',
     ].join('');
   }
@@ -8206,21 +9967,36 @@ function buildPlain(r, ask, ctx = {}) {
     const avoid = join(ys.avoid);
     const strength = STRENGTH_PLAIN[st.level] || '力量偏中性';
     const tiaohou = ys.tiaohou && ys.tiaohou.note ? `另外，${ys.tiaohou.note}，所以「暖一点、亮一点」的环境通常更舒服。` : '';
+    const sy = (r.liunian || []).find((l) => l.suiyun && Array.isArray(l.suiyun.signals) && l.suiyun.signals.length);
+    const syPlain = sy
+      ? `再往后看，${sy.year} 年${sy.ganzhi}是${sy.suiyun.signals.map((x) => x.type).join('、')}——传统上把它当作「变化感强一点」的提示，既不是好消息也不是坏消息，遇上时多留个心眼就好。`
+      : '';
     return `你的命局属于「${s(st.level, '中性')}」：${strength}。` +
       `${favor ? `能补${favor}的环境（行业、方位、作息、相处的人）会让你省力；${avoid ? `而${avoid}偏重的场合容易空耗，能绕就绕。` : ''}` : ''}` +
-      tiaohou;
+      tiaohou + syPlain;
   }
   if (r.system === 'ziwei') {
     const soul = r.soul || {};
     const body = r.body || {};
-    return `紫微看的是「你与环境怎么互动」。命宫落${s(soul.branch, '—')}宫，说明你做事的第一反应是从这个宫位的气质出发` +
-      `${body.lands ? `；身宫在「${body.lands}」，意味着真正让你上心的，是${body.lands}这件事` : ''}。`;
+    const ji = r.flyChains && r.flyChains.忌;
+    const plainFly = ji && ji.steps.length
+      ? `另外有一条线值得留意：${ji.path.map((p) => p.replace(/宫$/, '')).join(' → ')}——这几件事在你身上是连着转的，一件事卡住，容易牵动下一件。`
+      : '';
+    return [
+      `紫微看的是「你与环境怎么互动」。命宫落${s(soul.branch, '—')}宫，说明你做事的第一反应是从这个宫位的气质出发` +
+        `${body.lands ? `；身宫在「${body.lands}」，意味着真正让你上心的，是${body.lands}这件事` : ''}。`,
+      plainFly,
+      flyCompositePlain(r.flyComposite),
+    ].filter(Boolean).join('');
   }
   if (r.system === 'liuyao') {
     const ben = r.ben || {};
     const moving = (r.cast && r.cast.movingPositions) || [];
+    const labels = (r.body && Array.isArray(r.body.labels)) ? r.body.labels : [];
+    const plainBody = bodyPlainOf(labels);
     return `${s(ben.name, '这一卦')}讲的是一个「${moving.length ? '正在动、还会变' : '暂时不动、先看清'}」的局面——` +
-      `${moving.length ? '有动爻，说明事情还有转圜空间，不是死局。' : '六爻安静，说明当下更该观察而不是硬推。'}`;
+      `${moving.length ? '有动爻，说明事情还有转圜空间，不是死局。' : '六爻安静，说明当下更该观察而不是硬推。'}` +
+      `${plainBody}${usePlainOf(r.useGod)}${useStrengthPlain(r.useGodStrength)}${jinTuiPlain(r)}${hexStrengthPlain(r.hexStrength)}`;
   }
   return '';
 }
@@ -8361,10 +10137,10 @@ const KNOWLEDGE = [
     id: 'bazi-suiyun',
     system: 'bazi', dims: ['overall', 'career'],
     gist: '大运管十年基调，流年管当年触发。',
-    detail: '大运像换了条路，流年像这条路上某一段的天气。岁运并临（大运与流年干支相同）与伏吟反吟（干支重复或与原局对冲）是传统上标记「变动较大」的年份，属于提示而非断语。',
+    detail: '大运像换了条路，流年像这条路上某一段的天气。岁运并临（当值大运与流年干支相同）、运年反吟（大运与流年天克地冲）、流年伏吟（流年与原局某柱干支相同）与流年反吟（流年与原局某柱天克地冲），是传统上标记「变动较大」的年份，属于提示而非断语。本插件逐年标出四类信号：当值大运按该年立春到次年立春的区间取，交运落在年内时前后两步并列；只标干支重复与对冲，不折分数。',
     source: '岁运并临、伏吟反吟见《三命通会》《渊海子平》',
     status: 'variant',
-    note: '「岁运并临主大凶」是流传最广也最被滥用的说法，本插件只作变动提示，不断吉凶。',
+    note: '「岁运并临主大凶」是流传最广也最被滥用的说法，本插件只作变动提示，不断吉凶；大运与原局之间的伏吟反吟未逐年标注，四柱十神层面的引化也未叠入。',
   },
   {
     id: 'bazi-liuqin',
@@ -8393,6 +10169,34 @@ const KNOWLEDGE = [
     status: 'settled',
   },
 
+  {
+    id: 'bazi-sanming-duizhao',
+    system: 'bazi', dims: ['overall', 'career'],
+    gist: '同一个格，子平真诠讲怎么用，三命通会讲怎么取。',
+    detail: '两书不是谁替代谁：子平真诠以月令取用神、论顺逆成败，重「用」；三命通会按十神逐格立论，重「取」与「忌」。同看正官格，前者问财印护官、伤煞混杂，后者先说「止许一位，多则不宜」。本插件把两条并列，不合并成一句断语。',
+    source: '《子平真诠》论正官等篇；《三命通会》卷五、卷六论十神',
+    status: 'variant',
+    note: '两书成书年代与流派不同，用语有出入；本插件照录通行本，不做校勘改字，也不替两家调和。',
+  },
+  {
+    id: 'bazi-geju-chengbai',
+    system: 'bazi', dims: ['overall', 'career'],
+    gist: '格有成有败：成中带忌会打折，败中有救还能转成。',
+    detail: '月令取到格只是起点。成格要看有没有带忌——官逢财又逢伤、官透而被合、财旺生官又逢伤，都会把成格打折；败格也看有没有救应——印来解伤、合来清煞、劫来解财，败中可转。所以判格不能只报一个格名。',
+    source: '《子平真诠》九、论用神成败救应',
+    status: 'variant',
+    note: '各家对成格条件与带忌轻重的排序不同（有先看刑冲、有先看合化），本插件只把原文与成败方向并列摆出，不逐盘判成破。',
+  },
+  {
+    id: 'bazi-huagi-bianhua',
+    system: 'bazi', dims: ['overall', 'career'],
+    gist: '月令用神会因合化而变：同一个起点，取用可以不同。',
+    detail: '用神本从月令取，但月令藏干不一，透出的字不同、支会合局不同，取用就跟着变：丁生亥月本为正官，支全卯未化为印；己生申月本属伤官，藏庚透壬化为财。所以看到化气格，要回头核对月令与合局，不能只按本气定格。',
+    source: '《子平真诠》十、论用神变化；化气条件各家另论',
+    status: 'variant',
+    note: '化气格成立条件各家宽严不一（是否要求月令为化神、日主是否允许有根），本插件只列条件、附原文，不据此断定化气已成。',
+  },
+
   {
     id: 'ziwei-sanfang',
     system: 'ziwei', dims: ['overall', 'career'],
@@ -8445,13 +10249,40 @@ const KNOWLEDGE = [
     status: 'variant',
     note: '空劫是否见禄反吉，各家说法不一，本插件只提示变动性质，不判吉凶。',
   },
+  {
+    id: 'ziwei-feixing',
+    system: 'ziwei', dims: ['overall', 'career'],
+    gist: '宫干定四化，星落哪宫，这一宫的力就往哪边走。',
+    detail: '生年四化是先天带的，飞星四化是宫位自己去找的：每一宫的宫干定出禄权科忌四颗星，那几颗星落在哪一宫，就是这一宫的力气往哪边使。所以同一个「化忌」，从命宫飞出去和从财帛飞出去，说的是两件事。',
+    source: '《紫微斗数全书》四化篇；中州派宫干四化传法',
+    status: 'variant',
+    note: '飞星派（如钦天四化）把宫干四化当主线，三合派只作辅助；庚干四化各派另有异说，本插件取中州派常用表。飞星串连与三方四正复合飞化现已给出，但未叠大限流年四化。',
+  },
+  {
+    id: 'ziwei-sanfang-fei',
+    system: 'ziwei', dims: ['overall', 'career'],
+    gist: '三方四正一起飞，看四股力会到哪一宫。',
+    detail: '单宫飞化只看本宫宫干把四化送去哪里；三方四正复合飞化把本宫、对宫与两个三合宫共四宫的宫干四化同时摊开，约 16 条，按落宫归堆，落到同一宫的就是会照。会在一处的化越多，那一宫被牵动的力道越集中；两忌以上会宫、禄忌同宫、三化以上会宫、宫干化出又落回本宫（自化），是这一层最常取的几种情形。',
+    source: '《紫微斗数全书》四化篇；飞星派三方四正同飞说',
+    status: 'variant',
+    note: '飞星派对「三方四正一起飞」是否成立、会照要不要折成分数，各家口径不一；本插件只做落宫归堆与会照标记，不折分数，也未叠大限流年四化。',
+  },
+  {
+    id: 'ziwei-jichuanji',
+    system: 'ziwei', dims: ['overall'],
+    gist: '忌转忌：化忌落进哪一宫，就从那一宫再化出去。',
+    detail: '串连是跟着同一支化逐宫走：命宫化忌入父母，父母宫的宫干再化忌往下一宫，直到绕回走过的宫成环。环越短，越容易在同一组宫位上反复；走不出去（传统说「忌出不去」）不等于凶，只是这条力没有别的出口。',
+    source: '《紫微斗数全书》四化篇；忌转忌串连法',
+    status: 'variant',
+    note: '串连几跳为止、是否允许借对宫飞化，各派不一；本插件只跟单一支化逐宫走，走满 12 宫或成环即停。',
+  },
 
   {
     id: 'liuyao-yongshen',
-    system: 'liuyao', dims: ['overall'],
-    gist: '问什么，就以那一类六亲为用神。',
-    detail: '问财看妻财、问事业官位看官鬼、问文书房产看父母、问子女下属看子孙、问同辈朋友看兄弟。用神两现时，取动者、取临世者、取旺者；用神不上卦，则从本宫首卦取伏神。这一步定错，后面全盘白算。',
-    source: '《卜筮正宗》用神章；《增删卜易》同',
+    system: 'liuyao', dims: ['overall', 'work', 'wealth', 'love', 'health', 'study'],
+    gist: '问什么就以哪一类六亲为用神，这一步定错，后面全盘白算。',
+    detail: '取用按所问之事：求财与男命妻缘看妻财，工作职位考核看官鬼，文书合同学历看父母，健康以官鬼为病、子孙为医药，出行以世爻为用，感情男看妻财、女看官鬼。用神在卦上就取那一爻，出现两处记「两现」；用神不上卦，按本宫首卦同六亲的爻位取伏神，再看飞伏生克。本插件把这些位置与动变、旬空、卦体标签一一对上，但不替你选两现之中的主用。',
+    source: '《卜筮正宗》用神章、伏神章；《增删卜易》用神章',
     status: 'settled',
   },
   {
@@ -8473,10 +10304,29 @@ const KNOWLEDGE = [
   {
     id: 'liuyao-fushen',
     system: 'liuyao', dims: ['overall'],
-    gist: '伏神是藏在下面、要借力才出得来的那一爻。',
-    detail: '用神不上卦，就从本宫首卦的同位取伏神。伏神要得出——得日月生扶、或飞神生伏神、或伏神自身旺相，才有用；伏在忌神之下且被克，则虽有如无。',
-    source: '《卜筮正宗》伏神章',
-    status: 'settled',
+    gist: '用神不上卦，就去本宫首卦的同位取伏神。',
+    detail: '本卦六爻里没有用神那一类六亲，就叫用神不上卦。取法是回到本卦所属宫的首卦（八纯卦），找出该六亲所在的爻位，那一爻即伏神，本卦同一爻位上的爻叫飞神。伏神要「得出」才有用：飞神生伏神、伏神克飞神、日月生扶都算得力；飞神克伏神则受压难出。本插件给出伏神爻位、干支五行与飞伏生克关系，不出具体的出伏日期。',
+    source: '《卜筮正宗》伏神章；《增删卜易》伏神篇',
+    status: 'variant',
+    note: '首卦里同一六亲也可能出现两次（如乾宫乾为天的父母在三爻与上爻），此时取哪一爻为伏神各家不一；本插件把候选都列出并标「伏神两现」，不代选。伏神出伏的应期各家分歧更大，故不输出日期。',
+  },
+  {
+    id: 'liuyao-yongshen-shuai',
+    system: 'liuyao', dims: ['overall', 'work'],
+    gist: '用神旺不旺，看月建给的气与日辰当天的扶克。',
+    detail: '月建管「这一段时令」：爻五行与月支五行同气为旺、受月令生为相、生月令为休、克月令为囚、被月令克为死。日辰管「当天这一股力」：日辰生爻为生、克爻为克、同气为比和，反过来则是爻泄日、爻耗日。此外月建冲爻叫月破，日辰冲静爻叫暗动、冲旬空之爻叫冲空。本插件把这几项折成标签逐爻列出，不折成分数。',
+    source: '《增删卜易》月建章、日辰章；《卜筮正宗》月建论',
+    status: 'variant',
+    note: '月破、暗动、冲空三者各家取法不完全一致（有派别把日冲动爻也叫暗动，有派别只认旺相之爻暗动）；本插件按「月建冲=月破、日冲静爻=暗动、日冲旬空=冲空」这一套给标签，并注明用了哪一支月建。',
+  },
+  {
+    id: 'liuyao-quanggu-shuai',
+    system: 'liuyao', dims: ['overall', 'work'],
+    gist: '全卦逐爻看月建，才看得出气聚在哪一头。',
+    detail: '月建管这一段时令的旺衰、日辰管当天的扶克，落到全部六爻逐爻判定：每爻都出月令五态（旺相休囚死）与日辰五关系，并标月破、暗动、冲空。世爻、应爻、动爻与旬空另标，五态分布能看出气是聚在世应还是散在旁爻——用神只是其中一处落点，不看全卦容易把一处当全局。',
+    source: '《增删卜易》月建章、日辰章；《卜筮正宗》六爻旺衰论',
+    status: 'variant',
+    note: '各家对月破、暗动、冲空的取法不完全一致，是否给六爻折力重（分数）分歧更大；本插件只给状态标签与五态分布，不折分数。',
   },
   {
     id: 'liuyao-yingqi',
@@ -8496,6 +10346,59 @@ const KNOWLEDGE = [
     status: 'settled',
   },
 
+  {
+    id: 'liuyao-liuchong',
+    system: 'liuyao', dims: ['overall'],
+    gist: '六冲卦讲「散」：起落快、来去急。',
+    detail: '六冲不按「爻位相邻」判，而是看六个地支能不能正好配成子午、寅申、辰戌三组对冲。按纳甲实排，八纯卦之外天雷无妄、雷天大壮也成六冲。冲不是单纯的坏：近病逢冲主速愈、久病逢冲才忌；求财问婚，冲多主聚不住。',
+    source: '《卜筮正宗》六冲章；《增删卜易》卦体说',
+    status: 'variant',
+    note: '通行口诀多把六冲限为八纯卦，本插件按纳甲地支实配判定，故多出无妄与大壮两支；《增删卜易》卦例里这两卦确被称作六冲，可互证。',
+  },
+  {
+    id: 'liuyao-liuhe',
+    system: 'liuyao', dims: ['overall', 'love'],
+    gist: '六合卦讲「成」：容易谈拢，也容易黏住。',
+    detail: '六个地支正好配成子丑、寅亥、卯戌、辰酉、巳申、午未三组相合，即六合卦，共天地否、地天泰、地雷复、雷地豫、山火贲、水泽节、泽水困、火山旅八支。六合主和合、拖延：谈事情容易成，也容易久拖不决；问病则忌缠绵。',
+    source: '《卜筮正宗》六合章',
+    status: 'settled',
+  },
+  {
+    id: 'liuyao-fanyin',
+    system: 'liuyao', dims: ['overall', 'work'],
+    gist: '反吟主反复：去了又来、定了又改。',
+    detail: '卦反吟有两种成法：一是变卦某宫的三爻地支与本卦对应宫正好全冲；二是本卦之宫与变卦之宫在后天八卦上正对（乾巽、坎离、艮坤、震兑）。爻反吟则是动爻变出的地支回头冲本爻。无论哪种，取象都是反复、翻覆、旧事重提。',
+    source: '《增删卜易》反吟伏吟篇；《卜筮正宗》',
+    status: 'variant',
+    note: '各家对「卦反吟」是否只认地支全冲有分歧；本插件的八卦正对一路，是从《增删卜易》卦例（如山地剥之坤为地、风天小畜之乾为天）反推出来的。',
+  },
+  {
+    id: 'liuyao-fuyin',
+    system: 'liuyao', dims: ['overall'],
+    gist: '伏吟主呻吟：事情在原地打转。',
+    detail: '卦变了，纳甲地支却没变，叫卦伏吟。纳甲上只有乾与震共用子寅辰、午申戌一套地支，所以卦伏吟只会出在乾与震互换的卦上，例如天雷无妄之雷天大壮、天风姤之雷风恒。动爻变出的地支与本爻同支，则是爻伏吟。伏吟取象是欲动不动、原地反复，常指人想动而形势不许。',
+    source: '《增删卜易》伏吟篇；《卜筮正宗》',
+    status: 'variant',
+    note: '另有「伏吟以用神受困论」的说法，不限于卦体；本插件只报卦体层面的伏吟与动爻伏吟，不推断吉凶轻重。',
+  },
+  {
+    id: 'liuyao-jintui',
+    system: 'liuyao', dims: ['overall'],
+    gist: '动爻变出同五行顺次之支，为化进神；反向为化退神。',
+    detail: '动爻变出的地支与本爻同五行、且在顺次上往前一步，叫化进神；倒退一步叫化退神。八对是：寅→卯（木）、巳→午（火）、申→酉（金）、亥→子（水），土一支成环，丑→辰→未→戌→丑。同五行但不相邻（如寅→辰）不算。进神取象是这一爻代表的人或事有后劲、势在往前；退神取象是渐渐退气、按原势头推会落空。',
+    source: '《增删卜易》进神退神章',
+    status: 'settled',
+  },
+  {
+    id: 'liuyao-jintui-yong',
+    system: 'liuyao', dims: ['overall', 'work'],
+    gist: '化进化退要看是用神还是忌神，还要叠月建日辰。',
+    detail: '进神退神本身只说明这一爻的向外趋势：用神化进为得力，忌神化进则为患加剧；用神化退是力衰，忌神化退反而是解脱。传统还要看它在本月令衰旺、有没有日辰生扶，空亡或受克时进者未必能进。本插件把进退与爻位标出来，再按月建五态给一档力重——得令则进得动、退得慢，失令则进得虚、退得实，月破压过一切；只给档位，不折成加权分数，吉凶仍落在用神与忌神那一层判。',
+    source: '《增删卜易》进神退神章、用神章',
+    status: 'variant',
+    note: '土之进退次序各家说法不完全一致，有以丑→辰→未→戌为进、也有只取辰戌丑未相对者；本插件按丑辰未戌成环处理，并用《增删卜易》卦例中「未土化戌土为进」「戌土化未土为退」对拍。',
+  },
+
   {
     id: 'meihua-tiyong',
     system: 'meihua', dims: ['overall'],
@@ -8521,6 +10424,50 @@ const KNOWLEDGE = [
     status: 'variant',
     note: '三种取局法在节气交接前后差异最明显，本插件同时实现三种，可在参数里指定。',
   },
+  {
+    id: 'qimen-jixing',
+    system: 'qimen', dims: ['overall', 'work'],
+    gist: '六仪落刑宫叫击刑，是宫位条件不是判决。',
+    detail: '六仪按所配地支相刑：甲子戊落震三（子刑卯）、甲戌己落坤二（戌刑未）、甲申庚落艮八（申刑寅）、甲午辛落离九（午自刑）、甲辰壬落巽四（辰自刑）、甲寅癸落巽四（寅刑巳）。天盘六仪落到自己那一宫即击刑，取象是受制、掣肘、旧账翻出来，多用来量这个符号本身使不使得上力。',
+    source: '《烟波钓叟歌》刑格注；《奇门遁甲统宗》',
+    status: 'variant',
+    note: '有流派只论天盘六仪击刑，也有把地盘一并算的；本插件只判天盘，且只作宫位条件，不自动断用神受制。',
+  },
+  {
+    id: 'qimen-rumu',
+    system: 'qimen', dims: ['overall'],
+    gist: '三奇落墓宫叫入墓：力量收进去，不容易使出来。',
+    detail: '按五行墓库推：乙木墓在未（未属坤二宫），丙丁火墓在戌（戌属乾六宫）。天盘乙奇落坤二、丙奇或丁奇落乾六，即三奇入墓。取象是收束、藏起来、事情压住不动；好坏要看所问之事——问收藏、问了结，入墓未必是坏事。',
+    source: '《奇门遁甲统宗》三奇入墓条；五行墓库见《五行大义》',
+    status: 'variant',
+    note: '各家对入墓范围说法不一：有只论三奇，也有把六仪、八门、九星一并论墓的；本插件只判天盘三奇，其余留白。',
+  },
+  {
+    id: 'qimen-wangshuai',
+    system: 'qimen', dims: ['overall', 'work'],
+    gist: '门、星与天盘干按月令分旺相休囚死，只说明力量强弱。',
+    detail: '旺相休囚死以月支五行为尺：与月令同气为旺，月令所生为相，生月令为休，克月令为囚，被月令所克为死。八门、九星与天盘干（三奇六仪）各按自身五行对月令，得出该符号当下「使不使得上力」。比如午月火旺，景门（火）旺、生门死门（土）相、休门（水）囚、开门惊门（金）死，天盘丙丁（火）旺、庚辛（金）死。',
+    source: '《奇门遁甲统宗》门星旺衰条；五行旺相休囚死见《五行大义》',
+    status: 'settled',
+  },
+  {
+    id: 'qimen-wangshuai-yong',
+    system: 'qimen', dims: ['overall', 'work'],
+    gist: '旺衰是助力，不单独定吉凶：门旺而宫克门仍受制。',
+    detail: '月令旺衰只回答「这个符号自身有多少气」，不回答「事情成不成」。取象时要和宫位关系叠起来看：门旺但同宫门克宫（门迫），力量被宫位掣肘；门囚但宫生门，仍得宫助。星同理，旺星落宫若被克，也难全其用。',
+    source: '《奇门遁甲统宗》；《烟波钓叟歌》门宫生克注',
+    status: 'variant',
+    note: '有流派按时令而非月令论门星旺衰，也有以落宫五行当令者；本插件统一按月支五行判，并在解读里明确只作强度参考。',
+  },
+  {
+    id: 'qimen-gan-shengke',
+    system: 'qimen', dims: ['overall', 'work'],
+    gist: '天盘干落宫论生克：干克宫主进取，宫克干受制，比和相安。',
+    detail: '天盘干（三奇六仪）落到某宫，就看干的五行与该宫五行的生克：干克宫，是符号压向环境、偏进取与主动；宫克干，是环境反过来管住符号、偏受制与掣肘；干生宫，力量往外泄；宫生干，环境给力；比和，两下相安。这一层与门宫关系（门迫、宫制门）并列，各说各的，不互相替换；两者同时成立时分别列出，不折成一个分数。',
+    source: '《奇门遁甲统宗》干宫生克条；《烟波钓叟歌》门宫生克注',
+    status: 'variant',
+    note: '各家对「干与宫」的取象宽窄不一：有只论干宫、有连天盘干加地盘干（十干克应）一并论的。本插件只判天盘干与所落宫，十干克应 100 组未做。',
+  },
   {
     id: 'tarot-orientation',
     system: 'tarot', dims: ['overall'],
@@ -8530,24 +10477,24 @@ const KNOWLEDGE = [
     status: 'variant',
     note: '逆位是否参与解读本身就有分歧（有牌阵传统完全不用逆位）。本插件按削弱加内向综合取象，并在开头声明。',
   },
+  {
+    id: 'bazi-dayun-jiaoqi',
+    system: 'bazi', dims: [],
+    gist: '交运按「三日折一年」放大到日、时：起运时刻与每步换运日期都给。',
+    detail: '把「出生 → 起运那一侧节令」的真实间隔按 365.2422/3（约 121.7474 倍）放大，加到出生时刻上就是交运时刻；同一比例也兑现「一日折四月、一时辰折十日」。每步大运在同月同日同时刻换，闰日退到 2 月 28 日。年长取回归年 365.2422 日，故与按 360 日折算的流派会差一两天。',
+    source: '《渊海子平》起运法（三日折一年）；《三命通会》论行运',
+    status: 'variant',
+    note: '各家对「一年折几日」「交运日是否按 360 日计」取法不一，本插件固定 365.2422 日并把口径写进结果（dayun.jiao.yearDays）。出生时刻或经度一变，交运日会前后移一两天；月柱在交节边界时尤其要复核。',
+  },
   {
     id: 'liuyao-yingqi-exact',
     system: 'liuyao', dims: [],
     gist: '具体应期（哪一天应验）本插件尚未推算。',
     detail: '应期需要综合用神旺衰、动变、旬空出空、日月冲合多层条件，且各家取法不同。当前只给时间窗口的方向性提示，不给具体日期——与其给一个看起来精确、实则拍脑袋的日子，不如留白。',
-    source: '待补：《卜筮正宗》应期章逐条实现 + 138 条卦例对拍',
+    source: '待补：《卜筮正宗》应期章逐条实现 + 已录 128 条卦例对拍（源 138 条）',
     status: 'todo',
     note: '扩展方向：用《卜筮正宗》卦例里有明确应验日期的条目做回归，先验证再输出。',
   },
-  {
-    id: 'bazi-dayun-jiaoqi',
-    system: 'bazi', dims: [],
-    gist: '起运时间按「三日折一年」折算，未做交运日的时辰级校正。',
-    detail: '传统折算为三天折一年、一天折四月、一时辰折十天。本插件按此折算到年月，不含交运当日的时辰细分，因此起运年份在边界处可能相差一年内。',
-    source: '《渊海子平》起运法；交运日细算各家不一',
-    status: 'todo',
-    note: '扩展方向：补交运日的时辰级推算，并用已知案例核对。',
-  },
 ];
 
 function knowledgeFor(system, dimKey) {
@@ -8571,6 +10518,7 @@ __mods.interpret = (function () {
 
 const { HEX64, HEX_BY_CORE, TRIGRAM, YAO_POSITION, MOVING_NATURE, ZIWEI_STARS, WUXING_INDUSTRY, WUXING_ORGAN, TENGOD_STYLE, LIUREN_JIANG, TAROT_ELEMENT_FOCUS, DISCLAIMER } = __mods['interpret-data'];
 const { MUTAGEN } = __mods.ziwei;
+const { bodyLabels, yongshenOf } = __mods.liuyao;
 
 const DIMENSIONS = [
   { key: 'overall', label: '整体运势' },
@@ -8864,9 +10812,25 @@ function baziInterpret(r) {
           const why = (lk.reasons || []).slice(0, 2).join('，');
           return `${l.year} ${l.ganzhi}·${l.stemTenGod || ''}·${lk.tier || '平'}${why ? `（${why}）` : ''}`;
         }).join('；');
-        return `当前大运：${pick(cur, 'ganzhi', '—')}（${curSpan}）。后续两步：${nextTwo}。\n近五年流年：${years || '—'}。\n读法：大运管"这十年的大环境"，流年管"今年的具体天气"；两者打架时，以能否动到用神为准。`;
+        const jiaoLine = r.dayun && r.dayun.jiao && r.dayun.jiao.at
+          ? `起运交运时刻 ${r.dayun.jiao.at}（${r.dayun.jiao.frame}；三日折一年，距${r.dayun.jiao.from.name} ${r.dayun.jiao.spanDays} 天）。每步大运在同月同日同时刻换，逐年日期见下方大运表「交运」列。\n`
+          : '';
+        return `${jiaoLine}当前大运：${pick(cur, 'ganzhi', '—')}（${curSpan}）。后续两步：${nextTwo}。\n近五年流年：${years || '—'}。\n读法：大运管"这十年的大环境"，流年管"今年的具体天气"；两者打架时，以能否动到用神为准。`;
       })(),
     },
+    (() => {
+      const hits = (r.liunian || []).filter((l) => l.suiyun && Array.isArray(l.suiyun.signals) && l.suiyun.signals.length);
+      return {
+        key: 'suiyun', label: '岁运提示',
+        text: hits.length
+          ? hits.map((l) => {
+            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读法：岁运并临、运年反吟与流年伏吟/反吟只说明干支层面重复或对冲，传统上当作「变动感较强」的信号；本插件不据此判吉凶，要落到具体年份，仍看该年是否动到用神。'
+          : '近十年没有岁运并临、运年反吟或流年伏吟/反吟。「岁运并临主大凶」这类说法流传很广，本插件只把它当变动提示，没有命中就不作额外解读。',
+      };
+    })(),
     {
       key: 'checks', label: '交叉校验',
       text: (() => {
@@ -8912,6 +10876,10 @@ function baziInterpret(r) {
       key: 'geju', label: '格局依据',
       text: (Array.isArray(frame.geju) ? frame.geju : []).map((g) => `${g.name}（${g.kind}）：${g.evidence}`).join('；') || '未取到格局',
     },
+    ...(Array.isArray(r.classics) && r.classics.length ? [{
+      key: 'classics', label: '古籍原文',
+      text: r.classics.map((e) => `《${CLASSIC_BOOKS[e.book].name}·${e.chapter}》「${e.quote}」——${e.plain}`).join('\n'),
+    }] : []),
     {
       key: 'quant', label: '量化口径',
       text: `本报告的量化只到「档位」：事业看十神权重（${topName} ${top[0]?.[1] ?? '—'}）、财富看财星权重（${groups['财'] ?? 0}）、感情看配偶星权重（${spouseKey} ${groups[spouseKey] ?? 0}）；大运/流年用「大吉 / 吉 / 平 / 忌」四档。不换算金额、不给健康诊断——那需要地域、家庭、行业与体检数据，命盘本身推不出来。`,
@@ -8931,8 +10899,8 @@ function baziInterpret(r) {
   ];
   const tables = [
     {
-      key: 'dayun', title: '大运表', columns: ['大运', '年龄', '十神', '档位', '理由'],
-      rows: list.map((d) => [d.ganzhi, `${d.startAge}–${d.startAge + 9}`, d.stemTenGod || '', d.luck?.tier || '平', (d.luck?.reasons || []).join('，')]),
+      key: 'dayun', title: '大运表', columns: ['大运', '年龄', '交运', '十神', '档位', '理由'],
+      rows: list.map((d) => [d.ganzhi, `${d.startAge}–${d.startAge + 9}`, d.fromDate || '—', d.stemTenGod || '', d.luck?.tier || '平', (d.luck?.reasons || []).join('，')]),
     },
     {
       key: 'liunian', title: '流年表（近十年）', columns: ['年份', '干支', '十神', '档位', '与原局'],
@@ -9143,7 +11111,7 @@ function ziweiInterpret(r) {
     },
     {
       key: 'limits', label: '未纳入',
-      text: '本盘没有计算：飞星四化（宫干引发的连锁）、小限与大限的加权、流日流时的具体事项定位，以及双星组合的强弱细分。四化表取中州派常用口径，其他流派（如飞星派）结论会不同；这些不改变盘面事实，只影响轻重，所以只作方向参考。',
+      text: '本盘没有计算：小限与大限的加权、流日流时的具体事项定位、双星组合的强弱细分，以及「三方四正一起飞」的复合飞化（这里只跟单一支化逐宫串连）。四化表取中州派常用口径，其他流派（如飞星派）结论会不同；这些不改变盘面事实，只影响轻重，所以只作方向参考。',
     },
   ];
   if (natalSihua.length) {
@@ -9160,6 +11128,70 @@ function ziweiInterpret(r) {
     });
   }
 
+  {
+    const fc = r.flyChains;
+    const word = (p) => `${p}${String(p).endsWith('宫') ? '' : '宫'}`;
+    if (fc) {
+      const chainOf = (t) => {
+        const ch = fc[t];
+        if (!ch || !ch.steps.length) return `${t}：命宫这一干不化${t}星`;
+        const hops = ch.steps
+          .map((s) => `${word(s.from)}（${s.fromStem}）化${t}${s.star}→${word(s.to)}（${s.toBranch}）`)
+          .join('；');
+        return `${t}：${hops}${ch.closed ? `，绕回${word(ch.path[ch.path.length - 1])}成环` : ''}`;
+      };
+      const selfs = (r.fly || []).flatMap((p) => (p.flies || [])
+        .filter((f) => f.self)
+        .map((f) => `${word(p.palace)}（${p.stem}）化${f.type}${f.star}落回本宫`));
+      const ji = fc.忌;
+      const jiRead = ji && ji.steps.length
+        ? `忌这一条最值得盯：${word(ji.from)}化忌入${word(ji.steps[0].to)}，${word(ji.steps[0].to)}的宫干再化忌往下一宫去，${ji.closed ? `最后绕回${word(ji.path[ji.path.length - 1])}` : '走到没有可落的星就停下'}——` +
+          `这条线就是你反复着力的那一圈，` +
+          `${ji.closed ? '环越短越容易在同一组宫位上打转（传统说「忌出不去」）' : '没成环表示这条力还有落点没走完'}。`
+        : '命宫这一干化忌未上盘，忌线不成立。';
+      sections.push({
+        key: 'fly', label: '四化飞星',
+        text: `生年四化说的是「一出场就带着什么」，飞星四化说的是「这一宫自己会去找谁」：宫干定出四颗化星，星落到哪一宫，这一宫的力就往哪边使。` +
+          `从命宫出发，四条线各串一遍——${chainOf('禄')}；${chainOf('权')}；${chainOf('科')}；${chainOf('忌')}。` +
+          `${jiRead}` +
+          `另外，四化落回本宫的是自化：${selfs.length ? selfs.join('、') + '——自己化出去又回到自己，常表现为「说得多、落得少」或一阵一阵的劲头' : '本盘没有自化'}。` +
+          `这一层只描方向与牵引，不断吉凶：同样是化忌入某宫，落在生年忌上还是落在生年禄上，味道完全不同，得并着生年四化看。`,
+      });
+    }
+  }
+
+  {
+    const fc = r.flyComposite;
+    const word = (p) => `${p}${String(p).endsWith('宫') ? '' : '宫'}`;
+    if (fc && Array.isArray(fc.sources) && fc.sources.length >= 2) {
+      const hubs = fc.targets.filter((t) => t.count >= 2);
+      const hubText = hubs.length
+        ? hubs.slice(0, 5).map((t) => `${word(t.palace)}收了 ${t.incoming.map((x) => `${word(x.from)}化${x.type}${x.star}`).join('、')}`).join('；')
+        : '四宫化出去之后没有落在同一宫，力是散开的';
+      const readings = [];
+      if (fc.groups.doubleJi.length) {
+        readings.push(`${fc.groups.doubleJi.map((t) => word(t.palace)).join('、')}收到两个以上的忌——同一件事被反复牵动，传统看作那一宫的事务容易拖着不放`);
+      }
+      if (fc.groups.luJi.length) {
+        readings.push(`${fc.groups.luJi.map((t) => word(t.palace)).join('、')}禄忌同宫：好处与在意的地方绑在一起，越想要的东西越容易反复`);
+      }
+      if (fc.groups.tripleHua.length) {
+        readings.push(`${fc.groups.tripleHua.map((t) => word(t.palace)).join('、')}三化以上会宫：那一宫同时被几种力牵住，常常是这张盘最忙的地方`);
+      }
+      if (fc.groups.selfHua.length) {
+        readings.push(`${fc.groups.selfHua.map((t) => word(t.palace)).join('、')}自化：宫干化出去又落回自己，表现为力气绕回原处`);
+      }
+      sections.push({
+        key: 'flyComposite',
+        label: '三方四正飞化',
+        text: `上一节是命宫一条线往下追；这一节把命宫连同对宫与两个三合宫（${fc.sanfang.join('、')}）一起飞：四宫各化禄权科忌，共 16 条飞化（星未上盘的只记星不记落宫），按落宫归堆。` +
+          `${hubText}。` +
+          `${readings.length ? `${readings.join('；')}。` : ''}` +
+          `读法上，会在一处的化越多，那一宫被牵动的力道越集中；落单的飞化只说明方向，不单独取象。这一层同样只描会照与方向，不折吉凶，也没有叠大限与流年四化。`,
+      });
+    }
+  }
+
   if (r.flow) {
     const f = r.flow;
     const at = (p) => `${p.ganzhi || '—'}${p.palace ? `落${p.palace}` : ''}`;
@@ -9261,7 +11293,7 @@ const LIUQIN_USE = {
   兄弟: '同事、同行、竞争者，多与破财相关',
 };
 
-function liuyaoInterpret(r) {
+function liuyaoInterpret(r, ask) {
   const ben = isObj(r.ben) ? r.ben : {};
   const bian = isObj(r.bian) ? r.bian : {};
   const lines = Array.isArray(ben.lines) ? ben.lines : [];
@@ -9278,6 +11310,8 @@ function liuyaoInterpret(r) {
   const movingLiuqin = moving?.liuqin || '';
   const movingLiushen = moving?.liushen || '';
   const dayGZ = pick(r.dayGanZhi, 'name', '');
+  const bd = isObj(r.body) ? r.body : {};
+  const bodyLabelList = (bd && Array.isArray(bd.labels)) ? bd.labels : bodyLabels(bd);
   const cnt = (k) => lines.filter((l) => l.liuqin === k).length;
   const lineEv = (l) => (l ? `${l.position}爻${l.liuqin}${l.liushen ? '·' + l.liushen : ''}${l.moving ? '（动）' : ''}` : '—');
   const ev = (...xs) => xs.filter((x) => x != null && x !== '');
@@ -9299,9 +11333,112 @@ function liuyaoInterpret(r) {
       `⑥ 看变卦：${bian.name ? `变出「${bian.name}」，是事情后续的走向` : '本卦无变，以静卦论'}。以上每一步都能在下方「依据」里对上号。`,
     ].join('\n'),
   });
+  if (bodyLabelList.length) {
+    const sideOf = (o) => [o && o.inner ? '内卦' : '', o && o.outer ? '外卦' : ''].filter(Boolean).join('、');
+    const fanYinSides = sideOf(bd.fanYin || {});
+    const fanYinBy = ['inner', 'outer'].map((k) => bd.fanYin && bd.fanYin[k] && bd.fanYin[k].by).filter(Boolean).flat();
+    const bodyText = [];
+    if (bd.ben && bd.ben.chong) bodyText.push('本卦是六冲卦：六爻地支正好配成子午、寅申、辰戌三组对冲，传统读作「散」——事情起落快、成得急也散得急，急事与近病反而喜欢这股冲开的力量，拖了很久的人事则不容易凝聚。');
+    if (bd.ben && bd.ben.he) bodyText.push('本卦是六合卦：六爻地支两两相合（子丑、寅亥、卯戌、辰酉、巳申、午未），传统读作「成」——容易谈拢，也容易拖住不放。');
+    if (bd.bian && bd.bian.chong) bodyText.push('变卦也是六冲：往后走偏「散」，收尾容易一拍两散，也可能是速战速决。');
+    else if (bd.bian && bd.bian.he) bodyText.push('变卦是六合：往后走偏「合」，收尾倾向于合拢、或者就这么延续下去。');
+    if (sideOf(bd.fuYin || {})) bodyText.push(`${sideOf(bd.fuYin || {})}伏吟：卦变了，纳甲地支却没变（六十四卦里只有乾与震共用子寅辰/午申戌，所以卦伏吟只会出在乾↔震互换）——传统说「伏吟主呻吟」，人想动、事情在原地打转，宜先看清楚再迈步。`);
+    if (fanYinSides) bodyText.push(`${fanYinSides}反吟：变卦与本卦相冲，来源有两种——${fanYinBy.includes('chong') ? '地支三爻全冲' : ''}${fanYinBy.includes('chong') && fanYinBy.includes('pair') ? '，或' : ''}${fanYinBy.includes('pair') ? '本卦之宫与变卦之宫在后天八卦上正对（乾巽、坎离、艮坤、震兑）' : ''}。传统说「反吟主反复」，去而复来、方案改来改去。`);
+    if (bd.yaoFanYin && bd.yaoFanYin.length) bodyText.push(`动爻反吟（第${bd.yaoFanYin.join('、')}爻）：变出的地支回头冲本爻，变化点本身在反复——动了又翻回来，等于绕一圈回到原处。`);
+    if (bd.yaoFuYin && bd.yaoFuYin.length) bodyText.push(`动爻伏吟（第${bd.yaoFuYin.join('、')}爻）：变出的地支与本爻同支，动了等于没动，想推的事会卡在同一道坎上。`);
+    const jinYao = (bd.jinTui || []).filter((x) => x.type === '进');
+    const tuiYao = (bd.jinTui || []).filter((x) => x.type === '退');
+    if (jinYao.length) bodyText.push(`化进神（第${jinYao.map((x) => x.position).join('、')}爻：${jinYao.map((x) => `${x.from}→${x.to}`).join('、')}）：变出的地支与本爻同五行、且顺着往前一步，传统读作「进」——这一爻代表的人或事有后劲，往前走比退回去顺。`);
+    if (tuiYao.length) bodyText.push(`化退神（第${tuiYao.map((x) => x.position).join('、')}爻：${tuiYao.map((x) => `${x.from}→${x.to}`).join('、')}）：变出的地支与本爻同五行、却倒着退一步，传统读作「退」——这一爻代表的人或事渐渐退气，别按原来的势头去推。`);
+    const jp = r.jinTuiPower;
+    if (jp && Array.isArray(jp.lines) && jp.lines.length) {
+      bodyText.push(`进退的力重（放回月建日辰看）：${jp.lines.map((l) => `第${l.position}爻${l.say}`).join('；')}。进退只管方向，走不走得动看时令托不托着；用神化进为喜，忌神化进反而是忌。`);
+    }
+    bodyText.push('这些标签只说明卦体的动势，不直接定吉凶：同一支六冲，近病问的是速愈、久病问的是凶险；同一爻化进，也得看用神旺不旺、有没有月建日辰托着。');
+    sections.push({ key: 'body', label: '卦体关系', text: bodyText.join('\n') });
+  }
+
+  const ug = yongshenOf(r, {
+    direction: (ask && ask.direction) || (r.useGod && r.useGod.direction) || 'general',
+    gender: (r.useGod && r.useGod.gender) || 'male',
+  });
+  if (ug && ug.liuqin) {
+    const useText = [];
+    useText.push(`所问方向取${ug.byShi ? '世爻' : ug.liuqin}为用神（${ug.ask}）${ug.direction === 'love' ? `；感情按${ug.gender === 'female' ? '女命看官鬼' : '男命看妻财'}取，性别未给时按男命算` : ''}。`);
+    if (ug.found.length) {
+      useText.push(`用神在卦上：${ug.found.map((f) => `${f.position}爻${f.ganzhi}${f.element}${f.liuqin}${f.liushen ? `·${f.liushen}` : ''}${f.shi ? '（持世）' : ''}${f.ying ? '（临应）' : ''}${f.moving ? '（发动）' : ''}${f.kong ? '（旬空）' : ''}`).join('、')}${ug.side ? `，落在${ug.side}` : ''}。`);
+      if (ug.found.length > 1) useText.push('用神两现：传统取动者、取持世者、取旬空待填者，各派权重不同；这里只把几处都列出来，不替你选哪一爻当主用。');
+    } else if (ug.fushen.length) {
+      useText.push(`用神不上卦：本卦六爻里没有${ug.liuqin}，按「用神不上卦则于本宫首卦内寻之」，到${String(pick(ben, 'palace', '')).replace(/宫$/, '')}宫首卦取伏神——${ug.fushen.map((f) => `${f.position}爻${f.ganzhi}${f.element}，伏于飞神${f.fei ? `${f.fei.liuqin}${f.fei.ganzhi}${f.fei.element}` : '—'}之下`).join('；')}。`);
+      if (ug.relationSay.length) useText.push(`飞伏生克：${ug.relationSay.join('；')}。伏神要得出才算有力，藏在忌神之下且被克，则虽有如无。`);
+    } else {
+      useText.push(`用神不上卦，且本宫首卦里也没找到${ug.liuqin}，这一问在卦面上没有直接对应物，只能借日月或改日再占。`);
+    }
+
+    const link = [];
+    if (bd.ben && bd.ben.chong) link.push('用神在六冲卦里：六冲主散，急事与近病借这股冲开的力量，缓事、久拖的人事则不容易凝聚');
+    if (bd.ben && bd.ben.he) link.push('用神在六合卦里：六合主成，容易谈拢，也容易黏住不放');
+    if (bd.bian && bd.bian.chong) link.push('用神逢变六冲：往后走向偏散，收尾容易一拍两散，也可能是速战速决');
+    else if (bd.bian && bd.bian.he) link.push('用神逢变六合：往后走向偏合，倾向于合拢或就这么延续');
+    for (const side of ['inner', 'outer']) {
+      const nm = side === 'inner' ? '内卦' : '外卦';
+      if (bd.fuYin && bd.fuYin[side]) link.push(`用神在${nm}伏吟：动而地支未变，想推的事卡在原地`);
+      if (bd.fanYin && bd.fanYin[side]) link.push(`用神在${nm}反吟：变卦与本卦相冲，用神这一头去而复来、定了又改`);
+    }
+    const jinYong = (bd.jinTui || []).filter((x) => x.type === '进' && ug.found.some((f) => f.position === x.position));
+    const tuiYong = (bd.jinTui || []).filter((x) => x.type === '退' && ug.found.some((f) => f.position === x.position));
+    if (jinYong.length) link.push(`用神化进神（${jinYong.map((x) => `${x.from}→${x.to}`).join('、')}）：这一爻有后劲，顺着推比退回去顺`);
+    if (tuiYong.length) link.push(`用神化退神（${tuiYong.map((x) => `${x.from}→${x.to}`).join('、')}）：这一爻渐渐退气，别按原来的势头硬推`);
+    if (ug.found.some((f) => f.kong)) link.push('用神旬空：事情先悬着，传统说空要出空、填实才算落地');
+    if (ug.found.some((f) => (bd.yaoFanYin || []).includes(f.position))) link.push('用神这一爻动而反吟：变化点本身在反复，动了又翻回来');
+    if (ug.found.some((f) => (bd.yaoFuYin || []).includes(f.position))) link.push('用神这一爻动而伏吟：动了等于没动，容易卡在同一道坎上');
+    if (link.length) useText.push(`与卦体对起来看：${link.join('；')}。`);
+    const strength = r.useGodStrength;
+    if (strength && strength.lines && strength.lines.length) {
+      const head = strength.month && strength.month.branch
+        ? `月建 ${strength.month.branch}（${strength.month.element}）`
+        : '没有月建（未给起卦时间），只按日辰看';
+      const body = strength.lines.map((l) => {
+        const chong = l.monthChong ? '，遭月建冲（月破）'
+          : l.dayChong ? (l.kong ? '，日辰冲空' : l.moving ? '，逢日辰冲' : '，日辰冲而暗动') : '';
+        return `${l.position}爻${l.branch}${l.element}：月建${l.monthState}（${l.monthSay}），${l.dayRelation}（${l.daySay}）${chong}`;
+      });
+      useText.push(`时令对用神：${head}，日辰 ${strength.day ? `${strength.day.branch}（${strength.day.element}）` : '—'}。${body.join('；')}。`);
+      useText.push('月建看这一段时令站在哪一边，日辰看当天那股力量是扶还是克；两处同时看，只报状态，不折成分数。');
+    }
+    useText.push('这一层只把用神、卦体与时令对起来，应期与成败还要看动爻变化与月建日辰的进退节奏，所以这里不折成分数、不断成败。');
+    sections.push({ key: 'yongshen', label: '用神落位与卦体', text: useText.join('\n') });
+  }
+
+  {
+    const hs = r.hexStrength;
+    if (hs && Array.isArray(hs.lines) && hs.lines.length) {
+      const head = hs.month && hs.month.branch
+        ? `月建 ${hs.month.branch}（${hs.month.element}）`
+        : '没有月建（未给起卦时间）';
+      const day = hs.day && hs.day.branch ? `日辰 ${hs.day.branch}（${hs.day.element}）` : '日辰 —';
+      const rows = hs.lines.map((l) => {
+        const who = l.shi ? '（世）' : l.ying ? '（应）' : '';
+        const flags = `${l.moving ? '·动' : ''}${l.kong ? '·旬空' : ''}`;
+        return `${l.position}爻${l.liuqin ? l.liuqin : ''}${l.branch}${l.element}${who}${flags}：月建${l.monthState}，${l.dayRelation}${l.chongTag ? `，${l.chongTag}` : ''}`;
+      });
+      const order = ['旺', '相', '休', '囚', '死'];
+      const dist = order.filter((k) => hs.counts[k]).map((k) => `${k}${hs.counts[k]}`).join('、');
+      const shi = hs.shi ? `世爻在${hs.shi.position}爻（月建${hs.shi.monthState}，${hs.shi.dayRelation}）` : '';
+      const ying = hs.ying ? `应爻在${hs.ying.position}爻（月建${hs.ying.monthState}，${hs.ying.dayRelation}）` : '';
+      sections.push({
+        key: 'hexStrength',
+        label: '全卦逐爻旺衰',
+        text: `整张卦按${head}、${day}逐爻过一遍：${rows.join('；')}。五态分布：${dist}——${[shi, ying].filter(Boolean).join('，')}。` +
+          `气旺的爻对应的事推进起来省力，气弱或遭月破的爻对应的事宜缓；这只是六爻全貌，用神那几爻的细节仍以上一节为准，两处不冲突时再看动爻把哪一头带动。` +
+          `判定与用神旺衰同一套（月令五态、日辰五关系、月破/暗动/冲空），只报状态，不折成分数。`,
+      });
+    }
+  }
+
   sections.push({
     key: 'limits', label: '未纳入',
-    text: '本卦没有计算：月建对爻的旺衰（只用了日辰）、伏神与飞神的完整生克链、进神退神与反吟伏吟的细节，以及用神多重时的取舍权重。这些会改变"旺不旺"的判断，所以这里只给取象与方向。',
+    text: '本卦没有计算：用神两现时该取哪一爻的权重、伏神出伏的应期。化进/化退的力重只按月建五态给「得令/失令」这类档位，不折成加权分数，也不叠动变连环；这些都会改变"旺不旺"的判断，所以这里只给取象与方向。',
   });
 
   const dimensions = [
@@ -9315,6 +11452,7 @@ function liuyaoInterpret(r) {
         moving ? `动爻 ${lineEv(moving)}` : '无动爻',
         `日辰 ${dayGZ || '—'}`,
         `卦宫 ${pick(ben, 'palace', '—')}·${palaceEl || '—'}`,
+        bodyLabelList.length ? `卦体 ${bodyLabelList.join('、')}` : '卦体 无六冲六合伏吟反吟',
       ),
     },
     {
@@ -9703,6 +11841,7 @@ const BUILDERS = {
 const { interpretQimen } = __mods['qimen-interpret'];
 const { buildAnswer, buildPlain, buildGlossary, buildFollowups, dimensionPlain } = __mods['interpret-plain'];
 const { knowledgeFor, caveatsFor, STATUS_LABEL } = __mods['interpret-knowledge'];
+const { CLASSIC_BOOKS } = __mods.classics;
 
 function enrichPlain(result, r, ask) {
   if (!result) return result;
@@ -9798,7 +11937,7 @@ function interpret(r, opts) {
   if (!fn) return null;
   let body;
   try {
-    body = fn(r);
+    body = fn(r, ask);
   } catch (e) {
     return {
       moduleType: MODULE_TYPE[r.system] || 'natal',
@@ -9990,7 +12129,54 @@ function followup(r, question) {
   return { question: q, ...result };
 }
 
-return { followup };
+const SYSTEM_LABEL = {
+  bazi: '八字（四柱）',
+  ziwei: '紫微斗数',
+  liuyao: '六爻',
+  meihua: '梅花易数',
+  daliuren: '大六壬',
+  qimen: '奇门遁甲',
+  tarot: '塔罗',
+  hepan: '合盘',
+  chenggu: '称骨',
+  almanac: '黄历',
+  zeri: '择日',
+  star: '星座',
+  numerology: '生命数字',
+  mbti: '十六型人格',
+  trend: '人生 K 线',
+  fengshui: '风水',
+  name: '起名',
+  convert: '公农历互转',
+};
+
+function askPrompt(r, opts = {}) {
+  const label = SYSTEM_LABEL[r && r.system] || (r && r.system) || '未知体系';
+  const asked = String((opts && opts.question) || '').trim();
+  const question = asked || '请先总览这张盘，指出最值得注意的一两处，并说明各自的依据。';
+  const limit = Number.isFinite(opts && opts.maxChars) && opts.maxChars >= 400 ? opts.maxChars : 3000;
+  const raw = String((r && r.summary) || '').trim();
+  const truncated = raw.length > limit;
+  const summary = truncated ? `${raw.slice(0, limit)}…（摘要已截断）` : raw;
+
+  const lines = [
+    '【命理追问】下面这张盘是命理插件刚排好的，请就着它回答我的问题；不用重新排盘，盘面字段已经够用。',
+    `体系：${label}`,
+    `所问：${question}`,
+    '',
+    '——盘面摘要——',
+    summary || '（这张盘没有摘要字段，请先让我重新排一次。）',
+    '',
+    '——回答要求——',
+    '1) 尽量引用到具体的柱、宫或爻，再说判断，别只给结论；',
+    '2) 盘面里没有依据的地方直接说「这盘里看不出来」，不要补外部假设；',
+    '3) 用概率和倾向的说法，别给绝对化的断言，也别把传统说法当成事实。',
+  ];
+  const text = lines.join('\n');
+  return { text, question, system: (r && r.system) || '', label, chars: text.length, truncated };
+}
+
+return { followup, askPrompt };
 })();
 
 __mods.crosscheck = (function () {
@@ -10280,19 +12466,19 @@ return { matchEvent, rectifyBirth, RECTIFY_KINDS };
 
 __mods.index = (function () {
 const { buildBazi } = __mods.bazi;
-const { buildLiuyao, tossLines } = __mods.liuyao;
+const { buildLiuyao, tossLines, bodyLabels, yongshenOf, yongshenStrength, hexagramStrength, jinTuiPower } = __mods.liuyao;
 const { buildZiwei, BRIGHTNESS, flowOf, asOfParts } = __mods.ziwei;
 const { drawTarot } = __mods.tarot;
 const { buildMeihua } = __mods.meihua;
 const { buildDaliuren } = __mods.daliuren;
 const { buildHepan } = __mods.hepan;
 const { buildZiweiHepan } = __mods['ziwei-hepan'];
-const { buildQimen } = __mods.qimen;
+const { buildQimen, buildSnapshot } = __mods.qimen;
 const { geocodeAddress, resolveAddress } = __mods.geo;
 const { toJDN, ganzhiName, dayGanzhiIndex } = __mods.calendar;
 const { randomOf, isSeed } = __mods.random;
 const { interpret, DIRECTIONS, DIRECTION_DEFAULT } = __mods.interpret;
-const { followup } = __mods.followup;
+const { followup, askPrompt } = __mods.followup;
 const { crossCheck, crossText } = __mods.crosscheck;
 const { pastSignals, verifyFit } = __mods.verify;
 const { rectifyBirth } = __mods.rectify;
@@ -10302,7 +12488,9 @@ const { buildChenggu } = __mods.chenggu;
 const { buildXiaoliuren } = __mods.xiaoliuren;
 const { buildStar } = __mods.star;
 const { buildNumerology } = __mods.numerology;
+const { buildMbti, mbtiPaper } = __mods.mbti;
 const { buildConvert } = __mods.convert;
+const { classicsFor, classicsText } = __mods.classics;
 const { buildTrend } = __mods.trend;
 const { buildFengshui } = __mods.fengshui;
 const { buildName } = __mods.name;
@@ -10367,6 +12555,9 @@ function baziText(r) {
     : '';
   const dayun = r.dayun.list.slice(0, 8)
     .map((d) => `${d.startAge}岁 ${d.ganzhi}(${d.stemTenGod})${d.luck ? `·${d.luck.tier}` : ''}${d.relations && d.relations.length ? `[${d.relations.join('')}]` : ''}`).join('　');
+  const jiao = r.dayun.jiao && r.dayun.jiao.at
+    ? `；交运 ${r.dayun.jiao.at}（${r.dayun.jiao.frame}，距${r.dayun.jiao.from.name} ${r.dayun.jiao.spanDays} 天，三日折一年）`
+    : '';
   const near = r.jieqi.nearBoundaryMinutes < 20
     ? `\n⚠ 出生时刻距「节」仅 ${r.jieqi.nearBoundaryMinutes} 分钟，而节气时刻本身有最多约 14 分钟的偏差，月柱与年柱建议人工复核。`
     : '';
@@ -10397,9 +12588,16 @@ function baziText(r) {
     shenshaLine,
     `真太阳时：${r.solarTime.trueSolarText}（${r.input.geo ? r.input.geo.note + '；' : ''}${r.solarTime.note}）　晚子时：${r.input.lateZi ? '23:00 后算次日' : '23:00 后仍算当日'}`,
     `节气：上一节 ${r.jieqi.previous.name} ${r.jieqi.previous.time}　下一节 ${r.jieqi.next.name} ${r.jieqi.next.time}`,
-    `大运：${r.dayun.rule}（${r.dayun.direction}），${r.dayun.startAge.years}岁${r.dayun.startAge.months}个月起运`,
+    `大运：${r.dayun.rule}（${r.dayun.direction}），${r.dayun.startAge.years}岁${r.dayun.startAge.months}个月起运${jiao}`,
     `　${dayun}`,
     `流年：${r.liunian.slice(0, 10).map((l) => `${l.year}${l.ganzhi}(${l.stemTenGod})${l.luck ? `·${l.luck.tier}` : ''}`).join('　')}`,
+    (() => {
+      const hits = r.liunian.filter((l) => l.suiyun && l.suiyun.signals && l.suiyun.signals.length);
+      if (!hits.length) return '岁运提示：近十年无岁运并临、运年反吟或流年伏吟/反吟（只标干支，不判吉凶）';
+      const label = (s) => `${s.type}${s.type.startsWith('流年') && s.target ? `(${s.target})` : ''}`;
+      return '岁运提示（只标干支变动，不判吉凶）：' + hits
+        .map((l) => `${l.year}${l.ganzhi} ${l.suiyun.signals.map(label).join('/')}`).join('；');
+    })(),
     '（格局、用神、行运吉凶为扶抑＋简化调候的量化提示，非断语。）',
   ].join('\n') + near;
 }
@@ -10426,6 +12624,28 @@ function ziweiText(r) {
     : '无明显格局（按内置规则）';
   const daxian = (r.daxianList ?? []).slice(0, 8).map((d) =>
     `  ${d.branch}宫（${d.palace}）${d.ages[0]}-${d.ages[1]}岁 ${d.ganzhi} 会${d.mainStars.join('') || '—'} 化 ${d.mutagenHits.map((m) => `${m.star}${m.type}→${m.palace || '未上盘'}`).join('、')}`);
+  const flyLine = (() => {
+    const fc = r.flyChains;
+    if (!fc) return '';
+    const one = (t) => {
+      const ch = fc[t];
+      if (!ch || !ch.steps.length) return '';
+      return `${t}：${ch.path.join('→')}${ch.closed ? '（成环）' : ''}`;
+    };
+    const text = ['禄', '权', '科', '忌'].map(one).filter(Boolean).join('　');
+    return text ? `【命宫飞星】${text}` : '';
+  })();
+  const flyCompositeLine = (() => {
+    const fc = r.flyComposite;
+    if (!fc || !Array.isArray(fc.sources) || !fc.sources.length) return '';
+    const groups = fc.labels.length ? fc.labels.join(' · ') : '无同宫会聚';
+    const detail = ['禄', '权', '科', '忌'].map((t) => {
+      const list = ((fc.byType && fc.byType[t]) || []).filter((x) => !x.self);
+      const tos = [...new Set(list.map((x) => String(x.to).replace(/宫$/, '')))];
+      return tos.length ? `${t}→${tos.join('/')}` : '';
+    }).filter(Boolean).join('　');
+    return `【三方四正飞化】${fc.sanfang.join('·')}：${groups}${detail ? `　${detail}` : ''}`;
+  })();
   return [
     `【农历】${lunarText}（月首 ${r.lunar.monthStart}）　时支：${r.hourBranch}　年干支：${r.yearGanzhi}`,
     `【时刻】${r.solarTime ? `${r.solarTime.civilText} → 真太阳时 ${r.solarTime.trueSolarText}${r.input.geo ? '（' + r.input.geo.note + '）' : ''}` : ''}`,
@@ -10434,6 +12654,8 @@ function ziweiText(r) {
     `【大限】${r.daxian.rule}，${r.daxian.startAge}岁起　【小限】${r.xiaoxianRule.direction}`,
     `【昌曲】文昌${r.changqu.wenchang.branch}（${r.changqu.wenchang.palace}${r.changqu.wenchang.mutagen ? '·化' + r.changqu.wenchang.mutagen : ''}）　文曲${r.changqu.wenqu.branch}（${r.changqu.wenqu.palace}${r.changqu.wenqu.mutagen ? '·化' + r.changqu.wenqu.mutagen : ''}）`,
     `　　　${r.changqu.relation}　入命三方：${r.changqu.inSoulSanfang ? '是' : '否'}　吸收面：${r.changqu.absorb.label}（${r.changqu.absorb.reason}）`,
+    flyLine,
+    flyCompositeLine,
     '十二宫：',
     ...rows,
     '大限（按起运年龄排序，前 8 限，宫干四化落宫）：',
@@ -10441,11 +12663,21 @@ function ziweiText(r) {
     '流年（前 6 年，完整 12 年在结构化数据里）：',
     ...liunian,
     `【格局】${patterns}`,
-    r.patternSummary ? `【结构统计】吉格 ${r.patternSummary.good.length}、忌格 ${r.patternSummary.bad.length}；${r.patternSummary.note}` : '',
+    r.patternSummary ? `【结构统计】吉格 ${r.patternSummary.good.length}、中性 ${r.patternSummary.neutral.length}、忌格 ${r.patternSummary.bad.length}；${r.patternSummary.note}` : '',
     r.lunar.note ? `注：${r.lunar.note}` : '',
   ].filter(Boolean).join('\n');
 }
 
+const STATE_ORDER = ['旺', '相', '休', '囚', '死'];
+function stateLine(r) {
+  const st = r.states;
+  const mo = r.month;
+  if (!st || !mo) return '无月令数据';
+  const fmt = (g) => STATE_ORDER.filter((k) => g && Array.isArray(g[k]) && g[k].length)
+    .map((k) => `${k} ${g[k].join('/')}`).join('　');
+  return `月令 ${mo.branch}（${mo.element}）　门 ${fmt(st.gate) || '—'}　星 ${fmt(st.star) || '—'}　干 ${fmt(st.stem) || '—'}`;
+}
+
 function qimenText(r) {
   const P = r.palaces;
   const cell = (x) => `${x.palace}宫 ${x.star || '—'}／${x.gate || '—'}／${x.god || '—'}${x.kong ? ' 空' : ''}${x.ma ? ' 马' : ''}`;
@@ -10454,6 +12686,8 @@ function qimenText(r) {
     `【局数】${r.ju}　节气 ${r.jieqi}（${r.jieqiTime}）`,
     `【值符】${r.zhiFu.star}（${r.zhiFu.gong}宫）　【值使】${r.zhiShi.gate}（${r.zhiShi.gong}宫）　旬首 ${r.xunshou}`,
     `【空亡】${r.kongWang.join('') || '—'}　驿马 ${r.ma.zhi || '—'}（${r.ma.gong || '—'}宫）`,
+    `【宫位条件】击刑 ${(r.conditions && r.conditions.jiXing || []).map((x) => `${x.palace}宫${x.stem}`).join('、') || '无'}　入墓 ${(r.conditions && r.conditions.ruMu || []).map((x) => `${x.palace}宫${x.stem}`).join('、') || '无'}`,
+    `【旺衰】${stateLine(r)}`,
     `【九宫】${P.map(cell).join('　')}`,
     `※ 晚子时：${r.lateZiHourMode === 'next-day' ? '23:00 后归次日' : '23:00 后仍归当日'}（可用 lateZiHourMode / lateZi 指定）`,
     `※ ${r.rules[r.rules.length - 1]}`,
@@ -10555,6 +12789,36 @@ function liuyaoText(r) {
   ];
   if (r.bian) out.push(`动爻：第 ${r.cast.movingPositions.join('、')} 爻`, '变卦（六亲以变卦自身宫论）：', fmt(r.bian));
   else out.push('六爻安静，无变卦。');
+  const body = (r.body && Array.isArray(r.body.labels)) ? r.body.labels : bodyLabels(r.body);
+  out.push(`卦体：${body.length ? body.join(' · ') : '无六冲、六合、伏吟、反吟'}`);
+  const ug = r.useGod || yongshenOf(r, {});
+  if (ug && ug.liuqin) {
+    const where = ug.found.length
+      ? ug.found.map((f) => `${f.position}爻${f.ganzhi}${f.element}${f.kong ? '（空）' : ''}`).join('、')
+      : (ug.fushen.length ? ug.fushen.map((f) => `伏 ${f.position}爻${f.ganzhi}${f.element}（${f.relation || '飞伏关系未知'}）`).join('、') : '不上卦');
+    out.push(`用神：${ug.byShi ? '世爻' : ug.liuqin}（${ug.ask}）→ ${where}${ug.side ? `（${ug.side}）` : ''}`);
+    const head = ug.byShi ? '用神 世爻' : `用神 ${ug.liuqin}`;
+    const extra = ug.labels.filter((x) => x !== head && !x.startsWith(head));
+    if (extra.length) out.push(`用神联动：${extra.join(' · ')}`);
+    const strength = r.useGodStrength;
+    if (strength && strength.labels.length) {
+      const m = strength.month && strength.month.branch ? `月建 ${strength.month.branch}（${strength.month.element}）　` : '';
+      out.push(`用神旺衰：${m}${strength.labels.join(' · ')}`);
+    }
+  } else {
+    out.push('用神：未取（未指明所问之事；用「询问方向」指定后即按六亲取用）');
+  }
+  const hexSt = r.hexStrength;
+  if (hexSt && Array.isArray(hexSt.labels) && hexSt.labels.length) {
+    const m = hexSt.month && hexSt.month.branch
+      ? `月建 ${hexSt.month.branch}（${hexSt.month.element}）　`
+      : '无月建（未给起卦时间）　';
+    out.push(`全卦旺衰：${m}${hexSt.labels.join(' · ')}`);
+  }
+  const jt = r.jinTuiPower;
+  if (jt && Array.isArray(jt.lines) && jt.lines.length) {
+    out.push(`进退力重：${jt.lines.map((l) => `${l.position}爻${l.from}→${l.to}${l.type}·${l.verdict}`).join(' · ')}`);
+  }
   return out.filter(Boolean).join('\n');
 }
 
@@ -10564,6 +12828,11 @@ function jsonSafe(value) {
 
 function compute(args = {}) {
   const r = jsonSafe(computeRaw(args));
+  if (r && r.system === 'bazi') {
+    r.classics = classicsFor(r);
+    const ct = classicsText(r.classics);
+    if (ct) r.summary = `${r.summary}\n【古籍】\n${ct}`;
+  }
   if (r && r.precision && r.precision.level === 'approx' && r.summary) {
     r.summary = `⚠ ${r.precision.note}\n${r.summary}`;
   }
@@ -10829,6 +13098,25 @@ function computeRaw(args = {}) {
     } catch (e) {
       throw fail('E_LINES', e && e.message ? e.message : e);
     }
+    const ug = yongshenOf(result, { direction: args.direction, gender: args.gender });
+    if (ug.liuqin) result.useGod = ug;
+    let monthBranch = null;
+    if (stamp) {
+      try {
+        const snap = buildSnapshot({ year: stamp.year, month: stamp.month, day: stamp.day, hour: stamp.hour, minute: stamp.minute });
+        monthBranch = (snap.monthGanZhi || '')[1] || null;
+      } catch {
+        monthBranch = null;
+      }
+    }
+    const hexStrength = hexagramStrength(result, { monthBranch, dayBranch: result.dayGanZhi.branch });
+    if (hexStrength) result.hexStrength = hexStrength;
+    const jtPower = jinTuiPower(result, { monthBranch, dayBranch: result.dayGanZhi.branch });
+    if (jtPower) result.jinTuiPower = jtPower;
+    if (ug.liuqin) {
+      const strength = yongshenStrength(result, ug, { monthBranch, dayBranch: result.dayGanZhi.branch });
+      if (strength) result.useGodStrength = strength;
+    }
     if (args.seed !== undefined && args.seed !== null && args.seed !== '') result.seed = Number(args.seed);
     return { ...result, ...(asOf ? { asOf } : {}), summary: liuyaoText(result) };
   }
@@ -10902,6 +13190,14 @@ function computeRaw(args = {}) {
     const result = buildNumerology({ year: dt.year, month: dt.month, day: dt.day });
     return { ...result, summary: numerologyText(result) };
   }
+  if (system === 'mbti') {
+    if (args.answers === undefined || args.answers === null) {
+      const paper = mbtiPaper();
+      return { ...paper, summary: mbtiPaperText(paper) };
+    }
+    const result = buildMbti({ answers: args.answers });
+    return { ...result, summary: mbtiText(result) };
+  }
   if (system === 'trend') {
     const dt = parseDateTime(args.datetime);
     const result = buildTrend({
@@ -10971,9 +13267,9 @@ function computeRaw(args = {}) {
     return { ...result, summary: nameText(result) };
   }
   if (!system) {
-    throw fail('E_INPUT', '缺少 system，可选：bazi（四柱八字）、ziwei（紫微斗数）、liuyao（六爻）、meihua（梅花易数）、daliuren（大六壬）、qimen（奇门遁甲）、hepan（合盘）、tarot（塔罗）、almanac（黄历）、zeri（择日）、chenggu（称骨）、xiaoliuren（小六壬）、star（星座）、numerology（生命数字）、trend（人生 K 线）、fengshui（风水）、name（起名）、convert（公农历互转）。');
+    throw fail('E_INPUT', '缺少 system，可选：bazi（四柱八字）、ziwei（紫微斗数）、liuyao（六爻）、meihua（梅花易数）、daliuren（大六壬）、qimen（奇门遁甲）、hepan（合盘）、tarot（塔罗）、almanac（黄历）、zeri（择日）、chenggu（称骨）、xiaoliuren（小六壬）、star（星座）、numerology（生命数字）、mbti（十六型人格问卷）、trend（人生 K 线）、fengshui（风水）、name（起名）、convert（公农历互转）。');
   }
-  throw fail('E_SYSTEM', `未知体系「${system}」，可选：bazi（四柱八字）、ziwei（紫微斗数）、liuyao（六爻）、meihua（梅花易数）、daliuren（大六壬）、qimen（奇门遁甲）、hepan（合盘）、tarot（塔罗）、almanac（黄历）、zeri（择日）、chenggu（称骨）、xiaoliuren（小六壬）、star（星座）、numerology（生命数字）、trend（人生 K 线）、fengshui（风水）、name（起名）、convert（公农历互转）。`);
+  throw fail('E_SYSTEM', `未知体系「${system}」，可选：bazi（四柱八字）、ziwei（紫微斗数）、liuyao（六爻）、meihua（梅花易数）、daliuren（大六壬）、qimen（奇门遁甲）、hepan（合盘）、tarot（塔罗）、almanac（黄历）、zeri（择日）、chenggu（称骨）、xiaoliuren（小六壬）、star（星座）、numerology（生命数字）、mbti（十六型人格问卷）、trend（人生 K 线）、fengshui（风水）、name（起名）、convert（公农历互转）。`);
 }
 
 function almanacText(r) {
@@ -11072,6 +13368,41 @@ function numerologyText(r) {
   ].join('\n');
 }
 
+function mbtiText(r) {
+  const dims = r.dims.map((d) => {
+    const side = d.picked === d.left ? d.leftSay : d.rightSay;
+    const pct = Math.round(d.pct * 100);
+    return `${d.left}/${d.right} 取 ${d.picked}（${d.strength} ${pct}%，净分 ${d.sum}）　${side}`;
+  });
+  const p = r.profile;
+  const stack = Array.isArray(p.stack) && p.stack.length
+    ? p.stack.map((f, i) => `${i === 0 ? '主导 ' : ''}${f.code}`).join(' → ') + `\n　${p.stack.map((f) => `${f.code}：${f.say}`).join('\n　')}`
+    : '';
+  return [
+    `【十六型人格】${r.type}（${p.title}）· ${p.keywords}　已答 ${r.answered}/${r.total} 题`,
+    `一句：${p.oneLine}`,
+    '【四维】',
+    ...dims,
+    `【优势】${p.strengths.join('；')}`,
+    `【留意】${p.blindspots.join('；')}`,
+    `【课题】${p.growth}`,
+    `【认知功能】${stack}`,
+    `【工作】${p.work}`,
+    `【关系】${p.love}`,
+    `【学习】${p.study}`,
+    `注：${r.note}`,
+  ].join('\n');
+}
+
+function mbtiPaperText(paper) {
+  return [
+    `【十六型人格问卷】${paper.total} 题，每题按 1（完全不像我）到 5（很像我）打分`,
+    ...paper.questions.map((q) => `${q.no}. ${q.text}`),
+    `请把 ${paper.total} 个分数按顺序交给 answers（如 [4,2,5,3,…]）；可以跳过某些题（填 null），至少答 12 题。`,
+    `注：${paper.note}`,
+  ].join('\n');
+}
+
 function trendText(r) {
   const s = r.meta.strength;
   const dm = r.meta.dayMaster;
@@ -11168,11 +13499,12 @@ function renderText(result) {
   return parts.filter(Boolean).join('\n\n');
 }
 
-return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAddress, resolveAddress, buildBazi, buildLiuyao, tossLines, followup, pastSignals, verifyFit, rectifyBirth, crossCheck, crossText, buildAlmanac, buildZeri, buildChenggu, buildXiaoliuren, buildStar, buildNumerology, buildConvert, buildTrend, buildFengshui, buildName, parseDateTime, compute, interpretText, renderText };
+return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAddress, resolveAddress, buildBazi, buildLiuyao, tossLines, followup, askPrompt, pastSignals, verifyFit, rectifyBirth, crossCheck, crossText, buildAlmanac, buildZeri, buildChenggu, buildXiaoliuren, buildStar, buildNumerology, buildConvert, buildTrend, buildFengshui, buildName, parseDateTime, compute, interpretText, renderText };
 })();
 
     const Engine = __mods.index;
     window.Engine = Engine;
+    window.__MP_VER = '0.38.2';
 (function () {
   const NEED_ASK = { liuyao: true, meihua: true, daliuren: true, tarot: true };
   const needAsk = (kind) => !!NEED_ASK[kind];
@@ -11203,25 +13535,28 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 
 (function () {
   const CSS = `
-.pp,.mp-it{--ink:#1b1b1b;--ink2:#3f3a33;--muted:#6f6a60;--label:#8a8378;--faint:#a9a296;
+.pp,.mp-it,.mp-al,.mp-cg,.mp-cl,.mp-cli,.mp-kline,.mp-mb,.mp-mb-paper,.mp-nm,.mp-quick{--ink:#1b1b1b;--ink2:#3f3a33;--muted:#6f6a60;--label:#8a8378;--faint:#a9a296;
   --line:#c8c1b2;--dimline:#b9b2a4;--hair:#e9e2d3;
   --bg:#f6f1e6;--card:#fffdf8;--band:#fbf7ee;--hover:#f3ede1;--hover2:#ece5d6;
   --tri:#f3e8cd;--soul:#fae4dc;--sel:#fceee7;--link:#f9ece0;
   --red:#b3261e;--red-rgb:179,38,30;--lu:#1f6f3f;--lu-rgb:31,111,63;
   --quan:#8a5a00;--quan-rgb:138,90,0;--ke:#1f4e79;--ke-rgb:31,78,121;--ji:#b3261e;
   --br-good:#4c7a5c;--br-bad:#9c5b56;--on-accent:#fff;--wx-metal:#8a6b1f;
-  --tg-bi:#4a6f8a;--tg-shi:#4c7a5c;--tg-cai:#8a6b1f;--tg-guan:#9c5b56;--tg-yin:#6d5f83}
+  --tg-bi:#4a6f8a;--tg-shi:#4c7a5c;--tg-cai:#8a6b1f;--tg-guan:#9c5b56;--tg-yin:#6d5f83;
+  --ink3:#8a8378;--fx:"Kaiti SC",KaiTi,"STKaiti","Songti SC",serif;--sans:system-ui,-apple-system,"Microsoft YaHei",sans-serif;--kai:"Kaiti SC",KaiTi,"STKaiti",serif;
+  --shadow:0 1px 2px rgba(35,28,18,.05),0 18px 40px -30px rgba(35,28,18,.42)}
 .pp{border:1px solid var(--line);background:var(--bg);color:var(--ink);font-family:"Songti SC","SimSun","Microsoft YaHei",serif;font-size:12.5px;line-height:1.55;
-  container-type:inline-size}
+  border-radius:12px;overflow:hidden;box-shadow:var(--shadow);container-type:inline-size}
 @media screen and (prefers-color-scheme:dark){
-  .pp,.mp-it{--ink:#eae5d9;--ink2:#d5cfc2;--muted:#aca598;--label:#a49c8e;--faint:#928b7e;
+  .pp,.mp-it,.mp-al,.mp-cg,.mp-cl,.mp-cli,.mp-kline,.mp-mb,.mp-mb-paper,.mp-nm,.mp-quick{--ink:#eae5d9;--ink2:#d5cfc2;--muted:#aca598;--label:#a49c8e;--faint:#928b7e;
     --line:#514a3e;--dimline:#5f5849;--hair:#2f2b23;
     --bg:#12110c;--card:#211f18;--band:#282419;--hover:#2e2a1f;--hover2:#383322;
     --tri:#332913;--soul:#3a231c;--sel:#43271f;--link:#33241c;
     --red:#f08569;--red-rgb:240,133,105;--lu:#74c795;--lu-rgb:116,199,149;
     --quan:#e2a95c;--quan-rgb:226,169,92;--ke:#86bcea;--ke-rgb:134,188,234;--ji:#f08569;
     --br-good:#79c79a;--br-bad:#e09a8c;--on-accent:#14130f;--wx-metal:#dcb273;
-    --tg-bi:#93b7cf;--tg-shi:#8fbb9d;--tg-cai:#d3ae62;--tg-guan:#d98d84;--tg-yin:#b4a4d0}
+    --tg-bi:#93b7cf;--tg-shi:#8fbb9d;--tg-cai:#d3ae62;--tg-guan:#d98d84;--tg-yin:#b4a4d0;
+    --ink3:#8b8478;--shadow:0 1px 2px rgba(0,0,0,.5),0 18px 40px -30px rgba(0,0,0,.9)}
 }
 .pp *{box-sizing:border-box}
 .pp-grid{display:grid;grid-template-columns:repeat(4,1fr);grid-template-rows:repeat(4,minmax(150px,auto));gap:0;border:1px solid var(--line)}
@@ -11311,6 +13646,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 
 .pp-cell{cursor:pointer;transition:background .14s ease,box-shadow .14s ease;outline:none}
 .pp-cell:hover{background:var(--hover)}
+.pp-cell:focus-visible{box-shadow:inset 0 0 0 2px var(--red)}
 .pp-cell.pp-sel{background:var(--sel);box-shadow:inset 0 0 0 2px rgba(var(--red-rgb),.5)}
 .pp-cell.pp-link{background:var(--link);box-shadow:inset 0 0 0 1.5px rgba(var(--red-rgb),.22)}
 .pp-detail{display:none;border-top:1px solid var(--line);background:var(--card);padding:11px 14px 13px;font-family:system-ui,sans-serif}
@@ -11366,7 +13702,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 .mp-trig{display:inline-block;width:14px;height:10px;vertical-align:-1px;margin-right:4px;color:currentColor}
 
 .mp-hy-wrap{display:flex;gap:22px;flex-wrap:wrap;align-items:flex-start}
-.mp-hy-box{border:1px solid var(--line);background:var(--card);padding:12px 16px 14px;min-width:250px}
+.mp-hy-box{border:1px solid var(--line);border-radius:10px;background:var(--card);padding:12px 16px 14px;min-width:250px}
 .mp-hy-h{display:flex;align-items:baseline;gap:8px;margin-bottom:10px;font-family:system-ui,sans-serif}
 .mp-hy-h b{color:var(--red);font-size:14px}
 .mp-hy-h span{color:var(--muted);font-size:12px}
@@ -11385,7 +13721,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 .mp-mh{padding:16px}
 .mp-mh-head{font-size:13px;color:var(--muted);margin-bottom:12px}
 .mp-mh-main{display:flex;gap:18px;flex-wrap:wrap;align-items:flex-start}
-.mp-hexbox{border:1px solid var(--line);background:var(--card);padding:12px 15px 13px}
+.mp-hexbox{border:1px solid var(--line);border-radius:10px;background:var(--card);padding:12px 15px 13px}
 .mp-hexbox.hb-mini{min-width:118px}
 .mp-hexbox .hb-h{display:flex;justify-content:space-between;gap:10px;font-size:12px;letter-spacing:.14em;color:var(--muted);font-family:system-ui,sans-serif;margin-bottom:5px}
 .mp-hexbox .hb-n{font-size:17px;font-weight:700;color:var(--red);margin-bottom:8px;letter-spacing:.04em}
@@ -11555,7 +13891,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 .mp-tt{padding:16px}
 .mp-tt-head{font-size:12.5px;color:var(--muted);margin-bottom:12px;letter-spacing:.04em}
 .mp-tt-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(172px,1fr));gap:10px}
-.mp-tt-card{border:1px solid var(--line);background:var(--card);padding:13px 14px;display:flex;flex-direction:column;gap:7px;min-height:168px}
+.mp-tt-card{border:1px solid var(--line);border-radius:10px;background:var(--card);padding:13px 14px;display:flex;flex-direction:column;gap:7px;min-height:168px}
 .mp-tt-card.tt-rev{background:var(--band);border-style:dashed}
 .mp-tt-pos{font-size:12px;color:var(--muted);letter-spacing:.14em}
 .mp-tt-name{font-size:19px;font-weight:700;color:var(--red);letter-spacing:.04em}
@@ -11575,11 +13911,12 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 .mp-tt-ta{width:100%;border:1px solid var(--line);background:var(--card);color:var(--ink);padding:8px;font-size:13px;font-family:inherit;line-height:1.7;resize:vertical;outline:none}
 .mp-tt-ta:focus{border-color:var(--red)}
 
-.mp-it{margin-top:14px;border:1px solid var(--line);background:var(--bg);color:var(--ink);
+.mp-it{margin-top:14px;border:1px solid var(--line);background:var(--bg);color:var(--ink);border-radius:12px;overflow:hidden;box-shadow:var(--shadow);
   font-family:"Songti SC","SimSun","Microsoft YaHei",serif;font-size:13px;line-height:1.75}
 .mp-it *{box-sizing:border-box}
 .mp-it-head{display:flex;align-items:center;gap:9px;flex-wrap:wrap;width:100%;padding:12px 16px;border:none;border-bottom:1px solid var(--line);background:var(--card);color:inherit;font:inherit;font-family:inherit;text-align:left;cursor:pointer;-webkit-appearance:none;appearance:none}
 .mp-it-head:hover{background:var(--band)}
+.mp-it-head:focus-visible{outline:2px solid var(--red);outline-offset:-3px}
 .mp-it-arrow{flex:none;font-size:12px;line-height:1;color:var(--red);transition:transform .16s ease}
 .mp-it.folded .mp-it-arrow{transform:rotate(-90deg)}
 .mp-it.folded .mp-it-wrap{display:none}
@@ -11654,7 +13991,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 .mp-tables{border-top:1px solid var(--line);padding:12px 16px 4px;background:var(--card)}
 .mp-table-wrap{margin-bottom:12px}
 .mp-table-h{font-size:12px;font-weight:700;letter-spacing:.1em;color:var(--lu);margin-bottom:5px;font-family:system-ui,sans-serif}
-.mp-table-scroll{overflow-x:auto;border:1px solid var(--line);border-radius:6px}
+.mp-table-scroll{overflow-x:auto;border:1px solid var(--line);border-radius:8px}
 .mp-table{width:100%;border-collapse:collapse;font-size:12px;line-height:1.6;color:var(--ink2);font-family:system-ui,sans-serif}
 .mp-table th,.mp-table td{padding:5px 9px;text-align:left;vertical-align:top;border-bottom:1px solid var(--line);white-space:nowrap}
 .mp-table th{background:var(--band);color:var(--label);font-weight:600;font-size:11px;letter-spacing:.06em}
@@ -11720,6 +14057,18 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 .mp-qt-y b.first{color:var(--ji);border-bottom:2px solid var(--ji);padding-bottom:1px}
 .mp-qt-q{margin-top:6px;font-size:12.5px;line-height:1.8;color:var(--ink2);font-family:var(--fx)}
 .mp-qt-q span{display:block;font-size:11px;color:var(--ink3);font-family:var(--sans);margin-top:2px}
+.mp-cl{margin-top:12px;padding:10px 12px 8px;border-left:2px solid var(--quan);border-radius:0 8px 8px 0;
+  background:color-mix(in srgb,var(--band) 72%,transparent)}
+.mp-cl-h{display:flex;gap:8px;align-items:baseline;font-size:12.5px;margin-bottom:7px}
+.mp-cl-h b{color:var(--ink);letter-spacing:.06em}
+.mp-cl-h span{color:var(--ink3);font-size:11.5px}
+.mp-cl-e{padding:8px 0;border-top:1px dashed var(--hair)}
+.mp-cl-e:first-of-type{border-top:0;padding-top:0}
+.mp-cl-t b{font-family:var(--fx);font-size:13px;color:var(--lu);font-weight:600;letter-spacing:.03em}
+.mp-cl-q{font-family:var(--fx);font-size:14px;line-height:2;color:var(--ink);margin-top:3px;letter-spacing:.02em;
+  padding-left:1.05em;text-indent:-1.05em}
+.mp-cl-p{font-size:12px;line-height:1.9;color:var(--ink2);margin-top:3px}
+@media print{.mp-cl{break-inside:avoid}}
 @media print{.mp-cli{break-inside:avoid}}
 .mp-nm{margin:12px 16px;border:1px solid var(--line);border-radius:8px;background:var(--card);padding:12px 14px;font-family:system-ui,sans-serif}
 .mp-nm-h{display:flex;align-items:baseline;gap:10px;flex-wrap:wrap;border-bottom:1px solid var(--hair);padding-bottom:8px;margin-bottom:10px}
@@ -11748,6 +14097,49 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 .mp-nm-c em{font-style:normal;font-size:11.5px;line-height:1.7;color:var(--muted);font-family:var(--sans)}
 @media print{.mp-nm{break-inside:avoid}}
 .mp-quick-pre{margin:0;white-space:pre-wrap;word-break:break-word;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:13px;line-height:1.9;color:var(--ink2)}
+.mp-mb{margin:12px 16px;border:1px solid var(--line);border-radius:12px;background:var(--card);box-shadow:var(--shadow);overflow:hidden;font-family:var(--sans)}
+.mp-mb-h{display:flex;flex-direction:row;align-items:center;gap:14px;flex-wrap:wrap;padding:15px 18px 14px;
+  background:linear-gradient(135deg,var(--sel),var(--band) 64%,var(--card));border-bottom:1px solid var(--hair)}
+.mp-mb-code{font-family:var(--fx);font-size:32px;font-weight:700;line-height:1;letter-spacing:.12em;color:var(--ink)}
+.mp-mb-meta{display:flex;flex-direction:column;gap:3px;min-width:0}
+.mp-mb-meta b{font-size:14.5px;font-weight:600;color:var(--ink);letter-spacing:.04em}
+.mp-mb-meta i{font-style:normal;font-size:12px;line-height:1.5;color:var(--muted)}
+.mp-mb-count{margin-left:auto;padding:3px 10px;border:1px solid var(--line);border-radius:999px;background:var(--card);color:var(--muted);font-size:11.5px;white-space:nowrap}
+.mp-mb-body{padding:14px 18px 16px}
+.mp-mb-dims{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px}
+.mp-mb-dim{border:1px solid var(--hair);border-radius:10px;background:var(--band);padding:9px 11px 10px}
+.mp-mb-dh{display:flex;align-items:baseline;gap:6px;font-size:11.5px;color:var(--muted)}
+.mp-mb-dh b{font-family:var(--fx);font-size:17px;font-weight:600;line-height:1.1;letter-spacing:.08em;color:var(--faint)}
+.mp-mb-dh b.on{color:var(--ink)}
+.mp-mb-dh em{font-style:normal;margin:0 auto;font-size:11.5px;letter-spacing:.06em}
+.mp-mb-bar{position:relative;height:7px;border-radius:4px;background:var(--hair);margin:7px 0 6px;overflow:hidden}
+.mp-mb-bar::after{content:"";position:absolute;left:50%;top:-1px;bottom:-1px;width:1px;background:color-mix(in srgb,var(--line) 70%,transparent)}
+.mp-mb-bar em{position:absolute;top:0;bottom:0;background:linear-gradient(90deg,var(--quan),color-mix(in srgb,var(--quan) 55%,var(--card)));border-radius:4px}
+.mp-mb-bar.l em{left:0}
+.mp-mb-bar.r em{right:0;background:linear-gradient(270deg,var(--quan),color-mix(in srgb,var(--quan) 55%,var(--card)))}
+.mp-mb-df{font-size:11.5px;color:var(--ink2);font-variant-numeric:tabular-nums}
+.mp-mb-ds{margin-top:2px;font-size:11.5px;line-height:1.7;color:var(--muted)}
+.mp-mb-sec{margin-top:11px;font-size:12.5px;line-height:1.85;color:var(--ink2)}
+.mp-mb-sec em{display:inline-block;margin-right:7px;padding:0 7px;border:1px solid var(--hair);border-radius:5px;background:var(--band);color:var(--muted);font-size:11px;font-style:normal;letter-spacing:.08em}
+.mp-mb-two{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;margin-top:11px}
+.mp-mb-two>div{border:1px solid var(--hair);border-left:3px solid var(--br-good);border-radius:8px;background:var(--card);padding:8px 10px;font-size:12.5px;line-height:1.8;color:var(--ink2)}
+.mp-mb-two>div+div{border-left-color:var(--br-bad)}
+.mp-mb-two b{display:block;margin-bottom:2px;font-size:11.5px;font-weight:600;letter-spacing:.08em;color:var(--br-good)}
+.mp-mb-two>div+div b{color:var(--br-bad)}
+.mp-mb-fn{display:flex;flex-wrap:wrap;gap:6px;margin-top:7px}
+.mp-mb-fn span{font-size:11.5px;border:1px solid var(--line);border-radius:999px;background:var(--card);padding:2px 9px;color:var(--ink2)}
+.mp-mb-fn span.lead{border-color:var(--quan);background:color-mix(in srgb,var(--quan) 9%,var(--card));color:var(--quan);font-weight:600}
+.mp-mb-fn span b{font-weight:600;margin-right:4px}
+.mp-mb-note{margin:12px 18px 14px;padding-top:10px;font-size:11px;line-height:1.7;color:var(--muted);border-top:1px solid var(--hair)}
+.mp-mb-paper{margin:12px 16px;border:1px solid var(--line);border-radius:12px;background:var(--card);box-shadow:var(--shadow);overflow:hidden;font-family:var(--sans)}
+.mp-mb-paper ol{counter-reset:q;display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:4px 20px;
+  margin:0;padding:12px 18px 14px;list-style:none;font-size:12.5px;line-height:1.7;color:var(--ink2)}
+.mp-mb-paper li{counter-increment:q;position:relative;padding:0 0 6px 26px;border-bottom:1px dashed var(--hair)}
+.mp-mb-paper li::before{content:counter(q);position:absolute;left:0;top:1px;display:flex;align-items:center;justify-content:center;
+  width:19px;height:19px;border:1px solid var(--hair);border-radius:50%;background:var(--band);color:var(--muted);font-size:10.5px;font-variant-numeric:tabular-nums}
+.mp-mb-paper .mp-mb-note{margin:0 18px 14px}
+@media (max-width:640px){.mp-mb-dims,.mp-mb-two,.mp-mb-paper ol{grid-template-columns:1fr}.mp-mb-code{font-size:26px}.mp-mb-body{padding:12px 14px 14px}.mp-mb-h{padding:13px 14px 12px}}
+@media print{.mp-mb{break-inside:avoid}}
 .mp-al{margin:12px 16px;border:1px solid var(--line);border-radius:8px;background:var(--card);padding:12px 14px;font-family:system-ui,sans-serif}
 .mp-al-h{display:flex;align-items:baseline;gap:10px;flex-wrap:wrap;border-bottom:1px solid var(--hair);padding-bottom:8px;margin-bottom:9px}
 .mp-al-h b{font-size:18px;color:var(--ink);font-weight:700;font-variant-numeric:tabular-nums}
@@ -12130,6 +14522,25 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
       ? `<div class="pp-chips">${r.daxianList.slice(0, 8).map((d) => `<span class="pp-chip" title="${esc(`${d.ganzhi} 宫干四化：` + d.mutagenHits.map((m) => `${m.star}化${m.type}→${m.palace || '未上盘'}`).join('、'))}">${d.branch} ${d.ages[0]}-${d.ages[1]}</span>`).join('')}</div>` : '';
     const lnHit = ln && ln.mutagenHits && ln.mutagenHits.length
       ? `<div class="pp-chips">${ln.mutagenHits.map((m) => `<span class="pp-chip ${m.type === '忌' ? 'warn' : m.type === '禄' ? 'ok' : ''}">${m.star}化${m.type}→${m.palace || '未上盘'}</span>`).join('')}</div>` : '';
+    const flyHTML = r.flyChains ? (() => {
+      const chips = ['禄', '权', '科', '忌'].map((t) => {
+        const ch = r.flyChains[t];
+        if (!ch || !ch.steps.length) return '';
+        const path = ch.path.map((p) => String(p).replace(/宫$/, '')).join('→');
+        const tip = ch.steps.map((s) => `${s.from}（${s.fromStem}）化${t}${s.star}→${s.to}`).join('；');
+        const cls = t === '忌' ? 'warn' : t === '禄' ? 'ok' : '';
+        return `<span class="pp-chip ${cls}" title="${esc(tip)}">飞${t} ${esc(path)}${ch.closed ? '↺' : ''}</span>`;
+      }).join('');
+      return chips ? `<div class="pp-chips">${chips}</div>` : '';
+    })() : '';
+    const flyCompositeHTML = r.flyComposite && Array.isArray(r.flyComposite.labels) && r.flyComposite.labels.length
+      ? `<div class="pp-chips">${r.flyComposite.labels.map((l) => {
+        const cls = /忌/.test(l) ? 'warn' : /自化/.test(l) ? '' : 'ok';
+        const palaceOf = (x) => String(x).replace(/^.*?会/, '').replace(/^禄忌同宫/, '').replace(/自化$/, '');
+        const hit = (r.flyComposite.targets || []).find((t) => t.palace === palaceOf(l));
+        const tip = hit ? hit.incoming.map((x) => `${x.from}化${x.type}${x.star}`).join('、') : r.flyComposite.note;
+        return `<span class="pp-chip ${cls}" title="${esc(tip)}">三方四正 ${esc(l)}</span>`;
+      }).join('')}</div>` : '';
 
     const fl = r.flow;
     const flowHTML = fl ? (() => {
@@ -12147,7 +14558,6 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
         ${row(`流时 ${BR[fl.hour.hourIndex]}时`, fl.hour)}
       </div>`;
     })() : '';
-
     pp._zw = r;
     return `<div class="pp">
       <input type="radio" name="ppm" id="ppm-ben" class="pp-r" checked>
@@ -12160,7 +14570,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
       ${body('ben', soulIdx, 'ben')}
       ${body('da', dxIdx, 'da')}
       ${body('ln', lnIdx, 'ln')}
-    </div>${flowHTML}${chips}${pats}${dxs}${lnHit}`;
+    </div>${flowHTML}${chips}${flyHTML}${flyCompositeHTML}${pats}${dxs}${lnHit}`;
   };
 
   function starLine(list) {
@@ -12319,9 +14729,52 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
       ? box(`变卦 ${r.bian.name}`, `${r.bian.palace} · ${r.bian.palaceElement}`, r.bian, r.bian.lines)
       : `<div class="mp-hy-box"><div class="mp-hy-h"><b>六爻安静</b><span>无动爻，不取变卦</span></div>
           <div class="pp-dim" style="font-size:12px;line-height:1.9">断卦以本卦卦辞与世应生克为主。</div></div>`;
+    const bodyLabels = (r.body && Array.isArray(r.body.labels)) ? r.body.labels : [];
+    const bodyRow = bodyLabels.length
+      ? `<div class="pp-chips">${bodyLabels.map((l) => {
+        const cls = /伏吟/.test(l) ? 'warn' : /反吟/.test(l) ? 'warn' : /化退神/.test(l) ? 'warn' : /六冲|散/.test(l) ? '' : 'ok';
+        return `<span class="pp-chip ${cls}">${esc(l)}</span>`;
+      }).join('')}</div>`
+      : `<div class="pp-chips"><span class="pp-chip">卦体无六冲、六合、伏吟、反吟</span></div>`;
+    const ug = r.useGod && r.useGod.liuqin ? r.useGod : null;
+    const useRow = ug
+      ? `<div class="pp-chips">${ug.labels.map((l) => {
+        const cls = /空亡|退神|受克|泄气|不上卦/.test(l) ? 'warn'
+          : /持世|化进|六合|得飞神生/.test(l) ? 'ok' : '';
+        return `<span class="pp-chip ${cls}">${esc(l)}</span>`;
+      }).join('')}</div>`
+      : `<div class="pp-chips"><span class="pp-chip">用神未取（未指明所问之事）</span></div>`;
+    const st = r.useGodStrength && Array.isArray(r.useGodStrength.labels) ? r.useGodStrength : null;
+    const strengthRow = st && st.labels.length
+      ? `<div class="pp-chips">${st.labels.map((l) => {
+        const cls = /死|囚|月破|受日辰克|泄|耗/.test(l) ? 'warn'
+          : /旺|相|得日辰生|比和/.test(l) ? 'ok' : '';
+        return `<span class="pp-chip ${cls}">${esc(l)}</span>`;
+      }).join('')}</div>`
+      : '';
+    const jp = r.jinTuiPower && Array.isArray(r.jinTuiPower.labels) ? r.jinTuiPower : null;
+    const jinRow = jp && jp.labels.length
+      ? `<div class="pp-chips">${jp.labels.map((l) => {
+        const cls = /后劲足|退得缓/.test(l) ? 'ok' : /有限|进得虚|退得实|月破|未定/.test(l) ? 'warn' : '';
+        return `<span class="pp-chip ${cls}">${esc(l)}</span>`;
+      }).join('')}</div>`
+      : '';
+    const hs = r.hexStrength && Array.isArray(r.hexStrength.labels) ? r.hexStrength : null;
+    const hexRow = hs && hs.labels.length
+      ? `<div class="pp-chips">${hs.labels.map((l) => {
+        const cls = /死|囚|月破|冲空/.test(l) ? 'warn'
+          : /旺|相/.test(l) ? 'ok' : '';
+        return `<span class="pp-chip ${cls}">${esc(l)}</span>`;
+      }).join('')}</div>`
+      : '';
     return `<div class="pp" style="padding:14px">
       <div class="mp-mh-head">起卦 ${r.cast.notation.join('、')}（自下而上）　日辰 ${r.dayGanZhi.name}</div>
       <div class="mp-hy-wrap">${ben}${bian}</div>
+      ${bodyRow}
+      ${useRow}
+      ${strengthRow}
+      ${jinRow}
+      ${hexRow}
     </div>`;
   };
 
@@ -12487,6 +14940,12 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
   pp.qimenFactsHTML = function (r) {
     if (!r || !r.palaces) return '';
     const row = (k, v) => `<div class="relation__row"><dt>${esc(k)}</dt><dd>${esc(v)}</dd></div>`;
+    const stateCell = (g) => {
+      if (!g) return '—';
+      const parts = ['旺', '相', '休', '囚', '死'].filter((k) => Array.isArray(g[k]) && g[k].length)
+        .map((k) => `${k} ${g[k].join('、')}`);
+      return parts.join('；') || '—';
+    };
     const rows = [
       ['局数', `${r.ju}${r.yuan ? `（${r.yuan}）` : ''}`],
       ['节气', `${r.jieqi || '—'}${r.jieqiTime ? `（${r.jieqiTime}）` : ''}`],
@@ -12498,6 +14957,24 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
       ['驿马', r.ma && r.ma.zhi ? `${r.ma.zhi}${r.ma.gong ? `（${r.ma.gong}宫）` : ''}` : '—'],
       ['换局规则', r.juMethodNote || r.juMethod || '—'],
       ['晚子时', r.lateZiHourMode === 'next-day' ? '23:00 后归次日' : '23:00 后仍归当日'],
+      ['击刑', (r.conditions && r.conditions.jiXing && r.conditions.jiXing.length)
+        ? r.conditions.jiXing.map((x) => `${x.palace}宫${x.stem}`).join('、') : '本盘无'],
+      ['入墓', (r.conditions && r.conditions.ruMu && r.conditions.ruMu.length)
+        ? r.conditions.ruMu.map((x) => `${x.palace}宫${x.stem}`).join('、') : '本盘无'],
+      ['月令', r.month && r.month.branch ? `${r.month.branch}（${r.month.element}）` : '—'],
+      ['门旺衰', stateCell(r.states && r.states.gate)],
+      ['星旺衰', stateCell(r.states && r.states.star)],
+      ['干旺衰', stateCell(r.states && r.states.stem)],
+      ['干宫生克', (() => {
+        const order = ['干克宫', '宫克干', '干生宫', '宫生干', '比和'];
+        const g = {};
+        for (const p of r.palaces || []) {
+          const rel = p.stemRelation || null;
+          if (!rel || rel.type === 'unknown' || !p.tianPan) continue;
+          (g[rel.type] = g[rel.type] || []).push(p.tianPan);
+        }
+        return order.filter((k) => g[k]).map((k) => k + ' ' + g[k].join('、')).join('；') || '—';
+      })()],
     ];
     return `<dl class="relation mp-qm-facts" aria-label="奇门盘面事实">${rows.map(([k, v]) => row(k, v)).join('')}</dl>`;
   };
@@ -12521,6 +14998,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
         <div class="pp-qm-mid"><span class="tp">${p.tianPan || ''}</span><span class="star">${p.star || ''}</span></div>
         <div class="pp-qm-mid"><span class="dp">${p.diPan || ''}</span><span class="gate">${p.gate || ''}</span></div>
         <div class="pp-qm-bot"><span>${p.anGan || ''}</span><span class="no">${g}</span></div>
+        <div class="pp-qm-bot"><span class="dim">${(p.stemRelation && p.stemRelation.type !== 'unknown') ? p.stemRelation.type : ''}</span><span class="dim">${p.stemState || ''}</span></div>
       </div>`;
     };
     return `<div class="pp mp-qm">
@@ -12657,7 +15135,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
     const tip = `<div class="cv-tip">曲线只呈现引擎已给出的行运评分（${VMIN} ~ ${VMAX}），不预测具体事件；档位与依据见下方「大运 / 流年」各节。悬停看逐年详情。</div>`;
 
     return `<div class="mp-curve">
-      <div class="mp-curve-h"><b>人生运势曲线</b><span>${a0}–${a1} 岁　${r.dayun.rule}，${startAge} 岁起运</span></div>
+      <div class="mp-curve-h"><b>人生运势曲线</b><span>${a0}–${a1} 岁　${r.dayun.rule}，${startAge} 岁起运${(r.dayun.jiao && r.dayun.jiao.at) ? `，交运 ${r.dayun.jiao.at}` : ''}</span></div>
       <svg viewBox="0 0 ${W} ${H}" role="img" aria-label="人生运势曲线：${a0} 到 ${a1} 岁的大运与流年评分走势">
         ${bands}${axes}${dyFill}${dyLine}${lnLine}${dots}${ticks.join('')}${yLabels}${mark}${markLo}
       </svg>
@@ -12981,12 +15459,17 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 
     const dy = r.dayun.list.map((d) => {
       const lk = d.luck || null;
-      return `<span class="pp-chip ${lk ? tierCls(lk.tier) : ''}" title="${esc(lk ? `${lk.tier} ${lk.score}｜${(lk.reasons || []).join('；')}` : '')}">${d.startAge} ${d.ganzhi}${(d.relations && d.relations.length) ? ` <i class="pp-drel">${d.relations.join('')}</i>` : ''}${lk ? ` ${lk.tier}` : ''}</span>`;
+      return `<span class="pp-chip ${lk ? tierCls(lk.tier) : ''}" title="${esc(`${d.fromDate ? `${d.fromDate} 交运；` : ''}${lk ? `${lk.tier} ${lk.score}｜${(lk.reasons || []).join('；')}` : ''}`)}">${d.startAge} ${d.ganzhi}${(d.relations && d.relations.length) ? ` <i class="pp-drel">${d.relations.join('')}</i>` : ''}${lk ? ` ${lk.tier}` : ''}</span>`;
     }).join('');
     const ln = (r.liunian && r.liunian.length) ? `<div class="pp-chips">${r.liunian.slice(0, 8).map((l) => {
       const lk = l.luck || null;
-      return `<span class="pp-chip ${lk ? tierCls(lk.tier) : ''}" title="${esc(lk ? `${lk.tier} ${lk.score}｜${(lk.reasons || []).join('；')}` : '')}">${l.year} ${l.ganzhi}${lk ? ` ${lk.tier}` : ''}</span>`;
+      const sy = (l.suiyun && Array.isArray(l.suiyun.signals)) ? l.suiyun.signals : [];
+      const syTip = sy.length ? `｜${sy.map((x) => x.detail).join('；')}` : '';
+      return `<span class="pp-chip ${lk ? tierCls(lk.tier) : ''}" title="${esc(lk ? `${lk.tier} ${lk.score}｜${(lk.reasons || []).join('；')}${syTip}` : syTip.replace(/^｜/, ''))}">${l.year} ${l.ganzhi}${lk ? ` ${lk.tier}` : ''}</span>`;
     }).join('')}</div>` : '';
+    const sy = (r.liunian || []).filter((l) => l.suiyun && Array.isArray(l.suiyun.signals) && l.suiyun.signals.length);
+    const syRow = sy.length ? `<div class="pp-tl pp-dim">岁运提示（只标干支变动，不判吉凶）</div><div class="pp-chips">${sy.map((l) =>
+      `<span class="pp-chip" title="${esc(`${l.suiyun.signals.map((x) => x.detail).join('；')}｜${l.suiyun.note || ''}`)}">${l.year} ${esc(l.suiyun.signals.map((x) => `${x.type}${x.type.startsWith('流年') && x.target ? `·${x.target}` : ''}`).join('/'))}</span>`).join('')}</div>` : '';
     const str = r.strength ? `<div class="pp-str">日主强弱：<b>${r.strength.level}</b>${r.strength.score}　<span class="pp-dim">${r.strength.detail}</span></div>` : '';
     const ssGroups = (r.shensha && r.shensha.groups) || [];
     const ssx = ssGroups.length ? `
@@ -13003,16 +15486,24 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
       ${sect('格局', gj)}
       ${sect('用神', ys)}
       ${cliCard}
+      ${(Array.isArray(r.classics) && r.classics.length) ? `<section class="mp-cl" aria-label="古籍原文">
+        <div class="mp-cl-h"><b>古籍原文</b><span>照录通行本，释义为白话自撰</span></div>
+        ${r.classics.map((e) => `<div class="mp-cl-e">
+          <div class="mp-cl-t"><b>${esc(({ ziping: '子平真诠', ditian: '滴天髓', sanming: '三命通会' }[e.book] || e.book) + '·' + e.chapter)}</b></div>
+          <div class="mp-cl-q">「${esc(e.quote)}」</div>
+          <div class="mp-cl-p">${esc(e.plain)}</div>
+        </div>`).join('')}
+      </section>` : ''}
       ${sect('五行与十神', `<div class="pp-chips">${wx}</div>${gods}`)}
       ${sect('大运', `${pp.curveHTML(r)}<div class="pp-chips">${dy}</div>`)}
-      ${ln ? sect('流年', ln) : ''}
+      ${ln ? sect('流年', ln + syRow) : ''}
       ${r.palaces ? sect('胎元与命身宫', `<div class="pp-chips">
         <span class="pp-chip" title="${r.palaces.taiyuan.note}">胎元 ${r.palaces.taiyuan.ganzhi}</span>
         <span class="pp-chip" title="${r.palaces.minggong.note}">命宫 ${r.palaces.minggong.ganzhi}</span>
         <span class="pp-chip" title="${r.palaces.shengong.note}">身宫 ${r.palaces.shengong.ganzhi}</span>
       </div>`) : ''}
       ${ssx}
-      <div style="margin-top:8px;font-size:12px;color:var(--muted)">上一节 ${r.jieqi.previous.name} ${r.jieqi.previous.time}　下一节 ${r.jieqi.next.name} ${r.jieqi.next.time}　${r.dayun.rule}，${r.dayun.startAge.years}岁起运</div>
+      <div style="margin-top:8px;font-size:12px;color:var(--muted)">上一节 ${r.jieqi.previous.name} ${r.jieqi.previous.time}　下一节 ${r.jieqi.next.name} ${r.jieqi.next.time}　${r.dayun.rule}，${r.dayun.startAge.years}岁起运${(r.dayun.jiao && r.dayun.jiao.at) ? `（交运 ${r.dayun.jiao.at}，${r.dayun.jiao.frame}）` : ''}</div>
     </div>`;
   };
 
@@ -13137,11 +15628,62 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
     </section>`;
   };
 
+  pp.mbtiHTML = function (r) {
+    if (!r) return '';
+    if (r.needAnswers && Array.isArray(r.questions)) {
+      const items = r.questions.map((q) => `<li>${esc(q.text)}</li>`).join('');
+      return `<section class="mp-mb-paper" aria-label="十六型人格问卷">
+        <div class="mp-mb-h">
+          <span class="mp-mb-meta"><b>十六型人格问卷</b><i>${r.total} 题 · 每题 1 完全不像 / 5 很像我</i></span>
+          <span class="mp-mb-count">填完分数再看结果</span>
+        </div>
+        <ol>${items}</ol>
+        <div class="mp-mb-note">${esc(r.note || '')}</div>
+      </section>`;
+    }
+    const dims = (r.dims || []).map((d) => {
+      const pct = Math.round((d.pct || 0) * 100);
+      const leftOn = d.picked === d.left;
+      const width = Math.max(2, pct);
+      const say = leftOn ? d.leftSay : d.rightSay;
+      return `<div class="mp-mb-dim">
+        <div class="mp-mb-dh"><b class="${leftOn ? 'on' : ''}">${esc(d.left)}</b><em>${esc(d.name)}</em><b class="${leftOn ? '' : 'on'}">${esc(d.right)}</b></div>
+        <div class="mp-mb-bar ${leftOn ? 'l' : 'r'}"><em style="width:${width}%"></em></div>
+        <div class="mp-mb-df">取 ${esc(d.picked)} · ${esc(d.strength)} ${pct}%</div>
+        <div class="mp-mb-ds">${esc(say)}</div>
+      </div>`;
+    }).join('');
+    const p = r.profile || {};
+    const stack = (p.stack || []).map((f, i) => `<span class="${i === 0 ? 'lead' : ''}"><b>${esc(f.code)}</b>${esc(f.say)}</span>`).join('');
+    return `<section class="mp-mb" aria-label="十六型人格结果">
+      <div class="mp-mb-h">
+        <span class="mp-mb-code">${esc(r.type || '')}</span>
+        <span class="mp-mb-meta"><b>${esc(p.title || '')}</b><i>${esc(p.keywords || '')}</i></span>
+        <span class="mp-mb-count">已答 ${r.answered || 0}/${r.total || 0} 题</span>
+      </div>
+      <div class="mp-mb-body">
+        <div class="mp-mb-dims">${dims}</div>
+        <div class="mp-mb-sec"><em>一句</em>${esc(p.oneLine || '')}</div>
+        <div class="mp-mb-two">
+          <div><b>优势</b>${(p.strengths || []).map((s) => esc(s)).join('；')}</div>
+          <div><b>留意</b>${(p.blindspots || []).map((s) => esc(s)).join('；')}</div>
+        </div>
+        ${stack ? `<div class="mp-mb-sec"><em>认知功能</em>主导 ${esc((p.stack[0] || {}).code || '')} → 依次展开</div><div class="mp-mb-fn">${stack}</div>` : ''}
+        <div class="mp-mb-sec"><em>工作</em>${esc(p.work || '')}</div>
+        <div class="mp-mb-sec"><em>关系</em>${esc(p.love || '')}</div>
+        <div class="mp-mb-sec"><em>学习</em>${esc(p.study || '')}</div>
+        <div class="mp-mb-sec"><em>课题</em>${esc(p.growth || '')}</div>
+      </div>
+      <div class="mp-mb-note">${esc(r.note || '')}</div>
+    </section>`;
+  };
+
   pp.quickHTML = function (r) {
     if (!r) return '';
     const LABEL = {
       almanac: '黄历', zeri: '择日', chenggu: '称骨', xiaoliuren: '小六壬',
       star: '星座', numerology: '生命数字', trend: '人生 K 线', fengshui: '风水', name: '起名', convert: '公农历转换',
+      mbti: '十六型人格',
     };
     const title = LABEL[r.system] || '速查';
     const text = r.summary || '';
@@ -13289,7 +15831,8 @@ const PP = window.__PP;
 const CSS = `
 .mp-wrap{height:100%;overflow:auto;padding:20px 24px 40px;color:var(--dsw-alias-label-primary);font-size:14px}
 .mp-wrap>*{max-width:940px;margin-left:auto;margin-right:auto}
-.mp-panel{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:14px;padding:16px 18px 14px;margin-bottom:14px}
+.mp-panel{background:linear-gradient(180deg,var(--dsw-alias-bg-layer-2),color-mix(in srgb,var(--dsw-alias-bg-layer-2) 88%,var(--dsw-alias-bg-layer-1)));border:1px solid var(--dsw-alias-border-l1);border-radius:16px;padding:18px 20px 16px;margin-bottom:16px;
+  box-shadow:0 1px 2px color-mix(in srgb,var(--dsw-alias-label-primary) 5%,transparent),0 16px 34px -30px color-mix(in srgb,var(--dsw-alias-label-primary) 45%,transparent)}
 .mp-row{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:12px 14px;align-items:end}
 .mp-lbl{display:block;height:18px;line-height:18px;font-size:12.5px;color:var(--dsw-alias-label-secondary);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
 .mp-checks{display:flex;gap:20px;flex-wrap:wrap;margin-top:13px;font-size:12.5px;color:var(--dsw-alias-label-secondary)}
@@ -13297,17 +15840,50 @@ const CSS = `
 .mp-askblock{margin-top:14px;display:flex;flex-direction:column;gap:5px}
 .mp-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:14px}
 .mp-tabs{display:inline-flex;gap:4px;margin-bottom:14px;flex-wrap:wrap;padding:4px;background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:11px;width:100%;max-width:940px}
-.mp-tab{padding:7px 15px;border-radius:8px;border:none;background:transparent;color:var(--dsw-alias-label-secondary);cursor:pointer;font-size:13.5px;transition:background .12s,color .12s}
-.mp-tab:hover{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary)}
-.mp-tab.on{background:var(--dsw-alias-brand-primary);color:#fff}
+.mp-tab{padding:7px 15px;border-radius:9px;border:none;background:transparent;color:var(--dsw-alias-label-secondary);cursor:pointer;font-size:13.5px;transition:background .14s,color .14s,box-shadow .14s}
+.mp-tab:hover{background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary)}
+.mp-tab.on{background:var(--dsw-alias-brand-primary);color:#fff;box-shadow:0 8px 18px -12px var(--dsw-alias-brand-primary)}
 .mp-field{display:flex;flex-direction:column;gap:5px;font-size:13px;color:var(--dsw-alias-label-secondary);min-width:0}
-.mp-input{background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);border-radius:8px;padding:7px 11px;font-size:14px;outline:none;width:100%;min-width:0;height:36px}
-.mp-input:focus{border-color:var(--dsw-alias-brand-primary)}
-.mp-textarea{background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);border-radius:8px;padding:8px 11px;font-size:14px;outline:none;width:100%;min-width:0;resize:vertical;line-height:1.5;font-family:inherit}
-.mp-textarea:focus{border-color:var(--dsw-alias-brand-primary)}
+.mp-input{background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);border-radius:9px;padding:7px 11px;font-size:14px;outline:none;width:100%;min-width:0;height:36px;
+  transition:border-color .14s,box-shadow .14s,background .14s}
+.mp-input:hover{border-color:color-mix(in srgb,var(--dsw-alias-border-l1) 45%,var(--dsw-alias-brand-primary))}
+.mp-input:focus{border-color:var(--dsw-alias-brand-primary);box-shadow:0 0 0 3px color-mix(in srgb,var(--dsw-alias-brand-primary) 18%,transparent)}
+.mp-textarea{background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary);border-radius:9px;padding:8px 11px;font-size:14px;outline:none;width:100%;min-width:0;resize:vertical;line-height:1.5;font-family:inherit;
+  transition:border-color .14s,box-shadow .14s}
+.mp-textarea:hover{border-color:color-mix(in srgb,var(--dsw-alias-border-l1) 45%,var(--dsw-alias-brand-primary))}
+.mp-textarea:focus{border-color:var(--dsw-alias-brand-primary);box-shadow:0 0 0 3px color-mix(in srgb,var(--dsw-alias-brand-primary) 18%,transparent)}
 .mp-textarea.invalid{border-color:var(--dsw-alias-state-error-primary)}
-.mp-btn{padding:8px 22px;border-radius:8px;border:none;background:var(--dsw-alias-brand-primary);color:#fff;cursor:pointer;font-size:14px;font-weight:600;min-width:132px}
-.mp-btn.ghost{background:transparent;border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-secondary)}
+.mp-quiz-wrap{grid-column:1 / -1;display:flex;flex-direction:column;gap:6px}
+.mp-quiz-top{display:flex;align-items:center;gap:10px;flex-wrap:wrap}
+.mp-quiz-bar{flex:1 1 160px;min-width:110px;height:6px;border:1px solid var(--dsw-alias-border-l1);border-radius:999px;background:var(--dsw-alias-bg-layer-1);overflow:hidden}
+.mp-quiz-bar i{display:block;height:100%;border-radius:999px;background:var(--dsw-alias-brand-primary);transition:width .18s ease}
+.mp-quiz-count{font-size:12px;color:var(--dsw-alias-label-secondary);font-variant-numeric:tabular-nums;white-space:nowrap}
+.mp-quiz-list{display:flex;flex-direction:column;gap:8px;margin-top:8px}
+.mp-quiz-q{padding:10px 12px;border:1px solid var(--dsw-alias-border-l1);border-radius:10px;background:var(--dsw-alias-bg-layer-1)}
+.mp-quiz-qt{display:flex;gap:8px;align-items:baseline;font-size:13px;line-height:1.6;color:var(--dsw-alias-label-primary)}
+.mp-quiz-qt b{flex:none;padding-top:1px;font:600 11px/1.4 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;letter-spacing:.04em;color:var(--dsw-alias-brand-primary)}
+.mp-quiz-opts{display:grid;grid-template-columns:repeat(5,minmax(0,1fr));gap:6px;margin-top:8px}
+.mp-quiz-o{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:2px;padding:6px 4px;border:1px solid var(--dsw-alias-border-l1);border-radius:8px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-secondary);cursor:pointer;text-align:center;
+  transition:border-color .14s,background .14s,color .14s}
+.mp-quiz-o input{position:absolute;inset:0;margin:0;opacity:0;cursor:pointer}
+.mp-quiz-o b{font-size:13px;font-weight:600;color:var(--dsw-alias-label-primary);font-variant-numeric:tabular-nums}
+.mp-quiz-o span{font-size:11px;line-height:1.3}
+.mp-quiz-o:hover{border-color:var(--dsw-alias-brand-primary)}
+.mp-quiz-o.on{border-color:transparent;background:var(--dsw-alias-brand-primary)}
+.mp-quiz-o.on b,.mp-quiz-o.on span{color:#fff}
+.mp-quiz-o:focus-within{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:2px}
+.mp-quiz-nav{display:flex;align-items:center;gap:8px;margin-top:10px;flex-wrap:wrap}
+.mp-quiz-btn{padding:6px 14px;border-radius:8px;border:1px solid var(--dsw-alias-border-l1);background:transparent;color:var(--dsw-alias-label-primary);font-family:inherit;font-size:12.5px;cursor:pointer;min-height:32px}
+.mp-quiz-btn:hover:not(:disabled){border-color:var(--dsw-alias-brand-primary)}
+.mp-quiz-btn:disabled{opacity:.42;cursor:not-allowed}
+.mp-quiz-btn.primary{border-color:transparent;background:var(--dsw-alias-brand-primary);color:#fff;font-weight:600}
+.mp-quiz-hint{margin-left:auto;font-size:12px;color:var(--dsw-alias-label-secondary);line-height:1.6}
+.mp-btn{padding:8px 22px;border-radius:9px;border:none;background:var(--dsw-alias-brand-primary);color:#fff;cursor:pointer;font-size:14px;font-weight:600;min-width:132px;
+  box-shadow:0 10px 20px -14px var(--dsw-alias-brand-primary);transition:transform .14s,filter .14s,box-shadow .14s}
+.mp-btn:hover{filter:brightness(1.06);transform:translateY(-1px)}
+.mp-btn:active{transform:none;filter:brightness(.98)}
+.mp-btn.ghost{background:transparent;border:1px solid var(--dsw-alias-border-l1);color:var(--dsw-alias-label-secondary);box-shadow:none}
+.mp-btn.ghost:hover{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);filter:none}
 .mp-seg{display:flex;width:100%;border:1px solid var(--dsw-alias-border-l1);border-radius:8px;overflow:hidden;height:36px}
 .mp-seg button{flex:1;padding:0 8px;background:transparent;border:none;color:var(--dsw-alias-label-secondary);font-size:13px;cursor:pointer}
 .mp-seg button.on{background:var(--dsw-alias-brand-primary);color:#fff}
@@ -13333,7 +15909,8 @@ const CSS = `
 .mp-hist-item b{font-weight:600}
 .mp-hist-item span{color:var(--dsw-alias-label-secondary)}
 .mp-hist-item i{font-style:normal;color:var(--dsw-alias-label-secondary);opacity:.7;font-size:11px}.mp-hint{font-size:12.5px;color:var(--dsw-alias-label-secondary);line-height:1.7;margin:0 0 14px;padding-left:2px}
-.mp-card{margin-top:18px;padding:16px 18px;border-radius:14px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1)}
+.mp-card{margin-top:18px;padding:16px 18px;border-radius:16px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);
+  box-shadow:0 1px 2px color-mix(in srgb,var(--dsw-alias-label-primary) 5%,transparent),0 18px 40px -32px color-mix(in srgb,var(--dsw-alias-label-primary) 42%,transparent)}
 .mp-flat{margin-top:16px;padding:0;border:none;background:transparent;border-radius:0}
 .mp-dim{color:var(--dsw-alias-label-secondary)}
 .mp-err{margin-top:16px;padding:9px 14px;border-radius:8px;border-left:3px solid var(--dsw-alias-state-error-primary);background:color-mix(in srgb,var(--dsw-alias-state-error-primary) 8%,transparent);color:var(--dsw-alias-state-error-primary);font-size:13px}
@@ -13371,6 +15948,11 @@ const CSS = `
   .mp-tab{padding:9px 4px;font-size:13.5px;text-align:center}
   .mp-input,.mp-textarea{padding:10px 12px;font-size:16px;min-height:44px;height:auto}
   .mp-textarea{min-height:76px}
+  .mp-quiz-q{padding:9px 10px}
+  .mp-quiz-o{padding:8px 3px;min-height:50px}
+  .mp-quiz-o span{font-size:10px}
+  .mp-quiz-btn{flex:1 1 auto;min-height:44px}
+  .mp-quiz-hint{flex-basis:100%;margin-left:0}
   .mp-actions{margin-top:12px}
   .mp-btn{width:100%;padding:12px;font-size:15px;min-height:46px;min-width:0}
   .mp-hint,.mp-auto,.mp-cast{font-size:12.5px}
@@ -13384,10 +15966,81 @@ const CSS = `
   .mp-wrap{padding:12px 10px 32px}
   .mp-tab{font-size:13px;padding:8px 2px}
 }
+:where(.mp-btn,.mp-tab,.mp-chip,.mp-hist-item,.mp-hist-clear,.mp-qmopt,.seg button):focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:2px}
+@media (prefers-reduced-motion:reduce){
+  *,*::before,*::after{transition-duration:.001ms!important;animation-duration:.001ms!important}
+}
 `;
 
 const { useState, useEffect } = React;
 
+const MBTI_PER_PAGE = 4;
+const MBTI_MIN = 12;
+let MBTI_INFO = null;
+function mbtiInfo() {
+  if (MBTI_INFO) return MBTI_INFO;
+  let p = null;
+  try { p = Engine.compute({ system: 'mbti' }); } catch (e) { p = null; }
+  const questions = (p && p.questions) || [];
+  MBTI_INFO = { total: (p && p.total) || questions.length, questions, scale: (p && p.scale) || {} };
+  return MBTI_INFO;
+}
+
+function MbtiQuiz(props) {
+  const { answers, page, onPick, onPage, onSubmit, onClear } = props;
+  const info = mbtiInfo();
+  const pages = Math.max(1, Math.ceil(info.total / MBTI_PER_PAGE));
+  const start = page * MBTI_PER_PAGE;
+  const slice = info.questions.slice(start, start + MBTI_PER_PAGE);
+  const answered = answers.filter((v) => v != null).length;
+  const pct = info.total ? Math.round((answered / info.total) * 100) : 0;
+  const last = page >= pages - 1;
+  const ready = answered >= MBTI_MIN;
+  return h('div', { className: 'mp-quiz' },
+    h('div', { className: 'mp-quiz-top' },
+      h('div', { className: 'mp-quiz-bar', 'aria-hidden': 'true' }, h('i', { style: { width: pct + '%' } })),
+      h('span', { className: 'mp-quiz-count' }, `第 ${page + 1} / ${pages} 页 · 已答 ${answered} / ${info.total}`)),
+    h('div', { className: 'mp-quiz-list' }, slice.map((q, k) => {
+      const i = start + k;
+      return h('div', { key: q.id || i, className: 'mp-quiz-q' },
+        h('div', { className: 'mp-quiz-qt' }, h('b', null, String(i + 1).padStart(2, '0')), h('span', null, q.text)),
+        h('div', { className: 'mp-quiz-opts', role: 'radiogroup', 'aria-label': `第 ${i + 1} 题` },
+          [1, 2, 3, 4, 5].map((n) => h('label', { key: n, className: 'mp-quiz-o' + (answers[i] === n ? ' on' : '') },
+            h('input', {
+              type: 'radio', name: `mpmbq${i}`, value: String(n), checked: answers[i] === n,
+              onChange: () => onPick(i, n),
+            }),
+            h('b', null, String(n)),
+            h('span', null, info.scale[n] || '')))));
+    })),
+    h('div', { className: 'mp-quiz-nav' },
+      h('button', { className: 'mp-quiz-btn', disabled: page <= 0, onClick: () => onPage(-1) }, '上一页'),
+      last ? null : h('button', { className: 'mp-quiz-btn', onClick: () => onPage(1) }, '下一页'),
+      h('button', { className: 'mp-quiz-btn primary', disabled: !ready, onClick: onSubmit }, '看结果'),
+      h('button', { className: 'mp-quiz-btn', onClick: onClear }, '清空'),
+      h('span', { className: 'mp-quiz-hint' }, ready
+        ? `已够 ${MBTI_MIN} 题，可以看结果；答完 ${info.total} 题会更准。`
+        : `答满 ${MBTI_MIN} 题可先看结果（还差 ${MBTI_MIN - answered} 题）。`)),
+  );
+}
+
+class PanelGuard extends (React.Component || Object) {
+  constructor(props) { super(props); this.state = { err: null }; }
+  static getDerivedStateFromError(err) { return { err }; }
+  componentDidCatch(err, info) { console.error('[metaphysics] 面板渲染异常', err, info); }
+  render() {
+    if (!this.state.err) return this.props.children;
+    const e = this.state.err;
+    const stack = String((e && e.stack) || '').split('\n').slice(0, 14).join('\n');
+    return h('div', { className: 'mp-wrap' }, h('div', { className: 'mp-panel' },
+      h('div', { className: 'mp-lbl' }, '命理面板渲染出错——把下面这段发给我'),
+      h('pre', { style: { whiteSpace: 'pre-wrap', fontSize: 12, lineHeight: 1.5, maxHeight: 320, overflow: 'auto', margin: '8px 0' } },
+        String((e && e.message) || e) + '\n\n' + stack),
+      h('div', { className: 'mp-lbl' }, '环境：__PP ' + (typeof PP) + ' · Engine ' + (typeof window.Engine) + ' · React ' + (typeof React) + ' · 版本 ' + (typeof PP === 'object' && PP && (window.__MP_VER || '?'))),
+    ));
+  }
+}
+
 function PanelIcon(props) {
   const size = props && props.size ? props.size : 20;
   const active = props && props.active;
@@ -13418,6 +16071,7 @@ const TABS = [
   { k: 'xiaoliuren', label: '小六壬', timeLabel: '起课时刻', hint: '小六壬用农历月/日/时掐指，也可用三个随机数起课。' },
   { k: 'star', label: '星座', timeLabel: '', hint: '星座按公历日期给出太阳星座与当日基调；同日同星座结果固定。' },
   { k: 'numerology', label: '生命数字', timeLabel: '', hint: '生命数字按公历生日归约出生命路径数、生日数与态度数。' },
+  { k: 'mbti', label: '人格', timeLabel: '', hint: '十六型人格是 24 道自我报告题的 MBTI 风格测算：4 题一页，按 1–5 打分，答满 12 题即可看结果；只作自我参照，不是官方量表。' },
   { k: 'trend', label: '人生K线', timeLabel: '出生时刻', hint: '人生 K 线按大运与流年十神给逐年运势分，画成走势图。' },
   { k: 'fengshui', label: '风水', timeLabel: '', hint: '风水看八宅命卦、大游年四吉四凶与流年九宫飞星；也可按坐向看门主灶倾向。' },
   { k: 'name', label: '起名', timeLabel: '', hint: '起名按八字喜用匹配字库五行，可评估现有名字或生成候选名。' },
@@ -13437,6 +16091,7 @@ const TIME_KIND = {
   almanac: 'date', zeri: 'date', star: 'date', numerology: 'date', convert: 'date',
   chenggu: 'birth', trend: 'birth', fengshui: 'birth', name: 'birth',
   xiaoliuren: 'cast',
+  mbti: 'none',
 };
 const SAMPLE = { date: '1990-05-12', time: '14:30' };
 const kindOf = (t) => TIME_KIND[t] || 'none';
@@ -13444,6 +16099,85 @@ const kindOf = (t) => TIME_KIND[t] || 'none';
 const Core = window.__MPCore || {};
 const needAsk = Core.needAsk || ((t) => false);
 
+const COMPOSER = { ref: null, seats: [], keys: '', injectType: '', spec: '', errs: [], regs: 0, mounted: 0 };
+const LAST = { r: null, q: '' };
+
+function bridgeDiagText() {
+  const bits = [];
+  bits.push('inputActions ' + (COMPOSER.ref ? '已拿到' : '未拿到'));
+  bits.push('渲染 ' + COMPOSER.mounted + ' 次');
+  bits.push('注册 ' + COMPOSER.regs + ' 次');
+  bits.push('inject ' + (COMPOSER.injectType || '?'));
+  bits.push('槽位 ' + (COMPOSER.spec || '?'));
+  if (COMPOSER.errs.length) bits.push('错误：' + COMPOSER.errs.join(' / '));
+  return '桥自检：' + bits.join('；');
+}
+
+function noteRegError(e) {
+  if (COMPOSER.errs.length >= 3) return;
+  const s = e && e.message ? String(e.message) : String(e);
+  COMPOSER.errs.push(s.slice(0, 90));
+}
+function bridgeActions(props) {
+  if (!props) return null;
+  const a = props.inputActions;
+  if (a && typeof a.setDraft === 'function' && typeof a.submit === 'function') return a;
+  const b = props.actions && props.actions.input;
+  if (b && typeof b.setDraft === 'function' && typeof b.submit === 'function') return b;
+  return null;
+}
+
+function useBridge(props, name) {
+  const actions = bridgeActions(props);
+  useEffect(() => {
+    if (COMPOSER.seats.indexOf(name) < 0) COMPOSER.seats.push(name);
+    COMPOSER.keys = props ? Object.keys(props).join(',') : '';
+    if (actions) {
+      COMPOSER.ref = actions;
+      try { window.__MPComposer = actions; } catch (e) { /* 非浏览器环境忽略 */ }
+    }
+    return () => { if (COMPOSER.ref === actions) COMPOSER.ref = null; };
+  }, [actions, name]);
+  return actions;
+}
+
+function askTextForLast() {
+  const r = LAST.r;
+  if (!r) return '';
+  try {
+    const p = Engine.askPrompt ? Engine.askPrompt(r, { question: LAST.q }) : null;
+    return (p && p.text) || String(r.summary || '');
+  } catch (e) { return String(r.summary || ''); }
+}
+
+function ComposerBridge(props) {
+  COMPOSER.mounted += 1;
+  const actions = useBridge(props, 'input.right');
+  if (!actions) {
+    return h('span', { className: 'mp-chip warn', title: '命理：已占住输入框槽位，但没拿到 inputActions；把这句话告诉作者' }, '命理·未就绪');
+  }
+  return h('button', {
+    type: 'button', className: 'mp-chip ok',
+    title: LAST.r ? '把上一张盘的摘要和问题发进对话窗' : '先在侧栏「命理」里排一张盘',
+    onClick: () => { const t = askTextForLast(); if (t) sendToComposer(t); },
+  }, '命理·问');
+}
+
+function ComposerProbe(props) {
+  COMPOSER.mounted += 1;
+  useBridge(props, 'composer.dock');
+  return null;
+}
+
+function sendToComposer(text) {
+  let ia = COMPOSER.ref;
+  if (!ia) { try { ia = window.__MPComposer || null; } catch (e) { ia = null; } }
+  if (!ia || typeof ia.setDraft !== 'function' || typeof ia.submit !== 'function') return false;
+  ia.setDraft(text);
+  ia.submit();
+  return true;
+}
+
 function App() {
   const [tab, setTab] = useState('ziwei');
   const [date, setDate] = useState('1990-05-12');
@@ -13461,6 +16195,7 @@ function App() {
   const [qLateZi, setQLateZi] = useState('same-day');
   const [crossOn, setCrossOn] = useState(false);
   const [askText, setAskText] = useState('');
+  const [chatNote, setChatNote] = useState('');
   const [fx, setFx] = useState(null);
   const [pastMarks, setPastMarks] = useState({});
   const [fit, setFit] = useState(null);
@@ -13474,6 +16209,8 @@ function App() {
   const [leapMonth, setLeapMonth] = useState(false);
   const [xlrMode, setXlrMode] = useState('time');
   const [num1, setNum1] = useState(''); const [num2, setNum2] = useState(''); const [num3, setNum3] = useState('');
+  const [mbAns, setMbAns] = useState(() => new Array(mbtiInfo().total).fill(null));
+  const [mbPage, setMbPage] = useState(0);
   const [toAge, setToAge] = useState('60');
   const [fsMode, setFsMode] = useState('natal');
   const [sitting, setSitting] = useState('子');
@@ -13485,6 +16222,9 @@ function App() {
   const [onlineGeo, setOnlineGeo] = useState(false);
   const [lines, setLines] = useState('');
   const [result, setResult] = useState(null);
+  useEffect(() => {
+    if (result && result.r) { LAST.r = result.r; LAST.q = askText.trim(); }
+  }, [result, askText]);
   const [hist, setHist] = useState(() => loadHistory());
   const [replayArgs, setReplayArgs] = useState(null);
   const [error, setError] = useState('');
@@ -13506,7 +16246,7 @@ function App() {
     || tab === 'chenggu' || tab === 'trend' || tab === 'fengshui' || tab === 'name';
   const timeKind = kindOf(tab);
   const usesTimeInput = !(tab === 'meihua' && mhMode === 'number');
-  const showDate = tab !== 'tarot' && usesTimeInput;
+  const showDate = tab !== 'tarot' && tab !== 'mbti' && usesTimeInput;
   const showTime = showDate && timeKind !== 'date';
   const showDT = showTime;
 
@@ -13516,6 +16256,7 @@ function App() {
     const dt = override ? override : { date, time };
     const genderV = over && over.gender ? over.gender : gender;
     const addressV = over && typeof over.address === 'string' ? over.address : address;
+    setNotice('');   // 上一次的提示（如「先答满 12 题」）不该跟着新结果一起留下
     try {
       const datetime = `${dt.date}T${dt.time}`;
       const args = { system: k };
@@ -13560,6 +16301,12 @@ function App() {
           args.hour = Number.isFinite(hh) ? hh : 12;
         }
       }
+      if (k === 'mbti') {
+        delete args.datetime;
+        const nums = mbAns.slice();
+        while (nums.length && nums[nums.length - 1] == null) nums.pop();
+        if (nums.length) args.answers = nums;
+      }
       if (k === 'trend') { args.gender = genderV; args.toAge = Number(toAge) || 60; args.trueSolar = trueSolar; args.lateZi = lateZi; }
       if (k === 'fengshui') {
         args.action = fsMode;
@@ -13658,7 +16405,7 @@ function App() {
       setResult({ kind: k, r, it, at: dt, timed, trend });
       setFx(null); setFit(null); setPastMarks({}); setRectRes(null);
       setError('');      setCopied('');
-      if (k !== 'tarot') {
+      if (k !== 'tarot' && k !== 'mbti') {
         const entry = {
           kind: k, date, time, gender, address,
           lines: k === 'liuyao' ? lines : '',
@@ -13684,6 +16431,12 @@ function App() {
     const k = kindOf(next);
     setTab(next);
     setError('');
+    if (next === 'mbti') {
+      setNotice('');
+      if (mbAns.filter((v) => v != null).length >= MBTI_MIN) run(next);
+      else setResult(null);
+      return;
+    }
     if (k === 'none') { run(next); return; } // 塔罗不看时间，直接抽牌（与 web-ui 一致）
     const v = manual[k] || (k === 'cast' ? nowParts() : { date: SAMPLE.date, time: SAMPLE.time });
     setDate(v.date);
@@ -13709,6 +16462,15 @@ function App() {
   };
 
   const go = () => {
+    if (tab === 'mbti') {
+      const n = mbAns.filter((v) => v != null).length;
+      if (n < MBTI_MIN) {
+        setNotice(`先答满 ${MBTI_MIN} 题再看结果（现答 ${n} 题，还差 ${MBTI_MIN - n} 题）。`);
+        return;
+      }
+      run(tab);
+      return;
+    }
     if (timeKind !== 'none' && !manual[timeKind]) {
       const t = nowParts();
       setDate(t.date);
@@ -13781,6 +16543,21 @@ function App() {
     } catch (e) { setFx({ question: askText.trim(), ok: false, answer: '追问失败：' + (e && e.message ? e.message : e), evidence: [], confidence: '弱' }); }
   };
 
+  const askInChat = () => {
+    if (!result || !result.r) return;
+    try {
+      const p = Engine.askPrompt ? Engine.askPrompt(result.r, { question: askText.trim() }) : null;
+      const text = p && p.text ? p.text : String(result.r.summary || '');
+      if (sendToComposer(text)) { setChatNote('已发到对话窗，往下看回复。'); return; }
+      const diag = '（' + bridgeDiagText() + '）';
+      if (navigator.clipboard && navigator.clipboard.writeText) {
+        navigator.clipboard.writeText(text).then(
+          () => setChatNote('对话输入框还没就绪' + diag + '，已复制提问；粘进对话窗回车即可。'),
+          () => setChatNote('对话输入框还没就绪' + diag + '，复制也没成功；先点「复制文字结果」再贴。'));
+      } else { setChatNote('对话输入框还没就绪' + diag + '；先点「复制文字结果」再贴进对话窗。'); }
+    } catch (e) { setChatNote('发到对话窗失败：' + (e && e.message ? e.message : e)); }
+  };
+
   const downloadReport = () => {
     if (!result || !result.r) return;
     try {
@@ -14004,6 +16781,27 @@ function App() {
           className: 'mp-input', type: 'number', min: 1, max: 99, value: num3,
           onChange: (e) => setNum3(e.target.value),
         })) : null,
+        tab === 'mbti' ? h('div', { className: 'mp-quiz-wrap' },
+          h('div', { className: 'mp-lbl' }, '十六型人格问卷 · 4 题一页，按 1（完全不像）到 5（很像我）打分'),
+          h(MbtiQuiz, {
+            answers: mbAns,
+            page: mbPage,
+            onPick: (i, n) => setMbAns((prev) => {
+              const next = prev.slice();
+              next[i] = n;
+              return next;
+            }),
+            onPage: (d) => setMbPage((p) => Math.max(0, Math.min(
+              p + d,
+              Math.max(0, Math.ceil(mbtiInfo().total / MBTI_PER_PAGE) - 1),
+            ))),
+            onSubmit: go,
+            onClear: () => {
+              setMbAns(new Array(mbtiInfo().total).fill(null));
+              setMbPage(0);
+              setResult(null);  
+            },
+          })) : null,
         tab === 'trend' ? field('算到几岁', h('input', {
           className: 'mp-input', type: 'number', min: 10, max: 100, value: toAge,
           onChange: (e) => setToAge(e.target.value),
@@ -14052,7 +16850,7 @@ function App() {
           onChange: (e) => { setQuestion(e.target.value); setAskInvalid(false); },
           onBlur: (e) => refreshInterpret(undefined, e.target.value),
         })) : null,
-      h('div', { key: 'actions', className: 'mp-actions' },
+      tab === 'mbti' ? null : h('div', { key: 'actions', className: 'mp-actions' },
         h('button', {
           className: 'mp-btn ghost', style: { fontSize: 12, padding: '5px 12px', marginRight: 8 },
           onClick: openSample, title: '用固定示例盘看完整报告（不改动你已填的数据）',
@@ -14084,9 +16882,13 @@ function App() {
     notice ? h('div', { key: 'ntc', className: 'mp-note', role: 'status' }, notice) : null,
 
     (!result && !error) ? h('div', { key: 'empty', className: 'mp-empty' },
-      h('b', null, tab === 'ziwei' ? '填好出生信息，点「排盘」' : tab === 'bazi' ? '填好出生信息，点「排盘」'
-        : tab === 'tarot' ? '写下想问的事，点「抽牌」' : '写下所问之事，点「起卦」'),
-      tab === 'ziwei' || tab === 'bazi' ? '出生日期、时刻与性别即可；出生地只影响真太阳时。' : '起卦时刻已自动取当下，也可以手动改。') : null,
+      h('b', null, tab === 'ziwei' || tab === 'bazi' ? '填好出生信息，点「排盘」'
+        : tab === 'tarot' ? '写下想问的事，点「抽牌」'
+          : tab === 'mbti' ? '按 1–5 给题目打分，答满 12 题就能看结果'
+            : '写下所问之事，点「起卦」'),
+      tab === 'ziwei' || tab === 'bazi' ? '出生日期、时刻与性别即可；出生地只影响真太阳时。'
+        : tab === 'mbti' ? '4 题一页，答案只在本地参与计算，不会上传。'
+          : '起卦时刻已自动取当下，也可以手动改。') : null,
 
     result ? h('div', {
       key: 'card',
@@ -14109,6 +16911,7 @@ function App() {
                         : result.kind === 'almanac' ? PP.almanacHTML(result.r)
                         : result.kind === 'trend' ? PP.trendHTML(result.r)
                         : result.kind === 'name' ? PP.nameHTML(result.r)
+                        : result.kind === 'mbti' ? PP.mbtiHTML(result.r)
                         : PP.quickHTML(result.r),
           result.it,
           { folded: defaultFolded() },
@@ -14128,14 +16931,20 @@ function App() {
         onClick: downloadCard, title: '生成 PNG 摘要卡（一页读懂 + 首张表），适合直接分享',
       }, '存为摘要长图')) : null,
 
-    result ? h('div', { key: 'ask', className: 'mp-askbox' },
+    result ? h('div', { key: 'ask', className: 'mp-askbox', style: { flexWrap: 'wrap' } },
       h('input', {
         className: 'mp-input', value: askText, maxLength: 120,
         placeholder: '追问：如 2027 年事业怎么样（回车提交）',
         onChange: (e) => setAskText(e.target.value),
         onKeyDown: (e) => { if (e.key === 'Enter') doAsk(); },
       }),
-      h('button', { className: 'mp-btn ghost', style: { fontSize: 12, padding: '5px 12px' }, onClick: doAsk }, '追问')) : null,
+      h('button', { className: 'mp-btn ghost', style: { fontSize: 12, padding: '5px 12px' }, onClick: doAsk }, '追问'),
+      h('button', {
+        className: 'mp-btn ghost', style: { fontSize: 12, padding: '5px 12px', marginLeft: 8 },
+        onClick: askInChat, title: '把这张盘的摘要和你的问题一起发进 DSH 对话窗，由对话里的模型接着答',
+      }, '问进对话'),
+      (COMPOSER.ref ? null : h('div', { key: 'bridgediag', className: 'mp-note', style: { marginTop: 6, fontSize: 11, flexBasis: '100%' } }, bridgeDiagText())),
+      chatNote ? h('div', { key: 'chatnote', className: 'mp-note', style: { marginTop: 6, fontSize: 12, flexBasis: '100%' } }, chatNote) : null) : null,
 
     fx ? h('div', { key: 'fx', className: 'mp-fx', dangerouslySetInnerHTML: { __html: PP.followupHTML(fx) } }) : null,
 
@@ -14219,6 +17028,25 @@ function safeApply(ctx) {
     return;
   }
 
+  try {
+    COMPOSER.injectType = typeof slots.inject;
+    const sp = typeof slots.spec === 'function' ? slots.spec('conversation.input.right') : null;
+    COMPOSER.spec = sp ? sp.kind + '/' + sp.scope : '未声明';
+  } catch (e) {
+    COMPOSER.spec = '取声明失败';
+    noteRegError(e);
+  }
+  const tryReg = (options, component) => {
+    try {
+      const d = slots.register(options, component);
+      COMPOSER.regs += 1;
+      return d;
+    } catch (e) {
+      noteRegError(e);
+      return null;
+    }
+  };
+
   const waitFor = (key, install) => {
     try {
       if (typeof slots.inject === 'function') {
@@ -14232,12 +17060,59 @@ function safeApply(ctx) {
     }
   };
 
-  waitFor('sidebar.panellist', () => slots.register(
-    { name: 'sidebar.panellist', id: 'metaphysics', order: 20, label: () => '命理' },
+  waitFor('sidebar.panellist', () => tryReg(
+    { name: 'sidebar.panellist', id: 'metaphysics', order: 20, label: () => '命理 v' + (window.__MP_VER || '') },
     PanelIcon,
   ));
 
-  waitFor('main', () => slots.register({ name: 'main', key: 'metaphysics' }, App));
+  waitFor('main', () => tryReg({ name: 'main', key: 'metaphysics' }, (p) => h(PanelGuard, null, h(App, p))));
+
+  const sessionSeat = (key, install) => {
+    const run = () => {
+      try { slots.inject(key, install); }
+      catch (e) {
+        console.error('[metaphysics] 槽位注册失败：' + key, e);
+        try { install(); } catch (e2) { console.error('[metaphysics] 直接注册也失败：' + key, e2); }
+      }
+    };
+    try {
+      if (typeof ctx.effect === 'function') ctx.effect(run, 'metaphysics: ' + key);
+      else run();
+    } catch (e) {
+      console.error('[metaphysics] effect 包裹失败：' + key, e);
+      run();
+    }
+  };
+
+  sessionSeat('conversation.input.right', () => tryReg(
+    { name: 'conversation.input.right', id: 'metaphysics-ask', order: 40 },
+    ComposerBridge,
+  ));
+
+  sessionSeat('conversation.composer.dock', () => tryReg(
+    { name: 'conversation.composer.dock', id: 'metaphysics-dock', order: 60 },
+    ComposerProbe,
+  ));
+
+  let seatTries = 0;
+  const trySeatNow = () => {
+    if (COMPOSER.ref) return;
+    seatTries += 1;
+    const tag = '-' + seatTries;
+    tryReg({ name: 'conversation.input.right', id: 'metaphysics-ask' + tag, order: 40 }, ComposerBridge);
+    tryReg({ name: 'conversation.composer.dock', id: 'metaphysics-dock' + tag, order: 60 }, ComposerProbe);
+  };
+  let seatTriesLeft = 20;
+  const seatRetry = () => {
+    if (COMPOSER.ref || seatTriesLeft <= 0) return;
+    seatTriesLeft -= 1;
+    trySeatNow();
+    setTimeout(seatRetry, 700);
+  };
+  try { setTimeout(seatRetry, 700); } catch (e) { /* 无计时器环境 */ }
+  try {
+    document.addEventListener('pointerdown', () => trySeatNow(), { once: true, capture: true });
+  } catch (e) { /* 非 DOM 环境 */ }
 }
 
 return {