dsh-metaphysics 0.18.4 → 0.20.0

package/client.js

@@ -746,7 +746,7 @@ function resolveAddress(input) {
 
 const DETAIL = /(区|县|镇|乡|村|小区|街道|路|号|巷|弄|组|队)/;
 
-const USER_AGENT = 'dsh-metaphysics/0.18.4 (+https://github.com/xuanfu-web/dsh-metaphysics)';
+const USER_AGENT = 'dsh-metaphysics/0.20.0 (+https://github.com/xuanfu-web/dsh-metaphysics)';
 
 async function onlineLookup(text, { timeoutMs = 2500 } = {}) {
   if (typeof fetch !== 'function') return null;
@@ -1280,8 +1280,216 @@ const RULE_TABLE = RULES.reduce((acc, r) => { acc[r.name] = { cat: r.cat, luck:
 return { PILLAR_KEYS, PILLAR_LABEL, CATEGORY_ORDER, computeBaziShensha, RULE_TABLE };
 })();
 
+__mods.tiaohou = (function () {
+
+const STEM_ELEMENT = {
+  甲: '木', 乙: '木', 丙: '火', 丁: '火', 戊: '土',
+  己: '土', 庚: '金', 辛: '金', 壬: '水', 癸: '水',
+};
+
+const SEASON_TEMP = {
+  亥: -1.8, 子: -2, 丑: -1.5,
+  寅: -0.4, 卯: 0.2, 辰: 0.5,
+  巳: 1.3, 午: 2, 未: 1.5,
+  申: 0.6, 酉: 0.2, 戌: -0.2,
+};
+
+const SEASON_NAME = {
+  亥: '初冬', 子: '仲冬', 丑: '季冬',
+  寅: '初春', 卯: '仲春', 辰: '季春',
+  巳: '初夏', 午: '仲夏', 未: '季夏',
+  申: '初秋', 酉: '仲秋', 戌: '季秋',
+};
+
+const WET_BRANCH = { 丑: 1, 辰: 1, 子: 0.6, 亥: 0.5 };
+const DRY_BRANCH = { 未: 1, 戌: 1, 午: 0.4, 巳: 0.4 };
+
+const NEED = {
+  寒湿: { element: '火', stem: '丙', avoid: '水', why: '冻土要太阳来解，水再多只会更冷' },
+  寒燥: { element: '火', stem: '丙', avoid: '水', why: '天寒地干，先要一点阳和之气' },
+  寒: { element: '火', stem: '丙', avoid: '水', why: '冬令气寒，非火不暖' },
+  温热: { element: '水', stem: '壬', avoid: '火', why: '火气初旺，得水润泽才好用' },
+  燥热: { element: '水', stem: '壬', avoid: '火', why: '火炎土燥，非水不润' },
+  热: { element: '水', stem: '壬', avoid: '火', why: '夏令炎威，先求一泓清水' },
+  湿滞: { element: '火', stem: '丙', avoid: '水', why: '湿气郁结，要火来蒸腾' },
+  燥: { element: '水', stem: '壬', avoid: '火', why: '气燥不润，得水则舒' },
+  平和: { element: null, stem: null, avoid: null, why: '寒暖相济，气候不是这一盘的主要矛盾' },
+};
+
+const KIND_NAME = {
+  寒湿: '寒湿', 寒燥: '寒燥', 寒: '寒',
+  温热: '温热', 燥热: '燥热', 热: '热',
+  湿滞: '湿滞', 燥: '燥', 平和: '平和',
+};
+
+const DAY_FEEL = {
+  寒湿: {
+    木: '木是花草藤萝，冰封的土里抽不出芽——它不缺雨水，缺的是一轮太阳',
+    火: '火在冬天最怕被水浇，一点火苗要护住，才谈得上发光',
+    土: '土冻成一块，再厚也长不出东西，得先晒透',
+    金: '金在寒水里泡久了，锋刃会发滞，要火来炼一炼',
+    水: '水本就冷，再加寒就是死水；要火把它烧活',
+  },
+  寒燥: {
+    木: '木在干冷里最难熬，既缺暖气，又缺一点滋润',
+    火: '火在寒天里要先活下来，才有余力照别人',
+    土: '土冷而干，板结着，得暖气与一点水汽一起松',
+    金: '金寒则脆，得火炼、得土养，才成器',
+    水: '水在寒天里收得太紧，要一点火气化开',
+  },
+  寒: {
+    木: '冬木先要暖，暖了才谈得上发荣',
+    火: '火在冬天要护住，别被冷风吹散',
+    土: '土寒不生物，先暖后养',
+    金: '金寒则钝，得火则利',
+    水: '水寒则滞，得火则行',
+  },
+  温热: {
+    木: '木在暖和里长得快，但要防长得太急、根扎不深',
+    火: '火得时令，容易旺过头，要留一点水来收',
+    土: '土被火烤着，容易燥，得水润一润',
+    金: '金在暖处容易软，需要一点水土把它养住',
+    水: '水在暖处容易蒸干，要源头不断',
+  },
+  燥热: {
+    木: '木被火烤着，叶子先焦，得先补水',
+    火: '火已经够旺了，再添柴只会烧到自己',
+    土: '土燥则裂，得水润、得木疏',
+    金: '金在燥热里容易发烫变形，要水来淬',
+    水: '水在燥热里最珍贵，一滴都不能浪费',
+  },
+  热: {
+    木: '木在暑天要水，不然只长叶不结果',
+    火: '火已经当令，收着用比放出去更划算',
+    土: '土热则燥，得水则安',
+    金: '金在暑天要水来洗，才见光泽',
+    水: '水在暑天是命脉，要保住源头',
+  },
+  湿滞: {
+    木: '木泡在水里会烂根，先要疏土透气',
+    火: '火在湿气里点不着，得先除湿',
+    土: '土湿成泥，得火蒸腾、得木来疏',
+    金: '金埋在湿土里会生锈，要见火见光',
+    水: '水已经太多，再添就是泛滥',
+  },
+  燥: {
+    木: '木在燥气里容易枯，先要一点水',
+    火: '火在燥处容易失控，要收',
+    土: '土燥不毛，得水润、得木疏',
+    金: '金在燥处要水来洗，才不刺手',
+    水: '水在燥处最容易被耗干，要护住',
+  },
+  平和: {
+    木: '寒暖还算相济，木有生长的余地',
+    火: '气候不偏，火可以按自己的节奏用',
+    土: '土不燥不湿，能养也能载',
+    金: '金不寒不燥，成器只差打磨',
+    水: '水不冰不涸，能流得动',
+  },
+};
+
+const round2 = (n) => Math.round(n * 100) / 100;
+
+function judgeClimate({ monthBranch, dayStem, wuxing = {}, branches = [] }) {
+  const fire = Number(wuxing['火'] || 0);
+  const water = Number(wuxing['水'] || 0);
+  let wet = 0;
+  let dry = 0;
+  let wetCount = 0;
+  let dryCount = 0;
+  for (const b of branches) {
+    if (WET_BRANCH[b]) { wet += WET_BRANCH[b]; if (b === '丑' || b === '辰') wetCount += 1; }
+    if (DRY_BRANCH[b]) { dry += DRY_BRANCH[b]; if (b === '未' || b === '戌') dryCount += 1; }
+  }
+  const seasonT = SEASON_TEMP[monthBranch] ?? 0;
+  const temp = round2(seasonT + 0.45 * fire - 0.4 * water);
+  const damp = round2(wet - dry + 0.25 * water - 0.25 * fire);
+
+  const cold = temp <= -0.8;
+  const hot = temp >= 0.9;
+  const wetSide = damp >= 0.8;
+  const drySide = damp <= -0.8;
+
+  let kind = '平和';
+  if (cold && wetSide) kind = '寒湿';
+  else if (cold && drySide) kind = '寒燥';
+  else if (cold) kind = '寒';
+  else if (hot && drySide) kind = '燥热';
+  else if (hot) kind = '温热';
+  else if (hot && damp >= 0.8) kind = '湿滞';
+  else if (drySide) kind = '燥';
+  else if (wetSide) kind = '湿滞';
+
+  const need = NEED[kind] || NEED.平和;
+  const dayElement = STEM_ELEMENT[dayStem] || '土';
+  const evidence = [
+    `${SEASON_NAME[monthBranch] || monthBranch}${monthBranch}月`,
+    `火${fire}`,
+    `水${water}`,
+    wetCount ? `湿土${wetCount}处` : '',
+    dryCount ? `燥土${dryCount}处` : '',
+  ].filter(Boolean);
+
+  const priority = Math.abs(temp) >= 1.2 || Math.abs(damp) >= 1.2 ? '调候优先' : '扶抑为主';
+  const narration = buildNarration({ kind, monthBranch, dayElement, need, temp, damp, fire, water });
+
+  return {
+    kind,
+    label: KIND_NAME[kind] || kind,
+    temp,
+    damp,
+    cold,
+    hot,
+    wet: wetSide,
+    dry: drySide,
+    need: need.element ? { element: need.element, stem: need.stem, why: need.why } : null,
+    avoidElement: need.avoid,
+    dayElement,
+    priority,
+    evidence,
+    narration,
+  };
+}
+
+function buildNarration({ kind, monthBranch, dayElement, need, fire, water }) {
+  const feel = (DAY_FEEL[kind] || DAY_FEEL.平和)[dayElement] || '';
+  const season = SEASON_NAME[monthBranch] || '';
+  const head = `${season ? season : ''}${monthBranch}月出生，全局火${fire}、水${water}，这一盘的气候是「${KIND_NAME[kind] || kind}」`;
+  if (!need.element) {
+    return `${head}。${feel}。调候不是这一盘的主要矛盾，取用仍以扶抑为主，寒暖只作微调。`;
+  }
+  return `${head}。${feel}。所以这一局要的不是更多的${kind.includes('寒') ? '水' : '火'}，而是${need.stem}${need.element}——${need.why}。`;
+}
+
+function arbitrate(climate, favors = [], avoids = []) {
+  if (!climate || !climate.need) return { clash: false, text: '气候平和，按扶抑取用即可。' };
+  const needEl = climate.need.element;
+  const inFavor = favors.includes(needEl);
+  const inAvoid = avoids.includes(needEl);
+  const same = inFavor && !inAvoid;
+  if (same) return { clash: false, text: `调候要${climate.need.stem}${needEl}，扶抑也以${needEl}为喜——两套取法同向，不必取舍。` };
+  return {
+    clash: true,
+    text: `调候要${climate.need.stem}${needEl}，扶抑却把${needEl}列为${inAvoid ? '忌' : '闲'}；两者不一致，本盘按调候优先取${needEl}，扶抑次之——因为寒暖失衡时，再补强弱也难受。`,
+  };
+}
+
+function climateText(climate) {
+  if (!climate) return '';
+  const ev = (climate.evidence || []).join('、');
+  const arb = climate.need
+    ? `调候取${climate.need.stem}${climate.need.element}（${climate.need.why}），忌${climate.avoidElement}。`
+    : '气候平和，调候不作主取。';
+  return `${climate.label}（${ev}）。${climate.narration}${arb}${climate.priority === '调候优先' ? ' 本盘调候优先于扶抑。' : ''}`;
+}
+
+return { judgeClimate, arbitrate, climateText };
+})();
+
 __mods.geju = (function () {
 
+const { judgeClimate, arbitrate } = __mods.tiaohou;
+
 const STEMS = ['甲', '乙', '丙', '丁', '戊', '己', '庚', '辛', '壬', '癸'];
 const BRANCHES = ['子', '丑', '寅', '卯', '辰', '巳', '午', '未', '申', '酉', '戌', '亥'];
 
@@ -1459,38 +1667,35 @@ function specialPatterns(pillars, dayStem, monthBranch, strength, wuxing, gods)
   return out;
 }
 
-const TIAOHOU = {
-  亥: ['火', '冬月寒水当令，最喜火暖局'],
-  子: ['火', '仲冬水旺，最喜火暖局'],
-  丑: ['火', '季冬湿寒，喜火解冻'],
-  巳: ['水', '初夏火旺，喜水制衡'],
-  午: ['水', '仲夏火炎，最喜水调候'],
-  未: ['水', '季夏燥土，喜水润局'],
-  寅: ['火', '初春尚寒，得火而发'],
-  卯: ['火', '仲春木旺，喜火吐秀'],
-  辰: ['金', '季春湿土，喜金水疏泄'],
-  申: ['火', '初秋金旺，喜火炼金'],
-  酉: ['火', '仲秋金锐，喜火制'],
-  戌: ['水', '季秋燥土，喜水润泽'],
-};
-
-function yongshenOf(dayStem, monthBranch, strength, wuxing) {
+function yongshenOf(dayStem, monthBranch, strength, wuxing, branches = []) {
   const roles = elementRoles(dayStem);
   const me = roles.me;
   const weak = strength.level === '身弱' || strength.level === '偏弱';
   const strong = strength.level === '身强' || strength.level === '偏强';
 
-  const favor = weak ? [roles.inMe, me] : strong ? [roles.shi, roles.cai, roles.guan] : [roles.inMe, me, roles.shi];
-  const avoid = weak ? [roles.shi, roles.cai, roles.guan] : strong ? [me, roles.inMe] : [roles.guan, roles.cai];
-  const favorableTenGods = weak ? ['正印', '偏印', '比肩', '劫财'] : strong
-    ? ['食神', '伤官', '正财', '偏财', '正官', '七杀']
-    : ['正印', '偏印', '食神', '伤官'];
+  const baseFavor = weak ? [roles.inMe, me] : strong ? [roles.shi, roles.cai, roles.guan] : [roles.inMe, me, roles.shi];
+  const baseAvoid = weak ? [roles.shi, roles.cai, roles.guan] : strong ? [me, roles.inMe] : [roles.guan, roles.cai];
+  let favor = baseFavor.slice();
+  let avoid = baseAvoid.slice();
 
-  const th = TIAOHOU[monthBranch];
-  const tiaohou = th ? { element: th[0], note: th[1] } : null;
+  const climate = judgeClimate({ monthBranch, dayStem, wuxing, branches });
+  const arb = arbitrate(climate, baseFavor, baseAvoid);
+  if (climate.need && climate.priority === '调候优先') {
+    const needEl = climate.need.element;
+    if (!favor.includes(needEl)) favor.unshift(needEl);
+    avoid = avoid.filter((e) => e !== needEl);
+    if (climate.avoidElement && !avoid.includes(climate.avoidElement)) avoid.unshift(climate.avoidElement);
+  }
 
   const roleName = (el) => (el === me ? '比劫' : el === roles.inMe ? '印'
     : el === roles.shi ? '食伤' : el === roles.cai ? '财' : '官杀');
+  const expand = {
+    比劫: ['比肩', '劫财'], 印: ['正印', '偏印'], 食伤: ['食神', '伤官'],
+    财: ['正财', '偏财'], 官杀: ['正官', '七杀'],
+  };
+  const favorTenGods = Array.from(new Set(favor.flatMap((el) => expand[roleName(el)] || [])));
+  const avoidTenGods = Array.from(new Set(avoid.flatMap((el) => expand[roleName(el)] || [])));
+
   const detail = [
     `日主${dayStem}${me}，${strength.level}（${strength.score} 分）：`,
     weak
@@ -1498,24 +1703,22 @@ function yongshenOf(dayStem, monthBranch, strength, wuxing) {
       : strong
         ? `喜${roles.shi}（食伤）泄秀、${roles.cai}（财）耗、${roles.guan}（官杀）制；忌${me}（比劫）与${roles.inMe}（印）再助。`
         : '身中和，先取调候与通关，喜忌随大运流年动态变化。',
-    tiaohou ? `调候（简化）：${tiaohou.note}，宜${tiaohou.element}。` : '',
-    '扶抑法为主；调候未用穷通宝鉴全表，各派取用不同，仅作方向提示。',
+    `调候：${climate.label}（${(climate.evidence || []).join('、')}）${climate.need ? `，取${climate.need.stem}${climate.need.element}，忌${climate.avoidElement}` : '，气候平和'}。`,
+    arb.text,
+    arb.clash ? '取舍：本盘按「调候优先、扶抑次之」取用；若你更认同扶抑派，可把调候当环境偏好，强弱判断不受影响。' : '',
   ].filter(Boolean).join('');
 
   return {
-    method: '扶抑为主 + 调候简化提示',
+    method: climate.priority === '调候优先' ? '调候优先 + 扶抑校验' : '扶抑为主 + 调候校验',
     level: strength.level,
     favor,
     avoid,
     favorRoles: favor.map(roleName),
     avoidRoles: avoid.map(roleName),
-    favorTenGods: favorableTenGods,
-    avoidTenGods: weak
-      ? ['食神', '伤官', '正财', '偏财', '正官', '七杀']
-      : strong
-        ? ['比肩', '劫财', '正印', '偏印']
-        : ['正官', '七杀', '正财', '偏财'],
-    tiaohou,
+    favorTenGods,
+    avoidTenGods,
+    tiaohou: { ...climate, ...arb, element: climate.need ? climate.need.element : null },
+    climate,
     detail,
   };
 }
@@ -1534,33 +1737,54 @@ function scoreLuck(ganzhi, frame) {
   const branch = ganzhi[1];
   const stemEl = STEM_ELEMENT[stem];
   const branchEl = BRANCH_ELEMENT[branch];
+  const th = ys.tiaohou || ys.climate || null;
   const scoreEl = (el) => {
     let s = 0;
     if (ys.favor.includes(el)) s += 1;
     if (ys.avoid.includes(el)) s -= 1;
-    if (ys.tiaohou && el === ys.tiaohou.element) s += 0.4;
     return s;
   };
   let score = scoreEl(stemEl) * 1.0 + scoreEl(branchEl) * 0.8;
   for (const h of (HIDDEN[branch] || []).slice(1)) {
     score += scoreEl(STEM_ELEMENT[h]) * 0.2;
   }
-  score = Math.round(score * 10) / 10;
 
-  const godStem = tenGod(frame.dayStem, stem);
-  const bonus = ys.favorTenGods.includes(godStem) ? 0.3 : 0;
-  const total = Math.round((score + bonus) * 10) / 10;
-
-  const tier = TIERS.find(([min]) => total >= min)[1];
   const reasons = [];
   if (ys.favor.includes(stemEl)) reasons.push(`天干${stem}${stemEl}为用神`);
   else if (ys.avoid.includes(stemEl)) reasons.push(`天干${stem}${stemEl}为忌神`);
   else reasons.push(`天干${stem}${stemEl}不喜不忌`);
   if (ys.favor.includes(branchEl)) reasons.push(`地支${branch}${branchEl}助用`);
   else if (ys.avoid.includes(branchEl)) reasons.push(`地支${branch}${branchEl}助忌`);
-  if (ys.tiaohou && (stemEl === ys.tiaohou.element || branchEl === ys.tiaohou.element)) {
-    reasons.push(`合调候（${ys.tiaohou.element}）`);
+
+  if (th && th.need && th.priority === '调候优先') {
+    const needEl = th.need.element;
+    const oppEl = th.avoidElement;
+    const cold = String(th.kind).includes('寒');
+    if (stemEl === needEl) {
+      score += 1.1;
+      reasons.push(`${th.label}之局得${stem}${stemEl}，${cold ? '解冻' : '得润'}`);
+    } else if (stemEl === oppEl) {
+      score -= 0.9;
+      reasons.push(`${th.label}之局再逢${stem}${stemEl}，${cold ? '冻木难生' : '燥上加燥'}`);
+    }
+    if (branchEl === needEl) {
+      score += 0.9;
+      reasons.push(`地支${branch}${branchEl}合调候`);
+    } else if (branchEl === oppEl) {
+      score -= 1.0;
+      reasons.push(`地支${branch}${branchEl}加重${th.label}`);
+    }
+    if (cold && (stemEl === '水' || branchEl === '水')) score -= 0.3;
+  } else if (th && th.need && (stemEl === th.need.element || branchEl === th.need.element)) {
+    reasons.push(`合调候（${th.need.element}）`);
   }
+
+  const godStem = tenGod(frame.dayStem, stem);
+  const bonus = ys.favorTenGods.includes(godStem) ? 0.3 : 0;
+  let total = Math.round((score + bonus) * 10) / 10;
+  total = Math.max(-4, Math.min(4, total));
+
+  const tier = TIERS.find(([min]) => total >= min)[1];
   return { ganzhi, score: total, tier, stemTenGod: godStem, reasons, note: `${godStem}运，${tier}（${total}）` };
 }
 
@@ -1569,7 +1793,7 @@ function analyzeBaziFrame({ pillars, dayStem, monthBranch, strength, wuxing }) {
   const month = monthPattern(pillars, dayStem, monthBranch);
   const special = specialPatterns(pillars, dayStem, monthBranch, strength, wuxing, gods);
   const geju = [month, ...special];
-  const yongshen = yongshenOf(dayStem, monthBranch, strength, wuxing);
+  const yongshen = yongshenOf(dayStem, monthBranch, strength, wuxing, Object.values(pillars).map((p) => p.branch));
   return {
     geju,
     primary: month,
@@ -2042,6 +2266,7 @@ function buildBazi(input) {
     },
     strength,
     frame,
+    climate: frame.yongshen.climate || frame.yongshen.tiaohou || null,
     liunian,
     liunianFrom: thisYear,
   };
@@ -5732,6 +5957,7 @@ return { TRIGRAM, YAO_POSITION, MOVING_NATURE, HEX64, HEX_BY_CORE, ZIWEI_STARS,
 
 __mods.almanac = (function () {
 const { solarToLunar } = __mods.lunar;
+const { nayinOf } = __mods.nayin;
 const { toJDN, fromJDN, dayGanzhiIndex, ganzhiName, termWindow, termInstantJd, partsToJd, STEMS, BRANCHES, TERM_NAMES } = __mods.calendar;
 const { HEX64 } = __mods['interpret-data'];
 const { assertCivil, daysInMonth } = __mods.validate;
@@ -5803,6 +6029,80 @@ function lunarMonthText(month, isLeap = false) {
   return `${isLeap ? '闰' : ''}${MONTH_TEXT[month - 1] || month}月`;
 }
 
+const TIAN_SHEN = ['青龙', '明堂', '天刑', '朱雀', '金匮', '天德', '白虎', '玉堂', '天牢', '玄武', '司命', '勾陈'];
+const TIAN_SHEN_TYPE = {
+  青龙: '黄道', 明堂: '黄道', 金匮: '黄道', 天德: '黄道', 玉堂: '黄道', 司命: '黄道',
+  天刑: '黑道', 朱雀: '黑道', 白虎: '黑道', 天牢: '黑道', 玄武: '黑道', 勾陈: '黑道',
+};
+const TIAN_SHEN_OFFSET = { 子: 4, 丑: 2, 寅: 0, 卯: 10, 辰: 8, 巳: 6, 午: 4, 未: 2, 申: 0, 酉: 10, 戌: 8, 亥: 6 };
+
+function tianShenOf(branch, anchorBranch) {
+  const b = BRANCHES.indexOf(branch);
+  const off = TIAN_SHEN_OFFSET[anchorBranch];
+  if (b < 0 || off == null) return null;
+  const name = TIAN_SHEN[(b + off) % 12];
+  const type = TIAN_SHEN_TYPE[name];
+  return { name, type, luck: type === '黄道' ? '吉' : '凶' };
+}
+
+const MANSIONS = {
+  角: { luck: '吉', zheng: '木', animal: '蛟', gong: '东' }, 亢: { luck: '凶', zheng: '金', animal: '龙', gong: '东' },
+  氐: { luck: '凶', zheng: '土', animal: '貉', gong: '东' }, 房: { luck: '吉', zheng: '日', animal: '兔', gong: '东' },
+  心: { luck: '凶', zheng: '月', animal: '狐', gong: '东' }, 尾: { luck: '吉', zheng: '火', animal: '虎', gong: '东' },
+  箕: { luck: '吉', zheng: '水', animal: '豹', gong: '东' }, 斗: { luck: '吉', zheng: '木', animal: '獬', gong: '北' },
+  牛: { luck: '凶', zheng: '金', animal: '牛', gong: '北' }, 女: { luck: '凶', zheng: '土', animal: '蝠', gong: '北' },
+  虚: { luck: '凶', zheng: '日', animal: '鼠', gong: '北' }, 危: { luck: '凶', zheng: '月', animal: '燕', gong: '北' },
+  室: { luck: '吉', zheng: '火', animal: '猪', gong: '北' }, 壁: { luck: '吉', zheng: '水', animal: '獝', gong: '北' },
+  奎: { luck: '凶', zheng: '木', animal: '狼', gong: '西' }, 娄: { luck: '吉', zheng: '金', animal: '狗', gong: '西' },
+  胃: { luck: '吉', zheng: '土', animal: '彘', gong: '西' }, 昴: { luck: '凶', zheng: '日', animal: '鸡', gong: '西' },
+  毕: { luck: '吉', zheng: '月', animal: '乌', gong: '西' }, 觜: { luck: '凶', zheng: '火', animal: '猴', gong: '西' },
+  参: { luck: '吉', zheng: '水', animal: '猿', gong: '西' }, 井: { luck: '吉', zheng: '木', animal: '犴', gong: '南' },
+  鬼: { luck: '凶', zheng: '金', animal: '羊', gong: '南' }, 柳: { luck: '凶', zheng: '土', animal: '獐', gong: '南' },
+  星: { luck: '凶', zheng: '日', animal: '马', gong: '南' }, 张: { luck: '吉', zheng: '月', animal: '鹿', gong: '南' },
+  翼: { luck: '凶', zheng: '火', animal: '蛇', gong: '南' }, 轸: { luck: '吉', zheng: '水', animal: '蚓', gong: '南' },
+};
+const XIU_GROUPS = {
+  A: ['虚', '毕', '翼', '箕', '奎', '鬼', '氐'],
+  B: ['房', '危', '觜', '轸', '斗', '娄', '柳'],
+  C: ['星', '心', '室', '参', '角', '牛', '胃'],
+  D: ['昴', '张', '尾', '壁', '井', '亢', '女'],
+};
+const XIU_GROUP_OF = { 子: 'A', 辰: 'A', 申: 'A', 丑: 'B', 巳: 'B', 酉: 'B', 寅: 'C', 午: 'C', 戌: 'C', 卯: 'D', 未: 'D', 亥: 'D' };
+
+function xiuOf(dayBranch, weekdayIndex) {
+  const g = XIU_GROUP_OF[dayBranch];
+  if (!g) return null;
+  const name = XIU_GROUPS[g][weekdayIndex];
+  const info = MANSIONS[name];
+  return info ? { name, ...info } : null;
+}
+
+const DIR_OF = { 坎: '正北', 艮: '东北', 震: '正东', 巽: '东南', 离: '正南', 坤: '西南', 兑: '正西', 乾: '西北' };
+const POS_XI = { 甲: '艮', 乙: '乾', 丙: '坤', 丁: '离', 戊: '巽', 己: '艮', 庚: '乾', 辛: '坤', 壬: '离', 癸: '巽' };
+const POS_CAI = { 甲: '艮', 乙: '艮', 丙: '坤', 丁: '坤', 戊: '坎', 己: '坎', 庚: '震', 辛: '震', 壬: '离', 癸: '离' };
+const POS_FU = { 甲: '坎', 乙: '坤', 丙: '乾', 丁: '巽', 戊: '艮', 己: '坎', 庚: '坤', 辛: '乾', 壬: '巽', 癸: '艮' };
+const POS_YANG_GUI = { 甲: '坤', 乙: '坤', 丙: '兑', 丁: '乾', 戊: '艮', 己: '坎', 庚: '离', 辛: '艮', 壬: '震', 癸: '巽' };
+const POS_YIN_GUI = { 甲: '艮', 乙: '坎', 丙: '乾', 丁: '兑', 戊: '坤', 己: '坤', 庚: '艮', 辛: '离', 壬: '巽', 癸: '震' };
+const posOf = (map, stem) => (map[stem] ? { gua: map[stem], dir: DIR_OF[map[stem]] } : null);
+
+const TAI_SHEN = {
+  甲子: '占门碓 外东南', 乙丑: '碓磨厕 外东南', 丙寅: '厨灶炉 外正南', 丁卯: '仓库门 外正南', 戊辰: '房床栖 外正南',
+  己巳: '占门床 外正南', 庚午: '占碓磨 外正南', 辛未: '厨灶厕 外西南', 壬申: '仓库炉 外西南', 癸酉: '房床门 外西南',
+  甲戌: '占门栖 外西南', 乙亥: '碓磨床 外西南', 丙子: '厨灶碓 外西南', 丁丑: '仓库厕 外正西', 戊寅: '房床炉 外正西',
+  己卯: '占大门 外正西', 庚辰: '碓磨栖 外正西', 辛巳: '厨灶床 外正西', 壬午: '仓库碓 外西北', 癸未: '房床厕 外西北',
+  甲申: '占门炉 外西北', 乙酉: '碓磨门 外西北', 丙戌: '厨灶栖 外西北', 丁亥: '仓库床 外西北', 戊子: '房床碓 外正北',
+  己丑: '占门厕 外正北', 庚寅: '碓磨炉 外正北', 辛卯: '厨灶门 外正北', 壬辰: '仓库栖 外正北', 癸巳: '占房床 房内北',
+  甲午: '占门碓 房内北', 乙未: '碓磨厕 房内北', 丙申: '厨灶炉 房内北', 丁酉: '仓库门 房内北', 戊戌: '房床栖 房内中',
+  己亥: '占门床 房内中', 庚子: '占碓磨 房内南', 辛丑: '厨灶厕 房内南', 壬寅: '仓库炉 房内南', 癸卯: '房床门 房内西',
+  甲辰: '占门栖 房内东', 乙巳: '碓磨床 房内东', 丙午: '厨灶碓 房内东', 丁未: '仓库厕 房内东', 戊申: '房床炉 房内中',
+  己酉: '占大门 外东北', 庚戌: '碓磨栖 外东北', 辛亥: '厨灶床 外东北', 壬子: '仓库碓 外东北', 癸丑: '房床厕 外东北',
+  甲寅: '占门炉 外东北', 乙卯: '碓磨门 外正东', 丙辰: '厨灶栖 外正东', 丁巳: '仓库床 外正东', 戊午: '房床碓 外正东',
+  己未: '占门厕 外正东', 庚申: '碓磨炉 外东南', 辛酉: '厨灶门 外东南', 壬戌: '仓库栖 外东南', 癸亥: '占房床 外东南',
+};
+
+const LIUHE = { 子: '丑', 丑: '子', 寅: '亥', 亥: '寅', 卯: '戌', 戌: '卯', 辰: '酉', 酉: '辰', 巳: '申', 申: '巳', 午: '未', 未: '午' };
+const SANHE = { 申: '申子辰', 子: '申子辰', 辰: '申子辰', 亥: '亥卯未', 卯: '亥卯未', 未: '亥卯未', 寅: '寅午戌', 午: '寅午戌', 戌: '寅午戌', 巳: '巳酉丑', 酉: '巳酉丑', 丑: '巳酉丑' };
+
 function dailyHexagram(year, month, day) {
   const names = Object.keys(HEX64);
   if (!names.length) return null;
@@ -5858,7 +6158,41 @@ function buildAlmanac(input) {
     return `${p.year}-${String(p.month).padStart(2, '0')}-${String(p.day).padStart(2, '0')}`;
   };
 
-  const weekday = ['日', '一', '二', '三', '四', '五', '六'][(jdn + 1) % 7];
+  const weekdayIdx = (jdn + 1) % 7;
+  const weekday = ['日', '一', '二', '三', '四', '五', '六'][weekdayIdx];
+  const dayGod = tianShenOf(dayBranch, BRANCHES[monthBranchIdx]);
+  const xiu = xiuOf(dayBranch, weekdayIdx);
+  const taiShen = TAI_SHEN[dayGz.name] || null;
+  const hourBase = (STEMS.indexOf(dayGz.stem) % 5) * 2;
+  const hours = BRANCHES.map((zhi, i) => {
+    const gan = STEMS[(hourBase + i) % 10];
+    const gz = ganzhiName(hourComposite((hourBase + i) % 10, i));
+    const shen = tianShenOf(zhi, dayBranch);
+    return {
+      zhi,
+      name: `${zhi}时`,
+      ganZhi: gz.name,
+      gan,
+      shen: shen ? shen.name : null,
+      type: shen ? shen.type : null,
+      luck: shen ? shen.luck : null,
+    };
+  });
+  const sanheGroup = SANHE[dayBranch] || '';
+  const liuheBranch = LIUHE[dayBranch] || null;
+  const lucky = {
+    liuhe: liuheBranch ? SHENGXIAO[BRANCHES.indexOf(liuheBranch)] : null,
+    sanhe: [...sanheGroup].filter((b) => b !== dayBranch).map((b) => SHENGXIAO[BRANCHES.indexOf(b)]),
+  };
+  const positions = {
+    caiShen: CAI_SHEN[dayGz.stem] || null,
+    xiShen: XI_SHEN[dayGz.stem] || null,
+    fuShen: posOf(POS_FU, dayGz.stem),
+    yangGui: posOf(POS_YANG_GUI, dayGz.stem),
+    yinGui: posOf(POS_YIN_GUI, dayGz.stem),
+    xiShenFull: posOf(POS_XI, dayGz.stem),
+    caiShenFull: posOf(POS_CAI, dayGz.stem),
+  };
   const lunarText = `农历${springGz.name}年${lunarMonthText(lunar.month, lunar.isLeap)}${dayText(lunar.day)}`;
   const boundaryNote = yearGz.name !== springGz.name
     ? `年界：本条按立春界作${yearGz.name}年·属${SHENGXIAO[BRANCHES.indexOf(yearGz.branch)]}（命理排盘用）；春节界为${springGz.name}年·属${SHENGXIAO[BRANCHES.indexOf(springGz.branch)]}，两种都对，取用场合不同`
@@ -5870,7 +6204,7 @@ function buildAlmanac(input) {
       date: `${year}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`,
       weekday: `星期${weekday}`,
       ...(boundaryNote ? { boundaryNote } : {}),
-      scope: '通行简表口径：宜忌只按建除十二神；逐日神煞/二十八宿/彭祖百忌/胎神等全量黄历数据未收录',
+      scope: '通行口径：宜忌按建除十二神简表；已收录值日十二神（黄道/黑道）、时辰吉凶、二十八宿、胎神、吉神方位、纳音、六合三合吉配；逐日全量吉神凶煞与彭祖百忌未收录',
     },
     lunar: {
       year: springYear,
@@ -5891,7 +6225,13 @@ function buildAlmanac(input) {
       prev: prevTerm ? { name: termName(prevTerm), date: fmtJdDate(prevTerm.jd) } : null,
       next: nextTerm ? { name: termName(nextTerm), date: fmtJdDate(nextTerm.jd) } : null,
     },
-    positions: { caiShen: CAI_SHEN[dayGz.stem] || null, xiShen: XI_SHEN[dayGz.stem] || null },
+    positions,
+    dayGod,
+    xiu,
+    taiShen,
+    nayin: { day: nayinOf(dayGanzhiIndex(jdn)) },
+    lucky,
+    hours,
     zhiXing,
     yi: ZHIXING_YI[zhiXing].slice(),
     ji: ZHIXING_JI[zhiXing].slice(),
@@ -5904,6 +6244,7 @@ function buildAlmanac(input) {
     sources: [
       '农历与节气：本地天文历法（定朔 + 节气黄经）',
       '建除十二神与冲煞：传统通行口径',
+      '值日/时家十二神（青龙…勾陈）、二十八宿、胎神、吉神方位：通行表',
       '宜忌：建除十二神通行简表（非逐日全量黄历）',
       '每日一卦：按公历日期确定性取卦（同日同卦）',
     ],
@@ -5918,7 +6259,14 @@ function monthComposite(stemIdx, branchIdx) {
   return 0;
 }
 
-return { ZHIXING, ZHIXING_YI, ZHIXING_JI, SHENGXIAO, hourToBranch, zhixingOf, lunarMonthText, dailyHexagram, buildAlmanac };
+function hourComposite(stemIdx, branchIdx) {
+  for (let i = 0; i < 60; i++) {
+    if (i % 10 === stemIdx && i % 12 === branchIdx) return i;
+  }
+  return 0;
+}
+
+return { ZHIXING, ZHIXING_YI, ZHIXING_JI, SHENGXIAO, hourToBranch, zhixingOf, lunarMonthText, TIAN_SHEN, TIAN_SHEN_TYPE, tianShenOf, MANSIONS, xiuOf, dailyHexagram, buildAlmanac };
 })();
 
 __mods.star = (function () {
@@ -6304,26 +6652,52 @@ const { buildAlmanac, SHENGXIAO } = __mods.almanac;
 const TASKS = {
   嫁娶: { yi: ['嫁娶', '结亲', '订盟', '纳采'], related: ['会亲友', '裁衣'], category: 'marriage' },
   订婚: { yi: ['订盟', '纳采'], related: ['嫁娶', '会亲友'], category: 'marriage' },
+  领证: { yi: ['嫁娶', '纳采'], related: ['订盟', '会亲友'], category: 'marriage' },
+  提亲: { yi: ['纳采', '订盟'], related: ['会亲友'], category: 'marriage' },
+  收送聘金: { yi: ['纳采', '订盟'], related: ['嫁娶'], category: 'marriage' },
+  满月酒: { yi: ['祭祀', '祈福'], related: ['会亲友'], category: 'celebration' },
   开业: { yi: ['开市', '立券', '交易'], related: ['纳财', '挂匾'], category: 'business' },
+  交易: { yi: ['交易', '立券'], related: ['开市', '纳财'], category: 'business' },
+  投资: { yi: ['纳财', '交易'], related: ['立券'], category: 'business' },
+  签订合同: { yi: ['立券', '交易'], related: ['纳财', '开市'], category: 'contract' },
+  签约: { yi: ['立券', '交易'], related: ['纳财', '开市'], category: 'contract' },
+  纳财: { yi: ['纳财', '收账'], related: ['开市', '立券'], category: 'contract' },
   入宅: { yi: ['入宅', '移徙'], related: ['安床', '修造', '扫舍'], category: 'move' },
   搬家: { yi: ['移徙', '入宅'], related: ['安床', '修造'], category: 'move' },
+  搬家入宅: { yi: ['入宅', '移徙'], related: ['安床', '扫舍'], category: 'move' },
   动土: { yi: ['动土', '修造'], related: ['竖柱', '上梁'], category: 'construction' },
   装修: { yi: ['修造', '修饰垣墙'], related: ['动土'], category: 'construction' },
+  装修建造: { yi: ['修造', '动土'], related: ['竖柱', '上梁'], category: 'construction' },
+  试车买车: { yi: ['交易', '纳财'], related: ['出行'], category: 'purchase' },
   安葬: { yi: ['安葬', '破土'], related: ['立碑', '埋穴'], category: 'burial' },
   出行: { yi: ['出行'], related: ['上任', '赴任'], category: 'travel' },
+  旅行: { yi: ['出行'], related: ['上任', '赴任'], category: 'travel' },
+  赴任: { yi: ['上任', '赴任'], related: ['出行'], category: 'travel' },
+  访亲友: { yi: ['会亲友'], related: ['出行'], category: 'visit' },
+  入学: { yi: ['入学'], related: ['开市', '修造'], category: 'study' },
   祭祀: { yi: ['祭祀'], related: ['祈福', '求嗣'], category: 'worship' },
-  签约: { yi: ['立券', '交易'], related: ['纳财', '开市'], category: 'contract' },
   求医: { yi: ['求医', '疗病'], related: ['针灸'], category: 'medical' },
-  纳财: { yi: ['纳财', '收账'], related: ['开市', '立券'], category: 'contract' },
+};
+
+const TASK_GROUPS = {
+  常用: ['嫁娶', '搬家入宅', '出行', '开业', '签订合同', '祭祀'],
+  婚嫁: ['嫁娶', '订婚', '领证', '提亲', '收送聘金', '满月酒'],
+  生活: ['搬家', '入宅', '旅行', '访亲友', '入学', '求医', '祭祀'],
+  建造: ['动土', '装修', '装修建造', '安葬', '试车买车'],
+  工商: ['开业', '交易', '投资', '签订合同', '签约', '纳财', '赴任'],
 };
 
 const ZHIXING_FAVOR = {
   marriage: ['满', '定', '成', '开'],
+  celebration: ['满', '成', '开', '平'],
   business: ['开', '成', '满', '收'],
   move: ['定', '成', '开', '除'],
   construction: ['建', '除', '成', '开'],
+  purchase: ['成', '开', '满'],
   burial: ['除', '定', '闭', '破'],
   travel: ['建', '成', '开', '除'],
+  visit: ['满', '平', '定', '成'],
+  study: ['成', '开', '建'],
   worship: ['除', '满', '平', '定', '执', '成', '开'],
   contract: ['定', '成', '收', '开'],
   medical: ['除', '开'],
@@ -6417,7 +6791,133 @@ function buildZeri(input) {
   };
 }
 
-return { TASKS, buildZeri };
+return { TASKS, TASK_GROUPS, buildZeri };
+})();
+
+__mods.convert = (function () {
+const { solarToLunar } = __mods.lunar;
+const { fromJDN, toJDN } = __mods.calendar;
+const { buildAlmanac } = __mods.almanac;
+const { assertCivil, daysInMonth } = __mods.validate;
+
+const WEEK = ['日', '一', '二', '三', '四', '五', '六'];
+const MONTH_TEXT = ['正', '二', '三', '四', '五', '六', '七', '八', '九', '十', '冬', '腊'];
+const DAY_TENS = ['初', '十', '廿'];
+const DAY_UNITS = ['十', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
+
+function dayText(day) {
+  if (day === 10) return '初十';
+  if (day === 20) return '二十';
+  if (day === 30) return '三十';
+  return `${DAY_TENS[Math.floor(day / 10)]}${DAY_UNITS[day % 10]}`;
+}
+
+function lunarText(year, month, day, isLeap) {
+  return `农历${year}年${isLeap ? '闰' : ''}${MONTH_TEXT[month - 1] || month}月${dayText(day)}`;
+}
+
+function lunarNewYearJdn(lunarYear) {
+  const from = toJDN(lunarYear, 1, 20);
+  const to = toJDN(lunarYear, 2, 25);
+  for (let jdn = from; jdn <= to; jdn++) {
+    const p = fromJDN(jdn);
+    const l = solarToLunar(p.year, p.month, p.day);
+    if (l.lunarYear === lunarYear && l.month === 1 && l.day === 1) return jdn;
+  }
+  return null;
+}
+
+function lunarMonths(lunarYear) {
+  const first = lunarNewYearJdn(lunarYear);
+  if (first == null) return [];
+  const out = [];
+  let cur = first;
+  for (let i = 0; i < 14; i++) {
+    const p = fromJDN(cur);
+    const l = solarToLunar(p.year, p.month, p.day);
+    if (i > 0 && l.month === 1 && !l.isLeap) break;
+    let next = null;
+    for (let k = 29; k <= 31; k++) {
+      const d = fromJDN(cur + k);
+      const l2 = solarToLunar(d.year, d.month, d.day);
+      if (l2.day === 1) { next = cur + k; break; }
+    }
+    if (next == null) break;
+    out.push({ month: l.month, isLeap: l.isLeap, startJdn: cur, length: next - cur });
+    cur = next;
+  }
+  return out;
+}
+
+function buildConvert(input) {
+  const mode = input.mode === 'lunar2solar' ? 'lunar2solar' : 'solar2lunar';
+  let solar;
+  let lunar;
+  let note = null;
+  if (mode === 'solar2lunar') {
+    solar = { year: input.year, month: input.month, day: input.day };
+    assertCivil(solar, '公农历转换');
+    if (solar.day > daysInMonth(solar.year, solar.month)) {
+      throw new Error(`非法日期：${solar.year} 年 ${solar.month} 月没有 ${solar.day} 日`);
+    }
+    lunar = solarToLunar(solar.year, solar.month, solar.day);
+  } else {
+    const y = Number(input.lunarYear);
+    const m = Number(input.lunarMonth);
+    const d = Number(input.lunarDay);
+    if (![y, m, d].every(Number.isInteger)) throw new Error('农历转换需要 lunarYear / lunarMonth / lunarDay');
+    if (m < 1 || m > 12) throw new Error('农历月份须在 1–12');
+    const months = lunarMonths(y);
+    if (!months.length) throw new Error(`农历 ${y} 年超出本地历法覆盖范围（1900–2100）`);
+    const isLeap = input.isLeapMonth === true;
+    const hit = months.find((x) => x.month === m && x.isLeap === isLeap);
+    if (!hit) {
+      const leapMonths = months.filter((x) => x.isLeap).map((x) => `闰${MONTH_TEXT[x.month - 1]}月`);
+      throw new Error(`农历 ${y} 年没有${leapMonths.length ? `该月（该年闰月为 ${leapMonths.join('、')}）` : '闰月'}：${isLeap ? '请确认闰月标记' : '请确认月份'}`);
+    }
+    if (d < 1 || d > hit.length) throw new Error(`农历 ${y} 年${isLeap ? '闰' : ''}${MONTH_TEXT[m - 1]}月只有 ${hit.length} 天，没有 ${d} 日`);
+    const p = fromJDN(hit.startJdn + d - 1);
+    solar = { year: p.year, month: p.month, day: p.day };
+    const check = solarToLunar(p.year, p.month, p.day);
+    if (check.month !== m || check.day !== d || check.isLeap !== isLeap) {
+      note = '反查结果与目标农历日不完全一致，已按本地历法实际月首回推';
+    }
+    lunar = check;
+  }
+
+  const a = buildAlmanac(solar);
+  const jdn = toJDN(solar.year, solar.month, solar.day);
+  const solarText = `${solar.year}-${String(solar.month).padStart(2, '0')}-${String(solar.day).padStart(2, '0')}`;
+  return {
+    system: 'convert',
+    meta: {
+      mode,
+      solarDate: solarText,
+      weekday: `星期${WEEK[(jdn + 1) % 7]}`,
+      ...(note ? { note } : {}),
+      scope: '公农历互转按本地定朔历（1900–2100）；农历闰月须显式指定，不自动猜同名月',
+    },
+    solar: { year: solar.year, month: solar.month, day: solar.day, text: solarText },
+    lunar: {
+      year: lunar.lunarYear,
+      month: lunar.month,
+      day: lunar.day,
+      isLeap: lunar.isLeap,
+      text: lunarText(lunar.lunarYear, lunar.month, lunar.day, lunar.isLeap),
+    },
+    ganzhi: {
+      year: a.ganzhi.year,
+      month: a.ganzhi.month,
+      day: a.ganzhi.day,
+      shengXiao: a.ganzhi.shengXiao,
+      springYear: a.ganzhi.springYear,
+    },
+    sources: ['农历：本地定朔 + 节气黄经历法（engine/lunar.js）', '干支与生肖：与黄历同口径（年按立春界，另列春节界）'],
+    disclaimer: '历法换算为确定性计算；民俗历法各版本在极少数日期（交节当日、闰月边界）存在日界差异，已注明口径。',
+  };
+}
+
+return { buildConvert };
 })();
 
 __mods['interpret-plain'] = (function () {
@@ -7001,6 +7501,7 @@ function baziInterpret(r) {
   const st = isObj(r.strength) ? r.strength : {};
   const frame = isObj(r.frame) ? r.frame : {};
   const ys = isObj(frame.yongshen) ? frame.yongshen : {};
+  const cli = r.climate || (isObj(ys.climate) ? ys.climate : (isObj(ys.tiaohou) ? ys.tiaohou : null));
   const wx = isObj(r.wuxing) ? r.wuxing : {};
   const level = pick(st, 'level', '中和');
   const favor = Array.isArray(ys.favor) ? ys.favor : [];
@@ -7184,10 +7685,12 @@ function baziInterpret(r) {
           else if (!good.includes(curTier) && !good.includes(lnTier)) out.push('大运与流年都偏逆：以守住基本盘为主，减少新增承诺。');
           else out.push('大运与流年同向偏顺：可以把想做但一直拖着的事排上日程。');
         }
-        const tiao = ys.tiaohou && ys.tiaohou.element;
-        if (tiao) out.push(favor.includes(tiao)
-          ? `调候喜${tiao}，与扶抑用神同向：取用上不打架，${tiao}相关的行业与环境优先。`
-          : `调候喜${tiao}，不在扶抑的喜用里：两套取法有分歧，这里以扶抑为主，${tiao}只作环境上的小幅偏好。`);
+        const th = ys.tiaohou && ys.tiaohou.need ? ys.tiaohou : null;
+        if (th) {
+          out.push(th.clash
+            ? `调候要${th.need.stem}${th.need.element}，扶抑不在喜用里：两套取法有分歧，本盘按调候优先——寒暖失衡时，再补强弱也难受。`
+            : `调候要${th.need.stem}${th.need.element}，与扶抑用神同向：取用上不打架，${th.need.element}相关的行业与环境优先。`);
+        }
         return out.join('　');
       })(),
     },
@@ -7196,6 +7699,12 @@ function baziInterpret(r) {
       text: `喜用：${join(favor)}（对应十神：${join(ys.favorTenGods || ys.favorRoles || [])}）；忌：${join(avoid)}（对应十神：${join(ys.avoidTenGods || ys.avoidRoles || [])}）。` +
         `${pick(ys, 'detail', '')}`,
     },
+    ...(cli ? [{
+      key: 'climate', label: '寒暖燥湿',
+      text: `${cli.narration}${cli.need
+        ? `调候取${cli.need.stem}${cli.need.element}，忌${cli.avoidElement}；${cli.clash ? '与扶抑冲突，本盘以调候为先' : '与扶抑同向'}`
+        : '气候平和，调候不作主取'}。`,
+    }] : []),
     {
       key: 'geju', label: '格局依据',
       text: (Array.isArray(frame.geju) ? frame.geju : []).map((g) => `${g.name}（${g.kind}）：${g.evidence}`).join('；') || '未取到格局',
@@ -7206,7 +7715,7 @@ function baziInterpret(r) {
     },
     {
       key: 'limits', label: '未纳入',
-      text: '本盘没有计算：流月与流日、神煞的加权轻重、地支藏干的动态引化（合冲后再论）。取用以扶抑为主、调候只做简化提示，各派取法不同；真太阳时未含历史时区与夏令时。把这些补上会改变"强弱"的边际判断，所以这里只给方向，不下断语。',
+      text: '本盘没有计算：流月与流日、神煞的加权轻重、地支藏干的动态引化（合冲后再论）。取用按「调候优先、扶抑校验」；调候由月令与全局寒暖燥湿判定，未逐条录入穷通宝鉴 120 条，各派取法仍有分歧；真太阳时未含历史时区与夏令时。把这些补上会改变"强弱"的边际判断，所以这里只给方向，不下断语。',
     },
   ];
 
@@ -8590,6 +9099,7 @@ const { buildChenggu } = __mods.chenggu;
 const { buildXiaoliuren } = __mods.xiaoliuren;
 const { buildStar } = __mods.star;
 const { buildNumerology } = __mods.numerology;
+const { buildConvert } = __mods.convert;
 const { buildTrend } = __mods.trend;
 const { buildFengshui } = __mods.fengshui;
 const { buildName } = __mods.name;
@@ -8667,6 +9177,7 @@ function baziText(r) {
     `　　　${r.frame.geju.map((g) => `${g.name}[${g.kind}]`).join('　')}`,
     `用神：喜${r.frame.yongshen.favor.join('')}（${r.frame.yongshen.favorTenGods.join('、')}）　忌${r.frame.yongshen.avoid.join('')}（${r.frame.yongshen.avoidTenGods.join('、')}）　${r.frame.yongshen.method}`,
     `　　　${r.frame.yongshen.detail}`,
+    `寒暖：${r.climate ? `${r.climate.label}（${(r.climate.evidence || []).join('、')}）${r.climate.need ? `　调候取${r.climate.need.stem}${r.climate.need.element}　忌${r.climate.avoidElement}` : ''}` : '—'}`,
     `十神权重：${Object.entries(r.frame.godStats.groups).map(([k, v]) => `${k}${v}`).join(' ')}`,
   ] : [];
   return [
@@ -9144,6 +9655,26 @@ function computeRaw(args = {}) {
     const result = buildChenggu({ year: dt.year, month: dt.month, day: dt.day, hour, minute: hasTime ? dt.minute : 0 });
     return { ...result, summary: chengguText(result) };
   }
+  if (system === 'convert') {
+    const mode = args.mode === 'lunar2solar' ? 'lunar2solar' : 'solar2lunar';
+    let result;
+    if (mode === 'lunar2solar') {
+      if (args.lunarYear == null || args.lunarMonth == null || args.lunarDay == null) {
+        throw fail('E_INPUT', '农历转公历需要 lunarYear / lunarMonth / lunarDay（闰月另加 isLeapMonth: true）');
+      }
+      result = buildConvert({
+        mode,
+        lunarYear: Number(args.lunarYear),
+        lunarMonth: Number(args.lunarMonth),
+        lunarDay: Number(args.lunarDay),
+        isLeapMonth: args.isLeapMonth === true,
+      });
+    } else {
+      const dt = parseDateTime(args.datetime);
+      result = buildConvert({ mode, year: dt.year, month: dt.month, day: dt.day });
+    }
+    return { ...result, summary: convertText(result) };
+  }
   if (system === 'xiaoliuren') {
     const dt = args.datetime ? parseDateTime(args.datetime) : null;
     const result = buildXiaoliuren({
@@ -9227,21 +9758,34 @@ 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（起名）。');
+    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_SYSTEM', `未知体系「${system}」，可选：bazi（四柱八字）、ziwei（紫微斗数）、liuyao（六爻）、meihua（梅花易数）、daliuren（大六壬）、qimen（奇门遁甲）、hepan（合盘）、tarot（塔罗）、almanac（黄历）、zeri（择日）、chenggu（称骨）、xiaoliuren（小六壬）、star（星座）、numerology（生命数字）、trend（人生 K 线）、fengshui（风水）、name（起名）。`);
+  throw fail('E_SYSTEM', `未知体系「${system}」，可选：bazi（四柱八字）、ziwei（紫微斗数）、liuyao（六爻）、meihua（梅花易数）、daliuren（大六壬）、qimen（奇门遁甲）、hepan（合盘）、tarot（塔罗）、almanac（黄历）、zeri（择日）、chenggu（称骨）、xiaoliuren（小六壬）、star（星座）、numerology（生命数字）、trend（人生 K 线）、fengshui（风水）、name（起名）、convert（公农历互转）。`);
 }
 
 function almanacText(r) {
   const g = r.ganzhi;
   const jq = r.jieQi && r.jieQi.next ? `　下一节：${r.jieQi.next.name} ${r.jieQi.next.date}` : '';
+  const god = r.dayGod ? `值日：${r.dayGod.name}（${r.dayGod.type}·${r.dayGod.luck}）` : '';
+  const xiu = r.xiu ? `二十八宿：${r.xiu.name}宿（${r.xiu.luck}·${r.xiu.zheng}·${r.xiu.animal}）` : '';
+  const tai = r.taiShen ? `胎神：${r.taiShen}` : '';
+  const pos = r.positions
+    ? `吉神方位：喜神${r.positions.xiShen || '—'}　财神${r.positions.caiShen || '—'}　福神${r.positions.fuShen ? r.positions.fuShen.dir : '—'}　阳贵${r.positions.yangGui ? r.positions.yangGui.dir : '—'}　阴贵${r.positions.yinGui ? r.positions.yinGui.dir : '—'}`
+    : '';
+  const lucky = r.lucky ? `吉配生肖：六合${r.lucky.liuhe || '—'}　三合${(r.lucky.sanhe || []).join('、') || '—'}` : '';
+  const nayin = r.nayin && r.nayin.day ? `日柱纳音：${r.nayin.day.name}` : '';
+  const hours = (r.hours || []).map((h) => `${h.zhi}${h.ganZhi.slice(0, 1)}·${h.shen}${h.luck === '吉' ? '吉' : '凶'}`).join(' ');
   return [
     `【黄历】${r.meta.date} ${r.meta.weekday}　${r.lunar.text}`,
     `干支：${g.year}年　${g.month}月　${g.day}日　属${g.shengXiao}`,
     ...(r.meta.boundaryNote ? [`　${r.meta.boundaryNote}`] : []),
-    `建除：${r.zhiXing}日　冲：${r.chong.text}${r.chong.sha ? `（${r.chong.sha}）` : ''}　财神：${r.positions.caiShen || '—'}　喜神：${r.positions.xiShen || '—'}`,
+    `建除：${r.zhiXing}日　冲：${r.chong.text}${r.chong.sha ? `（${r.chong.sha}）` : ''}　${god}`,
+    [xiu, nayin, tai].filter(Boolean).join('　'),
     `宜：${r.yi.join('、')}`,
     `忌：${r.ji.join('、')}`,
+    pos,
+    lucky,
+    hours ? `时辰吉凶：${hours}` : '',
     `节气：上一节 ${r.jieQi.prev ? `${r.jieQi.prev.name} ${r.jieQi.prev.date}` : '—'}${jq}`,
     r.dailyHexagram ? `每日一卦：${r.dailyHexagram.name}　${r.dailyHexagram.meaning || ''}` : '',
     `口径：${r.meta.scope}`,
@@ -9297,6 +9841,17 @@ function starText(r) {
   ].join('\n');
 }
 
+function convertText(r) {
+  const g = r.ganzhi;
+  const dir = r.meta.mode === 'lunar2solar' ? '农历 → 公历' : '公历 → 农历';
+  return [
+    `【公农历转换·${dir}】${r.lunar.text} ⇄ ${r.solar.text} ${r.meta.weekday}`,
+    `干支：${g.year}年　${g.month}月　${g.day}日　属${g.shengXiao}${g.springYear && g.springYear !== g.year ? `（春节界为${g.springYear}年）` : ''}`,
+    ...(r.meta.note ? [`注：${r.meta.note}`] : []),
+    `口径：${r.meta.scope}`,
+  ].join('\n');
+}
+
 function numerologyText(r) {
   return [
     `【生命数字】${r.meta.date}（西方数字学，与八字/紫微不可互证）`,
@@ -9391,7 +9946,7 @@ 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, buildTrend, buildFengshui, buildName, parseDateTime, compute, interpretText, renderText };
+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 };
 })();
 
     const Engine = __mods.index;
@@ -9921,7 +10476,52 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
 @media print{.mp-cg{break-inside:avoid}}
 @media (max-width:640px){.mp-cg-w{grid-template-columns:repeat(2,minmax(0,1fr))}}
 .mp-quick-h{font-size:13px;color:var(--lu);margin-bottom:6px;font-family:system-ui,sans-serif}
+.mp-cli{margin:10px 0;padding:10px 12px;border:1px solid var(--line);border-radius:10px;background:var(--card)}
+.mp-cli-h{display:flex;align-items:center;gap:8px;font-size:13px;color:var(--ink)}
+.mp-cli-h b{font-size:13px}
+.mp-cli-k{font-weight:700;color:var(--lu)}
+.mp-cli-p{margin-left:auto;font-size:11.5px;color:var(--quan);background:var(--bg);border:1px solid var(--line);border-radius:999px;padding:1px 8px}
+.mp-cli-bar{position:relative;margin:9px 0 4px;height:8px;border-radius:999px;background:linear-gradient(90deg,var(--quan) 0%,var(--line) 50%,var(--ji) 100%)}
+.mp-cli-bar i{position:absolute;top:-3px;width:14px;height:14px;margin-left:-7px;border-radius:50%;background:var(--card);border:2px solid var(--ink);box-shadow:0 0 0 2px var(--card)}
+.mp-cli-axis{display:flex;justify-content:space-between;font-size:11px;color:var(--ink3);margin-bottom:8px}
+.mp-cli-row{display:flex;flex-wrap:wrap;gap:6px 10px;align-items:center;font-size:12.5px;color:var(--ink2)}
+.mp-cli-row em{font-style:normal;color:var(--ink3)}
+.mp-cli-row b{color:var(--ink)}
+.mp-cli-narr{margin-top:8px;font-size:13px;line-height:1.85;color:var(--ink2);border-left:2px solid var(--quan);padding-left:9px}
+@media print{.mp-cli{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-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}
+.mp-al-h i{font-style:normal;font-size:12px;color:var(--muted)}
+.mp-al-gz{font-size:12.5px;color:var(--ink2);margin-bottom:9px;display:flex;align-items:center;gap:8px;flex-wrap:wrap}
+.mp-al-badge{font-size:11px;border:1px solid var(--line);border-radius:999px;padding:1px 8px}
+.mp-al-badge.good{color:var(--lu);border-color:var(--lu)}
+.mp-al-badge.bad{color:var(--ji);border-color:var(--ji)}
+.mp-al-yiji{display:grid;grid-template-columns:1fr 1fr;gap:10px;margin:6px 0 9px}
+.mp-al-col em,.mp-al-row>em{font-style:normal;font-size:10.5px;color:var(--muted);display:block;margin-bottom:4px}
+.mp-al-chips{display:flex;flex-wrap:wrap;gap:4px}
+.mp-al-chip{font-size:11.5px;padding:1px 7px;border:1px solid var(--line);border-radius:999px;color:var(--ink2);white-space:nowrap}
+.mp-al-grid{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:1px;background:var(--line);border:1px solid var(--line);border-radius:6px;overflow:hidden;margin:8px 0}
+.mp-al-cell{background:var(--card);padding:6px 8px;min-width:0}
+.mp-al-cell em{display:block;font-style:normal;font-size:10.5px;color:var(--muted);margin-bottom:2px}
+.mp-al-cell b{font-size:12.5px;color:var(--ink);font-weight:600;line-height:1.45;display:block}
+.mp-al-row{margin:9px 0}
+.mp-al-hours{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:5px}
+.mp-al-hour{display:flex;align-items:baseline;gap:3px;border:1px solid var(--hair);border-radius:5px;padding:3px 6px;font-size:11px;color:var(--ink2);background:var(--band)}
+.mp-al-hour i{font-style:normal;font-weight:600;color:var(--ink)}
+.mp-al-hour em{font-style:normal;color:var(--muted)}
+.mp-al-hour b{font-weight:500}
+.mp-al-hour u{text-decoration:none;margin-left:auto;font-size:10.5px}
+.mp-al-hour.good{border-color:var(--lu);color:var(--lu)}
+.mp-al-hour.good i{color:var(--lu)}
+.mp-al-hour.bad{border-color:var(--hair)}
+.mp-al-hour.bad u{color:var(--ji)}
+.mp-al-hex{margin-top:8px;font-size:12px;color:var(--ink2)}
+.mp-al-hex b{color:var(--quan)}
+.mp-al-note{margin-top:9px;padding-top:8px;border-top:1px dashed var(--line);font-size:11px;line-height:1.7;color:var(--muted)}
+@media print{.mp-al{break-inside:avoid}}
+@media (max-width:640px){.mp-al{margin:10px;padding:10px}.mp-al-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.mp-al-yiji{grid-template-columns:1fr}}.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-it-dis{padding:11px 16px;border-top:1px solid var(--line);background:var(--band);font-size:12px;line-height:1.75;color:var(--muted);font-family:system-ui,sans-serif}
 
 @media (max-width:640px){
@@ -10715,7 +11315,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
     const num = (v) => (typeof v === 'number' && isFinite(v) ? v : 0);
     const dyScore = (d) => (d.luck ? num(d.luck.score) : 0);
 
-    const VMAX = 3.2;
+    const VMAX = 4.2;
     const VMIN = -2.2;
     const startAge = num(r.dayun.startAge && r.dayun.startAge.years);
     const dyEnd = dyList.length
@@ -10731,7 +11331,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
     const pw = W - M.l - M.r;
     const ph = H - M.t - M.b;
     const X = (age) => M.l + ((age - a0) / span) * pw;
-    const Y = (v) => M.t + ph - ((v - VMIN) / (VMAX - VMIN)) * ph;
+    const Y = (v) => M.t + ph - ((Math.max(VMIN, Math.min(VMAX, v)) - VMIN) / (VMAX - VMIN)) * ph;
 
     const BANDS = [
       { from: 1.2, to: VMAX, cls: 'b-good' },
@@ -11056,6 +11656,21 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
       <div class="pp-tl">喜 ${fr.yongshen.favor.map(el).join('')}　忌 ${fr.yongshen.avoid.map(el).join('')}　<span class="pp-dim">${esc(fr.yongshen.method)}</span></div>
       <div class="pp-chips">${fr.yongshen.favorTenGods.map((t) => `<span class="pp-chip ok">${esc(t)}</span>`).join('')}${fr.yongshen.avoidTenGods ? fr.yongshen.avoidTenGods.map((t) => `<span class="pp-chip warn">${esc(t)}</span>`).join('') : ''}</div>
       <div class="pp-tl pp-dim">${esc(fr.yongshen.detail)}</div>` : '';
+    const cli = r.climate || (fr.yongshen && fr.yongshen.climate) || null;
+    const cliCard = cli ? (() => {
+      const pct = Math.max(2, Math.min(98, Math.round(((Number(cli.temp) || 0) + 3) / 6 * 100)));
+      const need = cli.need ? `<em>调候取</em><b>${esc(cli.need.stem + cli.need.element)}</b>` : '<em>气候平和</em>';
+      const avoid = cli.need ? `<em>忌</em><b>${esc(cli.avoidElement)}</b>` : '';
+      const ev = (cli.evidence || []).length ? `<em>依据</em><span>${esc(cli.evidence.join('、'))}</span>` : '';
+      const pri = cli.priority === '调候优先' ? '<span class="mp-cli-p">调候优先</span>' : '<span class="mp-cli-p">扶抑为主</span>';
+      return `<section class="mp-cli" aria-label="寒暖燥湿">
+        <div class="mp-cli-h"><b>寒暖燥湿</b><span class="mp-cli-k">${esc(cli.label || '')}</span>${pri}</div>
+        <div class="mp-cli-bar" title="寒 ← → 热"><i style="left:${pct}%"></i></div>
+        <div class="mp-cli-axis"><span>寒</span><span>平</span><span>热</span></div>
+        <div class="mp-cli-row">${need}${avoid}${ev}</div>
+        <div class="mp-cli-narr">${esc(cli.narration || '')}</div>
+      </section>`;
+    })() : '';
     const gods = fr.godStats ? `<div class="pp-chips">${Object.entries(fr.godStats.groups).map(([k, v]) => `<span class="pp-chip">${k} ${v}</span>`).join('')}</div>` : '';
 
     const dy = r.dayun.list.map((d) => {
@@ -11081,6 +11696,7 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
       ${str}
       ${sect('格局', gj)}
       ${sect('用神', ys)}
+      ${cliCard}
       ${sect('五行与十神', `<div class="pp-chips">${wx}</div>${gods}`)}
       ${sect('大运', `${pp.curveHTML(r)}<div class="pp-chips">${dy}</div>`)}
       ${ln ? sect('流年', ln) : ''}
@@ -11183,11 +11799,43 @@ return { interpret, DIRECTIONS, DIRECTION_DEFAULT, BRIGHTNESS, flowOf, geocodeAd
     return (html || '') + pp.interpretHTML(it, opt);
   };
 
+  pp.almanacHTML = function (r) {
+    if (!r || !r.meta) return pp.quickHTML(r);
+    const g = r.ganzhi || {};
+    const god = r.dayGod || null;
+    const chips = (list, cls) => (list || []).map((x) => `<span class="mp-al-chip${cls ? ` ${cls}` : ''}">${esc(x)}</span>`).join('');
+    const cell = (k, v) => (v ? `<div class="mp-al-cell"><em>${esc(k)}</em><b>${esc(v)}</b></div>` : '');
+    const xiu = r.xiu ? `${r.xiu.name}宿（${r.xiu.luck}·${r.xiu.zheng}·${r.xiu.animal}）` : '';
+    const nayin = r.nayin && r.nayin.day ? r.nayin.day.name : '';
+    const chong = r.chong ? `${r.chong.text}${r.chong.sha ? ` ${r.chong.sha}` : ''}` : '';
+    const hours = (r.hours || []).map((h) => `<span class="mp-al-hour ${h.luck === '吉' ? 'good' : 'bad'}">`
+      + `<i>${esc(h.zhi)}</i><em>${esc((h.ganZhi || '').slice(0, 1))}</em><b>${esc(h.shen || '')}</b>`
+      + `<u>${esc(h.luck || '')}</u></span>`).join('');
+    const pos = r.positions || {};
+    const posRow = (k, v) => (v ? `<span class="mp-al-chip">${esc(k)}·${esc(typeof v === 'string' ? v : v.dir || '')}</span>` : '');
+    const lucky = r.lucky || {};
+    const godBadge = god ? `<span class="mp-al-badge ${god.luck === '吉' ? 'good' : 'bad'}">${esc(god.name)}·${esc(god.type)}·${esc(god.luck)}</span>` : '';
+    return `<section class="mp-al" aria-label="黄历">
+      <div class="mp-al-h"><b>${esc(r.meta.date || '')}</b><i>${esc(r.meta.weekday || '')}　${esc((r.lunar || {}).text || '')}</i></div>
+      <div class="mp-al-gz">${esc(g.year || '')}年　${esc(g.month || '')}月　${esc(g.day || '')}日　属${esc(g.shengXiao || '')}　建除 ${esc(r.zhiXing || '')}日　${godBadge}</div>
+      <div class="mp-al-yiji">
+        <div class="mp-al-col"><em>宜</em><div class="mp-al-chips">${chips(r.yi)}</div></div>
+        <div class="mp-al-col"><em>忌</em><div class="mp-al-chips">${chips(r.ji)}</div></div>
+      </div>
+      <div class="mp-al-grid">${cell('二十八宿', xiu)}${cell('日柱纳音', nayin)}${cell('胎神', r.taiShen)}${cell('冲煞', chong)}</div>
+      <div class="mp-al-row"><em>吉神方位</em><div class="mp-al-chips">${posRow('喜神', pos.xiShen)}${posRow('财神', pos.caiShen)}${posRow('福神', pos.fuShen)}${posRow('阳贵', pos.yangGui)}${posRow('阴贵', pos.yinGui)}</div></div>
+      <div class="mp-al-row"><em>时刻吉凶</em><div class="mp-al-hours">${hours}</div></div>
+      <div class="mp-al-row"><em>吉配生肖</em><div class="mp-al-chips">${lucky.liuhe ? `<span class="mp-al-chip">六合·${esc(lucky.liuhe)}</span>` : ''}${chips(lucky.sanhe || [])}</div></div>
+      ${r.dailyHexagram ? `<div class="mp-al-hex">每日一卦：<b>${esc(r.dailyHexagram.name)}</b>　${esc(r.dailyHexagram.meaning || '')}</div>` : ''}
+      <div class="mp-al-note">${esc((r.meta && r.meta.scope) || '')}</div>
+    </section>`;
+  };
+
   pp.quickHTML = function (r) {
     if (!r) return '';
     const LABEL = {
       almanac: '黄历', zeri: '择日', chenggu: '称骨', xiaoliuren: '小六壬',
-      star: '星座', numerology: '生命数字', trend: '人生 K 线', fengshui: '风水', name: '起名',
+      star: '星座', numerology: '生命数字', trend: '人生 K 线', fengshui: '风水', name: '起名', convert: '公农历转换',
     };
     const title = LABEL[r.system] || '速查';
     const text = r.summary || '';
@@ -11457,7 +12105,8 @@ const TABS = [
   { k: 'qimen', label: '奇门', timeLabel: '起局时刻', hint: '奇门时家转盘：用起局时刻定节气、三元与局数；换局规则决定符头与节气如何对齐。' },
   { k: 'hepan', label: '合盘', timeLabel: '你的出生时刻', hint: '合盘按「日主 + 夫妻宫 + 五行互补」看两个人的相处与互补，需要双方出生信息。' },
     { k: 'tarot', label: '塔罗', timeLabel: '', hint: '塔罗不看时间，只记录抽牌时刻与你的提问。' },
-  { k: 'almanac', label: '黄历', timeLabel: '', hint: '黄历按公历日期查农历、干支、建除、宜忌与冲煞；只做本地计算。' },
+  { k: 'almanac', label: '黄历', timeLabel: '', hint: '黄历按公历日期查农历、干支、宜忌、时辰吉凶、二十八宿与吉神方位；只做本地计算。' },
+  { k: 'convert', label: '农历', timeLabel: '', hint: '公农历互转：公历生日可反查农历；只知道农历生日时，可转成公历再排盘。' },
   { k: 'zeri', label: '择日', timeLabel: '', hint: '择日把区间内每天的建除宜忌与事项适配打分排序，并按属相排除冲煞日。' },
   { k: 'chenggu', label: '称骨', timeLabel: '出生时刻', hint: '称骨按农历年、月、日、时的骨重求和；时辰必填。' },
   { k: 'xiaoliuren', label: '小六壬', timeLabel: '起课时刻', hint: '小六壬用农历月/日/时掐指，也可用三个随机数起课。' },
@@ -11479,7 +12128,7 @@ const TIME_KIND = {
   ziwei: 'birth', bazi: 'birth', hepan: 'birth',
   liuyao: 'cast', meihua: 'cast', daliuren: 'cast', qimen: 'cast',
   tarot: 'none',
-  almanac: 'date', zeri: 'date', star: 'date', numerology: 'date',
+  almanac: 'date', zeri: 'date', star: 'date', numerology: 'date', convert: 'date',
   chenggu: 'birth', trend: 'birth', fengshui: 'birth', name: 'birth',
   xiaoliuren: 'cast',
 };
@@ -11514,6 +12163,9 @@ function App() {
   const [task, setTask] = useState('开业');
   const [days, setDays] = useState('30');
   const [shengXiao, setShengXiao] = useState('');
+  const [convMode, setConvMode] = useState('solar2lunar');
+  const [lunarDate, setLunarDate] = useState('');
+  const [leapMonth, setLeapMonth] = useState(false);
   const [xlrMode, setXlrMode] = useState('time');
   const [num1, setNum1] = useState(''); const [num2, setNum2] = useState(''); const [num3, setNum3] = useState('');
   const [toAge, setToAge] = useState('60');
@@ -11619,6 +12271,24 @@ function App() {
           delete args.datetime;
         }
       }
+      if (k === 'convert') {
+        args.system = 'convert';
+        if (convMode === 'lunar2solar') {
+          const m = /^(\d{4})-(\d{1,2})-(\d{1,2})$/.exec(String(lunarDate).trim());
+          if (!m) {
+            setError('农历转公历请按「农历年-月-日」填写，例如 2026-9-17；闰月单独勾选。');
+            return;
+          }
+          args.mode = 'lunar2solar';
+          args.lunarYear = Number(m[1]);
+          args.lunarMonth = Number(m[2]);
+          args.lunarDay = Number(m[3]);
+          args.isLeapMonth = leapMonth;
+          delete args.datetime;
+        } else {
+          args.mode = 'solar2lunar';
+        }
+      }
       if (k === 'tarot') args.count = Number(count);
       if (k === 'hepan') {
         args.chart = hpChart;
@@ -11987,8 +12657,24 @@ function App() {
         })) : null,
         tab === 'zeri' ? field('所办事项', h('select', {
           className: 'mp-input', value: task, onChange: (e) => setTask(e.target.value),
-        }, ['嫁娶', '订婚', '开业', '入宅', '搬家', '动土', '装修', '安葬', '出行', '祭祀', '签约', '求医', '纳财']
-          .map((t) => h('option', { key: t, value: t }, t)))) : null,
+        }, [
+          ['常用', ['嫁娶', '搬家入宅', '出行', '开业', '签订合同', '祭祀']],
+          ['婚嫁', ['嫁娶', '订婚', '领证', '提亲', '收送聘金', '满月酒']],
+          ['生活', ['搬家', '入宅', '旅行', '访亲友', '入学', '求医', '祭祀']],
+          ['建造', ['动土', '装修', '装修建造', '安葬', '试车买车']],
+          ['工商', ['开业', '交易', '投资', '签订合同', '签约', '纳财', '赴任']],
+        ].map(([g, items]) => h('optgroup', { key: g, label: g },
+          items.map((t) => h('option', { key: `${g}-${t}`, value: t }, t)))))) : null,
+        tab === 'convert' ? field('转换方向', h('div', { className: 'mp-seg' },
+          h('button', { className: convMode === 'solar2lunar' ? 'on' : '', onClick: () => setConvMode('solar2lunar') }, '公历 → 农历'),
+          h('button', { className: convMode === 'lunar2solar' ? 'on' : '', onClick: () => setConvMode('lunar2solar') }, '农历 → 公历'))) : null,
+        (tab === 'convert' && convMode === 'lunar2solar') ? field('农历日期', h('input', {
+          className: 'mp-input', value: lunarDate, placeholder: '如 2026-9-17',
+          onChange: (e) => setLunarDate(e.target.value),
+        })) : null,
+        (tab === 'convert' && convMode === 'lunar2solar') ? h('label', {
+          className: 'mp-check',
+        }, h('input', { type: 'checkbox', checked: leapMonth, onChange: (e) => setLeapMonth(e.target.checked) }), ' 闰月') : null,
         tab === 'zeri' ? field('看多少天', h('input', {
           className: 'mp-input', type: 'number', min: 1, max: 60, value: days,
           onChange: (e) => setDays(e.target.value),
@@ -12114,6 +12800,7 @@ function App() {
                   : result.kind === 'tarot' ? PP.tarotHTML(result.r)
                     : result.kind === 'liuyao' ? PP.liuyaoHTML(result.r)
                       : result.kind === 'chenggu' ? PP.chengguHTML(result.r)
+                        : result.kind === 'almanac' ? PP.almanacHTML(result.r)
                         : result.kind === 'trend' ? PP.trendHTML(result.r)
                         : PP.quickHTML(result.r),
           result.it,