dsh-metaphysics 0.56.0 → 0.58.0

package/engine/index.js

@@ -5,12 +5,15 @@ import { buildZiwei, BRIGHTNESS, flowOf, asOfParts, ZIWEI_SCHOOL_DEFAULTS } from
 import { drawTarot } from './tarot.js';
 import { buildMeihua } from './meihua.js';
 import { buildDaliuren } from './daliuren.js';
-import { buildHepan } from './hepan.js';
+import { buildHepan, tripleOf } from './hepan.js';
 import { buildZiweiHepan } from './ziwei-hepan.js';
 import { buildQimen, buildSnapshot } from './qimen.js';
 import { geocodeAddress, resolveAddress } from './geo.js';
 import { toJDN, ganzhiName, dayGanzhiIndex } from './calendar.js';
 import { randomOf, isSeed } from './random.js';
+import { encodeHandle, decodeHandle, resolveHandle } from './handle.js';
+import { askLink, parseAskLink, formOf, restNote, askPackages } from './bridge.js';
+import { parseRevision, displayValue } from './revise.js';
 import { interpret, DIRECTIONS, DIRECTION_DEFAULT } from './interpret.js';
 import { followup, askPrompt } from './followup.js';
 import { crossCheck, crossText, crossSection } from './crosscheck.js';
@@ -25,12 +28,12 @@ import { buildNumerology } from './numerology.js';
 import { buildMbti, mbtiPaper } from './mbti.js';
 import { buildConvert } from './convert.js';
 import { classicsFor, classicsText, suiyunClassicOf, classicOf, CLASSIC_BOOKS } from './classics.js';
-import { diffObjects, summarize, sortDiffs, labelOf, rootOf, categoryOf, formatValue, CALIBER_SWITCHES } from './diff.js';
+import { diffObjects, summarize, sortDiffs, labelOf, rootOf, categoryOf, formatValue, CALIBER_SWITCHES, viewRows } from './diff.js';
 import { canonicalJson, fingerprintOf } from './fingerprint.js';
 import { buildTrend } from './trend.js';
 import { buildFengshui } from './fengshui.js';
 import { buildName } from './name.js';
-import { buildTrace, SYSTEM_LABEL } from './trace.js';
+import { buildTrace, traceMarkdown, SYSTEM_LABEL } from './trace.js';
 import { fail } from './fail.js';
 import { assertCivil } from './validate.js';
 
@@ -139,10 +142,14 @@ function baziText(r) {
     ? `　有争议：${ysd.map((d) => `${d.element}（${d.favorRole}；${d.climate}盘调候忌${d.element}）`).join('、')}`
     : '';
   const disEls = new Set(ysd.map((d) => d.element));
+  const ysn = (r.frame && r.frame.yongshen && r.frame.yongshen.neutral) || [];
+  const neuText = ysn.length
+    ? `　中性偏忌：${ysn.map((n) => `${n.element} ${n.weight} 分`).join('、')}（近零，不作实忌）`
+    : '';
   const gejuLine = r.frame ? [
     `格局：${r.frame.primary ? `${r.frame.primary.name}（${r.frame.primary.evidence}）` : '—'}`,
     `　　　${r.frame.geju.map((g) => `${g.name}[${g.kind}${g.status ? `·${g.status}` : ''}]`).join('　')}`,
-    `用神：喜${r.frame.yongshen.favor.join('')}（${r.frame.yongshen.favorTenGods.join('、')}）　忌${r.frame.yongshen.avoid.join('')}（${r.frame.yongshen.avoidTenGods.join('、')}）${disText}　${r.frame.yongshen.method}`,
+    `用神：喜${r.frame.yongshen.favor.join('')}（${r.frame.yongshen.favorTenGods.join('、')}）　忌${r.frame.yongshen.avoid.join('')}（${r.frame.yongshen.avoidTenGods.join('、')}）${disText}${neuText}　${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}${disEls.has(r.climate.avoidElement) ? '（有争议）' : ''}` : ''}` : '—'}` +
     (r.frame.yongshen.qt ? `　穷通：${r.frame.yongshen.qt.month}${r.frame.yongshen.qt.stem}取${r.frame.yongshen.qt.yong.join('、')}（首取${r.frame.yongshen.qt.primary}）` : ''),
@@ -291,6 +298,26 @@ function qimenText(r) {
   ].join('\n');
 }
 
