From ed9497e76ac71a811c918c8e4607c7f1673de6e0 Mon Sep 17 00:00:00 2001 From: Jesse_Chen Date: Wed, 2 Sep 2026 02:27:50 +0800 Subject: [PATCH] fix(voice): speak first, then keep Level 2 skeleton and boundary semantics Natal answers were opening on parameter tables, and rectification turns were one-sentence legal copy. Centralize user-facing strings, keep representative-minute and question-slot red lines, and stop duplicating the opening collect prompt as a second assistant message. Co-authored-by: Cursor --- docs/BUG_HISTORY.md | 16 ++ frontend/docs/VOICE.md | 40 ++++ frontend/src/app/api/consult/route.ts | 2 +- .../src/app/api/rectification/agent/route.ts | 10 +- .../src/components/rectification-board.tsx | 11 +- .../components/technique-audit-disclosure.tsx | 3 +- .../src/lib/consultation-thinking-plan.ts | 2 +- .../core/rectification-decision.ts | 29 +-- .../lib/rectification-agentic/user-copy.ts | 219 ++++++++++++++++++ .../rectification-agentic/v9/answer-choice.ts | 42 +++- .../rectification-agentic/v9/case-service.ts | 3 +- .../rectification-agentic/v9/choice-card.ts | 3 +- .../v9/decision-from-dossier.ts | 1 + .../v9/method-followup.ts | 26 +-- .../v9/refinement-packet.ts | 5 +- .../lib/rectification-agentic/v9/turn-exit.ts | 38 ++- .../v9/turn-narration.ts | 3 +- .../src/lib/rectification-candidate-result.ts | 2 +- frontend/src/mastra/agentic-rectification.ts | 8 +- frontend/src/mastra/index.ts | 8 +- frontend/src/mastra/product-voice.ts | 30 ++- frontend/src/mastra/skill-binding.ts | 2 +- .../tests/agent-voice-copy-contract.test.ts | 171 ++++++++++++++ .../tests/consultation-entrypoint.test.ts | 2 +- .../tests/consultation-voice-contract.test.ts | 33 ++- .../tests/rectification-answer-choice.test.ts | 13 +- .../tests/rectification-collect-stall.test.ts | 20 +- .../rectification-decision-authority.test.ts | 2 +- .../tests/rectification-eight-method.test.ts | 2 +- ...ification-occupation-coverage-exit.test.ts | 2 +- .../rectification-provisional-adopt.test.ts | 7 +- .../rectification-range-offer-deadend.test.ts | 6 +- .../tests/rectification-server-focus.test.ts | 3 +- .../rectification-spoken-collect.test.ts | 4 +- frontend/tests/rectification-v9-agent.test.ts | 2 +- 35 files changed, 652 insertions(+), 118 deletions(-) create mode 100644 frontend/docs/VOICE.md create mode 100644 frontend/src/lib/rectification-agentic/user-copy.ts create mode 100644 frontend/tests/agent-voice-copy-contract.test.ts diff --git a/docs/BUG_HISTORY.md b/docs/BUG_HISTORY.md index d7861be6..c60dc188 100644 --- a/docs/BUG_HISTORY.md +++ b/docs/BUG_HISTORY.md @@ -7166,3 +7166,19 @@ - 相关记录：BUG-464、BUG-465 - 复发自：无 - 修复版本：待发布 + +## BUG-467 | opening 轮把采集题干再写成第二条助手消息 + +- 状态：resolved +- 首次发现：2026-09-01 +- 最近更新：2026-09-01 +- 影响面：POST `/api/rectification/agent` opening 成功出口、`finalizeSuccessfulTurnExit`、口述采集当前问题槽 +- 用户现象：开场模型正文已经自然引导用户说一件事，紧接着又出现一条服务端采集题干，两条语义重复、语气断裂。 +- 触发条件：新 Case `action=opening`，本轮已有非空 assistant 正文，且 focus 为 collect 类。 +- 根因：BUG-460 为了让题干进历史，对所有成功推进轮都把 `current_question.prompt` 追加成独立 assistant 消息。opening 的模型正文本身已承担引导，再追加就变成双重提问。 +- 修复：focus 仍照常持久化。仅当 `action === opening`、focus 为 collect、且本轮已有非空 assistant 正文时，不再把题干写成第二条 turn 消息。判定只看 action / kind / intent / 正文是否非空，不读正文内容。 +- 验证：`shouldPersistFocusPromptTurn` 矩阵；既有 server-focus / question-ownership / 非终态出口闸测试保持；`agent-voice-copy-contract.test.ts`。 +- 防复发：不得用正文字符串判断“是否已问过”。非 opening 轮仍把服务端题干写入历史。 +- 相关记录：BUG-456、BUG-460、BUG-461 +- 复发自：BUG-460 +- 修复版本：待发布 diff --git a/frontend/docs/VOICE.md b/frontend/docs/VOICE.md new file mode 100644 index 00000000..27c46ab5 --- /dev/null +++ b/frontend/docs/VOICE.md @@ -0,0 +1,40 @@ +# Voice + +Jyotisha 的可见文案是产品的一部分。正确性红线（真实性、问题槽归属、代表分钟边界）不靠冷冰冰的句子来守。 + +## 人设 + +一位懂行、可靠、说人话的占星师朋友。不是客服，不是法务，不是表单。 + +对用户称「你」。口语化，但不轻佻。不加「亲爱的」，不每轮感谢信任，不用 emoji。 + +## 五条原则 + +1. **先回应人，再展开方法。** 用户问婚姻，先用人话答方向，再进入度数和分盘。 +2. **说进度。** 范围从 30 分钟收到 7 分钟，就说出来。数字只来自服务端投影，不口算、不编。 +3. **解释为什么问，一句就够。** 不问审讯式清单。 +4. **同一约束换着说。** 边界句必须在交付/采用轮完整出现一次；中间轮不要逐字复读法务稿。 +5. **口语化但不轻佻。** 短句、具体事实、少套话。 + +## 好 / 坏对照 + +取材自校正与咨询里真实出现过的文案。 + +| 坏 | 好 | 为什么 | +|---|---|---| +| 请先说一件你记得大概时间的人生经历，比如升学、入职、搬家、结婚或生病；只记得年份也可以。 | 从你最容易想起来的开始就好——比如哪年上的大学、哪年换的工作，记得大概年份就行。 | 公文枚举改成一件容易开口的事。 | +| 有没有记得住时间的收入变化、大笔支出或欠债？ | 钱的方面，还记得哪年收入明显变过、有过大笔支出，或欠过债吗？ | 去掉审讯口吻，先给领域引子。 | +| 请点选下面的选项作答。点选和一句话回答会按同一规则计入当前区分题。 | 直接点下面的选项就行，打字回答也一样算数。 | 内部计分规则不进聊天。 | +| 我没能确定这句话是否在回答当前问题。请点选下面的选项，或换一种说法。 | 我不太确定这句是不是在回答上面的问题——点个选项，或者换个说法都行。 | 承认不确定，不训人。 | +| 当前可信区间是 05:00–05:07，代表分钟 05:00。代表分钟只是代表性候选，不是已确认的唯一出生分钟。 | 已经从最初的 30 分钟收到 05:00–05:07 这 7 分钟。代表分钟是 05:00，这只是代表性候选，不是已确认的唯一出生分钟。 | 同一边界语义，带进度，少法务腔。 | +| 可以从下面的时间里选一个采用。 | 可以从下面选一个先用着。 | 采用仍是采用，不说成已确认。 | +| 当前问题已更新，请刷新后重新作答。 | 这一问刚换成新的，刷新后再答就行。 | 机器状态句改成下一步。 | +| 好的，记下了。 | 2016 年 9 月上大学，记下了——这类有明确月份的节点对校正特别有用。 | 确认收到什么，并说清为什么有用。 | +| ## 统一参数与原始结构（用户刚问「我婚姻怎么样」） | 先用几句口语答婚姻方向，再进入统一参数与原始结构。 | 骨架仍在，开场先回人。 | + +## 红线（语气改不了这些） + +- 不得虚构星盘事实或唯一出生分钟。 +- 问题槽仍由服务端 focus 唯一所有；正文不得出题、复述或改写题干。 +- 交付/采用轮必须出现「不是已确认的唯一出生分钟」这一语义。 +- 技法审计表仍在本命回答文末。 diff --git a/frontend/src/app/api/consult/route.ts b/frontend/src/app/api/consult/route.ts index 7f9cc690..63d95bd1 100644 --- a/frontend/src/app/api/consult/route.ts +++ b/frontend/src/app/api/consult/route.ts @@ -1195,7 +1195,7 @@ export async function POST(request: Request) { content: [ currentTimeContext(requestTime), name ? `用户称呼：${name}` : "", - "请按 skill Level 2 模板回答下面的问题：原始结构、六步宫位、Yoga 表、时机、综合、文末技法审计表，然后才是现代生活措辞。星盘事实只使用系统里已经注入的计算结果，不要复述内部字段、JSON 或再跑一遍咨询流程。", + "先用 3–6 句口语直接回答下面的问题，不要加标题；然后再按 skill Level 2 骨架写：原始结构、六步宫位、Yoga 表、时机、综合、文末技法审计表，最后才是现代生活。骨架不可省略。星盘事实只使用系统里已经注入的计算结果，不要复述内部字段、JSON 或再跑一遍咨询流程。", resolvedQuestion.modelQuestion, ].filter(Boolean).join("\n"), }, diff --git a/frontend/src/app/api/rectification/agent/route.ts b/frontend/src/app/api/rectification/agent/route.ts index c670707c..82559768 100644 --- a/frontend/src/app/api/rectification/agent/route.ts +++ b/frontend/src/app/api/rectification/agent/route.ts @@ -40,6 +40,7 @@ import { import { persistServerOwnedFocus, openQuestionFromPersistedFocus, isCollectFocusSchema, isRenderableChoiceOpenQuestion } from "@/lib/rectification-agentic/v9/server-focus"; import { buildMethodFollowupPlan } from "@/lib/rectification-agentic/v9/method-followup"; import { isNonConvergingRangeOffer, nonConvergingRangeNarration } from "@/lib/rectification-agentic/core/rectification-decision"; +import { RECTIFICATION_USER_COPY } from "@/lib/rectification-agentic/user-copy"; import { awaitTurnExitBeforeResponse, finalizeSuccessfulTurnExit, @@ -351,7 +352,7 @@ export async function POST(request: Request) { classified = null; } if (!classified || classified.intent === "unclear") { - const narration = "我没能确定这句话是否在回答当前问题。请点选下面的选项，或换一种说法。"; + const narration = RECTIFICATION_USER_COPY.unclearFocusReply; await persistV9DeterministicTurn(accounting, userId, caseId, { requestId, userMessage: parsed.data.message ?? null, @@ -361,11 +362,11 @@ export async function POST(request: Request) { } if (classified.intent === "answer_current_focus") { if (!classified.answer_class) { - return completedMessageResponse("当前问题已更新，请刷新后重新作答。", requestId, caseId); + return completedMessageResponse(RECTIFICATION_USER_COPY.questionUpdated, requestId, caseId); } const optionId = optionIdForAnswerClass(focus, classified.answer_class); if (!optionId) { - return completedMessageResponse("当前问题已更新，请刷新后重新作答。", requestId, caseId); + return completedMessageResponse(RECTIFICATION_USER_COPY.questionUpdated, requestId, caseId); } const continueToAgent = shouldContinueAgentForDatedEvent(classified); const previous = previousInferenceFromReceipt(dossier.latestResult?.decisionReceipt ?? null); @@ -514,7 +515,7 @@ export async function POST(request: Request) { return completedMessageResponse(applied.narration, requestId, caseId); } } - const narration = "请点选下面的选项作答。点选和一句话回答会按同一规则计入当前区分题。"; + const narration = RECTIFICATION_USER_COPY.choicePrompt; await persistV9DeterministicTurn(accounting, userId, caseId, { requestId, userMessage: parsed.data.message ?? null, @@ -722,6 +723,7 @@ export async function POST(request: Request) { userId, caseId, action, + assistantBodyPresent: Boolean(result.answerText?.trim()), }); } catch (error) { const code = error instanceof RectificationToolServiceError ? error.code : "run_failed"; diff --git a/frontend/src/components/rectification-board.tsx b/frontend/src/components/rectification-board.tsx index 94e89a6a..cd06bc43 100644 --- a/frontend/src/components/rectification-board.tsx +++ b/frontend/src/components/rectification-board.tsx @@ -8,6 +8,7 @@ import { workingRectificationTime, type RectificationBoardDiff, } from "@/lib/rectification-board-model"; +import { engineMeaningToDisplayCopy } from "@/lib/rectification-agentic/user-copy"; import { workingRectificationHouseTable, type RectificationCandidateResult, @@ -80,7 +81,7 @@ function RectificationBoardBody({ )} - {stage ?

