From 8dd73772c2ec46c28443d9f5d4a54f89b84e352f Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 17 Nov 2026 15:06:25 +0800 Subject: [PATCH 1/5] docs: brief for marking reports after birth input change and scenario statement (BUG-1959) Co-Authored-By: Claude Fable 5.2 Claude-Session: https://claude.ai/code/session_01DbBXp2U3BH1SxwAGyhhbe1 --- .../TASK-rect-artifact-marking-20261117.md | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 docs/tasks/TASK-rect-artifact-marking-20261117.md diff --git a/docs/tasks/TASK-rect-artifact-marking-20261117.md b/docs/tasks/TASK-rect-artifact-marking-20261117.md new file mode 100644 index 000000000..391042f2c --- /dev/null +++ b/docs/tasks/TASK-rect-artifact-marking-20261117.md @@ -0,0 +1,116 @@ +# 生时纠正 P0:出生时间变过的报告和合盘加一行标示,自选情景的报告加一句说明(2026-11-17,Claude) + +Bug 编号:BUG-1959。关联 BUG-1956(#310)、BUG-1958(#312)、BUG-1936。 + +## 背景 + +#310 已经让报告、年运、合盘记录生成时的出生输入版本,并在读取时给出 `birthInputState`(`current` / `changed` / `unknown`)。页面和导出还没有用它。#312 已经把自选保存成「用户自选情景」,并提供 `isSelfSelectedScenario`、`selfSelectedScenarioSide`(`frontend/src/lib/chart-choice/self-selected-scenario.ts`)。 + +产品负责人 11-17 的决定: + +1. 出生时间变过(`changed`)的报告,打开时显示一行:`这份报告按当时的出生时间生成,可重新生成。` 原文照常能看。 +2. **老报告一律不动。** 生产上从没上线过 11 月这套生时纠正,没有存量问题。`unknown`(没有记录版本的旧产物)不显示任何东西。 +3. 按用户自选情景生成的报告、年运、导出,开头加一句说明,只出现一次。 +4. 自选功能在本单和 #314 验收前不上生产。 + +## 一、`changed` 的标示 + +只在 `birthInputState === "changed"` 时显示;`current`、`unknown`、字段缺失都不显示。 + +| 位置 | 文案 | +|---|---| +| 长报告页(`personal-report-page.tsx`) | `这份报告按当时的出生时间生成,可重新生成。` | +| 年运页(`annual-report-page.tsx`) | `这份年运按当时的出生时间生成,可重新生成。` | +| 完整合盘(`synastry-report-view.tsx`) | `这份合盘按当时两个人的出生时间生成,其中有人的出生时间后来改过,可重新生成。` | +| 报告中心 / 过往列表里的每一项 | 不加文字,不加徽标(列表保持干净;打开后才看到那一行) | + +要求: + +- 放在报告正文上方、标题下方,普通正文段落,用页面已有的说明段落样式(看该页现有的提示/说明用的类名,沿用,不新造样式、不加图标、不加颜色块)。 +- 「可重新生成」不做成新按钮:长报告和年运页上已有回到报告中心重新生成的入口(`返回报告中心重新生成` 等),这一行里的「重新生成」做成指向同一入口的文字链接;合盘同理指向现有的再次生成入口。没有现成入口的页面只显示文字。 +- 英文版报告视图给对应英文句子:`This report was generated from the birth time on file at that time. You can generate it again.`(年运、合盘同理改主语)。 + +## 二、导出 + +`report-export-blocks.ts`、`annual-report-export.ts`、`synastry-report-export.ts`:#310 已把 `birthInputState` 放进导出块的 `metadata`。本单在导出的 Markdown 正文最前面(标题之后)加一段,仅 `changed` 时: + +`> 这份报告按当时的出生时间生成,之后出生时间改过。` + +快照里存有当时的出生时间范围时(年运快照的 `birth_window`、长报告的出生时间载荷),再加一行 `> 生成时使用的出生时间:HH:MM(范围 HH:MM–HH:MM)`;没有存就不加,不去读当前档案来补。 + +聊天导出(`consultation-report-export.ts`)不在本单。已经下载到用户手里的文件无法更改,在 PROGRESS「已知边界」登记。 + +## 三、自选情景下生成的报告、年运、合盘 + +### 生成时记录 + +生成报告时,如果主体当前来源是自选情景(`isSelfSelectedScenario(active_birth_provenance)`),在产物里记录(与 `birthInputRevision` 同位置): + +``` +birthScenario: { + kind: "self_selected", + side: "before" | "after" | "unsure", // selfSelectedScenarioSide + differingDomains: string[] // 见下 +} +``` + +`differingDomains`:从来源里的 `scenarios` 取主情景和其他情景,六张盘中上升星座不同的那些盘对应的领域名(用页面已有的盘名:主盘、婚恋、事业、钱财、日常、突变)。只有一个情景时为空数组。合盘记录双方各一份(`birthScenarios: { a, b }`,不是自选的一方为 `null`)。 + +不是自选的主体不写这个字段。旧产物没有这个字段。 + +### 显示 + +产物带 `birthScenario` 时,在正文上方显示一段(与第一节同样的位置和样式;两者都有时 `changed` 那行在上): + +- 选了一侧:`这份报告按你自己选的线后情景写成,不是出生时间已核实;你填的时间和范围都还保留着。`(「线后」按 `side` 换成「线前」;年运、合盘把「这份报告」换成「这份年运」「这份合盘」,合盘写明是哪一位:`其中 A 的出生时间按自己选的线后情景`,A 用报告里已有的称呼。) +- `side` 为 `unsure`:`你没有选定线前还是线后,这份报告按你填的时间写成;你填的时间和范围都还保留着。` +- `differingDomains` 非空时再接一句:`另一种情景下,婚恋、事业的分盘上升星座不同,报告里这两方面的判断只适用于你选的这一侧。`(领域名按实际列出;一个领域时写「这方面」。) + +导出正文开头带同样的话(引用块)。只出现这一次:**报告正文、章节、提示词都不因为自选而加任何别的保留语气**。这是产品负责人批准的唯一例外。 + +报告生成的提示词和渲染代码(`scripts/report_render/`、报告写作提示词)不改:报告仍然只按采用时刻写。本单不做报告内的分情景写作。 + +## 四、`birth_input_changed` 失败的说法 + +#310 之后,生成期间出生资料变了的任务会失败并返还点数,接口带 `failureReason: "birth_input_changed"`。现在页面显示的是通用失败文案。改成: + +`生成期间出生资料改过,这次没有扣点。请重新生成。` + +用现有的失败提示位置和样式。 + +## 五、合盘 worker 提交前再核对一次 + +`frontend/src/lib/synastry-full-run.ts` 现在只在开始时核对双方版本。在写最终快照之前再读一次双方档案并比对,不一致则抛 `birth_input_changed`(与长报告、年运一致),走现有失败与返还路径。没有记录版本的旧任务不核对(与 #310 验收时的修改一致)。 + +## 六、不做的事 + +- `unknown` 不显示任何东西;不回填、不改写旧产物。 +- 不改报告正文的生成、不做分情景写作、不改 `scripts/`。 +- 不动聊天(#314)、不动自选流程(#312)。 +- 不新造按钮、徽标、颜色块;不在列表上加标记。 + +## 七、测试 + +新文件 `frontend/tests/report-birth-marking-20261117.test.tsx`(合成数据): + +1. 三种页面:`changed` 显示对应那一行且含指向现有入口的链接;`current`、`unknown`、缺失都不显示。 +2. 导出:`changed` 时正文开头有那段引用,有存范围时带时间行,没有存时不带;`current`/`unknown` 时导出正文与现在逐字相同。 +3. 自选情景:生成时写入 `birthScenario`(before / after / unsure 三种;`differingDomains` 空与非空;合盘一方自选一方不是);非自选不写。 +4. 显示:三种 `side` 的句子;`differingDomains` 一个与多个;与 `changed` 同时出现时的先后;整份报告正文里这句话只出现一次。 +5. 页面任何位置不出现「无法确认」「未核对」「没有通过核对」「已校正」「已确认」。 +6. `birth_input_changed` 的失败文案;其他失败原因的文案不变。 +7. 合盘 worker:提交前一方档案变化 → 不写最终快照,原因 `birth_input_changed`,返还路径与现有失败用例相同;旧任务(无记录)照常完成。 +8. 既有测试不删断言:`annual-md-export-20261113.test.tsx`、`birth-input-revision-20261117.test.ts`、`report-birth-binding.test.ts`、`chart-choice-self-choice-scenario-20261117.test.tsx`、合盘与长报告的页面测试。 + +## 八、文档 + +- `docs/BUG_HISTORY.md` 新增 BUG-1959(只在自己那一节内编辑;不写姓名、出生资料、邮箱、ID)。 +- `CHANGELOG.md` 一行;`docs/tasks/PROGRESS-rect-artifact-marking-20261117.md`,含「已知边界」:已下载文件、聊天导出、报告内不分情景写作、`unknown` 不标示及其理由(生产无存量)。 +- `docs/research/rect-p0-artifact-checklist-20261116.md` 的「11-17 之后」一节更新缺口 1、3 的状态。 +- `frontend/DESIGN.md` 相应位置补一句这两段说明的位置和样式约定。 + +## 验收 + +- `PATH=/bin:$PATH python scripts/run_quality_gate.py --profile quick --skip-frontend-runtime` 通过; +- `cd frontend && npx tsc --noEmit` 通过;`npx eslint .` 0 错误;新测试与第七节第 8 条的测试通过;前端全量不新增失败; +- 验收时会在本地构建上看三种页面各一次(有标示 / 无标示),核对样式与现有说明段落一致。 -- 2.54.0 From 60aab8d12afb5850cbafed1bc0482182671a4e2a Mon Sep 17 00:00:00 2001 From: jesse-ux Date: Tue, 17 Nov 2026 15:47:26 +0800 Subject: [PATCH 2/5] Mark report birth inputs and guard synastry snapshot persistence --- .../src/app/api/reports/[reportId]/route.ts | 7 + .../components/annual/annual-report-page.tsx | 16 +- .../personal-report-markdown-view.tsx | 20 +- .../personal-report/personal-report-page.tsx | 25 ++- .../personal-report/report-actions.tsx | 11 +- .../personal-report/report-birth-notices.tsx | 42 ++++ .../synastry/synastry-report-view.tsx | 16 ++ frontend/src/lib/annual-report-export.ts | 9 +- frontend/src/lib/annual-report-generate.ts | 2 + frontend/src/lib/annual-report-server.ts | 21 +- frontend/src/lib/personal-report-contract.ts | 3 + .../src/lib/personal-report-generation.ts | 6 +- .../src/lib/personal-report-longform-cover.ts | 4 + .../lib/personal-report-longform-generate.ts | 7 + .../lib/personal-report-longform-snapshot.ts | 3 + .../src/lib/personal-report-route-core.ts | 2 + frontend/src/lib/personal-report-worker.ts | 2 + frontend/src/lib/report-birth-binding.ts | 11 +- frontend/src/lib/report-birth-marking.ts | 178 +++++++++++++++++ frontend/src/lib/report-export-blocks.ts | 33 +++- frontend/src/lib/synastry-full-generate.ts | 1 + frontend/src/lib/synastry-full-run.ts | 36 +++- frontend/src/lib/synastry-report-export.ts | 8 +- .../src/lib/synastry-snapshot-birth-check.ts | 17 ++ .../report-birth-marking-20261117.test.tsx | 185 ++++++++++++++++++ 25 files changed, 624 insertions(+), 41 deletions(-) create mode 100644 frontend/src/components/personal-report/report-birth-notices.tsx create mode 100644 frontend/src/lib/report-birth-marking.ts create mode 100644 frontend/src/lib/synastry-snapshot-birth-check.ts create mode 100644 frontend/tests/report-birth-marking-20261117.test.tsx diff --git a/frontend/src/app/api/reports/[reportId]/route.ts b/frontend/src/app/api/reports/[reportId]/route.ts index 653a604d8..315bd875b 100644 --- a/frontend/src/app/api/reports/[reportId]/route.ts +++ b/frontend/src/app/api/reports/[reportId]/route.ts @@ -1,4 +1,6 @@ import { NextResponse } from "next/server"; +import { asRecord } from "@/lib/guards"; +import { readReportBirthScenario, readReportBirthWindow } from "@/lib/report-birth-marking"; import { readReportBirthInputSection, REPORT_BIRTH_INPUT_SECTION } from "@/lib/report-birth-revision"; import { ownedReportBirthInputReader } from "@/lib/report-birth-revision-server"; import { REPORT_STABLE_CODES } from "@/lib/personal-report-codes"; @@ -206,8 +208,13 @@ export async function GET(request: Request, context: RouteContext) { const failure = owned.status === "failed" && jobs ? await jobs.getOwnedByRequestId(owned.userId, owned.requestId).catch(() => null) : null; + const subject = owned.status === "ready" ? asRecord(asRecord(owned.reportDocument)?.subject) : null; + const birthScenario = readReportBirthScenario(subject?.birthScenario); + const artifactBirthWindow = readReportBirthWindow(subject?.artifactBirthWindow); response = { ...response, body: { ...response.body, + ...(birthScenario ? { birthScenario } : {}), + ...(artifactBirthWindow ? { artifactBirthWindow } : {}), birthInputState: await inputState(binding), ...(failure?.lastErrorCode === "birth_input_changed" ? { failureReason: "birth_input_changed" } : {}), } }; diff --git a/frontend/src/components/annual/annual-report-page.tsx b/frontend/src/components/annual/annual-report-page.tsx index b336d614a..3c8a10a6d 100644 --- a/frontend/src/components/annual/annual-report-page.tsx +++ b/frontend/src/components/annual/annual-report-page.tsx @@ -21,6 +21,8 @@ import { accountDialogHref } from "@/lib/account-dialog-intent"; import { readCurrentSubjectId, useCurrentSubjectReady, useCurrentSubjectScope } from "@/lib/current-subject"; import { dragScroll } from "@/lib/drag-scroll"; import { ANNUAL_PRAVESHA_NOTE, ANNUAL_PRAVESHA_TITLE, annualAppendixDisplayLines, type AnnualSnapshot } from "@/lib/annual-report-generate"; +import { ReportBirthNotices } from "@/components/personal-report/report-birth-notices"; +import { REPORT_BIRTH_CHANGED_FAILURE, readReportBirthScenario } from "@/lib/report-birth-marking"; import { buildAnnualExportBlocks, hasAnnualTimeline } from "@/lib/annual-report-export"; import { annualGradeLine, remainingTableGrade } from "@/lib/annual-report-grade"; import { @@ -53,6 +55,7 @@ type ReportState = Readonly<{ id: string; status: "generating" | "ready" | "failed"; annual: AnnualSnapshot | null; + failureReason?: "birth_input_changed"; /** The worker's stage: queued → computing_annual → writing_report. */ phase?: string; createdAt?: string; @@ -668,6 +671,16 @@ export function AnnualReportView({ snapshot, generating, failed = false }: Reado

