From 7dfac594fac63e2ea4ff4409f66f35f5194aefa4 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 16 Nov 2026 15:59:03 +0800 Subject: [PATCH 1/2] docs: brief for rectification P0 wrap-up (BUG-1931) Co-Authored-By: Claude Fable 5.2 Claude-Session: https://claude.ai/code/session_01DbBXp2U3BH1SxwAGyhhbe1 --- docs/tasks/TASK-rect-p0-wrapup-20261116.md | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 docs/tasks/TASK-rect-p0-wrapup-20261116.md diff --git a/docs/tasks/TASK-rect-p0-wrapup-20261116.md b/docs/tasks/TASK-rect-p0-wrapup-20261116.md new file mode 100644 index 000000000..50e2c6cd6 --- /dev/null +++ b/docs/tasks/TASK-rect-p0-wrapup-20261116.md @@ -0,0 +1,72 @@ +# 生时纠正:P0 收尾——聚合统计脚本修订与旧产物检查清单(2026-11-16,Claude) + +Bug 编号:BUG-1931。 + +## 背景 + +占星师 11-16 审了 #294 交付的只读统计脚本 `docs/operations/rect-p0-aggregate-20261116.sql`,指出五处问题。脚本还没有在任何含真实用户资料的库上执行过。本单把这五处改掉,并补一份脚本覆盖不到的「旧产物与消费入口」检查清单。 + +## 不做的事 + +- 不连接、不查询任何含真实用户资料的数据库;不导出用户明细。脚本只写不跑,由产品负责人在受控环境执行。 +- 不改任何运行时行为:不改 `chart-choice` 的 API、页面、存储读写,不改报告、年运、聊天。 +- 不删除、不改写原始出生资料或历史记录的任何迁移。 +- 不改 `docs/operations/rect-p0-aggregate-20261116.sql` 原文件(它已随证据包 A 发出)。新脚本另起文件名。 +- 不碰 `references/real_case_calibration/` 下的归档。 + +## 一、新脚本 `docs/operations/rect-p0-aggregate-20261116-v2.sql` + +保持:只读、repeatable read 事务、只输出固定词表和计数、不选出任何出生资料、标识、邮箱、正文。 + +要改的五处: + +1. **来源冲突不再被首个匹配吞掉。** 现在的 `category` 是一条 `CASE`,先命中哪条算哪条。改为对每条档案分别算出各来源特征的布尔列(旧答题、旧事件采纳、segment-v1、明确手选、#229 分盘选边、填报默认),再输出: + - 各特征单独的计数; + - 同时命中两个及以上特征的计数,单列一类 `conflict`,并按「手选 + 旧来源」「其他组合」分开; + - 都没命中的 `unknown`。 + 「明确手选」如果同一条档案的记录链上还有旧答题、旧事件或选边的痕迹,归入 `conflict`,不算独立更正。 +2. **`unknown` 单独成表。** 另出一张表,只给 `unknown` 档案按「有无关联历史记录」「有无回执」「`contract` 是否缺失」分组的计数。脚本注释写明:unknown 不等于安全,也不等于应撤回。 +3. **补上已改状态档案上的旧产物。** 现在只看 `birth_time_status in ('accepted','confirmed')` 的档案及其 `ready` 报告。新增一段:历史记录表里出现过旧来源(旧答题、旧事件采纳、segment-v1、选边)的档案,不论当前状态,统计其名下各类型报告的数量(按报告类型、按报告状态分组)。表名、字段以仓内迁移为准;查不到对应字段就在注释里写明「无此字段」,不要猜。 +4. **零和「小于 5」分开。** 输出两列:`has_any`(`yes`/`no`)和 `count_display`(0 显示 `0`,1–4 显示 `<5`,其余显示数字)。注释写明:这是内部受权审计用的版本;外发前需再做组合披露审查,不能称为匿名保证。同时去掉可由总计减分组反推小组的输出:有分组被显示为 `<5` 时,该表不输出总计行。 +5. **说明统计的是什么。** 文件头注释写清:统计的是执行时刻的档案状态和现存报告,不是历史采用次数,也不能证明某份报告生成时用了已撤销的规则。 + +## 二、合成数据测试 + +新增 `frontend/tests/rectification-p0-aggregate-v2-20261116.test.ts`(沿用 #294 `rectification-p0-evidence-20261116.test.ts` 的做法;若那里是解析 SQL 文本的静态检查,就在此基础上增加可执行的检查): + +- 仓内已有可起本地数据库的测试设施时(参考 `frontend/tests/database-chart-choice-*.test.ts`),用**合成档案**灌入并执行新脚本,断言: + - 手选 + 旧答题痕迹的档案进 `conflict`,不进 `explicit_manual_choice`; + - 只有手选、无旧痕迹的档案进 `explicit_manual_choice`; + - 状态已改回的档案上的旧报告被第 3 点那段数到; + - 计数为 0 时 `has_any = no`、`count_display = 0`;计数为 3 时 `has_any = yes`、`count_display = <5`; + - 存在 `<5` 分组的表没有总计行; + - 输出中不含任何合成档案的出生日期、时间、标识。 +- 本地起不了数据库就保留静态检查,并在 PROGRESS 里写明哪些断言没有执行过,不要写成已验证。 +- 合成数据不得使用任何真实出生资料。 + +## 三、旧产物与消费入口检查清单 + +新建 `docs/research/rect-p0-artifact-checklist-20261116.md`。只盘点现状,不改行为。逐行给出:入口或产物、读的是什么(字段、函数、文件位置)、是否会读到旧校时结果、现有保护(测试名)、没有保护的写「无」。 + +至少覆盖: + +- 长报告、年运、合盘(含旧的独立合盘)、聊天取数卡、星盘面板、导出文件、首页; +- 各自的缓存:缓存键是什么,键里有没有出生时间来源或范围的版本;旧缓存在来源被撤销后会不会继续被读; +- 已生成并存库的报告快照:有没有「已校正」之类的状态字段;重开旧报告读的是快照还是当前档案; +- 用户已下载到本地的文件:写明服务器无法回收; +- 模型工具:聊天里的工具能不能读到或写回出生时间。 + +清单末尾列出「发现的缺口」,每条一句话,不给修复方案,不改代码。 + +## 四、文档 + +- `docs/BUG_HISTORY.md` 新增 BUG-1931(只在自己那一节内编辑;不写任何姓名、出生资料、邮箱、ID)。状态写 `resolved` 的前提是第二节的可执行断言真的跑过;否则写 `investigating` 并说明。 +- `CHANGELOG.md` 加一行。 +- `docs/tasks/PROGRESS-rect-p0-wrapup-20261116.md`:做了什么、跑了哪些命令和结果、没做到的。 + +## 验收 + +- `PATH=/bin:$PATH python scripts/run_quality_gate.py --profile quick --skip-frontend-runtime` 通过; +- `cd frontend && npx eslint .` 0 错误;新测试通过,前端全量测试不新增失败; +- 原脚本 `rect-p0-aggregate-20261116.sql` 与 `references/real_case_calibration/` 无改动; +- 没有任何运行时代码改动(diff 只含 SQL、测试、文档)。 -- 2.54.0 From 0e093419cea9d3b53ba79621f1fa1ba06f82f90c Mon Sep 17 00:00:00 2001 From: jesse-ux Date: Mon, 16 Nov 2026 16:39:50 +0800 Subject: [PATCH 2/2] docs: audit rectification source conflicts and old reports (#296) --- CHANGELOG.md | 4 + docs/BUG_HISTORY.md | 11 + .../rect-p0-aggregate-20261116-v2.sql | 225 ++++++++++++++++++ .../rect-p0-artifact-checklist-20261116.md | 24 ++ .../tasks/PROGRESS-rect-p0-wrapup-20261116.md | 25 ++ ...ification-p0-aggregate-v2-20261116.test.ts | 187 +++++++++++++++ 6 files changed, 476 insertions(+) create mode 100644 docs/operations/rect-p0-aggregate-20261116-v2.sql create mode 100644 docs/research/rect-p0-artifact-checklist-20261116.md create mode 100644 docs/tasks/PROGRESS-rect-p0-wrapup-20261116.md create mode 100644 frontend/tests/rectification-p0-aggregate-v2-20261116.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 902e38924..fb9495009 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 印度占星 Skill 更新日志 +## 2026-11-16 · 生时纠正 P0 复核统计修订 + +- BUG-1931(#296):新增聚合 SQL v2,补齐来源冲突、未知来源分组和按历史来源统计现存报告。附旧产物与消费入口检查清单。Skill 版本不变。 + ## 2026-11-16 — 生时纠正复跑逐臂核对并补齐 P0 证据 - 新增完整四臂比较、历史范围读回回归与只读聚合统计。占星 Skill 版本不变(BUG-1925)。 diff --git a/docs/BUG_HISTORY.md b/docs/BUG_HISTORY.md index 10de3991c..90406d556 100644 --- a/docs/BUG_HISTORY.md +++ b/docs/BUG_HISTORY.md @@ -26035,3 +26035,14 @@ - 验证与防复发:公开测试盘父母题本地样本(DeepSeek):改前 3 份每份 2 处「这条线」,改后 4 份合计 1 处;「底色」和补充套话改后 0 处。相关断言随新字句更新(原值 / 新值 / 原因写在测试注释里),问答测试 808 通过。未解决:「判断依据」里仍会出现 Narayana 的内部状态用语(该句受占星师裁定约束,未动)。Gemini 中转当天在本地只返回几百字的短答案(未改动的代码同样如此),因此没有 Gemini 的改后样本。 - 关联记录:BUG-1929、BUG-1928、BUG-1920。 - 修复版本:`claude/echo-words-1930`,待 staging 实测。 + +## BUG-1931 | 生时纠正聚合统计遗漏来源冲突与旧产物 + +- 状态:resolved(已在隔离 PostgreSQL 17 执行合成断言)。 +- 首次发现 / 最近更新:2026-11-16 / 2026-11-16。 +- 触发与现象:复核 #294 的 v1 统计时,重叠来源被首个匹配覆盖,已退回填报状态的档案名下旧报告漏计,零行与小样本用了同一显示。 +- 根因:来源用互斥分支判定,报告统计只关联当前采用且已完成的结果。旧独立合盘、未知来源与导出缺少足够的绑定信息。 +- 修复:保留 v1,新增只读 v2。逐项统计来源特征,单列冲突与未知明细。加入按有旧记录的主体统计现存报告,区分零行和小样本,并隐藏可减法反推小组的总计。 +- 验证与防复发:`frontend/tests/rectification-p0-aggregate-v2-20261116.test.ts` 验证手选和旧痕迹区分、旧报告统计、零值和遮蔽、总计抑制以及仅输出聚合值。新版已在使用仓内迁移的隔离数据库执行,生产统计留给负责人。 +- 关联记录:#294、#296、BUG-1890、BUG-1896、BUG-1925。 +- 修复版本:`codex/rect-p0-wrapup-20261116`。见 [旧产物清单](research/rect-p0-artifact-checklist-20261116.md) 和 [进度](tasks/PROGRESS-rect-p0-wrapup-20261116.md)。 diff --git a/docs/operations/rect-p0-aggregate-20261116-v2.sql b/docs/operations/rect-p0-aggregate-20261116-v2.sql new file mode 100644 index 000000000..c2aa09883 --- /dev/null +++ b/docs/operations/rect-p0-aggregate-20261116-v2.sql @@ -0,0 +1,225 @@ +-- Rectification P0 aggregate v2, 2026-11-16. Internal authorized audit only. +-- Business schema through staging 052e8ab6, including the chart-choice records, +-- adoption sources, annual report and marriage-match migrations. +-- Counts describe stored state at execution time and existing reports. They +-- cannot establish adoption frequency or which rule a report used at generation. +-- Output sections are named by metric. unknown_breakdown is the separate +-- unknown-profile table, grouped only by history, receipt and contract presence. +-- Unknown means neither safe nor subject to automatic withdrawal. +-- Zero is visible; 1–4 is masked. Suppress the unknown and conflict totals if +-- any of their groups is masked. No other group totals are emitted. This does not +-- guarantee anonymity. Review combined disclosure before sharing results. +-- No profile-bound browser download ledger. Legacy standalone match rows have +-- no status field; rows without a subject binding cannot be attributed. + +begin transaction isolation level repeatable read read only; + +with subjects as ( + select id as owner_id, null::uuid as subject_id, birth_time_status, birth_date, + active_birth_date, active_birth_time, active_birth_provenance as provenance + from public.profiles + union all + select user_id, id, birth_time_status, birth_date, + active_birth_date, active_birth_time, active_birth_provenance + from public.chart_profiles + where role = 'other' +), active as ( + select s.*, r.id as receipt_id, + coalesce(jsonb_typeof(r.detail -> 'provenance') = 'object' + or jsonb_typeof(r.detail -> 'decision') = 'object', false) as has_receipt, + exists ( + select 1 from public.chart_choice_records h + where h.user_id = s.owner_id and h.chart_profile_id is not distinct from s.subject_id + ) as has_history + from subjects s + left join public.chart_choice_records r + on r.user_id = s.owner_id and r.chart_profile_id is not distinct from s.subject_id + and r.saved_date = coalesce(s.active_birth_date, s.birth_date) + and r.saved_time = s.active_birth_time + and r.id = case when s.provenance ->> 'record_id' ~* '^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$' + then (s.provenance ->> 'record_id')::uuid end + where s.active_birth_time is not null and s.birth_time_status in ('accepted', 'confirmed') +), record_evidence as ( + select r.id, r.user_id, r.chart_profile_id, + r.detail #> '{provenance}' as provenance, + r.detail #> '{decision}' as decision, + coalesce(r.detail #>> '{provenance,contract}', + case when jsonb_typeof(r.detail -> 'decision') = 'object' + and r.detail #> '{decision,segment}' is null + then 'chart-choice-v1' end) as contract, + r.rule + from public.chart_choice_records r +), evidence as ( + -- Keep recorded, decision and active rules independent so one cannot mask another. + select 'history' as scope, r.user_id as owner_id, r.chart_profile_id as subject_id, + r.contract, r.provenance ->> 'source' as source, facts.rule, facts.decided_by, facts.rounds + from record_evidence r + cross join lateral ( + values (r.provenance ->> 'rule', r.provenance ->> 'decided_by', r.provenance -> 'rounds'), + (r.decision ->> 'rule', r.decision ->> 'decided_by', r.decision -> 'rounds'), + (r.rule, coalesce(r.decision ->> 'decided_by', r.provenance ->> 'decided_by'), + coalesce(r.decision -> 'rounds', r.provenance -> 'rounds')) + ) facts(rule, decided_by, rounds) + union all + select 'active', a.owner_id, a.subject_id, facts.contract, facts.source, facts.rule, facts.decided_by, facts.rounds + from active a + left join record_evidence r on r.id = a.receipt_id + cross join lateral ( + values (a.provenance ->> 'contract', a.provenance ->> 'source', a.provenance ->> 'rule', + a.provenance ->> 'decided_by', a.provenance -> 'rounds'), + (r.contract, r.provenance ->> 'source', r.provenance ->> 'rule', + r.provenance ->> 'decided_by', r.provenance -> 'rounds'), + (coalesce(r.contract, a.provenance ->> 'contract'), null, r.decision ->> 'rule', + r.decision ->> 'decided_by', r.decision -> 'rounds'), + (coalesce(r.contract, a.provenance ->> 'contract'), null, r.rule, + coalesce(r.decision ->> 'decided_by', r.provenance ->> 'decided_by'), + coalesce(r.decision -> 'rounds', r.provenance -> 'rounds')) + ) facts(contract, source, rule, decided_by, rounds) +), signals as ( + select scope, owner_id, subject_id, + coalesce(bool_or(source = 'user_choice_from_answers' or rule = 'chart_answers'), false) as old_questionnaire, + coalesce(bool_or(contract = 'chart-choice-v1' and rule = 'evidence' and decided_by = 'event'), false) as old_event, + coalesce(bool_or(contract = 'segment-v1' or source = 'server_segment_midpoint'), false) as old_segment, + coalesce(bool_or(rule = 'user_override'), false) as manual_choice, + coalesce(bool_or(contract = 'chart-choice-v2' and jsonb_typeof(rounds) = 'array' and rounds <> '[]'::jsonb), + false) as chart_side, + coalesce(bool_or(source in ('reported_time_default', 'window_midpoint_default')), false) as declared_default + from evidence + group by scope, owner_id, subject_id +), active_features as ( + select a.owner_id, a.subject_id, a.provenance, a.has_history, a.has_receipt, + s.old_questionnaire or (s.manual_choice and coalesce(h.old_questionnaire, false)) as old_questionnaire, + s.old_event or (s.manual_choice and coalesce(h.old_event, false)) as old_event, + s.old_segment or (s.manual_choice and coalesce(h.old_segment, false)) as old_segment, + s.chart_side or (s.manual_choice and coalesce(h.chart_side, false)) as chart_side, + s.manual_choice, s.declared_default + from active a + join signals s on s.scope = 'active' and s.owner_id = a.owner_id and s.subject_id is not distinct from a.subject_id + -- Old traces on the same subject leave a manual choice open to review even + -- without an active receipt. An audit conflict does not establish causality. + left join signals h on h.scope = 'history' and h.owner_id = a.owner_id and h.subject_id is not distinct from a.subject_id +), active_signals as ( + select f.*, + (old_questionnaire::int + old_event::int + old_segment::int + + manual_choice::int + chart_side::int + declared_default::int) as matches + from active_features f +), features as ( + select f.category, count(*) filter (where f.matched) as n + from (values (true)) as zero_fill(dummy) + left join active_signals a on true + cross join lateral ( + values ('old_questionnaire', a.old_questionnaire), + ('old_event', a.old_event), + ('segment-v1', a.old_segment), + ('explicit_manual_choice', a.manual_choice and a.matches = 1), + ('issue_229_chart_side', a.chart_side), + ('declared_default', a.declared_default), + ('conflict', a.matches >= 2), + ('conflict_manual_and_old', a.matches >= 2 and a.manual_choice + and (a.old_questionnaire or a.old_event or a.old_segment or a.chart_side)), + ('conflict_other', a.matches >= 2 and not (a.manual_choice + and (a.old_questionnaire or a.old_event or a.old_segment or a.chart_side))), + ('unknown', a.matches = 0) + ) f(category, matched) + group by f.category +), provenance_groups as ( + select case when provenance ->> 'contract' in ('segment-v1', 'chart-choice-v1', 'chart-choice-v2', 'agentic-rectification-v1') + then provenance ->> 'contract' when provenance ->> 'contract' is null then 'missing' else 'other' end as contract, + case when provenance ->> 'source' in ('user_choice', 'user_choice_from_answers', 'server_segment_midpoint', + 'reported_time_default', 'window_midpoint_default', 'certain') + then provenance ->> 'source' when provenance ->> 'source' is null then 'missing' else 'other' end as source, + case when provenance ->> 'rule' in ('chart_answers', 'evidence', 'user_override', 'reused_record', 'reported_time_default', + 'window_midpoint_default', 'majority', 'tie_keeps_reported', 'strong_override', + 'reported_kept', 'stopped', 'round_limit', 'no_line_in_range') + then provenance ->> 'rule' when provenance ->> 'rule' is null then 'missing' else 'other' end as rule + from active_signals +), active_retired as ( + select owner_id, subject_id + from active_signals + where provenance ->> 'retired_reason' = 'BUG-1890' or old_questionnaire or old_event or old_segment +), historical_subjects as ( + select q.owner_id, q.subject_id + from signals q + where q.scope = 'history' and (q.old_questionnaire or q.old_event or q.old_segment or q.chart_side) + and exists ( + select 1 from subjects s where s.owner_id = q.owner_id and s.subject_id is not distinct from q.subject_id + ) +), report_statuses(status) as ( + values ('generating'), ('ready'), ('failed') +), report_types(report_type) as ( + values ('personal_full'), ('personal_thematic'), ('annual_full'), ('synastry_full') +), statuses_by_type as ( + select t.report_type, s.status from report_types t cross join report_statuses s + union all select 'legacy_synastry', 'not_recorded' +), ready_reports as ( + select r.report_type + from public.personal_reports r + where r.status = 'ready' and r.report_type in (select report_type from report_types) + and exists ( + select 1 from active_retired s where s.owner_id = r.user_id + and (s.subject_id is not distinct from r.chart_profile_id + or (r.report_type = 'synastry_full' and r.partner_chart_profile_id = s.subject_id)) + ) +), historical_reports as ( + select r.report_type, r.status + from public.personal_reports r + where r.report_type in (select report_type from report_types) + and exists ( + select 1 from historical_subjects s where s.owner_id = r.user_id + and (s.subject_id is not distinct from r.chart_profile_id + or (r.report_type = 'synastry_full' and r.partner_chart_profile_id = s.subject_id)) + ) + union all + select 'legacy_synastry', 'not_recorded' + from public.synastry_reports r + where exists ( + select 1 from historical_subjects s where s.owner_id = r.user_id + and coalesce(s.subject_id::text, 'self') in (r.subject_low, r.subject_high) + ) +), presence(flag) as ( + values (true), (false) +), unknown_counts as ( + select h.flag as has_history, r.flag as has_receipt, m.flag as missing_contract, count(a.owner_id) as n + from presence h cross join presence r cross join presence m + left join active_signals a on a.matches = 0 and a.has_history = h.flag and a.has_receipt = r.flag + and (a.provenance ->> 'contract' is null) = m.flag + group by h.flag, r.flag, m.flag +), counts as ( + select 'provenance' as metric, null::text as category, contract, source, rule, + null::text as report_type, null::text as report_status, null::boolean as has_history, + null::boolean as has_receipt, null::boolean as missing_contract, count(*) as n + from provenance_groups + group by contract, source, rule + union all + select 'feature', category, null, null, null, null, null, null, null, null, f.n + from features f + where (f.category <> 'unknown' or not exists (select 1 from unknown_counts u where u.n between 1 and 4)) + and (f.category <> 'conflict' or not exists ( + select 1 from features child where child.category in ('conflict_manual_and_old', 'conflict_other') + and child.n between 1 and 4 + )) + union all + select 'unknown_breakdown', null, null, null, null, null, null, has_history, has_receipt, missing_contract, n + from unknown_counts + union all + select 'active_retired', null, null, null, null, null, null, null, null, null, count(*) from active_retired + union all + select 'ready_reports_on_retired', null, null, null, null, t.report_type, 'ready', null, null, null, count(r.report_type) + from report_types t left join ready_reports r using (report_type) + group by t.report_type + union all + select 'reports_on_historical_sources', null, null, null, null, t.report_type, t.status, null, null, null, count(r.report_type) + from statuses_by_type t left join historical_reports r on r.report_type = t.report_type and r.status = t.status + group by t.report_type, t.status +) +select metric, category, contract, source, rule, report_type, report_status, + case has_history when true then 'yes' when false then 'no' end as has_history, + case has_receipt when true then 'yes' when false then 'no' end as has_receipt, + case missing_contract when true then 'yes' when false then 'no' end as missing_contract, + case when n = 0 then 'no' else 'yes' end as has_any, + case when n between 1 and 4 then '<5' else n::text end as count_display +from counts +order by metric, category, contract, source, rule, report_type, report_status, + has_history, has_receipt, missing_contract; + +commit; diff --git a/docs/research/rect-p0-artifact-checklist-20261116.md b/docs/research/rect-p0-artifact-checklist-20261116.md new file mode 100644 index 000000000..5fcd5fb2d --- /dev/null +++ b/docs/research/rect-p0-artifact-checklist-20261116.md @@ -0,0 +1,24 @@ +# 生时纠正 P0 旧产物与消费入口检查清单 + +按 staging 052e8ab6 的源码、迁移和现有回归盘点。`readBirthRow` 是档案读取投影。它把可识别的停用采用结果替换为原报时或原填范围的代表分钟,并保留原范围。覆盖包括旧答题、segment-v1 和能与当前采用精确匹配的旧事件回执。读取投影不更新历史记录。 + +| 入口或产物 | 读的字段与代码位置 | 缓存键和撤回后的行为 | 已有保护 | +| --- | --- | --- | --- | +| 长报告新算、生成续跑 | `personal-report-worker-subject.ts` 的 `loadReportWorkerProfile` 经 `report-subject-birth.ts` 取当前指定主体。`personal-report-longform-birth.ts` 的 `buildLongformBirthPayload` 传出生时、时间来源、确认状态和范围。 | 已知请求以账号和请求号查找,`request_fingerprint` 用于幂等。`personal-report-longform-snapshot.ts` 以账号、请求号和 `longform-calculation-snapshot-v1` 读生成快照。`contentSha256` 校验正文完整性。新请求用当前投影,原请求可继续读取先前快照。快照查找键无停用来源或范围版本。 | `retired-birth-window-1890.test.ts` 的 `retired questionnaire and segment adoptions read the original chart, report window, and chat clock`。已排队旧快照的来源复核无。 | +| 长报告重开 | `api/reports/[reportId]/route.ts` 按所有者及报告号取 `personal_reports.report_document`,按需读取快照中的阅读与英文版。报告文档可有 `subject.birthTimeStatus`、`subject.birthFingerprint`。 | `resolveReportRead` 校验存档的文档结构及证据哈希。重开读取生成时的快照,仍可能有旧采用结果。无统一的独立「已校正」标志,也无当前停用来源比对。 | `report-birth-binding.test.ts` 的 `documents without the field (old reports) still parse; a malformed fingerprint does not`、`GET /api/reports/:id no longer looks up the subject for a cover (M5)`。旧快照来源复核无。 | +| 年运新算与重开 | `annual-report-server.ts` 取当前主体。`annualBirthTime` 生成 `birth_window` 及代表时刻。详情 API 经 `readAnnualSnapshot` 读 `annual-report-snapshot`,等候中的报告也可读已完成节。 | `findAnnualReport` 按账号、主体、报告类型和 `annual::` 查找生成中/现成报告,键无档案来源或范围版本。重开仍读取对应请求号的快照。旧区间、输入或判定可随既有快照继续显示,无统一「已校正」标志。 | `rectification-p0-evidence-20261116.test.ts` 的 `a retired profile reaches new chart and report readers with its declaration and leaves history intact`。旧同周期成果复用的来源保护无。 | +| 完整合盘 | `synastry-full-create.ts` 的 `openSynastryPair` 与 `marriage-match-service.ts` 的 `loadSynastrySubjectBirth` 按双方当前主体读时刻和范围。详情 API 以账号、请求号及 `synastry-full-snapshot` 读 `publicSynastryView`。 | `pairQuery` 键含账号、规范化双主体、两份 `marriageMatchFingerprint` 和规则版本。指纹含计算时刻、坐标、时区、岁差、节点、有效范围和确认标记,无独立来源版本。有效输入变化会换键。直接打开原报告号仍读快照,可含旧时刻和附录。 | `marriage-match-service.test.ts` 的 `a changed birth fingerprint is not the stored row` 验证共用指纹的缓存区隔。已生成完整合盘的来源复核无。 | +| 旧独立合盘 | `api/synastry-reports/route.ts` 的 GET 读账号自己的 `synastry_reports.report`(`rules_version` 为空)。同表有较新的可绑定配对快照,计算查询见 `marriage-match-service.ts`。 | 旧列表按账号、空规则版本、创建时间读取,未绑定主体的旧行无可用档案键、报告状态或通用「已校正」字段。已绑定的新配对按双主体、两份出生指纹和规则版本复用。旧列表仍可呈现历史结果。 | 新配对的 `swapped ids hit the same stored row` 和 `a changed birth fingerprint is not the stored row`。旧独立产物的撤回检查无。 | +| 聊天取数卡 | `api/consult/route.ts` 取当前指定主体的时刻,经 `consultation-route-service.ts` 的 `prepareConsultationRoute` 产出 `serverChart` 或 `declared_birth_window`。历史会话已交付正文仍是旧消息。 | `consultation-tools.ts` 的计算/证据缓存限本次请求。历史会话以会话和消息读取,无档案来源或范围版本比对。新回合可用原报范围,旧取数卡仍可能包含旧结果。 | `retired-birth-window-1890.test.ts` 的 `retired questionnaire and segment adoptions read the original chart, report window, and chat clock`。已交付消息的来源复核无。 | +| 星盘面板 | `chart-view-service.ts` 经主体读取调用 `prepareChartViewProfile`;`chart-view-profile-read.ts` 交付有效时刻、范围及档案指纹。 | `chartViewEngineCacheKey` 用账号、主体、计算路径和过运日期等调用作用域,以及日期、时刻、位置、时区、岁差和节点。无独立来源或范围版本。时刻变化时换键,时刻相同可以复用盘体。`use-chart-page.ts` 在账号或档案指纹改变时替换客户端页状态。 | P0 六入口合成测试与 `report-birth-binding.test.ts` 的 `the report fingerprint is the chart page's profileFingerprint (same function, stored row)`。来源撤回且时刻不变时的专门缓存回归无。 | +| 导出与已下载文件 | `report-export-blocks.ts`、`annual-report-export.ts`、`synastry-report-export.ts` 和 `consultation-report-export.ts` 用当前已渲染的报告、存档快照或聊天答案构造 Markdown。 | 导出函数没有再次读取档案,也没有服务器下载台账或单独档案缓存键。旧快照可再次导出;下载到本地的文件服务器无法回收。 | `annual-md-export-20261113.test.tsx` 的 `annual export supports old snapshots with separate windows and a single-column audit` 覆盖兼容读取。快照来源复核与外部文件回收保护无。 | +| 首页及今日卡 | `api/account/route.ts` 由 `readBirthRow` 投影本人资料,其他主体由 `api/chart-profiles/route.ts` 读取。`(app)/page.tsx` 用 `takeHomeWarmStart` 的初值和后续账号/档案刷新。 | `home-warm-start.ts` 的挂载记忆键是导航目标对象、URL 和 10 秒时限,读取上一次账号/档案投影。`daily-starlanguage.ts` 的卡片键含账号、主体、档案计算指纹与当地日。档案计算指纹含有效日期、时刻、时区、坐标和时间状态。两者没有独立的来源撤回版本。后续账号读取按当前档案投影。 | P0 六入口测试与 `birth-time-consultation-consent.test.ts` 的 `account refresh identities reject an older response after a newer case request starts`。撤回瞬间的内存暖启动复核无。 | +| 聊天模型工具 | `mastra/consultation-tools.ts` 中 `run-jyotish-consultation` 和 `run-jyotish-window-consultation` 消费本次服务端选择的时间或范围。模型能用计算结果和证据回执。能打开纠正邀请,工具注册不含采用出生时刻的写接口。 | `read-consultation-evidence` 只查本回合内存计算回执,按请求和证据段访问,无跨回合档案键。邀请工具不会写回出生时刻;采用发生在独立用户操作。 | P0 测试覆盖聊天取原范围,`legacy choice requests reject individually, on repeat and concurrently without storage writes` 覆盖停用采用接口。回读旧已生成聊天证据时的来源复核无。 | + +## 发现的缺口 + +- 没有把长报告、年运和合盘的历史快照与当前停用来源逐份复核的字段或读时检查。 +- 年运已有同主体同周期快照的匹配键没有纳入档案时间来源或范围版本。 +- 旧独立合盘中缺双主体绑定的行、浏览器导出和已下载文件不能按档案追溯。 +- 首页暖启动和已交付历史聊天内容可能保留上一次投影或当时的计算依据。 +- 星盘缓存按有效计算输入复用,来源撤回而有效时刻相同时缺少专门的回归证据。 diff --git a/docs/tasks/PROGRESS-rect-p0-wrapup-20261116.md b/docs/tasks/PROGRESS-rect-p0-wrapup-20261116.md new file mode 100644 index 000000000..ce48ecbac --- /dev/null +++ b/docs/tasks/PROGRESS-rect-p0-wrapup-20261116.md @@ -0,0 +1,25 @@ +# #296 生时纠正 P0 统计复核 + +- 开工基线 `052e8ab6add2155783155fc10616eac294caf271`。任务书提交 `7dfac594fac63e2ea4ff4409f66f35f5194aefa4`。关联 BUG-1931、#294、BUG-1890、BUG-1896、BUG-1925。 +- 保留 v1,新增 [只读聚合 v2](../operations/rect-p0-aggregate-20261116-v2.sql)。每个来源特征独立计数。只统计单独命中的手选为 `explicit_manual_choice`。当前采用与精确匹配的回执分别识别,不能用回执掩过已存来源,也不能用当前来源掩过回执中的旧痕迹。手选若在同主体历史中还有旧来源痕迹,也计冲突,即使没有当前回执指针。冲突表示需要核对,无法证明其中一次采用造成另一次采用。 +- `unknown_breakdown` 只按同主体有无历史、当前精确关联回执有无结构化来源或决定、当前档案缺不缺 `contract` 计数。冲突和未知总计在有小组被遮蔽时隐藏。零显示 `0` 和 `no`,1–4 显示 `<5` 和 `yes`。分组只输出固定词表。 +- 历史来源段独立于当前状态。对同一账号下的主体按历史收录长报告、主题报告、年运与完整合盘的现存行,分生成、完成、失败。合盘双方任一匹配即统计一次。可绑定的旧独立合盘单列,状态标示 `not_recorded`。统计报告存量,不能证明生成时的来源。 +- [旧产物与消费入口清单](../research/rect-p0-artifact-checklist-20261116.md) 记录当前输入、缓存键和已生成结果的读取边界。 + +## 验证 + +- `node node_modules/tsx/dist/cli.mjs --test tests/rectification-p0-aggregate-v2-20261116.test.ts` 两项通过。用仓内迁移在隔离 PostgreSQL 17 创建测试库。合成数据覆盖手选冲突、单独手选、未知分组、档案返回填报状态后仍可统计的报告、零和 1–4 区分、部分总计抑制和输出隐私。 +- 隔离测试首次运行时迁移子进程返回通用失败。最终测试直接调用同一仓内迁移函数,再走 PostgreSQL 客户端执行整份只读脚本。合成档案先写声明,再按实际数据库触发器边界写采用数据。 +- `npx --no-install eslint .` 为 0 错误,63 个既有警告。 +- `tsc --noEmit` 和 `npm run build` 通过。基线和候选首页都保持静态,39 个 JS/CSS 入口资产 gzip 各为 616 927 字节,变化 0%。 +- 生时纠正、长报告绑定、年运导出和合盘缓存的定向组合共 25 项通过。 +- 原生 Windows `npm test` 全量初跑,基线 3 903 项、70 项失败,候选 3 905 项、59 项失败,均无取消。按名字对照,候选出现 6 个基线未失败项,其中 5 个(含新增 PostgreSQL 用例)受共享的 Docker 测试端口耗尽影响,另一个是依赖调度时间的回答时钟断言。隔离库定向用例已通过。 +- Linux 快速门初跑有 2 项环境失败。修正容器中缺少 Node 和 `origin/staging` 未指向真实开工基线两个问题后,两份相关 Python 测试文件的 15 项定向复验通过。 +- 对照复跑用统一的 4 个前端测试并发,Docker 对这两轮全量不可用。基线 3 903 项(3 822 通过、37 跳过),候选 3 905 项(3 823 通过、38 跳过),相同 44 项失败,均无取消。按用例名逐项核对,原用例无缺失、新增失败为零。额外跳过的是另在隔离数据库通过的新增 PostgreSQL 用例。回答时钟断言在两端单跑都通过。 +- Linux Python 3.11.18、Node 22.23.2 上运行 `PATH=/bin:$PATH python scripts/run_quality_gate.py --profile quick --skip-frontend-runtime`,通过。 +- 原 SQL、冻结归档、应用运行时代码均无改动。既有测试断言未改动。 + +## 缺口 + +- 生产脚本由产品负责人按受控流程执行,实际统计值仍无。无主体关联的旧独立合盘、浏览器导出及本地下载无法按档案计数。 +- 审计分组可能发生组合披露,发布任何实际计数前仍需审核。旧快照重新核验、缓存失效和产品行为变更留在本单范围之外。 diff --git a/frontend/tests/rectification-p0-aggregate-v2-20261116.test.ts b/frontend/tests/rectification-p0-aggregate-v2-20261116.test.ts new file mode 100644 index 000000000..2bb6b6e5f --- /dev/null +++ b/frontend/tests/rectification-p0-aggregate-v2-20261116.test.ts @@ -0,0 +1,187 @@ +import assert from "node:assert/strict"; +import { spawnSync } from "node:child_process"; +import { randomUUID } from "node:crypto"; +import { readFileSync } from "node:fs"; +import test from "node:test"; +import { fileURLToPath } from "node:url"; +import { Client, type QueryResult } from "pg"; +import { runMigrations } from "../scripts/db-migrate.mjs"; +import { startPostgresFixture } from "./helpers/postgres-fixture.ts"; + +const script = readFileSync( + new URL("../../docs/operations/rect-p0-aggregate-20261116-v2.sql", import.meta.url), + "utf8", +); +const docker = spawnSync("docker", ["version"], { stdio: "ignore" }).status === 0; + +test("BUG-1931 aggregate SQL is one read-only repeatable-read transaction", () => { + const sql = script.replace(/^--.*$/gm, "").trim(); + assert.match(sql, /^begin transaction isolation level repeatable read read only;/i); + assert.match(sql, /\bcommit;$/i); + assert.doesNotMatch(sql, /\b(?:insert|update|delete|create|alter|truncate|copy)\b/i); +}); + +type AggregateRow = { + metric: string; + category: string | null; + contract: string | null; + source: string | null; + rule: string | null; + report_type: string | null; + report_status: string | null; + has_history: string | null; + has_receipt: string | null; + missing_contract: string | null; + has_any: string; + count_display: string; +}; + +test("BUG-1931 audits source conflicts, unknowns and old reports with synthetic PostgreSQL data", { + skip: !docker && "docker unavailable", +}, async () => { + const fixture = startPostgresFixture(); + const url = fixture.connectionUrl("schema_owner", "schema-owner-test-password"); + const db = new Client({ connectionString: url }); + // All times, identifiers and report content below are fictional. + const date = "2042-02-03"; + const time = "03:04:05"; + const ownerIds: string[] = []; + const recordIds: string[] = []; + const customSource = "synthetic-provenance-outside-allowlist"; + const privateText = "synthetic-report-body"; + const reportId = randomUUID(); + + async function addProfile(provenance: Record | null, accepted = true) { + const id = randomUUID(); + ownerIds.push(id); + fixture.psqlAs("identity_runtime", "identity-runtime-test-password", + "insert into identity.users(id,name,email,email_verified) values ('" + id + + "','Fictional Aggregate Fixture','" + id + "@example.invalid',true)"); + const declaration = await db.query( + "update public.profiles set birth_date=$2, reported_birth_time=$3, birth_time_status='reported' where id=$1", + [id, date, time], + ); + assert.equal(declaration.rowCount, 1); + if (accepted) { + await db.query( + "update public.profiles set birth_time_status='accepted', active_birth_date=$2, active_birth_time=$3, " + + "active_birth_provenance=$4 where id=$1", + [id, date, time, provenance], + ); + } + return id; + } + + async function addReceipt(ownerId: string, rule: string, detail: Record) { + const id = randomUUID(); + recordIds.push(id); + await db.query( + "insert into public.chart_choice_records " + + "(id,user_id,saved_date,saved_time,timezone_offset,chosen_side,rule,declaration,detail) " + + "values ($1,$2,$3,$4,0,'none',$5,'{}',$6)", + [id, ownerId, date, time, rule, detail], + ); + return id; + } + + try { + const migration = await runMigrations({ + connectionString: url, + migrationsDirectory: undefined, + migrationsDirectories: ["../db/migrations", "../supabase/migrations"].map( + (directory) => fileURLToPath(new URL(directory, import.meta.url)), + ), + }); + assert.equal(migration, 0); + await db.connect(); + + const manual = { contract: "chart-choice-v2", source: "user_choice", rule: "user_override" }; + const questionnaire = { + contract: "chart-choice-v2", source: "user_choice_from_answers", rule: "chart_answers", + }; + for (let index = 0; index < 5; index += 1) await addProfile(manual); + for (let index = 0; index < 3; index += 1) { + const id = await addProfile(manual); + const recordId = await addReceipt(id, "chart_answers", { provenance: questionnaire }); + await db.query("update public.profiles set active_birth_provenance=$2 where id=$1", + [id, { ...manual, record_id: recordId }]); + await addProfile({ source: customSource }); + } + const manualWithHistory = await addProfile(manual); + await addReceipt(manualWithHistory, "evidence", { decision: { rule: "evidence", decided_by: "event" } }); + const withHistory = await addProfile({ contract: "chart-choice-v1", source: customSource }); + const unknownReceipt = await addReceipt(withHistory, "majority", { decision: { rule: "majority" } }); + await db.query("update public.profiles set active_birth_provenance=$2 where id=$1", + [withHistory, { contract: "chart-choice-v1", source: customSource, record_id: unknownReceipt }]); + const event = { contract: "chart-choice-v1", rule: "evidence", decided_by: "event" }; + const changed = await addProfile(event); + await addReceipt(changed, "evidence", { decision: { rule: "evidence", decided_by: "event" } }); + await db.query( + "update public.profiles set birth_time_status='reported', active_birth_time=null where id=$1", + [changed], + ); + await db.query( + "insert into public.personal_reports (id,user_id,request_id,request_fingerprint,report_type,status," + + "schema_version,presentation_mode,skill_snapshot_sha256,failure_code) " + + "values ($1,$2,$3,repeat('a',64),'annual_full','failed','annual_report.v1','default'," + + "repeat('b',64),'report_guard_rejected')", + [reportId, changed, randomUUID()], + ); + const unrelated = await addProfile(null, false); + await db.query( + "insert into public.synastry_reports (user_id,report,subject_low,subject_high) " + + "values ($1,$3,'self',$4),($1,$3,null,null),($2,$3,'self',$4)", + [changed, unrelated, { preview: privateText }, randomUUID()], + ); + + const result = await db.query(script); + const results: QueryResult[] = Array.isArray(result) ? result : [result]; + const [begin, aggregate, commit] = results; + assert.equal(begin.command, "BEGIN"); + assert.equal(commit.command, "COMMIT"); + assert.deepEqual(aggregate.fields.map((field) => field.name), [ + "metric", "category", "contract", "source", "rule", "report_type", "report_status", + "has_history", "has_receipt", "missing_contract", "has_any", "count_display", + ]); + const rows = aggregate.rows; + const count = (match: Partial) => rows + .filter((row) => Object.entries(match).every(([key, value]) => row[key as keyof AggregateRow] === value)) + .map(({ has_any, count_display }) => [has_any, count_display]); + assert.deepEqual(count({ metric: "feature", category: "explicit_manual_choice" }), [["yes", "5"]]); + assert.deepEqual(count({ metric: "feature", category: "old_questionnaire" }), [["yes", "<5"]]); + assert.deepEqual(count({ metric: "feature", category: "old_event" }), [["yes", "<5"]]); + assert.deepEqual(count({ metric: "feature", category: "conflict_manual_and_old" }), [["yes", "<5"]]); + assert.deepEqual(count({ metric: "feature", category: "conflict_other" }), [["no", "0"]]); + assert.deepEqual(count({ metric: "feature", category: "conflict" }), []); + assert.deepEqual(count({ metric: "feature", category: "unknown" }), []); + assert.deepEqual(count({ + metric: "unknown_breakdown", has_history: "no", has_receipt: "no", missing_contract: "yes", + }), [["yes", "<5"]]); + assert.deepEqual(count({ + metric: "unknown_breakdown", has_history: "yes", has_receipt: "yes", missing_contract: "no", + }), [["yes", "<5"]]); + assert.deepEqual(count({ + metric: "unknown_breakdown", has_history: "yes", has_receipt: "no", missing_contract: "yes", + }), [["no", "0"]]); + assert.deepEqual(count({ + metric: "reports_on_historical_sources", report_type: "annual_full", report_status: "failed", + }), [["yes", "<5"]]); + assert.deepEqual(count({ + metric: "reports_on_historical_sources", report_type: "legacy_synastry", report_status: "not_recorded", + }), [["yes", "<5"]]); + assert.deepEqual(count({ + metric: "ready_reports_on_retired", report_type: "annual_full", report_status: "ready", + }), [["no", "0"]]); + assert.ok(!rows.some((row) => row.metric === "total" || row.category === "total")); + const output = JSON.stringify(rows); + for (const privateValue of [date, time, ...ownerIds, ...recordIds, reportId, customSource, privateText]) { + assert.equal(output.includes(privateValue), false, "aggregate leaked a fixture value"); + } + } finally { + try { + await db.end(); + } finally { + fixture.stop(); + } + } +}); -- 2.54.0