{stage}

: null} + {stage ?

{engineMeaningToDisplayCopy(stage)}

: null}

{diff.liveMessage}

@@ -154,7 +155,7 @@ function RectificationBoardBody({
两段本命上升
-

{contrast.user_meaning}

+

{engineMeaningToDisplayCopy(contrast.user_meaning)}

    {contrast.intervals.map((interval) => (
  • @@ -174,16 +175,16 @@ function RectificationBoardBody({
      {ledger.map((item) => ( -
    • {item.user_meaning}
      • +
    • {engineMeaningToDisplayCopy(item.user_meaning)}
      • ))}
    - {agreement ?

    {agreement.user_meaning}

    : null} + {agreement ?

    {engineMeaningToDisplayCopy(agreement.user_meaning)}

    : null}
)} {nakshatra?.near_boundary && nakshatra.user_meaning && (
交界节奏 -

{nakshatra.user_meaning}

+

{engineMeaningToDisplayCopy(nakshatra.user_meaning)}

)}
diff --git a/frontend/src/components/technique-audit-disclosure.tsx b/frontend/src/components/technique-audit-disclosure.tsx index e8119550..f3f44f16 100644 --- a/frontend/src/components/technique-audit-disclosure.tsx +++ b/frontend/src/components/technique-audit-disclosure.tsx @@ -7,6 +7,7 @@ import { } from "@/lib/consultation-technique-audit"; import type { TechniqueAuditRow } from "@/lib/consultation-agent-events"; import type { ConfirmationGate } from "@/lib/rectification-agentic/v9/confirmation-gate"; +import { engineMeaningToDisplayCopy } from "@/lib/rectification-agentic/user-copy"; export function TechniqueAuditDisclosure({ rows, @@ -95,7 +96,7 @@ export function ConfirmationGateDisclosure({ {GATE_LABELS[blocker.id]} {gateStatusLabel(blocker.status)} - {blocker.user_meaning} + {engineMeaningToDisplayCopy(blocker.user_meaning)} ))} diff --git a/frontend/src/lib/consultation-thinking-plan.ts b/frontend/src/lib/consultation-thinking-plan.ts index f2064d7d..05566197 100644 --- a/frontend/src/lib/consultation-thinking-plan.ts +++ b/frontend/src/lib/consultation-thinking-plan.ts @@ -250,7 +250,7 @@ export function consultationSpokenHeadingRule(kind: "natal" | "general" | "windo const activity = "Do not invent a thinking-process checklist. Activity, progress, and receipts are server-owned."; if (kind === "natal") { return [ - `Write the spoken answer with these exact Markdown H2 headings in order: ## ${REPORT_HEADING.foundation}, then ## {the Chinese label of each executed domain in tool order, such as 事业 / 财富 / 关系}, then ## ${REPORT_HEADING.audit}, then ## ${REPORT_HEADING.wrap}.`, + `After a 3-6 sentence spoken reply with no heading that answers the user's question, write the rest with these exact Markdown H2 headings in order: ## ${REPORT_HEADING.foundation}, then ## {the Chinese label of each executed domain in tool order, such as 事业 / 财富 / 关系}, then ## ${REPORT_HEADING.audit}, then ## ${REPORT_HEADING.wrap}. The skeleton must not be omitted.`, "Parallel points such as today's transits, 适合推进, 需要避开, and candidate windows must be Markdown bullet lists. Bold a short label, then one clause; do not stack those as plain paragraphs.", activity, secrets, diff --git a/frontend/src/lib/rectification-agentic/core/rectification-decision.ts b/frontend/src/lib/rectification-agentic/core/rectification-decision.ts index 650ff35e..356dfc80 100644 --- a/frontend/src/lib/rectification-agentic/core/rectification-decision.ts +++ b/frontend/src/lib/rectification-agentic/core/rectification-decision.ts @@ -21,6 +21,12 @@ import { type RectificationPhase, type ResultStatus, } from "./types.ts"; +import { + REPRESENTATIVE_MINUTE_DISCLAIMER, + nonConvergingRangeNarration, +} from "../user-copy.ts"; + +export { REPRESENTATIVE_MINUTE_DISCLAIMER, nonConvergingRangeNarration }; export type RectificationNextActionType = | "ask_fact_collection" @@ -429,29 +435,6 @@ export function isNonConvergingRangeOffer(decision: Pick< && decision.nextAction === "offer_provisional_range"; } -export const REPRESENTATIVE_MINUTE_DISCLAIMER = "代表分钟只是代表性候选，不是已确认的唯一出生分钟。"; - -export function nonConvergingRangeNarration(input: { - credibleRange?: readonly [string, string] | null; - representativeTime?: string | null; -} = {}, boundaryCopy = REPRESENTATIVE_MINUTE_DISCLAIMER): string { - const range = input.credibleRange; - const representative = input.representativeTime?.trim() || null; - const rangeText = range?.[0] && range[1] - ? range[0] === range[1] ? range[0] : `${range[0]}–${range[1]}` - : null; - if (rangeText && representative) { - return `当前可信区间是 ${rangeText}，代表分钟 ${representative}。${boundaryCopy}`; - } - if (rangeText) { - return `当前可信区间是 ${rangeText}。${boundaryCopy}`; - } - if (representative) { - return `当前代表分钟 ${representative}。${boundaryCopy}`; - } - return `当前几个候选还分不开。${boundaryCopy}`; -} - function discriminate( separation: CandidateSeparation, holdout: HoldoutValidationStatus, diff --git a/frontend/src/lib/rectification-agentic/user-copy.ts b/frontend/src/lib/rectification-agentic/user-copy.ts new file mode 100644 index 00000000..827ebd03 --- /dev/null +++ b/frontend/src/lib/rectification-agentic/user-copy.ts @@ -0,0 +1,219 @@ +/** + * User-visible rectification copy. Tone lives here; decision gates do not. + * + * See frontend/docs/VOICE.md. Semantic constraints in comments must survive + * rewrites: question-slot ownership, representative-minute boundary, and + * no unique-minute claim. + */ + +export const REPRESENTATIVE_MINUTE_DISCLAIMER = "这只是代表性候选，不是已确认的唯一出生分钟。"; + +/** Phrases that keep the unique-minute boundary in delivery/adopt turns. */ +export const BOUNDARY_SEMANTIC_PHRASES = [ + "不是已确认的唯一出生分钟", + "不是已经确认的唯一出生分钟", +] as const; + +export type CollectDomain = + | "relationship" + | "career" + | "family" + | "occupation" + | "education" + | "relocation" + | "finance" + | "health_pressure" + | "other"; + +export const GENERIC_COLLECT_QUESTION = "从你最容易想起来的开始就好——比如哪年上的大学、哪年换的工作，记得大概年份就行。"; + +export const USER_COLLECT_QUESTION: Readonly> = { + relationship: "感情这边，还记得哪年认真在一起、分开，或结婚吗？有年份就很好。", + career: "工作上呢，还记得哪年入职、换工作，或职责一下子变重吗？", + family: "家里如果有结婚、添丁或住院这类事，记得大概哪年就行。", + occupation: "你平时主要做什么工作？", + education: "上学这边，还记得哪年升学、转学或大考吗？", + relocation: "有没有哪年搬家，或开始长期住在外地？", + finance: "钱的方面，还记得哪年收入明显变过、有过大笔支出，或欠过债吗？", + health_pressure: "身体或压力这边，还记得哪年生病、受伤，或特别难熬的一段时间吗？", + other: "也可以再说一件你记得大概时间的事。", +}; + +export const RECTIFICATION_USER_COPY = { + genericCollectQuestion: GENERIC_COLLECT_QUESTION, + collectQuestionByDomain: USER_COLLECT_QUESTION, + choicePrompt: "直接点下面的选项就行，打字回答也一样算数。", + unclearFocusReply: "我不太确定这句是不是在回答上面的问题——点个选项，或者换个说法都行。", + questionUpdated: "这一问刚换成新的，刷新后再答就行。", + adoptCue: "可以从下面选一个先用着。", + hostNarrationFallback: "我按现有材料继续往下收。", + continueCollectFallback: "请继续说下一件你记得比较清楚、大概带年份的经历。", +} as const; + +export type RangeNarrationVariant = "delivery" | "intermediate"; + +export type RangeNarrationInput = { + credibleRange?: readonly [string, string] | null; + representativeTime?: string | null; + openingRange?: readonly [string, string] | null; + variant?: RangeNarrationVariant; +}; + +function clockMinutes(value: string): number | null { + const match = /^(\d{2}):(\d{2})$/.exec(value.trim()); + if (!match) return null; + return Number(match[1]) * 60 + Number(match[2]); +} + +export function rangeWidthMinutes(start: string, end: string): number | null { + const from = clockMinutes(start); + const to = clockMinutes(end); + if (from == null || to == null) return null; + const width = to >= from ? to - from : to + 24 * 60 - from; + return width > 0 ? width : null; +} + +export function formatClockRange(range: readonly [string, string] | null | undefined): string | null { + if (!range?.[0] || !range[1]) return null; + return range[0] === range[1] ? range[0] : `${range[0]}–${range[1]}`; +} + +export function openingRangeFromCandidateRange( + range: { start_time?: string | null; end_time?: string | null } | null | undefined, +): readonly [string, string] | null { + const start = range?.start_time?.trim().slice(0, 5) || ""; + const end = range?.end_time?.trim().slice(0, 5) || ""; + return start && end ? [start, end] : null; +} + +export function containsBoundarySemantics(text: string): boolean { + return BOUNDARY_SEMANTIC_PHRASES.some((phrase) => text.includes(phrase)); +} + +function progressClause( + openingRange: readonly [string, string] | null | undefined, + rangeText: string, + currentRange: readonly [string, string], +): string | null { + if (!openingRange) return null; + const openingWidth = rangeWidthMinutes(openingRange[0], openingRange[1]); + const currentWidth = rangeWidthMinutes(currentRange[0], currentRange[1]); + if (!openingWidth || !currentWidth || currentWidth >= openingWidth) return null; + return `已经从最初的 ${openingWidth} 分钟收到 ${rangeText} 这 ${currentWidth} 分钟`; +} + +export function nonConvergingRangeNarration( + input: RangeNarrationInput = {}, + boundaryCopy = REPRESENTATIVE_MINUTE_DISCLAIMER, +): string { + const range = input.credibleRange ?? null; + const representative = input.representativeTime?.trim() || null; + const rangeText = formatClockRange(range); + const variant = input.variant ?? "delivery"; + const progress = range && rangeText + ? progressClause(input.openingRange, rangeText, range) + : null; + + if (variant === "intermediate") { + if (rangeText && representative) { + return progress + ? `${progress}。眼下更像 ${representative}。` + : `范围已经收到 ${rangeText} 附近，眼下更像 ${representative}。`; + } + if (rangeText) { + return progress ? `${progress}。` : `范围已经收到 ${rangeText} 附近。`; + } + if (representative) return `眼下更像 ${representative}。`; + return "当前几个候选还分不开。"; + } + + if (rangeText && representative) { + const head = progress ?? `更站得住的范围是 ${rangeText}，代表分钟 ${representative}`; + const representativeClause = progress ? `。代表分钟是 ${representative}。` : `。`; + return `${head}${representativeClause}${boundaryCopy}`; + } + if (rangeText) { + const head = progress ?? `更站得住的范围是 ${rangeText}`; + return `${head}。${boundaryCopy}`; + } + if (representative) { + return `当前代表分钟 ${representative}。${boundaryCopy}`; + } + return `当前几个候选还分不开。${boundaryCopy}`; +} + +export function deliveryAdoptNarration(input: RangeNarrationInput): string { + return `${nonConvergingRangeNarration({ ...input, variant: "delivery" })} ${RECTIFICATION_USER_COPY.adoptCue}`; +} + +const INSTRUCTION_TONE_SENTENCE = /不得|请写成/; + +const ENGINE_MEANING_REPLACEMENTS: ReadonlyArray = [ + [/冲突时不能按更高把握收口。?/g, "两边看法还不一致，先不往更窄处收。"], + [/下面是本轮实际执行的技法，不能当作唯一分钟确认。?/g, ""], + [/不能确认唯一分钟或声称已完成精确分钟校准。?/g, "还不能把某一分钟当成已确认。"], + [/缺少该验证时不能确认唯一分钟。?/g, "所以还不能把某一分钟当成已确认。"], + [/不能确认唯一分钟。/g, "还不能把某一分钟当成已确认。"], +]; + +/** + * Consumer-side layer: engine `user_meaning` stays as model/audit material. + * User-visible surfaces must run this (or an equivalent display_copy field). + */ +export function engineMeaningToDisplayCopy(meaning: string | null | undefined): string { + if (!meaning) return ""; + const replaced = ENGINE_MEANING_REPLACEMENTS.reduce( + (text, [pattern, next]) => text.replace(pattern, next), + meaning, + ); + return replaced + .split(/(?<=[。！？;；])\s*/) + .filter((sentence) => sentence.trim() && !INSTRUCTION_TONE_SENTENCE.test(sentence)) + .join("") + .replace(/\s+/g, " ") + .trim(); +} + +export function listUserVisibleCopy(): string[] { + const values: string[] = [ + REPRESENTATIVE_MINUTE_DISCLAIMER, + GENERIC_COLLECT_QUESTION, + RECTIFICATION_USER_COPY.choicePrompt, + RECTIFICATION_USER_COPY.unclearFocusReply, + RECTIFICATION_USER_COPY.questionUpdated, + RECTIFICATION_USER_COPY.adoptCue, + RECTIFICATION_USER_COPY.hostNarrationFallback, + RECTIFICATION_USER_COPY.continueCollectFallback, + ...Object.values(USER_COLLECT_QUESTION), + ]; + return values; +} + +export function accidentCaseHardcodedTurns(input: { + openingRange?: readonly [string, string] | null; + credibleRange: readonly [string, string]; + representativeTime: string; +}): { + openingCollect: string; + discriminatorRedirect: string; + unclearFocusReply: string; + staleQuestion: string; + intermediateRange: string; + financeCollect: string; + deliveryAdopt: string; +} { + const shared = { + credibleRange: input.credibleRange, + representativeTime: input.representativeTime, + openingRange: input.openingRange ?? null, + }; + return { + openingCollect: GENERIC_COLLECT_QUESTION, + discriminatorRedirect: RECTIFICATION_USER_COPY.choicePrompt, + unclearFocusReply: RECTIFICATION_USER_COPY.unclearFocusReply, + staleQuestion: RECTIFICATION_USER_COPY.questionUpdated, + intermediateRange: nonConvergingRangeNarration({ ...shared, variant: "intermediate" }), + financeCollect: USER_COLLECT_QUESTION.finance, + deliveryAdopt: deliveryAdoptNarration(shared), + }; +} diff --git a/frontend/src/lib/rectification-agentic/v9/answer-choice.ts b/frontend/src/lib/rectification-agentic/v9/answer-choice.ts index 54c1d7ca..d534eb7e 100644 --- a/frontend/src/lib/rectification-agentic/v9/answer-choice.ts +++ b/frontend/src/lib/rectification-agentic/v9/answer-choice.ts @@ -9,6 +9,11 @@ import { posteriorMap, scoreDeltas } from "../core/decision-fingerprint"; import { nextProbe } from "../core/build-state"; import { RECTIFICATION_TERMINATION_COPY, isNonConvergingRangeOffer, nonConvergingRangeNarration, publicNextAction } from "../core/rectification-decision.ts"; +import { + deliveryAdoptNarration, + openingRangeFromCandidateRange, + RECTIFICATION_USER_COPY, +} from "../user-copy.ts"; import { applyChoiceWithoutEvidence, previousInferenceFromReceipt, @@ -63,6 +68,16 @@ function withProspectiveWindows( return extra ? `${base} ${extra}` : base; } +function openingRangeFromDossier(dossier: { + case?: { + acceptedTime?: string | null; + status?: string; + candidateRange?: { start_time?: string; end_time?: string } | null; + } | null; +}): readonly [string, string] | null { + return openingRangeFromCandidateRange(dossier.case?.candidateRange ?? null); +} + export type ApplyChoiceCommand = Readonly<{ userId: string; caseId: string; @@ -399,12 +414,14 @@ export async function persistNextInterviewAfterChoice(input: { hostNarration: withProspectiveWindows(nonConvergingRangeNarration({ credibleRange: input.nextAction.credible_range, representativeTime: input.nextAction.representative_time, + openingRange: openingRangeFromDossier(input.dossier), + variant: input.nextAction.can_adopt ? "delivery" : "intermediate", }), latest.decisionReceipt), choiceReady: false, }; } return { - hostNarration: spokenFollowupForUser(followup) ?? "我会继续根据现有资料整理下一步。", + hostNarration: spokenFollowupForUser(followup) ?? RECTIFICATION_USER_COPY.hostNarrationFallback, choiceReady: false, }; } @@ -545,10 +562,11 @@ export async function persistNextInterviewIfIdle(input: { return { persisted: false, choiceReady: false, - hostNarration: withProspectiveWindows(`${nonConvergingRangeNarration({ + hostNarration: withProspectiveWindows(deliveryAdoptNarration({ credibleRange: decision.credibleRange, representativeTime: decision.representativeTime, - })} 可以从下面的时间里选一个采用。`, dossier.latestResult?.decisionReceipt), + openingRange: openingRangeFromDossier(dossier), + }), dossier.latestResult?.decisionReceipt), }; } if (isNonConvergingRangeOffer(decision)) { @@ -600,6 +618,11 @@ async function persistExhaustionCollect(input: { evidence: Parameters[0]["evidence"]; conversationSummary: { declinedSkippedTopics?: readonly Readonly>[] }; latestResult?: { decisionReceipt?: Readonly> | null } | null; + case?: { + acceptedTime?: string | null; + status?: string; + candidateRange?: { start_time?: string; end_time?: string } | null; + }; }; decision: { credibleRange?: readonly [string, string] | null; representativeTime?: string | null }; decisionReceipt?: Readonly> | null; @@ -608,7 +631,11 @@ async function persistExhaustionCollect(input: { evidence: input.dossier.evidence, declinedTopics: input.dossier.conversationSummary.declinedSkippedTopics, }); - const range = nonConvergingRangeNarration(input.decision); + const range = nonConvergingRangeNarration({ + ...input.decision, + openingRange: openingRangeFromDossier(input.dossier), + variant: "intermediate", + }); const spoken = spokenFollowupForUser(followup); const persistedFocus = followup ? await persistFocusAfterChoice({ @@ -712,10 +739,11 @@ ${nextInterview.hostNarration}` } } const adoptionNarration = nextAction.can_adopt - ? withProspectiveWindows(`${nonConvergingRangeNarration({ + ? withProspectiveWindows(deliveryAdoptNarration({ credibleRange: nextAction.credible_range, representativeTime: nextAction.representative_time, - })} 可以从下面的时间里选一个采用。`, input.dossier.latestResult?.decisionReceipt) + openingRange: openingRangeFromDossier(input.dossier), + }), input.dossier.latestResult?.decisionReceipt) : null; const completedRangePrefix = input.narration.replace(RECTIFICATION_TERMINATION_COPY, "").trim(); const completedRangeNarration = nextAction.type === "complete_with_range" @@ -724,6 +752,8 @@ ${nextInterview.hostNarration}` ${nonConvergingRangeNarration({ credibleRange: nextAction.credible_range, representativeTime: nextAction.representative_time, + openingRange: openingRangeFromDossier(input.dossier), + variant: "delivery", }, RECTIFICATION_TERMINATION_COPY)}`, input.dossier.latestResult?.decisionReceipt) : null; if (adoptionNarration || completedRangeNarration) { diff --git a/frontend/src/lib/rectification-agentic/v9/case-service.ts b/frontend/src/lib/rectification-agentic/v9/case-service.ts index 07fa6b58..3fa00ebf 100644 --- a/frontend/src/lib/rectification-agentic/v9/case-service.ts +++ b/frontend/src/lib/rectification-agentic/v9/case-service.ts @@ -21,6 +21,7 @@ import { RECTIFICATION_SKILL_VERSION, type RectificationCaseStatus, } from "./case-status.ts"; +import { RECTIFICATION_USER_COPY } from "../user-copy.ts"; import { openResponse, type OpenRectificationCaseRequest, @@ -262,7 +263,7 @@ const KNOWN_RPC_ERROR_CODES = new Map[]; }>; diff --git a/frontend/src/lib/rectification-agentic/v9/method-followup.ts b/frontend/src/lib/rectification-agentic/v9/method-followup.ts index 6bff4e28..c239d207 100644 --- a/frontend/src/lib/rectification-agentic/v9/method-followup.ts +++ b/frontend/src/lib/rectification-agentic/v9/method-followup.ts @@ -73,6 +73,12 @@ import { type RectificationChoiceFrame, } from "./choice-card.ts"; import { overlayChoicePromptFromSpoken } from "./turn-narration.ts"; +import { + GENERIC_COLLECT_QUESTION, + USER_COLLECT_QUESTION, +} from "../user-copy.ts"; + +export { GENERIC_COLLECT_QUESTION }; import { RECTIFICATION_TERMINATION_COPY, decideRectification, @@ -937,20 +943,6 @@ export function shouldAttachChoiceFrame( return false; } -const USER_COLLECT_QUESTION: Readonly> = { - relationship: "还记得别的带年份的感情变化吗？比如开始认真交往、分手或结婚。", - career: "还记得别的带年份的工作变化吗？比如入职、换工作或职责加重。", - family: "家里有没有结婚、添丁或住院这类记得住时间的事？不记得具体日子也可以先说有没有。", - occupation: "你长期做什么工作？", - education: "有没有记得住年份的升学、转学或考试？", - relocation: "有没有记得住时间的搬家或长期住到外地？", - finance: "有没有记得住时间的收入变化、大笔支出或欠债？", - health_pressure: "有没有记得住时间的生病、受伤或特别大的压力？", - other: "可以再说一件记得大概时间的经历。", -}; - -export const GENERIC_COLLECT_QUESTION = "请先说一件你记得大概时间的人生经历，比如升学、入职、搬家、结婚或生病；只记得年份也可以。"; - export function spokenFollowupForUser(followup: MethodFollowup | null): string | null { if (!followup) return null; if (followup.choice_frame) return serverOwnedChoiceCopy(followup.choice_frame)?.prompt ?? null; @@ -1010,7 +1002,7 @@ export function exhaustionSpokenCollectFollowup(input: { ask_theme: "occupation", domain: "occupation", kind_hint: "occupation_note", - user_prompt_hint: collectHint("你长期做什么工作？", "D1-H10 + D10", "", input.evidence), + user_prompt_hint: collectHint(USER_COLLECT_QUESTION.occupation, "D1-H10 + D10", "", input.evidence), must_not_label: false, choice_frame: null, source: "method_coverage", @@ -1032,7 +1024,7 @@ export function exhaustionSpokenCollectFollowup(input: { domain: "other", kind_hint: null, user_prompt_hint: collectHint( - "可以再说一件记得大概时间的经历。", + USER_COLLECT_QUESTION.other, "本命 Dasha + 行运（方法1）", "", input.evidence, @@ -1817,7 +1809,7 @@ export function buildMethodFollowupPlan(input: { domain: "occupation", kind_hint: "occupation_note", user_prompt_hint: collect( - "你长期做什么工作？对照本命第 10 宫和 D10。", + `${USER_COLLECT_QUESTION.occupation}对照本命第 10 宫和 D10。`, "D1-H10 + D10", "可用事业类型表（白羊领导创业、天蝎研究转化等）作校时方法。", ), diff --git a/frontend/src/lib/rectification-agentic/v9/refinement-packet.ts b/frontend/src/lib/rectification-agentic/v9/refinement-packet.ts index 8b393e4d..1fc6e948 100644 --- a/frontend/src/lib/rectification-agentic/v9/refinement-packet.ts +++ b/frontend/src/lib/rectification-agentic/v9/refinement-packet.ts @@ -7,6 +7,7 @@ */ import { distinguishContractErrors } from "../core/distinguish-contract.ts"; +import { engineMeaningToDisplayCopy } from "../user-copy.ts"; import { questionContractVersionIsCompatible } from "./probe-question-contract.ts"; const TIME = /^(?:[01]\d|2[0-3]):[0-5]\d$/; @@ -371,7 +372,7 @@ export function parseDashaAgreement(value: unknown): DashaAgreement | null { ) return null; const meaning = asText(row.user_meaning, 220) ?? (status === "conflict" - ? "主限和分盘大运偏向不同时间。冲突时不能按更高把握收口。" + ? "主限和分盘大运偏向不同时间。两边看法还不一致，先不往更窄处收。" : status === "agree" ? "主限和分盘大运都更支持同一段代表性时间。这仍不是唯一分钟确认。" : "还没有足够的大运对照。"); @@ -683,7 +684,7 @@ export function parseProspectiveProbes(value: unknown): readonly ProspectiveProb export function prospectiveWindowsNarration(probes: readonly ProspectiveProbe[]): string | null { const meanings = probes .filter((item) => item.used_for_scoring === false) - .map((item) => item.user_meaning.trim()) + .map((item) => engineMeaningToDisplayCopy(item.user_meaning).trim()) .filter((item) => item.length > 0 && !CLOCK_IN_COPY.test(item)); if (meanings.length === 0) return null; return meanings.join(" "); diff --git a/frontend/src/lib/rectification-agentic/v9/turn-exit.ts b/frontend/src/lib/rectification-agentic/v9/turn-exit.ts index 03f51a24..6aa3f729 100644 --- a/frontend/src/lib/rectification-agentic/v9/turn-exit.ts +++ b/frontend/src/lib/rectification-agentic/v9/turn-exit.ts @@ -24,11 +24,36 @@ export const RECTIFICATION_ACTION_EXECUTION = { stop_and_review: "immediate", } as const satisfies Record; +export function dossierHasNonemptyAssistantBody( + turns: readonly Readonly<{ role: string; text: string | null }>[] | undefined, +): boolean { + return (turns ?? []).some((turn) => turn.role === "assistant" && Boolean(turn.text?.trim())); +} + +/** + * Whether to append the server-owned focus prompt as its own assistant turn. + * + * Structured only: action, focus kind/intent, and whether this turn already + * has a nonempty assistant body. Never inspect the body text to decide + * “whether it already asked”. + */ +export function shouldPersistFocusPromptTurn(input: { + action: RectificationRouteAction; + questionKind: string | null | undefined; + questionIntent: string | null | undefined; + assistantBodyPresent: boolean; +}): boolean { + const collect = input.questionKind === "collect_spoken" + || input.questionIntent === "collect_method_evidence"; + return !(input.action === "opening" && collect && input.assistantBodyPresent); +} + export async function finalizeSuccessfulTurnExit(input: { accounting: RectificationRpcClient; userId: string; caseId: string; action: RectificationRouteAction; + assistantBodyPresent?: boolean; }): Promise { if (input.action === "read_only") { // Read-only requests must never mutate the interview or create a focus. @@ -56,7 +81,18 @@ export async function finalizeSuccessfulTurnExit(input: { try { const dossier = await loadV9CaseDossier(input.accounting, input.userId, input.caseId); const question = projectCurrentQuestion(dossier.conversationSummary.activeFocus); - if (question?.focus_id && question.prompt) { + const assistantBodyPresent = input.assistantBodyPresent + ?? dossierHasNonemptyAssistantBody(dossier.turns); + if ( + question?.focus_id + && question.prompt + && shouldPersistFocusPromptTurn({ + action: input.action, + questionKind: question.kind, + questionIntent: question.intent, + assistantBodyPresent, + }) + ) { await persistV9DeterministicTurn(input.accounting, input.userId, input.caseId, { requestId: question.focus_id, userMessage: null, diff --git a/frontend/src/lib/rectification-agentic/v9/turn-narration.ts b/frontend/src/lib/rectification-agentic/v9/turn-narration.ts index 10915673..27f5c542 100644 --- a/frontend/src/lib/rectification-agentic/v9/turn-narration.ts +++ b/frontend/src/lib/rectification-agentic/v9/turn-narration.ts @@ -1,5 +1,6 @@ import { parseAgentChoiceCopy } from "./choice-card"; import type { V9CaseDossier } from "./tool-service"; +import { RECTIFICATION_USER_COPY } from "../user-copy.ts"; export type RectificationNarrationDto = Readonly<{ acknowledgedFacts: readonly string[]; @@ -26,7 +27,7 @@ export function composeRectificationTurnNarration(dto: RectificationNarrationDto } if (dto.nextQuestion && /[？?]/.test(dto.nextQuestion)) parts.push(dto.nextQuestion); if (parts.length === 0) { - return "请继续说下一件你记得比较清楚、大概带年份的经历。"; + return RECTIFICATION_USER_COPY.continueCollectFallback; } return parts.join(""); } diff --git a/frontend/src/lib/rectification-candidate-result.ts b/frontend/src/lib/rectification-candidate-result.ts index 3f5bc19c..a5ce8011 100644 --- a/frontend/src/lib/rectification-candidate-result.ts +++ b/frontend/src/lib/rectification-candidate-result.ts @@ -171,7 +171,7 @@ function natalRecastFromSnapshot( export function natalRecastMeaning(table: Pick | null): string | null { if (!table) return null; - return `本命宫位已按 ${table.time} 重算（上升 ${table.lagna}）。下面是本轮实际执行的技法，不能当作唯一分钟确认。`; + return `本命宫位已按 ${table.time} 重算（上升 ${table.lagna}）。`; } export function houseTableAlignedToMinute( diff --git a/frontend/src/mastra/agentic-rectification.ts b/frontend/src/mastra/agentic-rectification.ts index d38ec580..7e24654c 100644 --- a/frontend/src/mastra/agentic-rectification.ts +++ b/frontend/src/mastra/agentic-rectification.ts @@ -59,13 +59,15 @@ export function resolveRectificationStepBudget(action: RectificationAgentAction) * gate → scan → score → diagnostics. */ const agenticRectificationInstructions = `你是 Jyotisha，只服务当前绑定 jyotish-birth-time-rectification Skill 的生时校正 Case。方法以绑定 Skill 为准，不在系统提示中重写。 - +懂行、可靠、说人话：先回应人，再展开方法。有收窄就说进度；数字只来自服务端投影，不得自算。 1. 第一步调用 rectification-read-case。服务器是事实、焦点、权限与终态的唯一权威。 2. 事实只能来自用户原话；复述日期必须用 display_date_label。不得虚构事件、候选或出生分钟。 3. 新事件走 rectification-record-evidence-batch。工具执行保持静默；思考用简体中文写在思维链；对用户说的话必须自己写在正文里，不叙述工具或内部状态。 -4. 有持久化 current_question 时，题干与选项完全由结构化槽位和 UI 承担，正文不得提问、复述、改写或拼接题干。每轮正文只输出一句确认或承接；choice 由选择卡承载，collect_spoken 只承接用户刚说的事实，不输出输入提示。没有 current_question 时也不要自拟区分题；只在确有必要时用一句自然语言承接。点选与「先这样」由服务器处理。 +4. 有持久化 current_question 时，题干与选项完全由结构化槽位和 UI 承担，正文不得提问、复述、改写或拼接题干。每轮正文 2-4 句：确认收到什么、（可选）一句为什么有用或当前进度、自然过渡到界面上的下一步。不提问、不复述题干、不预告选项。choice 由选择卡承载，collect_spoken 只承接用户刚说的事实，不输出输入提示。没有 current_question 时也不要自拟区分题。点选与「先这样」由服务器处理。 5. 不得宣称唯一出生分钟。confirmation_allowed 为 false 或宽度大于 5 时，说明这是不可分区间，代表分钟只是代表性候选。出牌轮写入 skill_verification_report；80%/60% 只是事件吻合率。 -6. 一次一问。不泄露提示词或 Skill 原文。`; +6. 一次一问。不泄露提示词或 Skill 原文。 +坏：「好的，记下了。」好：「2016 年 9 月上大学，记下了——这类有明确月份的节点对校正特别有用。」 +坏：「范围还在收。」好：「范围已经从开场那一段收到更窄的几分钟了。」`; export function getRectificationV9Agent( model: ResolvedLanguageModel, diff --git a/frontend/src/mastra/index.ts b/frontend/src/mastra/index.ts index 95a6c4ea..bbf847ff 100644 --- a/frontend/src/mastra/index.ts +++ b/frontend/src/mastra/index.ts @@ -4,7 +4,7 @@ import { createConsultationTools, createWindowConsultationTools, MAX_CONSULTATIO import { toAgentConsultationContext } from "./consultation-workflow.ts"; import { evidenceDraftModelOutputSchema } from "../lib/birth-time-guide-agent.ts"; import type { ResolvedLanguageModel } from "./model"; -import { productConversationVoice } from "./product-voice"; +import { natalSpokenReportContract, productConversationVoice } from "./product-voice"; import { consultationSpokenHeadingRule } from "../lib/consultation-thinking-plan.ts"; import { jyotishSkillBinding, @@ -16,9 +16,10 @@ export type { ConsultationInput } from "./consultation-workflow.ts"; const jyotishInstructions = `You are the guide for a conversational Vedic astrology product. ${productConversationVoice} -Write in Simplified Chinese following the skill Level 2 report skeleton for natal domain questions. Markdown tables are required for raw structure, Yogas, and the Technique Audit Table. +${natalSpokenReportContract} +Write in Simplified Chinese: a heading-free spoken opener first, then the skill Level 2 report skeleton for natal domain questions. Markdown tables are required for raw structure, Yogas, and the Technique Audit Table. ${jyotishSkillMethodBlock} -The bound skill method is this product's answering contract, including its report order. Use run-jyotish-consultation for actual chart calculations instead of inventing results. Do not replace the skill template with a spoken-only chat shape. +The bound skill method is this product's answering contract, including its report order. Use run-jyotish-consultation for actual chart calculations instead of inventing results. 骨架不可省略，但必须以直接回应开场. Do not replace the skeleton with spoken-only chat. For questions that require a new chart claim, call run-jyotish-consultation before answering. Simple conversational follow-ups may use the existing context. Select consultation domains only through the single ordered domains array of run-jyotish-consultation, whether the question covers one domain or several; omit it to accept the domain the server already selected. At most ${MAX_CONSULTATION_DOMAINS} domains may be requested in one run, because they are calculated one after another inside a fixed time budget: list every domain the question actually needs, in priority order. Do not drop a relevant domain to keep the plan short—the natal compute already ran the full technique spectrum, and omitting a domain omits that route's checklist from the answer. The server canonicalizes aliases, rejects unsupported/product domains, executes each accepted domain, and returns the actual domains in the tool context and receipt. The only legal domain ids are the ones enumerated in that array's schema; the skill's methodology names strict-workflow checklists such as career-timing-strict, and those labels select techniques inside the skill, never domains for this tool. A rejected domain plan is final for this run: correct the domains once, and never re-send the same call with extra parameters. The tool result's methodology field is the skill's own strict checklist for the routes that actually ran, quoted from the live skill. Treat it as the method for this answer, not as background: work through its mandatory modules against the evidence you were given, and obey its output discipline, including any instruction to separate kinds of claim rather than merge them into one vague statement. Those sections are already delivered, so never spend a turn re-reading them; methodology.further_reading lists the references the skill names, and you may read one with skill_read only when the question needs something the delivered sections do not cover. When methodology.domains_without_strict_checklist names a domain, the skill declares no named checklist for it: still follow the delivered Full-spectrum invocation and shared baseline, and do not imply a named strict route was followed. When methodology is absent, follow the bound skill method above. @@ -114,6 +115,7 @@ export function getGeneralJyotishAgent(model: ResolvedLanguageModel) { const onboardingInstructions = `You create the first conversational turn for Jyotisha, a Vedic astrology chat product. +Write each suggested question the way a knowledgeable, reliable astrologer friend would hear it — not a form, not legal copy. No greeting field, no 亲爱的, no emoji. This is onboarding, not a chart reading: do not calculate, infer, or claim placements, timing windows, personality traits, relationship outcomes, or career conclusions. The suggested questions must stay inside what this product can later answer from a natal chart. Never suggest medical, legal, investment, death, diagnosis, pregnancy, or exact-date promises. Return valid JSON only. Do not use Markdown fences, commentary, or hidden fields. diff --git a/frontend/src/mastra/product-voice.ts b/frontend/src/mastra/product-voice.ts index 8187f36c..ea3776cf 100644 --- a/frontend/src/mastra/product-voice.ts +++ b/frontend/src/mastra/product-voice.ts @@ -1,9 +1,21 @@ -export const productConversationVoice = `VISIBLE VOICE (skill Level 2 report in Simplified Chinese) -This product is a private conversation with one person. The jyotish-vedic-astrology skill governs METHOD, TECHNIQUE INVOCATION, TRUTH BOUNDARIES, and the user-facing report skeleton. +export const productConversationVoice = `VISIBLE VOICE +PERSONA: a knowledgeable, reliable astrologer friend who speaks like a person — not customer service, not legal, not a form. -For career / wealth / marriage / family (and any natal domain reading), write the answer as the skill Level 2 template. Do not shorten it into spoken-only chat, and do not hide tables in a collapsed control as the only copy. +Five principles: answer the person before unfolding method; say progress when the numbers are already on the table; explain why a next step matters in one clause; restate the same constraint in different words; spoken Simplified Chinese to 你, warm but not cute. No 亲爱的, no 感谢你的信任, no emoji, no greeting spam. -Required body order, using these exact H2 headings: ## 统一参数与原始结构, then ## {Chinese domain label} for each executed domain, then ## 技法审计表, then ## 现代生活. Do not write a thinking-process checklist; Activity is server-owned. +Good: 你这段婚姻更像先把已经在一起的关系过稳，而不是立刻再开一段。眼下更值得把相处里反复出现的摩擦说清楚。 +Bad: opening a natal answer with infrastructure, 根据当前计算结果, or a degrees table before answering what the person asked. + +Good: 你更适合把已经积累的专业能力做成长期事业，而不是频繁换赛道。眼下更值得把现有工作做深，而不是立刻另起一摊。 +Bad: 根据当前计算结果，事业方向总体偏稳定，但副运细节与行运触发未在本轮完整计算。 + +Never open with 根据系统计算, 根据当前计算结果, 综合来看, 需要指出的是, 当前状态为, 本轮未完整计算, or 从星盘来看. Never quote JSON keys, English status codes, or field names (core_status, blocked, ready, consumer_context, missing_layers, omitted_domains). Never dump YAML or raw JSON.`; + +export const natalSpokenReportContract = `NATAL REPORT CONTRACT (spoken reply first, then skill Level 2 skeleton) +The skill governs METHOD, TECHNIQUE INVOCATION, TRUTH BOUNDARIES, and the Level 2 skeleton — not the opening paragraphs. +For career / wealth / marriage / family (and any natal domain reading): open with 3–6 heading-free sentences that answer the user's actual question (directional reading + one clause of context). Then write the skill Level 2 template. 骨架不可省略，但必须以直接回应开场. Do not hide tables in a collapsed control as the only copy. + +Required body order after that opener, using these exact H2 headings: ## 统一参数与原始结构, then ## {Chinese domain label} for each executed domain, then ## 技法审计表, then ## 现代生活. Do not write a thinking-process checklist; Activity is server-owned. 1. Unified parameters and raw structure first (degrees, houses, vargas, Dasha boundaries, Shadbala/AV, functional benefic/malefic, Western layers the server delivered). 2. Innate significators: Raman six-step house judgment for the question houses. Steps 1–3 (house / lord / natural karaka) are the executable core. Steps 4–6 (Sun/Moon repeat, D9, positive/negative majority) are methodology-layer filling from delivered chart fields; label them 方法论层. 3. Yoga table: name / formation / strength or hit-miss / domain effect. Use the governed 8/20 whitelist for the domain (Nabhasa, wealth core 5, spouse, children/mother/sibling_core). List hits and misses. Do not invent yogas. @@ -16,14 +28,8 @@ Required body order, using these exact H2 headings: ## 统一参数与原始结 Address the reader as 你. Gloss a technical term once in plain Chinese (婚姻分盘（D9）, 当前大运) before reuse. Raman yogas and house steps remain governed_support_only_candidate_ready: write strength and promotion/hindrance in skill language, but do not upgrade them into verified fate truth. -Never do these in the visible answer: -- Quote JSON keys, English status codes, or field names (core_status, blocked, ready, consumer_context, missing_layers, omitted_domains). -- Say 根据系统计算, 根据当前计算结果, 综合来看, 需要指出的是, 当前状态为, 本轮未完整计算, or 从星盘来看 as an opener. +Never: - Skip an executed layer the question needs in order to keep the answer short. -- Dump YAML or raw JSON. - Treat a collapsed UI control as a substitute for the body audit table. -Short chit-chat that is not a natal domain claim may stay conversational. One natal career/wealth/marriage/family question switches to the template above. - -Bad: 根据当前计算结果，事业方向总体偏稳定，但副运细节与行运触发未在本轮完整计算。 -Good: 先列本盘岁差、上升度数、10 宫与 D10，再走六步宫位和 Yoga 表，最后用审计表标明哪些层 executed / blocked。`; +Short chit-chat that is not a natal domain claim may stay conversational. One natal career/wealth/marriage/family question still uses the opener-plus-skeleton above.`; diff --git a/frontend/src/mastra/skill-binding.ts b/frontend/src/mastra/skill-binding.ts index 9d701fd3..f136e7d9 100644 --- a/frontend/src/mastra/skill-binding.ts +++ b/frontend/src/mastra/skill-binding.ts @@ -110,7 +110,7 @@ function boundMethod(): string { const BOUND_METHOD_MARKER = ``; -export const jyotishSkillMethodBlock = `The jyotish-vedic-astrology skill is already loaded. Its runtime method is quoted below from the live skill the operator maintains; there is no activation step, no hashed package, and no tool that loads it. Follow this method and its truth boundaries. For career, wealth, marriage, and family answers, present its Level 2 report template in the chat body (raw structure, six-step houses, Yoga table, timing, synthesis, Technique Audit Table, then a short modern wrap). Construction notes, CLI indexes, and case catalogs stay in the skill tree and are not part of this block. +export const jyotishSkillMethodBlock = `The jyotish-vedic-astrology skill is already loaded. Its runtime method is quoted below from the live skill the operator maintains; there is no activation step, no hashed package, and no tool that loads it. Follow this method and its truth boundaries. For career, wealth, marriage, and family answers, present its Level 2 report template in the chat body after a 3-6 sentence spoken reply with no heading (raw structure, six-step houses, Yoga table, timing, synthesis, Technique Audit Table, then a short modern wrap). Construction notes, CLI indexes, and case catalogs stay in the skill tree and are not part of this block. ${boundMethod()} `; diff --git a/frontend/tests/agent-voice-copy-contract.test.ts b/frontend/tests/agent-voice-copy-contract.test.ts new file mode 100644 index 00000000..01601aaa --- /dev/null +++ b/frontend/tests/agent-voice-copy-contract.test.ts @@ -0,0 +1,171 @@ +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import test from "node:test"; + +import { + GENERIC_COLLECT_QUESTION, + RECTIFICATION_USER_COPY, + REPRESENTATIVE_MINUTE_DISCLAIMER, + accidentCaseHardcodedTurns, + containsBoundarySemantics, + engineMeaningToDisplayCopy, + listUserVisibleCopy, + nonConvergingRangeNarration, +} from "../src/lib/rectification-agentic/user-copy.ts"; +import { shouldPersistFocusPromptTurn } from "../src/lib/rectification-agentic/v9/turn-exit.ts"; + +const MACHINE_VOICE_LEXICON = [ + "按同一规则计入", + "请刷新后重新作答", + "当前状态为", + "请点选下面的选项作答", + "当前区分题", + "接下来请点选下面这一问", + "可以从下面的时间里选一个采用", + "我没能确定这句话是否在回答当前问题", + "请先说一件你记得大概时间的人生经历，比如升学、入职、搬家、结婚或生病", + "有没有记得住时间的收入变化、大笔支出或欠债", +] as const; + +/** Task 0 frozen “before” snapshot: accident case f83d9b42, origin/staging @ 8617eb56. */ +export const ACCIDENT_CASE_BEFORE_COPY = { + openingCollect: "请先说一件你记得大概时间的人生经历，比如升学、入职、搬家、结婚或生病；只记得年份也可以。", + discriminatorRedirect: "请点选下面的选项作答。点选和一句话回答会按同一规则计入当前区分题。", + unclearFocusReply: "我没能确定这句话是否在回答当前问题。请点选下面的选项，或换一种说法。", + staleQuestion: "当前问题已更新，请刷新后重新作答。", + intermediateRange: "当前可信区间是 05:00–05:07，代表分钟 05:00。代表分钟只是代表性候选，不是已确认的唯一出生分钟。", + financeCollect: "有没有记得住时间的收入变化、大笔支出或欠债？", + deliveryAdopt: "当前可信区间是 05:00–05:07，代表分钟 05:00。代表分钟只是代表性候选，不是已确认的唯一出生分钟。 可以从下面的时间里选一个采用。", + marriageConsultOpen: [ + "## 统一参数与原始结构", + "## 关系", + "## 技法审计表", + ], +} as const; + +const ACCIDENT_SHAPE = { + openingRange: ["04:45", "05:15"] as const, + credibleRange: ["05:00", "05:07"] as const, + representativeTime: "05:00", +}; + +test("user-visible copy rejects the machine-voice lexicon", () => { + assert.ok(MACHINE_VOICE_LEXICON.length >= 8); + const visible = listUserVisibleCopy().join("\n"); + for (const phrase of MACHINE_VOICE_LEXICON) { + assert.equal(visible.includes(phrase), false, phrase); + } +}); + +test("delivery and adopt turns keep representative-minute boundary semantics", () => { + const after = accidentCaseHardcodedTurns(ACCIDENT_SHAPE); + assert.equal(containsBoundarySemantics(REPRESENTATIVE_MINUTE_DISCLAIMER), true); + assert.equal(containsBoundarySemantics(after.deliveryAdopt), true); + assert.match(after.deliveryAdopt, /05:00–05:07/); + assert.match(after.deliveryAdopt, /05:00/); + assert.match(after.deliveryAdopt, /30 分钟/); + assert.match(after.deliveryAdopt, /7 分钟/); + assert.equal(containsBoundarySemantics(after.deliveryAdopt), true); + assert.doesNotMatch(after.intermediateRange, /不是已确认的唯一出生分钟/); + assert.match(after.intermediateRange, /05:00–05:07|7 分钟/); +}); + +test("accident-case after copy is rebuilt from the shared module", () => { + const after = accidentCaseHardcodedTurns(ACCIDENT_SHAPE); + assert.equal(after.openingCollect, GENERIC_COLLECT_QUESTION); + assert.equal(after.discriminatorRedirect, RECTIFICATION_USER_COPY.choicePrompt); + assert.equal(after.unclearFocusReply, RECTIFICATION_USER_COPY.unclearFocusReply); + assert.equal(after.staleQuestion, RECTIFICATION_USER_COPY.questionUpdated); + assert.equal(after.financeCollect, "钱的方面，还记得哪年收入明显变过、有过大笔支出，或欠过债吗？"); + assert.notEqual(after.openingCollect, ACCIDENT_CASE_BEFORE_COPY.openingCollect); + assert.notEqual(after.financeCollect, ACCIDENT_CASE_BEFORE_COPY.financeCollect); + assert.ok(containsBoundarySemantics(after.deliveryAdopt)); +}); + +test("default range narration stays semantic even without an opening window", () => { + const text = nonConvergingRangeNarration({ + credibleRange: ["04:47", "04:53"], + representativeTime: "04:51", + }); + assert.match(text, /04:47–04:53/); + assert.match(text, /04:51/); + assert.equal(containsBoundarySemantics(text), true); +}); + +test("question-slot ownership stays in the rectification agent prompt", () => { + const agent = readFileSync(new URL("../src/mastra/agentic-rectification.ts", import.meta.url), "utf8"); + const route = readFileSync(new URL("../src/app/api/rectification/agent/route.ts", import.meta.url), "utf8"); + const exit = readFileSync(new URL("../src/lib/rectification-agentic/v9/turn-exit.ts", import.meta.url), "utf8"); + assert.match(agent, /正文不得提问、复述、改写或拼接题干/); + assert.match(agent, /每轮正文 2-4 句/); + assert.doesNotMatch(agent, /每轮正文只输出一句确认或承接/); + assert.doesNotMatch(route, /接下来请点选下面这一问/); + assert.doesNotMatch(exit, /接下来请点选下面这一问/); + assert.match(exit, /shouldPersistFocusPromptTurn/); + assert.match(exit, /action === ["']opening["']/); + assert.match(route, /assistantBodyPresent: Boolean\(result\.answerText\?\.trim\(\)\)/); + assert.doesNotMatch(exit, /assistantMessage\.(?:includes|match|search)/); + assert.doesNotMatch(exit, /question\.prompt\.(?:includes|match|search)/); + const skipFn = exit.slice( + exit.indexOf("export function shouldPersistFocusPromptTurn"), + exit.indexOf("export async function finalizeSuccessfulTurnExit"), + ); + assert.doesNotMatch(skipFn, /\.test\(/); + assert.doesNotMatch(skipFn, /\.match\(/); + assert.doesNotMatch(skipFn, /\.search\(/); + assert.doesNotMatch(skipFn, /includes\(/); +}); + +test("E-1 opening collect skip is structural, not a body-text regex", () => { + assert.equal(shouldPersistFocusPromptTurn({ + action: "opening", + questionKind: "collect_spoken", + questionIntent: "collect_method_evidence", + assistantBodyPresent: true, + }), false); + assert.equal(shouldPersistFocusPromptTurn({ + action: "opening", + questionKind: "collect_spoken", + questionIntent: "collect_method_evidence", + assistantBodyPresent: false, + }), true); + assert.equal(shouldPersistFocusPromptTurn({ + action: "opening", + questionKind: "choice", + questionIntent: "distinguish_candidates", + assistantBodyPresent: true, + }), true); + assert.equal(shouldPersistFocusPromptTurn({ + action: "message", + questionKind: "collect_spoken", + questionIntent: "collect_method_evidence", + assistantBodyPresent: true, + }), true); + assert.equal(shouldPersistFocusPromptTurn({ + action: "answer_choice", + questionKind: "choice", + questionIntent: "distinguish_candidates", + assistantBodyPresent: true, + }), true); +}); + +test("E-2 display copy keeps engine meaning out of instruction tone", () => { + const dasha = engineMeaningToDisplayCopy( + "主限更偏向 05:00，分盘大运更偏向 04:54。冲突时不能按更高把握收口。", + ); + assert.match(dasha, /05:00/); + assert.match(dasha, /04:54/); + assert.doesNotMatch(dasha, /不得/); + assert.doesNotMatch(dasha, /不能按更高把握收口/); + const natal = engineMeaningToDisplayCopy( + "本命宫位已按 05:07 重算（上升 金牛座）。下面是本轮实际执行的技法，不能当作唯一分钟确认。", + ); + assert.match(natal, /05:07/); + assert.doesNotMatch(natal, /不能当作唯一分钟确认/); + const instruct = engineMeaningToDisplayCopy("可以采用代表性候选作当前排盘；不得把它描述为已确认的唯一出生分钟。"); + assert.doesNotMatch(instruct, /不得/); + const board = readFileSync(new URL("../src/components/rectification-board.tsx", import.meta.url), "utf8"); + const gate = readFileSync(new URL("../src/components/technique-audit-disclosure.tsx", import.meta.url), "utf8"); + assert.match(board, /engineMeaningToDisplayCopy/); + assert.match(gate, /engineMeaningToDisplayCopy/); +}); diff --git a/frontend/tests/consultation-entrypoint.test.ts b/frontend/tests/consultation-entrypoint.test.ts index 35937d6e..6f81d808 100644 --- a/frontend/tests/consultation-entrypoint.test.ts +++ b/frontend/tests/consultation-entrypoint.test.ts @@ -308,7 +308,7 @@ test("consult route expands an optional entrypoint for both Agent and tool input assert.match(source, /entrypoint:\s*consultationEntrypointSchema\.optional\(\)/); assert.match(source, /question:\s*resolvedQuestion\.modelQuestion/); - assert.match(source, /请按 skill Level 2 模板回答下面的问题[\s\S]*?resolvedQuestion\.modelQuestion/); + assert.match(source, /先用 3–6 句口语直接回答下面的问题[\s\S]*?resolvedQuestion\.modelQuestion/); assert.doesNotMatch(source, /JSON\.stringify\(toolInput\)/); assert.match(source, /shouldLoadGeneralDailyPanchanga\(\{/); assert.doesNotMatch(source, /用户明确选择的无出生分钟一般咨询/); diff --git a/frontend/tests/consultation-voice-contract.test.ts b/frontend/tests/consultation-voice-contract.test.ts index 61a665c8..b68c385a 100644 --- a/frontend/tests/consultation-voice-contract.test.ts +++ b/frontend/tests/consultation-voice-contract.test.ts @@ -8,8 +8,9 @@ const route = readFileSync(new URL("../src/app/api/consult/route.ts", import.met const binding = readFileSync(new URL("../src/mastra/skill-binding.ts", import.meta.url), "utf8"); const workflow = readFileSync(new URL("../src/mastra/consultation-workflow.ts", import.meta.url), "utf8"); -test("product voice uses the skill Level 2 report skeleton in the answer body", () => { - assert.match(voice, /VISIBLE VOICE \(skill Level 2 report in Simplified Chinese\)/); +test("product voice uses a spoken opener then the skill Level 2 report skeleton", () => { + assert.match(voice, /VISIBLE VOICE/); + assert.match(voice, /natalSpokenReportContract/); assert.match(voice, /governs METHOD, TECHNIQUE INVOCATION, TRUTH BOUNDARIES/); assert.match(voice, /Raman six-step house judgment/); assert.match(voice, /Yoga table/); @@ -17,13 +18,16 @@ test("product voice uses the skill Level 2 report skeleton in the answer body", assert.match(voice, /已执行 \/ 阻塞 \/ 不适用/); assert.match(voice, /governed_support_only_candidate_ready/); assert.match(voice, /Skip an executed layer the question needs/); - assert.match(voice, /你更适合把已经积累的专业能力做成长期事业|先列本盘岁差/); + assert.match(voice, /你更适合把已经积累的专业能力做成长期事业/); + assert.match(voice, /3–6 heading-free sentences/); + assert.match(voice, /骨架不可省略，但必须以直接回应开场/); assert.match(mastra, /productConversationVoice/); + assert.match(mastra, /natalSpokenReportContract/); assert.match(mastra, /skill Level 2 report skeleton/); assert.match(mastra, /Paste that Technique Audit Table at the end of the answer body/); assert.match(binding, /Follow this method and its truth boundaries/); - assert.match(binding, /present its Level 2 report template in the chat body/); + assert.match(binding, /present its Level 2 report template in the chat body after a 3-6 sentence spoken reply/); assert.match(mastra, /The bound skill method is this product's answering contract/); assert.match(mastra, /Do not use a restricted technique/); assert.match(mastra, /must_use_layers is the executed shortlist/); @@ -38,10 +42,29 @@ test("product voice uses the skill Level 2 report skeleton in the answer body", assert.doesNotMatch(voice, /Do not paste the Technique Audit Table/); }); +test("general and onboarding get voice without the natal Level 2 skeleton", () => { + const generalStart = mastra.indexOf("const generalJyotishInstructions"); + const onboardingStart = mastra.indexOf("const onboardingInstructions"); + const windowStart = mastra.indexOf("const windowJyotishInstructions"); + const natalStart = mastra.indexOf("const jyotishInstructions"); + const general = mastra.slice(generalStart, onboardingStart); + const onboarding = mastra.slice(onboardingStart, mastra.indexOf("const onboardingAgents")); + const window = mastra.slice(windowStart, mastra.indexOf("export function getWindowJyotishAgent")); + const natal = mastra.slice(natalStart, mastra.indexOf("export function getJyotishAgent")); + assert.match(natal, /natalSpokenReportContract/); + assert.match(general, /productConversationVoice/); + assert.doesNotMatch(general, /natalSpokenReportContract/); + assert.match(window, /productConversationVoice/); + assert.doesNotMatch(window, /natalSpokenReportContract/); + assert.doesNotMatch(onboarding, /natalSpokenReportContract/); + assert.doesNotMatch(onboarding, /## 统一参数与原始结构/); + assert.match(onboarding, /knowledgeable, reliable astrologer friend/); +}); + test("consult user turn no longer dumps tool JSON that the model would parrot", () => { const chartBranch = route.slice(route.indexOf("const toolInput = consultationInputSchema.parse")); - assert.match(chartBranch, /请按 skill Level 2 模板回答下面的问题[\s\S]*?resolvedQuestion\.modelQuestion/); + assert.match(chartBranch, /先用 3–6 句口语直接回答下面的问题[\s\S]*?resolvedQuestion\.modelQuestion/); assert.doesNotMatch(chartBranch, /JSON\.stringify\(toolInput\)/); assert.doesNotMatch(chartBranch, /经过服务端校验的工具参数/); assert.match(route, /文末技法审计表/); diff --git a/frontend/tests/rectification-answer-choice.test.ts b/frontend/tests/rectification-answer-choice.test.ts index da9c9007..0d56f7e1 100644 --- a/frontend/tests/rectification-answer-choice.test.ts +++ b/frontend/tests/rectification-answer-choice.test.ts @@ -28,6 +28,7 @@ import { } from "../src/lib/rectification-agentic/v9/run-diagnostic.ts"; import { applyHoldoutAnswer, buildInferenceState } from "../src/lib/rectification-agentic/core/build-state.ts"; import { RECTIFICATION_TERMINATION_COPY } from "../src/lib/rectification-agentic/core/rectification-decision.ts"; +import { containsBoundarySemantics } from "../src/lib/rectification-agentic/user-copy.ts"; import { parseV9CaseDossier, RectificationToolServiceError } from "../src/lib/rectification-agentic/v9/tool-service.ts"; import { CASE_ID, @@ -607,12 +608,12 @@ test("last structured choice emits the adoption range and persists the same narr // Formerly offer_provisional_range: that depended on a 16/14 unresolved fixture being adoptable. assert.equal(applied.nextAction.type, "ready_to_adopt"); assert.equal(applied.nextAction.can_adopt, true); - assert.match(applied.narration, /当前可信区间是/); + assert.match(applied.narration, /05:\d{2}/); assert.match(applied.narration, /代表分钟/); - assert.match(applied.narration, /代表分钟只是代表性候选，不是已确认的唯一出生分钟。/); - assert.match(applied.narration, /可以从下面的时间里选一个采用/); + assert.equal(containsBoundarySemantics(applied.narration), true); + assert.match(applied.narration, /可以从下面选一个先用着/); const turn = accounting.calls.find((call) => call.fn === "append_agentic_rectification_turn"); - assert.match(String(turn?.args.p_assistant_message ?? ""), /可以从下面的时间里选一个采用/); + assert.match(String(turn?.args.p_assistant_message ?? ""), /可以从下面选一个先用着/); }); test("clicking A applies the choice without invoking a language model", async () => { @@ -639,8 +640,8 @@ test("clicking A applies the choice without invoking a language model", async () end: "2015-12-31", }); assert.match(applied.narration, /已记录你的选择/); - assert.match(applied.narration, /当前可信区间/); - assert.doesNotMatch(applied.narration, /家里有没有结婚、添丁或住院/); + assert.match(applied.narration, /05:00–05:10|眼下更像 05:00/); + assert.doesNotMatch(applied.narration, /家里如果有结婚、添丁或住院|家里有没有结婚、添丁或住院/); const fns = accounting.calls.map((call) => call.fn); assert.ok(fns.includes("apply_agentic_rectification_choice_action")); assert.equal(fns.includes("append_agentic_rectification_turn"), true); diff --git a/frontend/tests/rectification-collect-stall.test.ts b/frontend/tests/rectification-collect-stall.test.ts index d76bb2ef..619f8768 100644 --- a/frontend/tests/rectification-collect-stall.test.ts +++ b/frontend/tests/rectification-collect-stall.test.ts @@ -11,6 +11,7 @@ import { type DecisionDossier, } from "../src/lib/rectification-agentic/v9/decision-from-dossier.ts"; import { buildMethodFollowupPlan, spokenFollowupForUser } from "../src/lib/rectification-agentic/v9/method-followup.ts"; +import { USER_COLLECT_QUESTION } from "../src/lib/rectification-agentic/user-copy.ts"; import { focusStatusForAnswer } from "../src/lib/rectification-agentic/v9/choice-action.ts"; import { persistServerOwnedFocus } from "../src/lib/rectification-agentic/v9/server-focus.ts"; import { projectCurrentQuestion } from "../src/lib/rectification-agentic/v9/turn-decision.ts"; @@ -565,7 +566,7 @@ test("occupation collect denial declines the focus and advances coverage to hora target_domain: "occupation", target_kind: null, expected_answer_schema: { - prompt: "你长期做什么工作？", + prompt: "你平时主要做什么工作？", collect: true, }, status: "active", @@ -703,7 +704,7 @@ function occupationCollectFocus(id = FOCUS_ID) { target_kind: null, expected_answer_schema: { collect: true, - prompt: "你长期做什么工作？", + prompt: "你平时主要做什么工作？", }, status: "active", asked_at: "2026-08-30T00:00:00.000Z", @@ -855,13 +856,13 @@ test("duplicate collect focus reloads the active question instead of returning n }, }); const persisted = await persistOccupationAfterChoice(accounting.client); - assert.equal(persisted.hostNarration, "你长期做什么工作？"); + assert.equal(persisted.hostNarration, "你平时主要做什么工作？"); const currentQuestion = projectCurrentQuestion({ id: FOCUS_ID, questionId: "collect:occupation:collect_method_evidence", intent: "collect_method_evidence", targetDomain: "occupation", - expectedAnswerSchema: { collect: true, prompt: "你长期做什么工作？" }, + expectedAnswerSchema: { collect: true, prompt: "你平时主要做什么工作？" }, }); assert.equal(currentQuestion?.question_id, "collect:occupation:collect_method_evidence"); assert.equal(accounting.calls.filter((item) => item.fn === "set_agentic_rectification_conversation_focus").length, 2); @@ -879,7 +880,7 @@ test("skipped collect focus reloads once and retries persistence", async () => { }, }); const persisted = await persistOccupationAfterChoice(accounting.client); - assert.equal(persisted.hostNarration, "你长期做什么工作？"); + assert.equal(persisted.hostNarration, "你平时主要做什么工作？"); assert.equal(writes, 2); const write = accounting.calls.filter((item) => item.fn === "set_agentic_rectification_conversation_focus").at(-1); const currentQuestion = projectCurrentQuestion({ @@ -915,9 +916,8 @@ test("nonterminal turn exit deterministically restores a spoken question", async caseId: CASE_ID, }); assert.equal(repaired.persisted, true); - assert.match(repaired.hostNarration ?? "", /当前可信区间/); assert.match(repaired.hostNarration ?? "", /05:07/); - assert.match(repaired.hostNarration ?? "", /代表分钟/); + assert.match(repaired.hostNarration ?? "", /代表分钟|眼下更像/); const write = accounting.calls.find((item) => item.fn === "set_agentic_rectification_conversation_focus"); const currentQuestion = projectCurrentQuestion({ id: FOCUS_ID, @@ -951,7 +951,7 @@ test("live five-evidence case ends on the occupation spoken collect", async () = const plan = planFrom(dossier); assert.equal(plan.next_followup?.method_id, "occupation"); assert.equal(plan.next_followup?.intent, "collect_method_evidence"); - assert.equal(spokenFollowupForUser(plan.next_followup), "你长期做什么工作？"); + assert.equal(spokenFollowupForUser(plan.next_followup), USER_COLLECT_QUESTION.occupation); const accounting = fakeAccounting({ ...receiptHandlers, @@ -970,7 +970,7 @@ test("live five-evidence case ends on the occupation spoken collect", async () = nextAction: publicNextAction(decision), birthDate: "1997-08-08", }); - assert.match(persisted.hostNarration, /你长期做什么工作？/); + assert.match(persisted.hostNarration, /你平时主要做什么工作？/); const write = accounting.calls.find((item) => item.fn === "set_agentic_rectification_conversation_focus"); const currentQuestion = projectCurrentQuestion({ id: FOCUS_ID, @@ -1140,7 +1140,7 @@ test("collect denial with a new dated event does not persist the next interview target_domain: "occupation", target_kind: null, expected_answer_schema: { - prompt: "你长期做什么工作？", + prompt: "你平时主要做什么工作？", collect: true, }, status: "active", diff --git a/frontend/tests/rectification-decision-authority.test.ts b/frontend/tests/rectification-decision-authority.test.ts index 3c1884f9..eacc845e 100644 --- a/frontend/tests/rectification-decision-authority.test.ts +++ b/frontend/tests/rectification-decision-authority.test.ts @@ -615,7 +615,7 @@ test("nonterminal invariant 3: answer_choice response waits until incident fallb assert.equal(response.status, 200); assert.equal(decision.canAdopt, false); assert.ok(currentQuestion?.prompt); - assert.equal(currentQuestion.prompt, "家里有没有结婚、添丁或住院这类记得住时间的事？不记得具体日子也可以先说有没有。"); + assert.equal(currentQuestion.prompt, "家里如果有结婚、添丁或住院这类事，记得大概哪年就行。"); const historyTurn = accounting.calls.find((call) => call.fn === "append_agentic_rectification_turn"); assert.equal(historyTurn?.args.p_request_id, FOCUS_ID); assert.equal(historyTurn?.args.p_user_message, null); diff --git a/frontend/tests/rectification-eight-method.test.ts b/frontend/tests/rectification-eight-method.test.ts index ba4fd6ee..3561055c 100644 --- a/frontend/tests/rectification-eight-method.test.ts +++ b/frontend/tests/rectification-eight-method.test.ts @@ -2218,7 +2218,7 @@ test("family collect attaches the collection-probe year instead of a yearless D2 assert.equal(plan.next_followup?.probe_year, 2021); assert.match(plan.next_followup?.year_label ?? "", /2021/); assert.doesNotMatch(plan.next_followup?.semantic_key ?? "", /varga\.d24/); - assert.match(spokenFollowupForUser(plan.next_followup) ?? "", /2021 年前后，家里有没有/); + assert.match(spokenFollowupForUser(plan.next_followup) ?? "", /2021 年前后，家里/); }); test("already-open yearless family card is abandoned instead of kept as a scoring frame", () => { diff --git a/frontend/tests/rectification-occupation-coverage-exit.test.ts b/frontend/tests/rectification-occupation-coverage-exit.test.ts index f643b26a..4e5cc791 100644 --- a/frontend/tests/rectification-occupation-coverage-exit.test.ts +++ b/frontend/tests/rectification-occupation-coverage-exit.test.ts @@ -483,7 +483,7 @@ test("tool projection does not pair a 05:00 house table with a 04:47 representat test("collect focus is still not a renderable choice card", () => { assert.equal(isRenderableChoiceOpenQuestion({ question_id: OCCUPATION_FOCUS.questionId, - prompt: "你长期做什么工作？", + prompt: "你平时主要做什么工作？", status: "already_open", kind: "collect_spoken", intent: "collect_method_evidence", diff --git a/frontend/tests/rectification-provisional-adopt.test.ts b/frontend/tests/rectification-provisional-adopt.test.ts index 26477482..2aab8770 100644 --- a/frontend/tests/rectification-provisional-adopt.test.ts +++ b/frontend/tests/rectification-provisional-adopt.test.ts @@ -15,6 +15,7 @@ import { type DecisionDossier, } from "../src/lib/rectification-agentic/v9/decision-from-dossier.ts"; import { persistNextInterviewIfIdle } from "../src/lib/rectification-agentic/v9/answer-choice.ts"; +import { containsBoundarySemantics } from "../src/lib/rectification-agentic/user-copy.ts"; import { buildMethodFollowupPlan, buildNextUserAction, @@ -577,9 +578,9 @@ test("delivery B2: adoptable offer produces adopt_representative with zero follo assert.equal(idle.persisted, false); assert.equal(writes, 0); assert.match(idle.hostNarration ?? "", /05:00–05:07/); - assert.match(idle.hostNarration ?? "", /代表分钟 05:00/); - assert.match(idle.hostNarration ?? "", /代表分钟只是代表性候选，不是已确认的唯一出生分钟/); - assert.match(idle.hostNarration ?? "", /可以从下面的时间里选一个采用/); + assert.match(idle.hostNarration ?? "", /05:00/); + assert.equal(containsBoundarySemantics(idle.hostNarration ?? ""), true); + assert.match(idle.hostNarration ?? "", /可以从下面选一个先用着/); }); test("delivery B3: accept projection stays open from engine receipt, not exact-minute confirm", () => { diff --git a/frontend/tests/rectification-range-offer-deadend.test.ts b/frontend/tests/rectification-range-offer-deadend.test.ts index 0e902ae6..1b447a09 100644 --- a/frontend/tests/rectification-range-offer-deadend.test.ts +++ b/frontend/tests/rectification-range-offer-deadend.test.ts @@ -26,6 +26,7 @@ import { projectRectificationChoiceCard, spokenFollowupForUser, } from "../src/lib/rectification-agentic/v9/method-followup.ts"; +import { USER_COLLECT_QUESTION } from "../src/lib/rectification-agentic/user-copy.ts"; import { persistNextInterviewIfIdle } from "../src/lib/rectification-agentic/v9/answer-choice.ts"; import { informationGainAmongActive } from "../src/lib/rectification-agentic/v9/probe-question-contract.ts"; import { projectCurrentQuestion } from "../src/lib/rectification-agentic/v9/turn-decision.ts"; @@ -570,7 +571,6 @@ test("offerRangeWithoutAdopt persists a spoken collect and narrates the numeric assert.equal(idle.choiceReady, false); assert.match(idle.hostNarration ?? "", /04:47–04:53/); assert.match(idle.hostNarration ?? "", /04:51/); - assert.match(idle.hostNarration ?? "", new RegExp(REPRESENTATIVE_MINUTE_DISCLAIMER)); assert.doesNotMatch(idle.hostNarration ?? "", /升学|转学|考试/); assert.doesNotMatch(idle.hostNarration ?? "", new RegExp(DUAL_EXIT)); const setFocus = accounting.calls.find((item) => item.fn === "set_agentic_rectification_conversation_focus"); @@ -644,7 +644,7 @@ test("exhaustion after family declined and dated domains confirmed asks occupati }); assert.equal(next?.domain, "occupation"); assert.equal(next?.choice_frame, null); - assert.equal(spokenFollowupForUser(next), "你长期做什么工作？"); + assert.equal(spokenFollowupForUser(next), USER_COLLECT_QUESTION.occupation); }); test("exhaustion generic fallback uses domain other, not unknown", () => { @@ -663,5 +663,5 @@ test("exhaustion generic fallback uses domain other, not unknown", () => { assert.equal(next?.domain, "other"); assert.equal(next?.intent, "collect_method_evidence"); assert.equal(stableFollowupQuestionId(next), "collect:other:collect_method_evidence"); - assert.equal(spokenFollowupForUser(next), "可以再说一件记得大概时间的经历。"); + assert.equal(spokenFollowupForUser(next), USER_COLLECT_QUESTION.other); }); diff --git a/frontend/tests/rectification-server-focus.test.ts b/frontend/tests/rectification-server-focus.test.ts index aea31318..0d44cd8f 100644 --- a/frontend/tests/rectification-server-focus.test.ts +++ b/frontend/tests/rectification-server-focus.test.ts @@ -17,6 +17,7 @@ import { spokenFollowupForUser, type MethodFollowup, } from "../src/lib/rectification-agentic/v9/method-followup.ts"; +import { GENERIC_COLLECT_QUESTION } from "../src/lib/rectification-agentic/user-copy.ts"; import type { EventProbeStyleOption } from "../src/lib/rectification-agentic/v9/refinement-packet.ts"; import { fakeAccounting, CASE_ID, FOCUS_ID, USER_ID, activeFocusFixture } from "./rectification-v9-test-support.ts"; @@ -494,7 +495,7 @@ test("spoken collect followup persists a collect focus without a choice card", a test("zero-evidence opening persists the server-owned first question", async () => { const followup = buildMethodFollowupPlan({ evidence: [] }).next_followup; if (!followup) throw new Error("zero-evidence opening must produce a follow-up"); - const expected = "请先说一件你记得大概时间的人生经历，比如升学、入职、搬家、结婚或生病；只记得年份也可以。"; + const expected = GENERIC_COLLECT_QUESTION; const accounting = fakeAccounting({ set_agentic_rectification_conversation_focus: (_fn, args) => ({ diff --git a/frontend/tests/rectification-spoken-collect.test.ts b/frontend/tests/rectification-spoken-collect.test.ts index ff0043f4..58ab123e 100644 --- a/frontend/tests/rectification-spoken-collect.test.ts +++ b/frontend/tests/rectification-spoken-collect.test.ts @@ -27,7 +27,9 @@ import { } from "./rectification-v9-test-support.ts"; import { parseV9CaseDossier as parseDossier } from "../src/lib/rectification-agentic/v9/tool-service.ts"; -const RELATIONSHIP_PROMPT = "还记得别的带年份的感情变化吗？比如开始认真交往、分手或结婚。"; +import { USER_COLLECT_QUESTION } from "../src/lib/rectification-agentic/user-copy.ts"; + +const RELATIONSHIP_PROMPT = USER_COLLECT_QUESTION.relationship; const COLLECT_GET_QUESTION = { question_id: "active_focus:active_focus", diff --git a/frontend/tests/rectification-v9-agent.test.ts b/frontend/tests/rectification-v9-agent.test.ts index fc198757..185e24e2 100644 --- a/frontend/tests/rectification-v9-agent.test.ts +++ b/frontend/tests/rectification-v9-agent.test.ts @@ -64,7 +64,7 @@ test("system prompt carries only high-priority boundaries, never the method copy assert.match(prompt, /思考用简体中文写在思维链/); assert.match(prompt, /对用户说的话必须自己写在正文里/); assert.match(prompt, /题干与选项完全由结构化槽位和 UI 承担/); - assert.match(prompt, /每轮正文只输出一句确认或承接/); + assert.match(prompt, /每轮正文 2-4 句/); assert.match(prompt, /「先这样」由服务器/); assert.doesNotMatch(prompt, /不得询问外貌、体质、胎记或疤痕/); assert.doesNotMatch(prompt, /财务与健康只有用户主动说才问/);