{snapshot.range.label},{snapshot.range.span}

{snapshot.subject.name}的这一年

+ {!generating && !failed ? ( + + ) : null}
{snapshot.plan.map((entry) => { @@ -800,6 +813,7 @@ export function AnnualReportPage({ initialReportId = null }: Readonly<{ initialR const status = view.status === "ready" || view.status === "failed" ? view.status : "generating"; setReport({ id, status, annual: (json.annual as AnnualSnapshot | null) ?? null, + ...(json.failureReason === "birth_input_changed" ? { failureReason: json.failureReason } : {}), ...(typeof view.progressPhase === "string" ? { phase: view.progressPhase } : {}), ...(typeof view.createdAt === "string" ? { createdAt: view.createdAt } : {}), ...(typeof record(json.queue).line === "string" ? { queueLine: record(json.queue).line as string } : {}), @@ -871,7 +885,7 @@ export function AnnualReportPage({ initialReportId = null }: Readonly<{ initialR )} {failed ? (
-

这一次没写完,没有扣点。

+

{report?.failureReason === "birth_input_changed" ? REPORT_BIRTH_CHANGED_FAILURE : "这一次没写完,没有扣点。"}

) : null} diff --git a/frontend/src/components/personal-report/personal-report-markdown-view.tsx b/frontend/src/components/personal-report/personal-report-markdown-view.tsx index e7e18c673..6cc5bd25c 100644 --- a/frontend/src/components/personal-report/personal-report-markdown-view.tsx +++ b/frontend/src/components/personal-report/personal-report-markdown-view.tsx @@ -109,6 +109,7 @@ function markdownComponents( subjectName?: string, createdAt?: string, birth?: string | null, + birthNotices?: ReactNode, ): Components { const cursor = { h2: 0, h3: 0 }; const byline = { shown: false }; @@ -152,6 +153,7 @@ function markdownComponents(
{zh ? "印度占星,完整本命报告" : "Vedic astrology, Full natal report"}

{heading}

+ {birthNotices} {facts ?

{facts}

: null}

{reportAiNotice(language)}

@@ -207,10 +209,11 @@ function renderMarkdown( subjectName?: string, createdAt?: string, birth?: string | null, + birthNotices?: ReactNode, ) { return ( (outline.leadMarkdown - ? renderMarkdown(outline.leadMarkdown, outline.headings, language, subjectName, createdAt, reportBirthLine(markdown)) - : null), - [outline, language, subjectName, createdAt, markdown], - ); + const lead = useMemo(() => { + const hasTitle = /^#[ \t]+\S/m.test(outline.leadMarkdown); + const content = outline.leadMarkdown + ? renderMarkdown(outline.leadMarkdown, outline.headings, language, subjectName, createdAt, reportBirthLine(markdown), hasTitle ? birthNotices : null) + : null; + return hasTitle || !birthNotices ? content : <>{birthNotices}{content}; + }, [outline, language, subjectName, createdAt, markdown, birthNotices]); const safeChapter = Math.min(chapter, Math.max(chapters.length - 1, 0)); const currentChapter = chapters[safeChapter]; const pagedChapter = useMemo(() => ( diff --git a/frontend/src/components/personal-report/personal-report-page.tsx b/frontend/src/components/personal-report/personal-report-page.tsx index 07dc217c5..0aebe8c5d 100644 --- a/frontend/src/components/personal-report/personal-report-page.tsx +++ b/frontend/src/components/personal-report/personal-report-page.tsx @@ -23,6 +23,8 @@ import { ChartDrawLoader } from "@/components/chart-draw-loader"; import { SecondaryHeader } from "@/components/secondary-header"; import { SynastryReportView } from "@/components/synastry/synastry-report-view"; import { SynastryWait } from "@/components/synastry/synastry-wait"; +import { REPORT_BIRTH_CHANGED_FAILURE, readReportBirthScenario, readReportBirthWindow, type ReportBirthScenario, type ReportBirthWindow } from "@/lib/report-birth-marking"; +import { ReportBirthNotices } from "./report-birth-notices"; import { ReportActions } from "./report-actions"; import { ReportFactTables } from "./report-fact-tables"; import { ReportCalculationCharts } from "./report-calculation-charts"; @@ -63,7 +65,7 @@ export type ReportLoadState = queueLine?: string; } | { phase: "timed-out" } - | { phase: "failed"; failureCode: string | null; failureSummary?: string | null; appendixLastErrorCode?: string | null; reportType?: string } + | { phase: "failed"; failureCode: string | null; failureReason?: "birth_input_changed"; failureSummary?: string | null; appendixLastErrorCode?: string | null; reportType?: string } | { phase: "invalid"; message: string } | { phase: "network-error" } | { @@ -82,6 +84,8 @@ export type ReportLoadState = /** Model-written reading in front of the report (issue #113 R1); absent on older or failed readings. */ reading?: ReportReading; birthInputState?: BirthInputState; + birthScenario?: ReportBirthScenario; + artifactBirthWindow?: ReportBirthWindow; } | { phase: "legacy-unavailable" } | { phase: "synastry-ready"; reportId: string; synastry: unknown; createdAt?: string }; @@ -179,6 +183,8 @@ export function classifyReportEnvelope(statusCode: number, json: unknown): Repor phase: "markdown-ready", ...(json.birthInputState === "current" || json.birthInputState === "changed" || json.birthInputState === "unknown" ? { birthInputState: json.birthInputState } : {}), + birthScenario: readReportBirthScenario(json.birthScenario), + artifactBirthWindow: readReportBirthWindow(json.artifactBirthWindow), markdown, reportId: typeof view.id === "string" ? view.id : "", createdAt: typeof view.createdAt === "string" ? view.createdAt : "", @@ -216,6 +222,7 @@ export function classifyReportEnvelope(statusCode: number, json: unknown): Repor return { phase: "failed", failureCode: appendixLastErrorCode ?? code, + ...(json.failureReason === "birth_input_changed" ? { failureReason: json.failureReason } : {}), ...(typeof view.reportType === "string" ? { reportType: view.reportType } : {}), ...(summary ? { failureSummary: summary } : {}), ...(appendixLastErrorCode ? { appendixLastErrorCode } : {}), @@ -597,7 +604,9 @@ export function PersonalReportPage({