+function tripleText(t) {
+  if (!t || !Array.isArray(t.pairs) || !t.pairs.length) return [];
+  const lines = [
+    '【三方合盘】三对两两并列，不合成「三人总分」',
+    ...t.pairs.map((p) => `· ${p.a}–${p.b}：${p.level || '—'}（${p.total == null ? '—' : `${p.total}/100`}）`),
+  ];
+  if (t.best) {
+    // 差 1–2 分时点名「最顺/最需磨合」是假精确：三对分数接近就直说接近，不排名
+    if (t.spread >= 3) {
+      lines.push(`　最顺：${t.best.a}–${t.best.b}（${t.best.total}/100）`
+        + (t.hardest ? `；最需磨合：${t.hardest.a}–${t.hardest.b}（${t.hardest.total}/100）` : ''));
+    } else {
+      lines.push(`　三对分数接近（最高与最低相差 ${t.spread} 分），不排名`);
+    }
+  }
+  if (t.focus && t.focus.spread >= 3) lines.push(`　差异最大的一维：${t.focus.label}（三对相差 ${t.focus.spread} 分）`);
+  if (t.note) lines.push(`※ ${t.note}`);
+  return lines;
+}
+
 function hepanText(r) {
   if (r.chart === 'ziwei') {
     const d = (x) => `${x.label}：${x.score >= 0 ? '+' : ''}${x.score}　${x.text}`;
@@ -300,6 +327,7 @@ function hepanText(r) {
       `对方 命宫 ${r.b.soul.branch}（${r.b.soulStars.join('、') || '无主星'}）　夫妻 ${r.b.spouseStars.join('、') || '无主星'}　${r.b.bureau}`,
       ...r.dimensions.map(d),
       ...r.interactions.map((h) => `　· ${h.text}`),
+      ...tripleText(r.triple),
       ...r.notes.map((n) => `※ ${n}`),
     ].join('\n');
   }
@@ -323,6 +351,7 @@ function hepanText(r) {
       `年命纳音：${r.detail.nayin.a} / ${r.detail.nayin.b}（${r.detail.nayin.label}）——${r.detail.nayin.text}`,
       `吉凶象：吉 ${r.detail.tally.good} / 凶 ${r.detail.tally.bad}（${r.detail.tally.lean}；分档只数象，总分以上面三维度为准）`,
     ] : []),
+    ...tripleText(r.triple),
     ...r.notes.map((n) => `※ ${n}`),
   ].join('\n');
 }
