diff --git a/docs/BUG_HISTORY.md b/docs/BUG_HISTORY.md index 365569df0..587f746ae 100644 --- a/docs/BUG_HISTORY.md +++ b/docs/BUG_HISTORY.md @@ -27225,3 +27225,15 @@ - 遗留:固定句回答目前照常扣点(只有没读到材料或回答为空才不扣),是否改为不扣由产品负责人定。事实核对不区分是谁的星,材料里任何一方有这条就算对上。 - 关联记录:BUG-2001、BUG-2010、BUG-2014、BUG-2022。 - 修复版本:`claude/synastry-followup-canned-2023`。 + +## BUG-2025 | 财运题没用 AL 起第 2 / 11 宫;判断依据混着英文星名、「卡上」「随参数翻转」;正文首次提罗睺没带北交点 + +- 状态:fixed-pending-verify(待 staging 实测)。 +- 首次发现 / 最近更新:2026-11-19 / 2026-11-19。 +- 触发与现象:staging 第六轮真机复测(8dd72709,财运题、时间题):(1) 财运判断依据引 A2、A11、A10,没有用占星师第二批第 4、5 项定为财富主依据的 AL 起第 2、11 宫;(2) 判断依据「与 Mercury、Rahu 同宫」「Libra(Venus)」、「卡上」三次、「随参数翻转」;(3) 时间题正文第一次提罗睺 / 计都没带「(北交点)」「(南交点)」(BUG-2017 的写法规则是概率性的)。 +- 根因:(1) AL2 / AL11 在服务端事实包里、也进了关键事实行,但排在行末,财富精简清单只点名 A2、A11,模型就用了它们(本地用公开盘事实包重现:改前 6 份 0 份用到 AL 起第 2 / 11 宫);(2) BUG-1948 / 2009 的字眼检查对大写英文名一律放行,中文「卡上」在 BUG-2009 为了放过证据包分析句而没收;(3) 首次括注只靠写法规则。另:清单里 KP 那句写着「属 parameter_sensitive」,是「参数敏感」的又一来源。 +- 修复:(1) 关键事实行把 AL / UL 起算的宫排在最前(行运回到本命星座那句之后);财富清单在能力、留存两面加上 AL 起第 11 宫、AL 起第 2 宫,并加一句说明它们是主要依据、和 A2 / A11 是不同的点、判断依据分开写;清单里两处「属 parameter_sensitive」改为「换宫制结果会变」。(2) 只在「判断依据」行检查的补充表 `BASIS_ONLY_WORDS`:在卡上 / 卡上 → 去掉,结构观察行 → 结构上的观察,随参数翻转 → 随算法设置会变,九星和十二星座的英文名 → 中文名(引号里、前后紧挨英文词的不换,如「Sree Lagna」「KP Sub Lord Saturn」、英文原文引句);卡片和证据包的分析句不查。(3) 页面显示时给正文第一次出现的罗睺、计都补「(北交点)」「(南交点)」,已有括注不重复,判断依据和存下的文字不动。 +- 未改:「D2 结论没有跟『另一情景下……』」属生时纠正窗口 BUG-2018 的情景对照范围,转该窗口核对。 +- 验证与防复发:新增 `tests/consult-wealth-al-nodes-2025.test.tsx`;`consult-internal-words-1948`、`evidence-ids-1976`、`consult-professional-mode-20261107` 按新值更新并注明原因。公开盘 Obama、Zidane 财富题(带服务端事实包)各 3 份:判断依据用到 AL 起第 2 / 11 宫的,改前 0/6,只加清单后 0/6,再把 AL 句排到行首后 3/6。问答相关测试 926 通过。 +- 关联记录:BUG-1965、BUG-1948、BUG-2009、BUG-2017、BUG-2018。 +- 修复版本:`claude/qa-wealth-2025`,待 staging。 diff --git a/frontend/src/components/chat-message-content.tsx b/frontend/src/components/chat-message-content.tsx index b3e6101bc..88db124ff 100644 --- a/frontend/src/components/chat-message-content.tsx +++ b/frontend/src/components/chat-message-content.tsx @@ -11,6 +11,7 @@ import { splitJudgmentBasis } from "@/lib/consult-judgment-basis"; import { answerUsedBookLibrary, consultScopeLine, + withNodeFirstMention, withoutExternalVerificationRows, type ConsultAnswerBasisRow, } from "@/lib/consult-answer-basis"; @@ -138,7 +139,7 @@ export function ChatMessageContent({ // 产品 2026-11-16:正文之后的「## 判断依据」一节折叠显示,流式输出时也先收起。 // 流式输出中,写到一半的 Markdown(没合上的 **、还没成表的表头)先不当源码显示。 const judgment = splitJudgmentBasis(streaming ? streamingMarkdownView(storedText) : storedText); - const visibleText = withoutExternalVerificationRows(judgment.body); + const visibleText = withNodeFirstMention(withoutExternalVerificationRows(judgment.body)); // BUG-2007(2026-11-19):深度解读审计表末尾不再补 BUG-1834 的未核验说明。 const text = visibleText; const split = splitSpokenAnswerAndTechniqueAudit(text); diff --git a/frontend/src/lib/consult-answer-basis.ts b/frontend/src/lib/consult-answer-basis.ts index 7710898d1..8223a60ba 100644 --- a/frontend/src/lib/consult-answer-basis.ts +++ b/frontend/src/lib/consult-answer-basis.ts @@ -44,6 +44,23 @@ export function answerUsedBookLibrary(judgmentBasis: string | null | undefined): return /《[^》\n]+》/.test(judgmentBasis ?? ""); } +/** + * BUG-2025(占星师 11-19 第 16 条,复测第六轮):正文第一次出现罗睺、计都时带上「(北交点)」「(南交点)」。 + * 写法规则要求了,但模型不一定照做;这里在显示时补上,存下来的文字不变。已经带括注的不重复。 + */ +export function withNodeFirstMention(text: string): string { + let out = text; + for (const [name, gloss] of [["罗睺", "北交点"], ["计都", "南交点"]] as const) { + if (out.includes(`${name}(${gloss}`) || out.includes(`${name}(${gloss}`)) continue; + const at = out.indexOf(name); + if (at < 0) continue; + const after = at + name.length; + if (/^[((]/u.test(out.slice(after))) continue; + out = `${out.slice(0, after)}(${gloss})${out.slice(after)}`; + } + return out; +} + export type ConsultAnswerBasisStatus = "done" | "conditional"; export const CONSULT_ANSWER_BASIS_STATUS_LABELS: Readonly> = { diff --git a/frontend/src/lib/consultation-condensed-checklist.ts b/frontend/src/lib/consultation-condensed-checklist.ts index 8f8a91770..b6055be3c 100644 --- a/frontend/src/lib/consultation-condensed-checklist.ts +++ b/frontend/src/lib/consultation-condensed-checklist.ts @@ -122,7 +122,7 @@ export const CONSULTATION_CONDENSED_CHECKLISTS: Readonly clause.startsWith("行运")); + const derivedFirst = clauses.filter((clause) => / 起第 \d+ 宫/.test(clause) && !clause.startsWith("行运")); + const rest = clauses.filter((clause) => !lead.includes(clause) && !derivedFirst.includes(clause)); + clauses.splice(0, clauses.length, ...lead, ...derivedFirst, ...rest); const head = EVIDENCE_CARD_LABELS.keyFactsReading; // BUG-1965: when the line is too long, the derived Arudha houses are the last to go (the model // leaves bare data unread; these are her main evidence for wealth and marriage continuity). diff --git a/frontend/src/lib/consultation-internal-words.ts b/frontend/src/lib/consultation-internal-words.ts index 243e9401d..1de67d2ea 100644 --- a/frontend/src/lib/consultation-internal-words.ts +++ b/frontend/src/lib/consultation-internal-words.ts @@ -174,6 +174,32 @@ export const INTERNAL_CHINESE_PHRASES: Readonly> = { }; const PHRASE_RE = new RegExp(Object.keys(INTERNAL_CHINESE_PHRASES).join("|"), "gu"); +/** + * BUG-2025 (staging 复测第六轮): wording checked in 「判断依据」 lines only (the `english` scan), not in + * card or pack prose, where 「这张卡上」 is the analysis note's own word. English planet and sign names + * written into Chinese text (「与 Mercury、Rahu 同宫」「Libra(Venus)」) get their Chinese names. + */ +export const BASIS_ONLY_WORDS: Readonly> = { + "在卡上": "", + "卡上": "", + "结构观察行": "结构上的观察", + "随参数翻转": "随算法设置会变", + "参数翻转": "算法设置一变就翻转", + Sun: "太阳", Moon: "月亮", Mars: "火星", Mercury: "水星", Jupiter: "木星", Venus: "金星", Saturn: "土星", Rahu: "罗睺", Ketu: "计都", + Aries: "白羊", Taurus: "金牛", Gemini: "双子", Cancer: "巨蟹", Leo: "狮子", Virgo: "处女", + Libra: "天秤", Scorpio: "天蝎", Sagittarius: "射手", Capricorn: "摩羯", Aquarius: "水瓶", Pisces: "双鱼", +}; +const BASIS_CHINESE_RE = /在卡上|卡上|结构观察行|随参数翻转|参数翻转/gu; +const BASIS_NAME_RE = new RegExp( + `(? /^[A-Z]/.test(word)).join("|")})(?![a-z])(?![ \\t]?[A-Za-z])`, + "gu", +); + +/** The plain wording for a phrase hit (chat table first, then the 「判断依据」-only table). */ +export function phraseWording(token: string): string { + return INTERNAL_CHINESE_PHRASES[token] ?? BASIS_ONLY_WORDS[token] ?? ""; +} + /** BUG-1972: a run of lowercase English words (「aspected by」 is one hit); capitalised words never start a run. */ const ENGLISH_RUN_RE = /(? quoted.some(([from, to]) => at >= from && at < to); + for (const match of [...text.matchAll(BASIS_CHINESE_RE), ...text.matchAll(BASIS_NAME_RE)]) { + const start = match.index; + const end = start + match[0].length; + if (inQuote(start) || hits.some((hit) => start < hit.end && end > hit.start)) continue; + hits.push({ start, end, token: match[0], kind: "phrase" }); + } for (const hit of findEnglishWords(text)) { if (hits.some((other) => hit.start < other.end && hit.end > other.start)) continue; hits.push(hit); @@ -303,8 +337,8 @@ function wordMeanings(units: readonly InternalWordUnit[]): string[] { for (const token of units.flatMap((unit) => unit.tokens)) { if (seen.has(token)) continue; seen.add(token); - if (token in INTERNAL_CHINESE_PHRASES) { - const plain = INTERNAL_CHINESE_PHRASES[token]!; + if (token in INTERNAL_CHINESE_PHRASES || token in BASIS_ONLY_WORDS) { + const plain = phraseWording(token); lines.push(plain ? `${token}:内部说法,换成「${plain}」或意思相同的白话` : `${token}:内部说法,没有实际意思,去掉后把句子理顺`); continue; } @@ -427,7 +461,7 @@ export function scrubInternalWords(line: string): string { continue; } if (hit.kind === "phrase") { - text = splice(text, hit.start, hit.end, INTERNAL_CHINESE_PHRASES[hit.token] ?? ""); + text = splice(text, hit.start, hit.end, phraseWording(hit.token)); continue; } if (hit.kind === "english") { diff --git a/frontend/tests/consult-internal-words-1948.test.ts b/frontend/tests/consult-internal-words-1948.test.ts index c15768ed5..c03ba2421 100644 --- a/frontend/tests/consult-internal-words-1948.test.ts +++ b/frontend/tests/consult-internal-words-1948.test.ts @@ -89,17 +89,24 @@ test("a clean rewrite is taken; a rewrite that loses a number, the lead or still test("the table uses existing wording, drops what carries nothing, and leaves real terms alone", () => { // BUG-2009 原值:「卡上」「单体系候选」留在结果里 / 新值:去掉「卡上」,「单体系候选」换成白话 / 原因:复测时这些说法留在判断依据里 - assert.equal(scrubInternalWords("各步已定,但卡上 chat_use 为 single_system_candidate,不据此写成双体系确认。"), "各步已定,但卡上单一方法的候选,不据此写成两种方法一致。"); + assert.equal(scrubInternalWords("各步已定,但卡上 chat_use 为 single_system_candidate,不据此写成双体系确认。"), "各步已定,但单一方法的候选,不据此写成两种方法一致。"); assert.equal(scrubInternalWords("为单体系候选(`chat_use` = single_system_candidate),只作条件性窗口"), "为单一方法的候选,只作条件性窗口"); assert.equal(scrubInternalWords("起运比较这一步有分歧(seed 为 disputed),属单体系候选"), "起运比较这一步有分歧(起运比较有分歧),属单一方法的候选"); assert.equal(scrubInternalWords("各步虽已定,但按卡上状态只作为单体系候选,不据此加强应期"), "各步虽已定,但只作为单一方法的候选,不据此加强应期"); assert.equal(scrubInternalWords("Tajika 年盘只在第一目标集上验证过"), "Tajika 年盘只在一部分案例上验证过"); // BUG-2011 (staging 复测第三轮): no long wording dropped into another sentence, no trailing separator. assert.equal(scrubInternalWords("年盘为参数敏感层,只作结构参考"), "年盘为参考层,只作结构参考"); + // BUG-2025 (复测第六轮):判断依据里的「卡上」、英文星名和星座、「随参数翻转」;引号和英文句子里的不动。 + assert.equal(scrubInternalWords("Narayana 主运 Libra(Venus)2018-08-08 至 2028-08-07;卡上各步均已定"), "Narayana 主运天秤(金星)2018-08-08 至 2028-08-07;各步均已定"); + assert.equal(scrubInternalWords("宫主金星落本命第 2 宫,与 Mercury、Rahu 同宫"), "宫主金星落本命第 2 宫,与水星、罗睺同宫"); + assert.equal(scrubInternalWords("Moon 6.08(最低线 6.0)标为随参数翻转"), "月亮 6.08(最低线 6.0)标为随算法设置会变"); + assert.equal(scrubInternalWords("原书:「Jupiter in the 2nd」;KP Sub Lord Saturn"), "原书:「Jupiter in the 2nd」;KP Sub Lord Saturn"); + // 卡片和证据包的分析句不查这些(只查判断依据)。 + assert.deepEqual(findInternalWords("依赖项不在这张卡上;与 Mercury 同宫"), []); assert.equal(scrubInternalWords("Vimshottari 提供主要时间框架,Narayana 的当前分支按来源版各步配置计算,保留为条件性窗口,暂不作为双体系确认"), "Vimshottari 提供主要时间框架,Narayana 的当前分支,保留为条件性窗口"); assert.equal(scrubInternalWords("不计),net_result=strength_comparison_required,强弱待裁"), "不计),待定,强弱待裁"); assert.equal(scrubInternalWords("第 10 宫 SAV 33(极吉,sav_strength 强),且被土星照"), "第 10 宫 SAV 33(极吉,强),且被土星照"); - assert.equal(scrubInternalWords("被太阳、火星照(aspected_by: Sun, Mars);火星为 DK"), "被太阳、火星照(Sun, Mars);火星为 DK"); + assert.equal(scrubInternalWords("被太阳、火星照(aspected_by: Sun, Mars);火星为 DK"), "被太阳、火星照(太阳, 火星);火星为 DK"); assert.equal(scrubInternalWords(`另被判为传统格局(computed,${YOGA_STATUS_MAPPING.computed.text}),只用来说明结构稳`), `另被判为传统格局(${YOGA_STATUS_MAPPING.computed.text}),只用来说明结构稳`); assert.equal(scrubInternalWords("按卡上 method_status,Narayana 为单体系候选窗口"), ",Narayana 为单一方法的候选窗口"); const fine = "- **事业**:D10 第 10 宫金牛内有木星、罗睺;B. V. Raman《How to Judge a Horoscope》第 2 卷;Shadbala 7.81 Rupa。(明显,B)"; diff --git a/frontend/tests/consult-professional-mode-20261107.test.ts b/frontend/tests/consult-professional-mode-20261107.test.ts index 4e3aefae0..3ba62e28c 100644 --- a/frontend/tests/consult-professional-mode-20261107.test.ts +++ b/frontend/tests/consult-professional-mode-20261107.test.ts @@ -126,7 +126,9 @@ test("interpretation statuses replace 'blocked / reference only means cannot rea assert.doesNotMatch(tools, /still blocked: reference only/); const lists = Object.values(CONSULTATION_CONDENSED_CHECKLISTS).flat().join("\n"); assert.doesNotMatch(lists, /只作参考、不作依据|KP 精确宫头仍 blocked/); - assert.match(lists, /parameter_sensitive:可以有条件地作为依据/); + // BUG-2025 原值 /parameter_sensitive:可以有条件地作为依据/ / 新值:白话「换宫制结果会变」/ 原因:清单里的状态码被译成「参数敏感」进了判断依据(复测第六轮) + assert.match(lists, /换宫制结果会变:可以有条件地作为依据/); + assert.doesNotMatch(lists, /parameter_sensitive/); // KP rides on every domain card (card branch, 2026-11-07); the model reads the card's route table for the audit. assert.doesNotMatch(mastra, /KP are never on the card/); assert.match(mastra, /route table that says which techniques are on_card, not_applicable, blocked or not_available_yet/); diff --git a/frontend/tests/consult-wealth-al-nodes-2025.test.tsx b/frontend/tests/consult-wealth-al-nodes-2025.test.tsx new file mode 100644 index 000000000..cec30c88b --- /dev/null +++ b/frontend/tests/consult-wealth-al-nodes-2025.test.tsx @@ -0,0 +1,31 @@ +// BUG-2025 (staging 复测第六轮 2026-11-19): AL 起第 2 / 11 宫 lead the wealth key line and the checklist names them; +// the body's first 罗睺 / 计都 carries 北交点 / 南交点 on the page. Synthetic text only. +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import test from "node:test"; +import { renderToStaticMarkup } from "react-dom/server"; + +import { ChatMessageContent } from "../src/components/chat-message-content.tsx"; +import { withNodeFirstMention } from "../src/lib/consult-answer-basis.ts"; +import { CONSULTATION_CONDENSED_CHECKLISTS } from "../src/lib/consultation-condensed-checklist.ts"; + +test("the first 罗睺 and 计都 get their gloss once; an existing gloss is left alone", () => { + assert.equal(withNodeFirstMention("罗睺进摩羯,计都进巨蟹;罗睺之后再说。"), "罗睺(北交点)进摩羯,计都(南交点)进巨蟹;罗睺之后再说。"); + assert.equal(withNodeFirstMention("罗睺(北交点)进摩羯,后来罗睺离开。"), "罗睺(北交点)进摩羯,后来罗睺离开。"); + assert.equal(withNodeFirstMention("没有交点。"), "没有交点。"); + const markup = renderToStaticMarkup(); + assert.equal(markup.split("北交点").length - 1, 1, "body only, once"); +}); + +test("the wealth checklist names AL 起第 2 / 11 宫 as main evidence, apart from A2 / A11", () => { + const wealth = CONSULTATION_CONDENSED_CHECKLISTS.wealth!.join("\n"); + assert.match(wealth, /AL 起第 11 宫;A11/); + assert.match(wealth, /AL 起第 2 宫;A2/); + assert.match(wealth, /是财富的主要依据.*A2、A11 是第 2、11 宫各自的 Arudha/); + assert.doesNotMatch(wealth, /parameter_sensitive/); +}); + +test("derived AL / UL houses come right after a return, before the vargas, in the key line", () => { + const source = readFileSync(new URL("../src/lib/consultation-evidence-card.ts", import.meta.url), "utf8"); + assert.match(source, /clauses\.splice\(0, clauses\.length, \.\.\.lead, \.\.\.derivedFirst, \.\.\.rest\);/); +}); diff --git a/frontend/tests/evidence-ids-1976.test.ts b/frontend/tests/evidence-ids-1976.test.ts index 03d86af57..e053e5d76 100644 --- a/frontend/tests/evidence-ids-1976.test.ts +++ b/frontend/tests/evidence-ids-1976.test.ts @@ -62,7 +62,8 @@ test("an id in 「判断依据」 is dropped with its brackets and separators; i const scan = scanInternalWords(answer); assert.deepEqual(scan.bodyTokens, ["ev:D1:Saturn"]); assert.equal(scan.units.length, 4); - assert.ok(scan.units.every((unit) => unit.tokens.every(isEvidenceIdToken))); + // BUG-2025 原值:每个 token 都是证据编号 / 新值:另有英文星名 Rahu / 原因:判断依据里的英文星名换成中文(复测第六轮) + assert.ok(scan.units.every((unit) => unit.tokens.every((token) => isEvidenceIdToken(token) || token === "Rahu"))); // No model rewrite: the table pass drops every id. const result = applyInternalWordRepair(answer, scan.units, new Map()); assert.equal(result.remaining, 0); @@ -71,7 +72,7 @@ test("an id in 「判断依据」 is dropped with its brackets and separators; i "- **财运偏晚**:AL 起第 2 宫天蝎,宫主火星在第 9 宫。(明显,B)", "- **太阳有力**:本方法计算值 8.33 Rupa,达到该线。(明显,B)", "- **格局**:都成立。(只是可能,C)", - "- **大运**:Rahu 大运起,到 2030 年。(明显,B)", + "- **大运**:罗睺大运起,到 2030 年。(明显,B)", ]); // A rewrite that kept an id is cleaned before it is checked, so it is still taken. const kept = applyInternalWordRepair(answer, scan.units, new Map([[1, basis[0]!]]));