fix: Chinese aspect, chart and period names in synastry analysis lines (BUG-1927)
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DbBXoyn7Hj3LCW3BUs5bZ8
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
# 印度占星 Skill 更新日志
|
||||
|
||||
## 2026-11-16 — 合盘分析逻辑不再夹英文
|
||||
|
||||
- 分析逻辑里的相位名、盘名、运限主星名统一写中文,引号用「」;现实建议先写要做的事。占星 Skill 版本不变(BUG-1927)。
|
||||
|
||||
## 2026-11-16 — 合盘正文先结论再分段,可以导出
|
||||
|
||||
- 合盘每节先写一句结论,再分成短段,术语收进分析逻辑;报告右上角可以导出纯文字文件。占星 Skill 版本不变(BUG-1924)。
|
||||
|
||||
@@ -25977,3 +25977,14 @@
|
||||
- 版权:数据文件是 `references/book_corpus/catalog.json` 版权边界的一处例外,由产品负责人决定;提交前已告知仓库目前不登录也能读取。
|
||||
- 关联记录:BUG-1923、`references/product_runtime_contract.md` §R、`deploy/README.md`。
|
||||
- 修复版本:`claude/raman-house-texts-1116`。
|
||||
|
||||
## BUG-1927 | 合盘「分析逻辑」里还夹着英文相位名、D1、「北交点Rahu」和单引号
|
||||
|
||||
- 状态:fixed-pending-verify。
|
||||
- 首次发现 / 最近更新:2026-11-16 / 2026-11-16。
|
||||
- 触发与现象:BUG-1924 上线后产品负责人在 staging 新生成的合盘:正文已分段、无术语,但「分析逻辑」里有「合相(conjunction)」「rashi_contact(黄道接触)」「Ascendant」「D1 中」,应期依据写「北交点Rahu大运」「金星Venus小运」,正文用了单引号,第二段重复第一句结论,「所以」里有「互落」「对轴」,现实建议每条以「前文提到」开头。
|
||||
- 根因:证据行里的相位、接触名是英文;运限主星的中文名字段本身带英文;程序清理只换了星体和星座名;提示词没有约束「所以」一句和现实建议的写法。
|
||||
- 修复:程序把英文相位名、接触名、Ascendant 换成中文,分析逻辑里的 D1、D9、D10 写成本命盘、九分盘、十分盘,包住中文的单引号换成「」;应期依据的主星名只留中文;罗睺、计都按全站用词写北交点、南交点。提示词补充:第二段不重复结论,「所以」用日常的话,现实建议先写要做的事,不用「前文提到」开头。
|
||||
- 验证与防复发:`frontend/tests/synastry-evidence-units-20261115.test.ts`。
|
||||
- 关联记录:BUG-1919、BUG-1924。
|
||||
- 修复版本:`claude/synastry-polish-20261116`。
|
||||
|
||||
@@ -123,7 +123,7 @@ export function scrubEngineeringTerms(text: string, language: "zh" | "en"): stri
|
||||
// BUG-1919: Chinese prose uses Chinese planet and sign names (「Saturn落第9宫Pisces」).
|
||||
const ZH_NAMES: Readonly<Record<string, string>> = {
|
||||
Sun: "太阳", Moon: "月亮", Mercury: "水星", Venus: "金星", Mars: "火星", Jupiter: "木星", Saturn: "土星",
|
||||
Rahu: "罗睺", Ketu: "计都",
|
||||
Rahu: "北交点", Ketu: "南交点", Ascendant: "上升", Lagna: "上升",
|
||||
Aries: "白羊座", Taurus: "金牛座", Gemini: "双子座", Cancer: "巨蟹座", Leo: "狮子座", Virgo: "处女座",
|
||||
Libra: "天秤座", Scorpio: "天蝎座", Sagittarius: "射手座", Capricorn: "摩羯座", Aquarius: "水瓶座", Pisces: "双鱼座",
|
||||
};
|
||||
@@ -137,7 +137,20 @@ export function chineseNames(text: string): string {
|
||||
.replace(new RegExp(`([\\u4e00-\\u9fff]{2,3})\\s*[((]\\s*(${Object.keys(ZH_NAMES).join("|")})\\s*[))]`, "g"),
|
||||
(match, zh: string, name: string) => (ZH_NAMES[name].startsWith(zh) || zh === ZH_NAMES[name] ? zh : match))
|
||||
.replace(ZH_NAME_RE, (name) => ZH_NAMES[name])
|
||||
.replace(/([\u4e00-\u9fff])座座/g, "$1座");
|
||||
.replace(/([\u4e00-\u9fff])座座/g, "$1座")
|
||||
// BUG-1927: aspect and contact names copied from the evidence rows.
|
||||
.replace(/(合相|对分相|对冲|三分相|四分相|六分相)\s*[((]\s*(?:conjunction|opposition|trine|square|sextile)\s*[))]/gi, "$1")
|
||||
.replace(/\brashi[_ ]contact\b\s*(?:[((][^))]{1,8}[))])?/gi, "星座接触")
|
||||
.replace(/\bconjunction\b/gi, "合相").replace(/\bopposition\b/gi, "对分相")
|
||||
.replace(/\btrine\b/gi, "三分相").replace(/\bsquare\b/gi, "四分相").replace(/\bsextile\b/gi, "六分相")
|
||||
// Straight single quotes around Chinese become corner brackets.
|
||||
.replace(/'([^'\n]{1,40}[\u4e00-\u9fff][^'\n]{0,40})'/g, "「$1」");
|
||||
}
|
||||
|
||||
/** Analysis lines name the charts in words: 「D1 中」 reads as an internal code. */
|
||||
export function chineseChartNames(text: string): string {
|
||||
return text.replace(/(?<![A-Za-z0-9])D1(?![A-Za-z0-9])/g, "本命盘").replace(/(?<![A-Za-z0-9])D9(?![A-Za-z0-9])/g, "九分盘")
|
||||
.replace(/(?<![A-Za-z0-9])D10(?![A-Za-z0-9])/g, "十分盘").replace(/本命盘\s*[((]本命盘[))]/g, "本命盘").replace(/九分盘\s*[((]九分盘[))]/g, "九分盘");
|
||||
}
|
||||
|
||||
/** Reader-visible clean-up applied to every written field. */
|
||||
@@ -388,7 +401,8 @@ export async function writeSynastryLanguage(input: Readonly<{
|
||||
...draft,
|
||||
text: explainAbbreviations(readerText(draft.text, input.language), input.language),
|
||||
reasons: draft.reasons.map((reason) => ({
|
||||
...reason, plain: readerText(reason.plain, input.language), basis: readerText(reason.basis, input.language),
|
||||
...reason, plain: readerText(reason.plain, input.language),
|
||||
basis: input.language === "zh" ? chineseChartNames(readerText(reason.basis, input.language)) : readerText(reason.basis, input.language),
|
||||
})),
|
||||
} : { text: "", reasons: [] }),
|
||||
});
|
||||
|
||||
@@ -494,7 +494,7 @@ const V3_SYSTEM = {
|
||||
只用本节给出的依据。每条分析含 plain、basis、evidence 和 label。evidence 只放一条:从证据 JSON 里原样复制某一个完整字符串,不能放数组、对象或拼接多条;需要多条证据就分成多条分析。basis 提到的星体、星座、宫位和分盘都必须出现在这一条 evidence 里。叙述节给两到三条分析,应期和现实建议按各自的字段填写。label 只能是 ${EVIDENCE_LABELS.join("、")}。
|
||||
reading_scope 为 limited 时只写条件,不用 multi_system_consensus。出生时间误差内会变的层已经算出,只能作条件依据。缩写首次用括号解释。
|
||||
正文不点名补充方法,不写分数、出生资料、确定的婚期或分手年份。正文、plain 和现实建议里都不用这些断语:${SYNASTRY_ZH_BANNED_VERDICTS.join("、")};「功能吉星」「功能凶星」这类术语、「克制」「克服」「不合适」这类日常词可以写。数字后面不跟「分」字(时间写「十来分钟」这类说法也换成「一小会儿」),不写满分。第一句从双方能够感到的体验出发。
|
||||
版式(2026-11-16 产品负责人定稿):text 用空行分段。第一段只写一句话,是这一节的结论,不超过 45 字。后面写二到四段,每段只讲一件事,不超过 110 字;有多项要逐项写时,每项一段、每段两句。全节 240 到 340 字,不得少于 120 字。正文用日常的话写两个人的感受和做法:星体、星座、宫位、分盘名称和 UL、DK、A7 这类缩写只写在 basis 里,正文不出现;只有「能不能稳定走下去」一节保留一句提到九分盘。正文不用这些内部说法:${SYNASTRY_ZH_INTERNAL_WORDING.join("、")}。
|
||||
版式(2026-11-16 产品负责人定稿):text 用空行分段。第一段只写一句话,是这一节的结论,不超过 45 字。后面写二到四段,每段只讲一件事,不超过 110 字;有多项要逐项写时,每项一段、每段两句。全节 240 到 340 字,不得少于 120 字。正文用日常的话写两个人的感受和做法:星体、星座、宫位、分盘名称和 UL、DK、A7 这类缩写只写在 basis 里,正文不出现;只有「能不能稳定走下去」一节保留一句提到九分盘。第二段不要重复第一段的结论。plain(「所以」那一句)也用日常的话,不写「互落」「对轴」「落宫」「这一层」这类说法。现实建议每条先写一句要做的事,再写什么时候做,不用「前文提到」开头。引用的话用「」,不用单引号。正文不用这些内部说法:${SYNASTRY_ZH_INTERNAL_WORDING.join("、")}。
|
||||
11-15 Q1 适用于附录:附录由程序生成,模型不写附录。正文照写作合同,只用允许的证据,不输出工程字段或私有材料。`,
|
||||
en: `Write one section of a synastry report using the supplied writing contracts and ten-section reader structure. Return only this section's JSON, with no repeated heading in the body.
|
||||
Use this section's evidence only. Each narrative section gets two or three reasons with plain, basis, evidence and label. Timing and practical advice use their own fields. evidence holds exactly one complete string copied from the evidence JSON: never an array, an object or several strings joined. Split into separate reasons when you need more evidence. Every planet, sign, house and chart named in basis must appear in that evidence string. Allowed labels: ${EVIDENCE_LABELS.join(", ")}.
|
||||
|
||||
@@ -64,7 +64,8 @@ function basisLine(name: string, periods: readonly TimingPeriod[], at: number, l
|
||||
return parts.length > 0 ? `${name}: ${parts.join("; ")}` : `${name}: no dasha boundary in this span`;
|
||||
}
|
||||
const parts = [mahadasha, antardasha].flatMap((period) => period
|
||||
? [`${period.lordCn}${period.level === "md" ? "大运" : "小运"} ${formatMonth(parseDay(period.start))} 至 ${formatMonth(parseDay(period.end))}`]
|
||||
// BUG-1927: lordCn arrives as 「金星Venus」; Chinese reader text keeps the Chinese name only.
|
||||
? [`${period.lordCn.replace(/\s*[A-Za-z]+$/, "") || period.lordCn}${period.level === "md" ? "大运" : "小运"} ${formatMonth(parseDay(period.start))} 至 ${formatMonth(parseDay(period.end))}`]
|
||||
: []);
|
||||
if (narayana) parts.push(`Narayana ${SIGN_CN[narayana.lord] ?? narayana.lord}座大运 ${formatMonth(parseDay(narayana.start))} 至 ${formatMonth(parseDay(narayana.end))}`);
|
||||
return parts.length > 0 ? `${name}:${parts.join(";")}` : `${name}:这段没有可用的大运边界`;
|
||||
|
||||
@@ -118,3 +118,18 @@ test("the timing prompt tells the writer not to restate the event rules (BUG-191
|
||||
assert.match(zh, /正文不要提「正式核对」「研究扫描」,也不要复述这些写作要求/);
|
||||
assert.doesNotMatch(zh, /两人事件的结论只能按正式核对/);
|
||||
});
|
||||
|
||||
test("analysis lines read in Chinese: aspects, Ascendant, quotes, chart names, period lords (BUG-1927)", async () => {
|
||||
const { chineseNames, chineseChartNames } = await import("../src/lib/synastry-full-generate.ts");
|
||||
assert.equal(chineseNames("火星与月亮成合相(conjunction),水星与月亮形成 rashi_contact(黄道接触)"), "火星与月亮成合相,水星与月亮形成 星座接触");
|
||||
assert.equal(chineseNames("与甲的 Ascendant 成对轴,Rahu 落第 3 宫"), "与甲的 上升 成对轴,北交点 落第 3 宫");
|
||||
assert.equal(chineseNames("先把'我需要什么'说成具体请求"), "先把「我需要什么」说成具体请求");
|
||||
assert.equal(chineseChartNames("甲的 D1 中,D9 上升天蝎座,D10 不变,D12 保留"), "甲的 本命盘 中,九分盘 上升天蝎座,十分盘 不变,D12 保留");
|
||||
const timeline = await import("../src/lib/synastry-full-timeline.ts");
|
||||
const segments = timeline.buildTimelineSegments({ nameA: "甲", nameB: "乙", from: "2026-11-16",
|
||||
periodsA: [{ level: "md", lord: "Rahu", lordCn: "北交点Rahu", start: "2026-01-01", end: "2030-10-01" }, { level: "ad", lord: "Venus", lordCn: "金星Venus", start: "2026-11-01", end: "2027-05-01" }],
|
||||
periodsB: [{ level: "md", lord: "Saturn", lordCn: "土星Saturn", start: "2026-01-01", end: "2031-11-01" }, { level: "ad", lord: "Saturn", lordCn: "土星Saturn", start: "2026-11-01", end: "2027-09-01" }] } as never);
|
||||
const basis = segments.map((segment: { basis: string }) => segment.basis).join(" ");
|
||||
assert.match(basis, /北交点大运/);
|
||||
assert.doesNotMatch(basis, /Rahu|Venus|Saturn/);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user