@@ -484,7 +513,7 @@ function jsonSafe(value) {
 // 只收影响盘面的参数：地址换成有效经度后不再把原文算进去，问事/方向按体系保留。
 const SHADOW_IGNORE = new Set([
   'shadow', 'shadowVersion', 'diff', 'trace', 'traceError', 'withInterpret', 'cross', 'verifyPast', 'rectify', 'events',
-  'geocode', 'ask', 'followup', 'caliber', 'seed', 'asOf',
+  'geocode', 'ask', 'followup', 'caliber', 'seed', 'asOf', 'handle', 'revise',
 ]);
 
 const num6 = (n) => {
@@ -553,11 +582,14 @@ function shadowParams(args, result) {
     };
   }
   if (system === 'hepan') {
-    return {
+    const params = {
       chart: args.chart === 'ziwei' ? 'ziwei' : 'bazi',
       a: shadowPerson({ ...args, datetime: args.datetime }),
       b: shadowPerson(args.partner || {}),
     };
+    // 第三方进指纹：同一对加上不同的第三人，是另一组盘
+    if (args.partner2) params.c = shadowPerson(args.partner2);
+    return params;
   }
 
   // 其余体系：只剔除解析/附加模块参数，其余原样归一化
@@ -625,11 +657,11 @@ export function chartFingerprint(args = {}, opts = {}) {
 }
 
 const SHADOW_DIFF_IGNORE = new Set([
-  'shadow', 'trace', 'traceError', 'interpret', 'summary', 'classics', 'suiyunClassic', 'renyuanClassic', 'cross',
+  'shadow', 'trace', 'traceText', 'traceError', 'interpret', 'summary', 'classics', 'suiyunClassic', 'renyuanClassic', 'cross',
   'past', 'rectify', 'followup', 'caliber', 'input', 'reading', 'knowledge', 'outline',
   'sections', 'answer', 'plain', 'tables', 'glossary', 'caveats', 'lead', 'dimensions',
   'moduleType', 'technique', 'disclaimer', 'ask', 'followups', 'knowledgeCount', 'title',
-  'systemLabel',
+  'systemLabel', 'handle', 'handleError', 'revision',
 ]);
 
 function shadowChart(result) {
@@ -693,9 +725,34 @@ export function shadowDiff(previous, current, opts = {}) {
  * @param {object} args
  * @param {'bazi'|'ziwei'|'liuyao'} args.system
  * @param {string} [args.datetime]
+ * @param {string} [args.handle] 上次结果里的句柄；给了它就可以只传增量参数（如 asOf、direction、system）
  */
-export function compute(args = {}) {
+export function compute(input = {}) {
+  // 句柄先并回参数：后面的代码只看见一份完整参数，不必到处判 handle
+  let args = resolveHandle(input);
+  // 一句话改参（C2）：把「换成紫微看 2030 年事业」翻成补丁再排盘；识别不到就原样排，
+  // 绝不猜。改了哪些、没认哪些都随结果回传，便于核对。
+  let revision;
+  if (typeof args.revise === 'string' && args.revise.trim()) {
+    const rev = parseRevision(args.revise);
+    const before = { ...args };
+    args = { ...args, ...rev.patch };
+    revision = {
+      text: rev.text,
+      applied: rev.labels.map((l) => {
+        const from = before[l.key] === undefined ? null : before[l.key];
+        return { ...l, from, fromDisplay: displayValue(l.key, from) };
+      }),
+      ignored: rev.ignored,
+    };
+  }
+  // partner2: null 视同未传：先归一化再排盘，否则同一对盘会因为显式 null 多出一个句柄
+  if (args.partner2 === null) {
+    args = { ...args };
+    delete args.partner2;
+  }
   const r = jsonSafe(computeRaw(args));
+  if (revision) r.revision = revision;
   if (r && r.system === 'bazi') {
     r.classics = classicsFor(r);
     const ct = classicsText(r.classics);
@@ -788,7 +845,11 @@ export function compute(args = {}) {
   if (args.trace === true) {
     try {
       const layers = buildTrace(r, { direction: args.direction, gender: args.gender });
-      if (layers) r.trace = layers;
+      if (layers) {
+        r.trace = layers;
+        // 同一份层另出一份 Markdown：贴进对话/文档时表格不会散架，内容与 r.trace 同源
+        r.traceText = traceMarkdown(layers, { system: r.system });
+      }
     } catch (e) {
       r.traceError = String((e && e.message) || e);
     }
@@ -801,6 +862,13 @@ export function compute(args = {}) {
       r.shadow = { error: String((e && e.message) || e) };
     }
   }
+  // 排盘句柄：把这张盘的参数压成短串；下一次追问传 handle + 增量即可，不必重报出生信息
+  try {
+    const h = encodeHandle(args);
+    if (h) r.handle = h;
+  } catch (e) {
+    r.handleError = String((e && e.message) || e);
+  }
   return r;
 }
 
@@ -864,11 +932,12 @@ export function caliberCompare(args = {}, opts = {}) {
     const alt = sw.alt(current);
     let diffs = [];
     let error = '';
+    let cur = null;
+    let altRes = null;
     try {
-      diffs = diffObjects(
-        compute({ ...base, [sw.key]: current }),
-        compute({ ...base, [sw.key]: alt }),
-      );
+      cur = compute({ ...base, [sw.key]: current });
+      altRes = compute({ ...base, [sw.key]: alt });
+      diffs = diffObjects(cur, altRes);
     } catch (e) {
       error = (e && e.message) || String(e);
     }
@@ -896,6 +965,7 @@ export function caliberCompare(args = {}, opts = {}) {
       altLabel: sw.label(alt),
       total: diffs.length,
       summary: error ? '' : summarize(diffs),
+      views: error ? [] : viewRows(system, cur, altRes),
       roots,
       categories,
       error,
@@ -1008,31 +1078,42 @@ function computeRaw(args = {}) {
     if (!partner.datetime) {
       throw fail('E_PARTNER', '缺少 partner.datetime（对方的公历出生时间），例如 partner: {"datetime":"1992-03-03T10:00","gender":"female"}');
     }
-    const pa = parseDateTime(args.datetime);
-    const pb = parseDateTime(partner.datetime);
+    const partner2 = args.partner2;
+    if (partner2 !== undefined && partner2 !== null) {
+      if (typeof partner2 !== 'object' || Array.isArray(partner2)) {
+        throw fail('E_PARTNER', 'partner2 需要 { datetime, gender, address? }；不想看三方就整段省略（null 视同未传）');
+      }
+      if (!partner2.datetime) {
+        throw fail('E_PARTNER', '缺少 partner2.datetime（第三方的公历出生时间），例如 partner2: {"datetime":"1988-09-09T08:00","gender":"male"}');
+      }
+    }
     const chart = args.chart === 'ziwei' ? 'ziwei' : 'bazi';
     // 性别决定双方大运/大限顺逆，两边都不能用默认值
-    const sideA = {
-      ...pa,
-      gender: requireGender(args.gender, '你（主方）'),
-      trueSolar: args.trueSolar,
-      lateZi: args.lateZi,
-      dst: args.dst !== false,
-      address: typeof args.address === 'string' ? args.address : undefined,
-      longitude: typeof args.longitude === 'number' ? args.longitude : undefined,
-      geo: args.geo && typeof args.geo === 'object' ? args.geo : undefined,
+    const sideOf = (src, who) => {
+      const dt = parseDateTime(src.datetime);
+      return {
+        ...dt,
+        gender: requireGender(src.gender, who),
+        trueSolar: src.trueSolar,
+        lateZi: src.lateZi,
+        dst: src.dst !== false,
+        address: typeof src.address === 'string' ? src.address : undefined,
+        longitude: typeof src.longitude === 'number' ? src.longitude : undefined,
+        geo: src.geo && typeof src.geo === 'object' ? src.geo : undefined,
+      };
     };
-    const sideB = {
-      ...pb,
-      gender: requireGender(partner.gender, '对方'),
-      trueSolar: partner.trueSolar,
-      lateZi: partner.lateZi,
-      dst: partner.dst !== false,
-      address: typeof partner.address === 'string' ? partner.address : undefined,
-      longitude: typeof partner.longitude === 'number' ? partner.longitude : undefined,
-      geo: partner.geo && typeof partner.geo === 'object' ? partner.geo : undefined,
-    };
-    const result = chart === 'ziwei' ? buildZiweiHepan({ a: sideA, b: sideB }) : buildHepan({ a: sideA, b: sideB });
+    const sideA = sideOf(args, '你（主方）');
+    const sideB = sideOf(partner, '对方');
+    const build = (x, y) => (chart === 'ziwei' ? buildZiweiHepan({ a: x, b: y }) : buildHepan({ a: x, b: y }));
+    const result = build(sideA, sideB);
+    if (partner2) {
+      const sideC = sideOf(partner2, '第三方');
+      result.triple = tripleOf([
+        { key: 'a-b', a: '你', b: '对方', result },
+        { key: 'a-c', a: '你', b: '第三方', result: build(sideA, sideC) },
+        { key: 'b-c', a: '对方', b: '第三方', result: build(sideB, sideC) },
+      ]);
+    }
     return { ...result, summary: hepanText(result) };
   }
   if (system === 'meihua') {
@@ -1119,16 +1200,23 @@ function computeRaw(args = {}) {
     return { ...result, summary: almanacText(result) };
   }
   if (system === 'zeri') {
-    // startDate 必须显式：择日要「从哪天起看」，缺了不能拿本机今天静默代填
-    if (typeof args.startDate !== 'string' || !args.startDate.trim()) {
-      throw fail('E_INPUT', '择日需要 startDate（公历 YYYY-MM-DD，起算日）；可另给 days（1–60，默认 30）与 shengXiao（当事人属相）');
+    const candMode = args.candidates !== undefined && args.candidates !== null;
+    // startDate 必须显式：择日要「从哪天起看」，缺了不能拿本机今天静默代填；候选日模式改用 candidates
+    if (!candMode && (typeof args.startDate !== 'string' || !args.startDate.trim())) {
+      throw fail('E_INPUT', '择日需要 startDate（公历 YYYY-MM-DD，起算日）；可另给 days（1–60，默认 30）与 shengXiao（当事人属相）。只想比几天，改给 candidates: ["2026-12-01","2026-12-08"]');
+    }
+    let result;
+    try {
+      result = buildZeri({
+        task: args.task,
+        startDate: args.startDate,
+        days: args.days,
+        shengXiao: args.shengXiao,
+        candidates: args.candidates,
+      });
+    } catch (e) {
+      throw fail('E_INPUT', (e && e.message) || String(e));
     }
-    const result = buildZeri({
-      task: args.task,
-      startDate: args.startDate,
-      days: args.days,
-      shengXiao: args.shengXiao,
-    });
     return { ...result, summary: zeriText(result) };
   }
   if (system === 'chenggu') {
@@ -1318,16 +1406,27 @@ function almanacText(r) {
 
 /** 择日文本 */
 function zeriText(r) {
-  const head = `【择日·${r.meta.task}】${r.meta.startDate} 起 ${r.meta.days} 天${r.meta.shengXiao ? `　当事人属${r.meta.shengXiao}` : '（未给属相，未做冲煞排除）'}`;
-  const top = r.days.slice().sort((a, b) => b.score - a.score).slice(0, 5)
+  const cand = r.compare && r.compare.mode === 'candidates';
+  const head = cand
+    ? `【择日·${r.meta.task}】候选 ${r.meta.days} 天：${r.meta.candidates.join('、')}${r.meta.shengXiao ? `　当事人属${r.meta.shengXiao}` : '（未给属相，未做冲煞排除）'}`
+    : `【择日·${r.meta.task}】${r.meta.startDate} 起 ${r.meta.days} 天${r.meta.shengXiao ? `　当事人属${r.meta.shengXiao}` : '（未给属相，未做冲煞排除）'}`;
+  const top = r.days.slice().sort((a, b) => b.score - a.score).slice(0, cand ? 12 : 5)
     .map((d) => `· ${d.date} ${d.weekday}　${d.verdict}（${d.score}分）　宜${d.yi.slice(0, 3).join('/')}　${d.reasons.join('；') || '无特别加减分'}`);
+  const bestLine = cand
+    ? (r.compare.best
+      ? `这一组里最优：${r.compare.best.date}（${r.compare.best.score}分，${r.compare.best.verdict}）`
+        + (r.compare.best.ties.length > 1 ? `；同分：${r.compare.best.ties.filter((d) => d !== r.compare.best.date).join('、')}` : '')
+      : '这一组都因冲属相被排除，没有可用的日子')
+    : `推荐日：${r.best.length ? r.best.join('、') : '本期无（都不够推荐分）'}`;
   return [
     head,
-    `推荐日：${r.best.length ? r.best.join('、') : '本期无（都不够推荐分）'}`,
+    bestLine,
+    `推荐日：${r.best.length ? r.best.join('、') : '无'}`,
     `可用日：${r.usable.length ? r.usable.join('、') : '无'}`,
     `回避日：${r.avoid.length ? r.avoid.slice(0, 6).join('、') : '无'}`,
-    '逐日排序：',
+    cand ? '候选日逐日：' : '逐日排序：',
     ...top,
+    ...(cand ? [`比较口径：${r.compare.note}`] : []),
     `口径：${r.meta.scope}`,
   ].join('\n');
 }
@@ -1551,6 +1650,17 @@ export function renderText(result) {
       + (s.reproducible === false ? `\n　⚠ 不可复算：${s.reason}` : '')
       + (s.reproducible === true && s.asOfPinned === false && (s.system === 'bazi' || s.system === 'ziwei') ? '\n　提示：未固定 asOf，流年/流月随「此刻」变化；要比对请传 asOf。' : ''));
   }
+  // 一句话改参的回显：改了哪些、没认哪些，都摆出来让人核对，而不是悄悄按新参数排
+  if (result.revision && ((result.revision.applied || []).length || (result.revision.ignored || []).length)) {
+    const rev = result.revision;
+    const rows = (rev.applied || []).map((a) => `${a.label}：${a.fromDisplay == null ? '（未设）' : a.fromDisplay} → ${a.display}`);
+    parts.push(`【改参】${rev.text}${rows.length ? `\n　${rows.join('；')}` : '\n　没有识别到可改的参数，仍按原参数排盘'}`
+      + ((rev.ignored || []).length ? `\n　未处理：${rev.ignored.join('；')}` : ''));
+  }
+  // 句柄放进文本：模型看到的是这段摘要，不给它就没法在下一轮只传增量
+  if (typeof result.handle === 'string' && result.handle) {
+    parts.push(`【排盘句柄】${result.handle}\n　追问同一张盘：传 handle + 增量参数（asOf / direction / question，或换 system 看另一套盘），不必重报出生信息。`);
+  }
   if (Array.isArray(result.trace) && result.trace.length) {
     parts.push(`【推导链】${SYSTEM_LABEL[result.system] || result.system} · ${result.trace.length} 层\n`
       + result.trace.map((t, i) => `${i + 1}. ${t.field}｜${t.result}\n　规则：${t.rule}　出处：${t.source}`).join('\n'));
@@ -1566,7 +1676,11 @@ export function renderText(result) {
       + c.switches.map((s) => {
         if (s.error) return `· ${s.title}：未能对照（${s.error}）`;
         if (!s.total) return `· ${s.title}：${s.currentLabel} → ${s.altLabel}，本盘无变化`;
-        return `· ${s.title}：${s.currentLabel} → ${s.altLabel}\n　${s.summary}`;
+        const changed = (Array.isArray(s.views) ? s.views : []).filter((v) => v.changed);
+        const side = changed.length
+          ? `\n　并排：${changed.map((v) => `${v.label} ${v.current} → ${v.alt}`).join('；')}`
+          : '';
+        return `· ${s.title}：${s.currentLabel} → ${s.altLabel}\n　${s.summary}${side}`;
       }).join('\n'));
   }
   if (result.followup) {
@@ -1598,7 +1712,10 @@ export { pastSignals, verifyFit, rectifyBirth };
 export { crossCheck, crossText, crossSection };
 export { buildAlmanac, buildZeri, buildChenggu, buildXiaoliuren, buildStar, buildNumerology, buildConvert };
 export { buildTrend, buildFengshui, buildName };
-export { buildTrace };
+export { buildTrace, traceMarkdown };
+export { encodeHandle, decodeHandle, resolveHandle };
+// C3 对话桥替代：深链编解码、表单还原、三档复制包（面板与独立页共用一份）
+export { askLink, parseAskLink, formOf, restNote, askPackages };
 
 
 

package/engine/interpret-knowledge.js

@@ -25,7 +25,8 @@ export const KNOWLEDGE = [
     system: 'bazi', dims: ['overall', 'career'],
     gist: '天干是露在外面的样子，地支是藏在地下的根。',
     detail: '同一个五行，透在天干叫「显」，扎在地支叫「有根」。只有天干没有地支，是看着有、使不上劲；只有地支不通天干，是有实力、不显眼。判断一个人能不能扛事，看的就是根有多深。',
-    source: '《滴天髓》「天干得一比肩，不如得支中一墓库」一路的取象',
+    source: '《滴天髓·干支总论》「天全一气，不可使地德莫之载；地全三物，不可使天道莫之容」',
+    note: '常被署给《滴天髓》的「地支所藏之干，本静以待用，透出干头，则显其用矣。故干以通根为美，支以透出为贵」，出自《子平真诠》卷一论十干十二支的注文——滴天髓底本与沈孝瞻原文里都查不到这句，注文自己引的才是上面那句滴天髓。所以本卡引可核的原文，注文只作说明。',
     status: 'settled',
   },
   {
@@ -372,7 +373,7 @@ export const KNOWLEDGE = [
     detail: '进神退神本身只说明这一爻的向外趋势：用神化进为得力，忌神化进则为患加剧；用神化退是力衰，忌神化退反而是解脱。传统还要看它在本月令衰旺、有没有日辰生扶，空亡或受克时进者未必能进。本插件把进退与爻位标出来，再按月建五态给一档力重——得令则进得动、退得慢，失令则进得虚、退得实，月破压过一切；只给档位，不折成加权分数，吉凶仍落在用神与忌神那一层判。',
     source: '《增删卜易》进神退神章、用神章',
     status: 'variant',
-    note: '土之进退次序各家说法不完全一致，有以丑→辰→未→戌为进、也有只取辰戌丑未相对者；本插件按丑辰未戌成环处理，并用《增删卜易》卦例中「未土化戌土为进」「戌土化未土为退」对拍。',
+    note: '土之进退次序各家说法不完全一致，有以丑→辰→未→戌为进、也有只取辰戌丑未相对者；本插件按丑辰未戌成环处理，并用《增删卜易》卦例中「未土化戌土为进」「戌土化未土为退」对拍。喜忌分档的出处是《增删卜易》卷二·進神退神章第二十九：「所喜者宜於化進，所忌者宜化退神」；把「喜／忌」具体落到用神／忌神两档，是本插件的引申。',
   },
 
   // ── 梅花 / 六壬 / 奇门 / 塔罗 ───────────────────────────

package/engine/interpret-plain.js

@@ -170,10 +170,13 @@ export function buildAnswer(r, ask, ctx = {}) {
     const ys = (r.frame && r.frame.yongshen) || {};
     const favor = join(ys.favor);
     const avoid = join(ys.avoid);
+    const neu = Array.isArray(ys.neutral) && ys.neutral.length
+      ? `（其中${ys.neutral.map((n) => n.element).join('、')}在命局里几乎没有分量，算中性偏忌，不必刻意避）`
+      : '';
     const ln = (r.liunian || [])[0];
     const parts = [
       head + `先说结论：你是${s(dm.stem)}${s(dm.element)}日主，命局${s(st.level, '待定')}` +
-        `${favor ? `，顺${favor}、忌${avoid}——往${favor}的方向安排事情会更省力` : ''}。`,
+        `${favor ? `，顺${favor}、忌${avoid}${neu}——往${favor}的方向安排事情会更省力` : ''}。`,
       ln && ln.ganzhi
         ? `${s(ln.year)} 年是${ln.ganzhi}年（${s(ln.luck && ln.luck.tier, '平')}），这是「大环境」这一层。`
         : '',

package/engine/interpret.js

@@ -171,6 +171,10 @@ function baziInterpret(r) {
   const favor = Array.isArray(ys.favor) ? ys.favor : [];
   const avoid = Array.isArray(ys.avoid) ? ys.avoid : [];
   const disputed = Array.isArray(ys.disputed) ? ys.disputed : [];
+  const neutral = Array.isArray(ys.neutral) ? ys.neutral : [];
+  const neutralText = neutral.length
+    ? `其中${neutral.map((n) => `${n.element}（${n.role}）`).join('、')}全局仅 ${neutral.map((n) => n.weight).join('、')} 分，分量近零，按中性偏忌看；仍留在忌里，是因为行运走到这一行时照样按忌计。`
+    : '';
   const primary = pick(frame, 'primaryName', '未取定');
   const gender = pick(r.input, 'gender', '');
   const isMale = gender === 'male';
@@ -338,7 +342,7 @@ function baziInterpret(r) {
 
   const frameworkText = [
     `**日主**：${dm.stem}${dm.element}（${dm.yinYang}${dm.element}）${season ? `生于${season.branch}月，日主在月令「${season.word}」` : ''}，命局${level}（${pick(st, 'score', '—')} 分）${stemP ? `——${stemP.image}之象` : ''}。`,
-    `**用神**：喜${join(favor) || '—'}（${join(ys.favorRoles || []) || '—'}），忌${join(avoid) || '—'}（${join(ys.avoidRoles || []) || '—'}）。${frameToneOf(level, favorRolesByWeight)}`,
+    `**用神**：喜${join(favor) || '—'}（${join(ys.favorRoles || []) || '—'}），忌${join(avoid) || '—'}（${join(ys.avoidRoles || []) || '—'}）。${neutral.length ? `（${join(neutral.map((n) => n.element))} 近零，按中性偏忌看）` : ''}${frameToneOf(level, favorRolesByWeight)}`,
     `**格局**：${primary}（${pick(frame.primary, 'evidence', '')}）${(Array.isArray(frame.geju) ? frame.geju : []).filter((g) => g.name && g.name !== primary).length
       ? `，另有${frame.geju.map((g) => g.name).filter((n) => n && n !== primary).join('、')}`
       : ''}。`,
@@ -473,7 +477,7 @@ function baziInterpret(r) {
       key: 'yongshen', label: '用神与忌神',
       // detail 里通常已含调候说明，这里不再补一句，避免同一段出现两次「调候上…」
       text: `喜用：${join(favor)}（对应十神：${join(ys.favorTenGods || ys.favorRoles || [])}）；忌：${join(avoid)}（对应十神：${join(ys.avoidTenGods || ys.avoidRoles || [])}）。` +
-        `${pick(ys, 'detail', '')}`,
+        neutralText + `${pick(ys, 'detail', '')}`,
     },
     ...(cli ? [{
       key: 'climate', label: '寒暖燥湿',
@@ -515,7 +519,7 @@ function baziInterpret(r) {
   // 一页读懂：报告顶部的五条结论（整体 / 事业 / 财富 / 感情 / 节奏）。
   // 只做「摘要」，不引入新判断——全部取自下面已经算好的字段。
   const outline = [
-    { key: 'overall', label: '整体', text: `${level}，喜${join(favor) || '—'}、忌${join(avoid) || '—'}` },
+    { key: 'overall', label: '整体', text: `${level}，喜${join(favor) || '—'}、忌${join(avoid) || '—'}${neutral.length ? `（${join(neutral.map((n) => n.element))} 近零·中性偏忌）` : ''}` },
     { key: 'career', label: '事业', text: `主格${primary}，${topName}偏旺` },
     { key: 'wealth', label: '财富', text: `财星权重 ${groups['财'] ?? 0}${favor.includes('金') ? '，喜金助财' : ''}` },
     { key: 'love', label: '感情', text: `${spouseKey}星权重 ${groups[spouseKey] ?? 0}，日支 ${pick(r.pillars?.day, 'branch', '—')}` },