diff --git a/BLOCKED.md b/BLOCKED.md index 244df7795..9971eba23 100644 --- a/BLOCKED.md +++ b/BLOCKED.md @@ -873,3 +873,9 @@ - ~~默认试算时长和页面文案待确认。~~ 生时纠正页按实际前后各 15 分钟显示。 - 受影响的已生成报告快照、来源不明的旧采纳数量仍需受控 staging 聚合查询。可核对字段和现有替代证据见进度记录。 - 详见 [#279 进度](docs/tasks/PROGRESS-rect-p0-20261115.md)。 + +## #325 行运同本命星座事实验证缺口 + +- 本机碎片扫描 90 秒和定向预检 45 秒超时;远端、Python 与适配器通过。新功能用合成入座表和仓库公开 golden 独立验证。 +- 完整前端余下 21 项数据库 / 备份测试失败,40 项被套件跳过;两者来自隔离容器无法连接 PostgreSQL。与基线逐名对照无新增失败,不改动数据库或旧断言消红。条目名称见本轮进度。 +- 真实模型回答与登录浏览器验收未执行,交独立验收;只交付分支和 staging PR。完整自动化结果见 [#325 进度](docs/tasks/PROGRESS-transit-natal-return-20261118.md)。 diff --git a/CHANGELOG.md b/CHANGELOG.md index fcbb31c89..12a17a9b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 印度占星 Skill 更新日志 +## 2026-11-18 · 问答卡补充土星、木星同本命星座事实 + +- 年运、应期和综合卡标出同名星是否同座,日期只用已有换座记录,缺失照实标注。Skill 版本沿用(BUG-1995)。 + ## 2026-11-17 · 生时纠正暂停未验收的 Shadbala 加减分 - Python 同步暂停旧答题与事件评分请求。声明保存与用户自选照常,Skill 版本沿用(BUG-1966)。 diff --git a/docs/BUG_HISTORY.md b/docs/BUG_HISTORY.md index 80a461a5b..fbe36dc4f 100644 --- a/docs/BUG_HISTORY.md +++ b/docs/BUG_HISTORY.md @@ -26907,3 +26907,14 @@ - 验证与防复发:`frontend/tests/staging-backend-workflows.test.ts` 钉住三处。镜像地址和执行机器上的实际表现要到发布当天才能验证,失败时回退到默认源。预演记录在仓库外的上线材料里。 - 关联记录:BUG-1998、BUG-1991。 - 修复版本:与 BUG-1998 同批。 + +## BUG-1995 | 问答行运事实缺少土星、木星与本命同名星同座的判断 + +- 状态:fixed-pending-verify(待独立验收)。 +- 首次发现 / 最近更新:2026-11-18 / 2026-11-18。 +- 现象与触发:上线问答对照中,未来时间题的数据卡没有行运星与本命同名星同座的事实,模型无法从卡上读出这项位置关系。 +- 根因:卡片携带本命位置、当前行运位置和入座日期,但没有连接同名星的星座比较字段。 +- 修复:只在 annual、timing、general 的卡片上给土星和木星加 transit_natal_sign。星座值照抄已有数据,同座布尔值只做相等比较;同座起止只复用观测日两侧最近的已有入座记录,缺失写 not_available。证据编号沿用 ev:transit:<星>,新增覆盖模板。不增加解读句,不重新计算日期。 +- 验证与防复发:新增 consult-transit-natal-sign-1995.test.ts,覆盖同座、不同座、缺日期、缺位置、逆行再次入座、观测日入座、三张公开 golden 的领域选择及模型视图证据覆盖;旧卡片与覆盖合同一并验证。完整结果见 #325 进度。 +- 关联记录:BUG-1976、BUG-1978、BUG-1982;Gitea #325。 +- 修复版本:codex/transit-natal-return-20261118,待独立验收。 diff --git a/docs/research/pre_work_error_ledger.md b/docs/research/pre_work_error_ledger.md index 1cb63e2db..e08fe5e4b 100644 --- a/docs/research/pre_work_error_ledger.md +++ b/docs/research/pre_work_error_ledger.md @@ -702,3 +702,9 @@ Prevention: 开工作树前先看 `df -i /`;工作树用完、内容已推送 ## 2026-11-17 · #323 Windows 预检 - Gitea 远端可见性、Python 运行时与外部适配器诊断通过。独立工作树的碎片扫描超过 90 秒,定向预检超过 45 秒。独立检查使用真实 Python HTTP 和合成引擎输入。见 [#323 进度](../tasks/PROGRESS-rect-cut-shadbala-scoring-20261117.md)。 + +## 2026-11-18 · #325 独立校验快照 + +- Windows 完整前端基线出现 shell / WSL、PostgreSQL、YAML 和文件系统类失败。改用保留 Git 符号链接的 Linux 归档校验,不修改业务代码或旧断言适配环境。 +- Linux 初轮快照只有 Git index、没有 HEAD,离线报告验收因此无法生成资料;独立 venv 未装 swisseph 时,合盘资料测试无法导入。补齐隔离验证提交和与快速门相同的 Python 依赖后复验。验证提交仅存在本任务的临时 Linux 快照,不是仓库交付提交。 +- 两个快照都不连接宿主 Docker daemon,数据库及依赖数据库的备份用例保留为环境缺口。失败条目和结果见 [#325 进度](../tasks/PROGRESS-transit-natal-return-20261118.md)。 diff --git a/docs/tasks/PROGRESS-transit-natal-return-20261118.md b/docs/tasks/PROGRESS-transit-natal-return-20261118.md new file mode 100644 index 000000000..eeb992714 --- /dev/null +++ b/docs/tasks/PROGRESS-transit-natal-return-20261118.md @@ -0,0 +1,103 @@ +# #325 行运与本命同名星同座事实 + +执行者:Codex。任务书:[TASK-transit-natal-return-20261118.md](TASK-transit-natal-return-20261118.md)。 +可信规划:Gitea #325 评论 46262;本轮认领评论 46284,执行锁事件 46283。 + +## 基线与实现 + +- 从远端 staging `25af95f2d9bc02510516509b99c62cb504c50a31` 创建独立 worktree,快进到指定分支的任务书提交 `36cc594c14c3539d9d9d12aee997c85abc06ae61`。 +- 分支:`codex/transit-natal-return-20261118`;发布范围为该分支和 base=staging 的 PR。 +- `consultation-transit-natal-sign.ts` 只比较已有本命和当前行运的星座。只给土星、木星输出位置、同座布尔值及既有 `ev:transit:<星>` 编号;只在 annual、timing、general 段附加 `transit_natal_sign`。 +- 同座时,日期仅从现有卡片 key_dates 的入座行取。按观测日两侧最近边界区分逆行离座和再次入座;不取停滞日、窗口端点或别次经过的日期。没有的边界写 `not_available`;位置缺失不写成 false。 +- 证据覆盖登记新增字段;旧卡片全部事实覆盖检查保持通过。没有改动引擎、提示词、数据库、工作流或界面。 + +## 公开盘改前与改后 + +使用仓库已有真实引擎 golden 的 Taylor 公开盘,不复制出生输入。改前没有这一字段;改后这三类卡片各加: + +```json +[ + {"planet":"Saturn","natal_sign":"Capricorn","transit_sign":"Pisces","same_sign":false,"evidence_id":"ev:transit:Saturn"}, + {"planet":"Jupiter","natal_sign":"Cancer","transit_sign":"Cancer","same_sign":true,"evidence_id":"ev:transit:Jupiter","start":"not_available","end":"2026-10-21"} +] +``` + +观测日期沿用 golden,不把样例当作当前天象。这里仅展示计算事实,不作占星解读。 + +模型视图 JSON 字符数(含证据索引、无附加解读合同;同一测试问题): + +| 公开盘 | 领域 | 改前 | 改后 | 增量 | +| --- | --- | ---: | ---: | ---: | +| Jobs | annual | 112297 | 112557 | 260 | +| Jobs | timing | 103325 | 103585 | 260 | +| Jobs | general | 115125 | 115385 | 260 | +| Obama | annual | 115860 | 116127 | 267 | +| Obama | timing | 108366 | 108633 | 267 | +| Obama | general | 116931 | 117198 | 267 | +| Taylor | annual | 114246 | 114552 | 306 | +| Taylor | timing | 107269 | 107575 | 306 | +| Taylor | general | 118657 | 118963 | 306 | + +没有调整卡片大小上限。 + +## 既有合同测试新增字段登记 + +| 原值 | 新值 | 原因 | +| --- | --- | --- | +| 逐值来源检查没有 transit_natal_sign,evidence_id 最后分支只接受大运编号 | 保留旧字段的全部原断言;新增字段的编号另严格限定为 ev:transit:Saturn / Jupiter,日期缺口严格限定为 not_available | BUG-1995 新字段的编号及缺失标记是任务书要求的格式;另以真实 golden 逐星、逐领域核对,并验证证据索引覆盖。没有放宽既有字段断言。 | + +## 验证 + +- 新增定向与旧卡片合同:36 passed,0 failed,0 cancelled。 +- TypeScript:通过;ESLint:0 error,63 条既有 warning。 +- Python 快速门:通过,483 文件 py_compile;pytest 阶段 988.2 秒。使用 Linux 快照 `c741c2dc1e56162ab5a113395badd64306300509`,最终 Python / 前端运行源码与该快照逐字节一致。 +- 完整前端(Node 22.23.2,Linux,`node scripts/run-tests.mjs --test-concurrency=2`):基线 4088 项,4025 passed / 23 failed / 40 skipped / 0 cancelled;交付版完整复跑 4094 项,4033 passed / 21 failed / 40 skipped / 0 cancelled。退出码均为 1;余下 21 项全部在基线出现,均为隔离快照无法启动 Docker Compose PostgreSQL。下节逐条列名,不写成全量通过。 +- 逐名对照完整 TAP:旧测试名称缺失 0,新增 6,新失败 0;没有删改旧测试名称。 +- Linux 初轮归档环境另有两项失败:没有 Git HEAD 的离线报告验收、缺 swisseph 的公开合盘资料生成。补齐本任务临时验证提交及 Python venv 后,两项基线定向复验 2 passed;交付全量复跑也通过这两项。 +- 初轮新增合同说明中的用词触发旧 T2 检查,已将规范文字改为「离座后的再次入座」,旧 T2 断言原样保留。5 项相关检查和交付版完整复跑均通过。 +- 隐私检查:62 passed;推送前对最终文档与暂存范围重验。 +- 构建:Linux 两版均以 `npm run build -- --webpack` 成功,首页保持 Static;交付版 build 退出 0。首屏 32 个 JS 文件逐文件哈希相同,gzip 480629 → 480629 字节(0%);CSS gzip 95011 → 95011;HTML gzip 11010 → 11010。没有调整预算。 +- 开工预检:远端可见性、Python、引擎适配器通过;碎片扫描 90 秒、定向预检 45 秒超时。与既有 Windows 记录同类,未清理他人的目录或伪造镜像。 +- 浏览器与真实模型回答未执行,交独立验收;本单不推 staging、不部署。 + +## 完整前端的数据库环境失败名单 + +以下条目均在基线失败,最终仍因隔离容器未连接 Docker daemon、Compose 无法启动 PostgreSQL 而失败。另有 40 项由套件自己跳过。宿主 Docker 可用于构建,不能把这份缺口写成宿主没有 Docker。 + +- admin code functions reject immutable codes, revoked redemption, and roll back on audit failure +- admin customer reset clears only rebuildable application state +- service and restricted admin database identities stay separated +- Owner recovery grants only one currently loginable synced identity admin +- staging backups are encrypted, atomic, private, and retain the newest three +- billing order adjustments and redemption reasons are atomic and audited +- billing, subscriptions, usage authorization, RBAC, and model publication remain transactional +- saving a published product forks a draft and delete retires or removes it +- migration runner is serialized, atomic, drift-safe, and read-only in check mode +- foundation grants no direct runtime table DML and exposes only reviewed functions +- local PostgreSQL applies the reviewed business schema and serves authenticated business calls +- merged session setup applies the role only inside the transaction +- provider keys: copy of the old key, audited writes, last-key rule and admin_runtime reads +- personal report job migration is atomic, lease-bound, recoverable, and owner read-only +- personal report sections enforce owner-read RLS and service-owned durable transitions +- stdin PostgreSQL scripts carry large SQL and preserve transaction-local settings +- redeem security: case-sensitive hashing, rate limiting, idempotency and order ownership +- self-hosted identity migration creates Better Auth tables with least privilege +- database roles have no cluster privileges +- Better Auth supports shared user OTP/password sessions for admins +- database drops secret refs, generates immutable codes, and invalidates evidence after key rotation + +## 变更文件 + +- frontend/src/lib/consultation-transit-natal-sign.ts +- frontend/src/lib/consultation-evidence-card.ts +- frontend/src/lib/evidence-ids.ts +- frontend/src/lib/card-evidence-index.ts +- frontend/tests/consult-transit-natal-sign-1995.test.ts +- frontend/tests/consult-evidence-card-20260927.test.ts +- references/product_runtime_contract.md +- docs/BUG_HISTORY.md +- docs/research/pre_work_error_ledger.md +- docs/tasks/PROGRESS-transit-natal-return-20261118.md +- docs/tasks/README.md +- CHANGELOG.md +- BLOCKED.md diff --git a/docs/tasks/README.md b/docs/tasks/README.md index 14b724515..ee11d6b5f 100644 --- a/docs/tasks/README.md +++ b/docs/tasks/README.md @@ -7,6 +7,7 @@ - 被环境或依赖挡住的事项写进根目录 `BLOCKED.md`;Bug 事实写进 `docs/BUG_HISTORY.md`;两者不在这里重复。 - 纯文档改动不触发 staging 门禁(见 `deploy/gated-paths.txt`)。 +- [行运同本命星座事实(#325)](PROGRESS-transit-natal-return-20261118.md) — 土星、木星位置比较与证据覆盖。 - [生时纠正评分停用(#323)](PROGRESS-rect-cut-shadbala-scoring-20261117.md) — Shadbala 评分、Python 暂停及旧缓存回归。 - [生时用途政策 v2(#320)](PROGRESS-rect-purpose-policy-v2-20261117.md) — 断言组、时间粒度和三份原生 CLI 对照。 - [用途扫描缺失层(#307)](PROGRESS-rect-purpose-layers-20261117.md) — 原生计算、分钟网格和逐秒边界对照。 diff --git a/frontend/src/lib/card-evidence-index.ts b/frontend/src/lib/card-evidence-index.ts index 3f5236ca0..2f6202792 100644 --- a/frontend/src/lib/card-evidence-index.ts +++ b/frontend/src/lib/card-evidence-index.ts @@ -204,6 +204,7 @@ export const CARD_EVIDENCE_TEMPLATES: readonly Template[] = [ ["domain.*.arudha.*", "ev:arudha:{2}"], ["domain.*.karakas.*", "ev:karaka:{2}"], ["domain.*.transits.*", "ev:transit:{2}"], + ["domain.*.transit_natal_sign[]", "{.evidence_id}"], ["domain.*.slow_transits.current.*", "ev:transit:{2}"], ["domain.*.slow_transits.key_dates[]", "ev:transit_date:{.body}:{.kind}:{.to_sign|.date}"], ["domain.*.slow_transits.node_ingresses[]", "ev:transit_date:{.body}:{.kind}:{.to_sign|.date}"], diff --git a/frontend/src/lib/consultation-evidence-card.ts b/frontend/src/lib/consultation-evidence-card.ts index 4215794b8..7611788ab 100644 --- a/frontend/src/lib/consultation-evidence-card.ts +++ b/frontend/src/lib/consultation-evidence-card.ts @@ -1,3 +1,4 @@ +import { transitNatalSignFacts, type TransitNatalSignFact } from "./consultation-transit-natal-sign.ts"; import type { ConsultationDomain } from "./consultation-domain-registry.ts"; import { shadbalaMinimumRatio, shadbalaWithoutBand } from "./shadbala-minimum.ts"; import { dashaEvidenceId, shadbalaEvidenceId, yogaEvidenceId } from "./evidence-ids.ts"; @@ -656,6 +657,8 @@ export type EvidenceCardDomainSection = { /** BUG-1209: what `sav_sodhita` and `sav_score` are (EVIDENCE_CARD_LABELS.savColumns). */ sav_columns?: string; slow_transits?: Json; + /** BUG-1995: factual sign comparison, only annual / timing / general. */ + transit_natal_sign?: TransitNatalSignFact[]; double_transit?: Json; punarphoo?: Json; day_night?: Json; @@ -2839,6 +2842,14 @@ function domainSection( if (transits !== undefined) section.transits = transits; else gaps.push(`${domain}.transits`); } + if (domain === "annual" || domain === "timing" || domain === "general") { + const detail = record(base.timing.transits_detail); + const rows = transitNatalSignFacts(base.natal.planets, detail.bodies, detail.key_dates, detail.reference_date); + section.transit_natal_sign = rows; + for (const planet of ["Saturn", "Jupiter"]) { + if (!rows.some((row) => row.planet === planet)) gaps.push(`${domain}.transit_natal_sign.${planet}:not_available`); + } + } if (rule.ashtakavarga) { const table = record(localLayers.ashtakavarga); const houseScores = record(table.house_scores); diff --git a/frontend/src/lib/consultation-transit-natal-sign.ts b/frontend/src/lib/consultation-transit-natal-sign.ts new file mode 100644 index 000000000..70c6691d2 --- /dev/null +++ b/frontend/src/lib/consultation-transit-natal-sign.ts @@ -0,0 +1,57 @@ +import { SIGN_ORDER } from "./chart-view-labels.ts"; +import { recordOrEmpty as record } from "./guards.ts"; +import { transitEvidenceId } from "./evidence-ids.ts"; + +export type TransitNatalSignFact = { + planet: "Saturn" | "Jupiter"; + natal_sign: string; + transit_sign: string; + same_sign: boolean; + evidence_id: string; + start?: string; + end?: string; +}; + +const sign = (value: unknown): value is string => typeof value === "string" && (SIGN_ORDER as readonly string[]).includes(value); +const day = (value: unknown): value is string => typeof value === "string" && /^\d{4}-\d{2}-\d{2}$/.test(value); + +/** + * BUG-1995: position facts only. Dates are copied from the existing ingress + * table, never calculated or inferred from its window. The nearest boundary + * on each side must belong to this visit, including retrograde re-entries. + */ +export function transitNatalSignFacts( + natalPlanets: unknown, transitBodies: unknown, keyDates: unknown, referenceDate: unknown, +): TransitNatalSignFact[] { + const natal = record(natalPlanets); + const bodies = record(transitBodies); + const dates = Array.isArray(keyDates) ? keyDates.map(record) : []; + const facts: TransitNatalSignFact[] = []; + for (const planet of ["Saturn", "Jupiter"] as const) { + const natalSign = record(natal[planet]).sign; + const transitSign = record(bodies[planet]).sign; + // Missing positions cannot establish either true or false. + if (!sign(natalSign) || !sign(transitSign)) continue; + const fact: TransitNatalSignFact = { + planet, natal_sign: natalSign, transit_sign: transitSign, + same_sign: natalSign === transitSign, evidence_id: transitEvidenceId(planet), + }; + if (fact.same_sign) { + fact.start = "not_available"; + fact.end = "not_available"; + if (day(referenceDate)) { + const ingress = dates.filter((row) => row.kind === "ingress" + && typeof row.body === "string" && row.body.toLowerCase() === planet.toLowerCase() + && day(row.date) && sign(row.from_sign) && sign(row.to_sign) && row.from_sign !== row.to_sign) + .sort((a, b) => String(a.date).localeCompare(String(b.date))); + const previous = ingress.filter((row) => String(row.date) <= referenceDate).at(-1); + const next = ingress.find((row) => String(row.date) > referenceDate + || (row.date === referenceDate && row.from_sign === transitSign)); + if (previous?.to_sign === transitSign) fact.start = String(previous.date); + if (next?.from_sign === transitSign) fact.end = String(next.date); + } + } + facts.push(fact); + } + return facts; +} diff --git a/frontend/src/lib/evidence-ids.ts b/frontend/src/lib/evidence-ids.ts index 863537d84..09266c797 100644 --- a/frontend/src/lib/evidence-ids.ts +++ b/frontend/src/lib/evidence-ids.ts @@ -59,6 +59,11 @@ export function dashaEvidenceId(system: string, level: string, lords: readonly s return `${EVIDENCE_ID_PREFIX}dasha:${evidenceIdPart(system)}:${evidenceIdPart(level)}:${lords.map(evidenceIdPart).join(".")}`; } +/** Same identity as transit_id in scripts/consult_facts/evidence_ids.py. */ +export function transitEvidenceId(planet: string): string { + return `${EVIDENCE_ID_PREFIX}transit:${evidenceIdPart(planet)}`; +} + export function logicalKeyOf(evidenceId: string): string { return LOGICAL_KEY_PREFIX + evidenceId.slice(EVIDENCE_ID_PREFIX.length); } diff --git a/frontend/tests/consult-evidence-card-20260927.test.ts b/frontend/tests/consult-evidence-card-20260927.test.ts index 491ddb6b1..30958a880 100644 --- a/frontend/tests/consult-evidence-card-20260927.test.ts +++ b/frontend/tests/consult-evidence-card-20260927.test.ts @@ -318,6 +318,16 @@ test("every card value is a value the projection or the engine already holds (no // 原值(11): 瑜伽编号 = rule_id#方法版本@层;大运编号 = 主星@起始日 // 新值(11): 瑜伽编号 = rule_id@层;大运编号 = 主星链(Venus.Mercury),不含日期 // 原因(11): BUG-1978(占星师 2026-11-18 审核 §二.1):编号只认对象,数值和方法版本不进编号 + // BUG-1995 原值:新字段不存在;新值:仅新增字段的编号限定为土星 / 木星行运号, + // 日期缺失限定为 not_available。原因:任务书要求补同座事实,不改变旧字段的逐值断言。 + if (fieldId === "domain.transit_natal_sign.evidence_id") { + assert.ok(value === "ev:transit:Saturn" || value === "ev:transit:Jupiter", `${chart.id}/${domain} ${fieldId}`); + continue; + } + if (/^domain\.transit_natal_sign\.(start|end)$/.test(fieldId) && value === "not_available") { + assert.ok(domain === "annual" || domain === "timing" || domain === "general"); + continue; + } if (/\.evidence_id$/.test(fieldId)) { assert.ok(isEvidenceIdToken(String(value)), `${chart.id}/${domain} ${fieldId}=${JSON.stringify(value)}`); if (fieldId.includes("yogas_detail")) { diff --git a/frontend/tests/consult-transit-natal-sign-1995.test.ts b/frontend/tests/consult-transit-natal-sign-1995.test.ts new file mode 100644 index 000000000..dca858ccf --- /dev/null +++ b/frontend/tests/consult-transit-natal-sign-1995.test.ts @@ -0,0 +1,114 @@ +// BUG-1995: public engine golden responses plus synthetic ingress boundaries. +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import test from "node:test"; + +import { transitNatalSignFacts } from "../src/lib/consultation-transit-natal-sign.ts"; +import { buildEvidenceCard } from "../src/lib/consultation-evidence-card.ts"; +import { cardEvidenceRoots, uncoveredCardFacts, cardEvidenceLookup, expandCardEvidence } from "../src/lib/card-evidence-index.ts"; +import { consultationDomainIds, type ConsultationDomain } from "../src/lib/consultation-domain-registry.ts"; +import { createConsultationPlan } from "../src/lib/consultation-plan.ts"; +import { consultationWorkflowResponseSchema, toAgentConsultationContext, toModelOutput } from "../src/mastra/consultation-workflow.ts"; +import { createConsultationRuntimeState, createConsultationTools } from "../src/mastra/consultation-tools.ts"; + +type Obj = Record; +const golden = JSON.parse(readFileSync(new URL("./fixtures/consult-evidence-card-golden.json", import.meta.url), "utf8")) as { + charts: { id: string; workflow: Obj; annual_workflow: Obj; timing_workflow: Obj }[]; +}; +const natal = { Saturn: { sign: "Pisces" }, Jupiter: { sign: "Cancer" }, Mars: { sign: "Aries" } }; +const current = { ...natal, Jupiter: { sign: "Leo" } }; +const ingress = (date: string, body: string, from_sign: string, to_sign: string) => ({ kind: "ingress", date, body, from_sign, to_sign }); + +test("same and different natal signs are raw facts for Saturn and Jupiter only", () => { + assert.deepEqual(transitNatalSignFacts(natal, current, [], "2026-11-18"), [ + { planet: "Saturn", natal_sign: "Pisces", transit_sign: "Pisces", same_sign: true, evidence_id: "ev:transit:Saturn", start: "not_available", end: "not_available" }, + { planet: "Jupiter", natal_sign: "Cancer", transit_sign: "Leo", same_sign: false, evidence_id: "ev:transit:Jupiter" }, + ]); +}); + +test("dates come from the current visit, with retrograde visits kept apart and stations ignored", () => { + const dates = [ + ingress("2027-02-05", "jupiter", "Leo", "Cancer"), + ingress("2026-12-01", "saturn", "Pisces", "Aries"), + ingress("2026-08-01", "saturn", "Pisces", "Aries"), + ingress("2026-09-01", "saturn", "Aries", "Pisces"), + { kind: "station", body: "saturn", date: "2026-10-01" }, + ingress("2026-01-01", "Saturn", "Aquarius", "Pisces"), + ]; + const snapshot = structuredClone(dates); + const [saturn] = transitNatalSignFacts(natal, current, dates, "2026-11-18"); + assert.equal(saturn!.start, "2026-09-01"); + assert.equal(saturn!.end, "2026-12-01"); + assert.deepEqual(dates, snapshot, "input is unchanged"); +}); + +test("one available boundary stays visible; window endpoints, future returns and missing positions are not filled in", () => { + const [saturn] = transitNatalSignFacts(natal, current, [ + ingress("2026-12-01", "saturn", "Pisces", "Aries"), + ingress("2027-01-01", "saturn", "Aries", "Pisces"), + ], "2026-11-18"); + assert.equal(saturn!.start, "not_available"); + assert.equal(saturn!.end, "2026-12-01"); + const [missingReference] = transitNatalSignFacts(natal, current, [ingress("2026-09-01", "saturn", "Aries", "Pisces")], undefined); + assert.equal(missingReference!.start, "not_available"); + assert.equal(missingReference!.end, "not_available"); + assert.deepEqual(transitNatalSignFacts({}, {}, [], "2026-11-18"), []); + assert.deepEqual(transitNatalSignFacts({ Saturn: { sign: "not_available" } }, { Saturn: { sign: "not_available" } }, [], "2026-11-18"), []); +}); + +test("an ingress on the observation day belongs to the observed sign, not a prior visit", () => { + const dates = [ingress("2026-11-18", "saturn", "Aries", "Pisces")]; + assert.equal(transitNatalSignFacts(natal, current, dates, "2026-11-18")[0]!.start, "2026-11-18"); + assert.equal(transitNatalSignFacts({ Saturn: { sign: "Aries" } }, { Saturn: { sign: "Aries" } }, dates, "2026-11-18")[0]!.end, "2026-11-18"); +}); + +function card(workflow: Obj, domain: ConsultationDomain) { + const context = toAgentConsultationContext(consultationWorkflowResponseSchema.parse(structuredClone(workflow))); + const packet = toModelOutput(context, createConsultationPlan({ userIntent: "q", theme: domain }), domain); + return buildEvidenceCard([{ domain, context, packet }]); +} + +test("all public golden cards add the two facts only to annual, timing and general, copied from their own source", () => { + for (const chart of golden.charts) { + for (const domain of consultationDomainIds) { + const workflow = domain === "annual" ? chart.annual_workflow : domain === "timing" ? chart.timing_workflow : chart.workflow; + const built = card(workflow, domain); + const section = built.domain_sections[domain]!; + if (!["annual", "timing", "general"].includes(domain)) { + assert.equal(section.transit_natal_sign, undefined, chart.id + "/" + domain); + continue; + } + const raw = workflow.chart as Obj; + const layers = raw.consultation_native_layers as Obj; + const transit = layers.transit_detail as Obj; + const slow = layers.slow_transits as Obj; + assert.deepEqual(section.transit_natal_sign, transitNatalSignFacts(raw.planets, transit.bodies, slow.key_dates, transit.reference_date)); + assert.equal(section.transit_natal_sign!.length, 2); + } + } + const taylor = golden.charts.find((row) => row.id === "elizabeth_taylor")!; + assert.deepEqual(card(taylor.workflow, "general").domain_sections.general!.transit_natal_sign![1], { + planet: "Jupiter", natal_sign: "Cancer", transit_sign: "Cancer", same_sign: true, + evidence_id: "ev:transit:Jupiter", start: "not_available", end: "2026-10-21", + }); +}); + +test("the model view covers every new row with an existing transit id", async () => { + for (const domain of ["annual", "timing", "general"] as const) { + const publicChart = golden.charts.find((row) => row.id === "elizabeth_taylor")!; + const workflow = domain === "annual" ? publicChart.annual_workflow : domain === "timing" ? publicChart.timing_workflow : publicChart.workflow; + const tools = createConsultationTools({ + userId: "synthetic", sessionId: "synthetic", requestId: "transit-1995-" + domain, consultationMode: "verified_chart", + serverChart: { name: "public", toolInput: { year: 2000, month: 1, day: 1, hour: 0, minute: 0, city: "fixture", lat: 0, lon: 0, tz: 0, ayanamsa: "raman" }, truth: { birthTimeSource: "reported" } } as never, + state: createConsultationRuntimeState(), runWorkflow: async () => structuredClone(workflow) as never, + }); + const view = await tools["run-jyotish-consultation"].execute!({ question: "测试问题", domains: [domain] } as never, { writer: { custom: async () => {} } } as never) as Obj; + assert.deepEqual(uncoveredCardFacts(cardEvidenceRoots(view)), []); + const lookup = cardEvidenceLookup(view); + const { covered } = expandCardEvidence(cardEvidenceRoots(view)); + for (const planet of ["Saturn", "Jupiter"]) { + assert.ok(lookup.has("ev:transit:" + planet)); + assert.ok(covered.has("domain." + domain + ".transit_natal_sign[" + (planet === "Saturn" ? 0 : 1) + "]")); + } + } +}); diff --git a/references/product_runtime_contract.md b/references/product_runtime_contract.md index b1c67af12..375d22da5 100644 --- a/references/product_runtime_contract.md +++ b/references/product_runtime_contract.md @@ -676,3 +676,10 @@ evidence_card.backstage records, for the backend only, that global web evidence - 落陷取消主检测器对每颗落陷星分别判定。两颗星都成立时是两个实例,不是同一实例的两次命中;它们各有一行、一个实例键(`rule_id|方法版本|D1|行星`)、一个证据编号(`ev:yoga:main_detector:neecha_bhanga:<行星>@D1`)和各自的取消关系。同一行星重复出现仍按一次计,不当作多项独立支持(占星师 11-18 第三节第 6 条)。 - 其他规则的实例键和编号不变。 - 待占星师确认:行星状态里的「落陷取消」标签和主检测器用的是两套条件(见 BUG-1988);在她裁定前,证据包里的取消关系只来自主检测器。 + +## AK. 行运星与本命同名星同座(产品补充,待占星师确认;2026-11-18,BUG-1995) + +- 仅 annual、timing、general 的问答卡增加 `transit_natal_sign`,只列 Saturn / Jupiter。 +- 每行记录已有 `natal_sign`、`transit_sign`、相等比较 `same_sign` 及既有行运编号 `ev:transit:<星>`。这是位置事实,不是精确度数回归或应期判定,不附加解读句。 +- 同座时 `start` / `end` 只抄卡上已有 key_dates 的入座记录,以观测日两侧最近边界限定当前这次经过,离座后的再次入座不与前次合并;缺少一侧日期或观测日时,该侧写 `not_available`。不计算新日期,不拿扫描窗口起止冒充入座起止。位置缺失时不生成同座 true / false。 +- 证据索引按每行既有的行运编号覆盖。其他领域不增加这一字段。