From 8be39d5ad64e93b18838b3d330c6389c262ffab5 Mon Sep 17 00:00:00 2001 From: Jesse_Chen Date: Tue, 21 Jul 2026 07:25:02 +0800 Subject: [PATCH] fix: harden birth-time consultation modes --- frontend/src/app/api/account/route.ts | 153 +++++++------- frontend/src/app/api/consult/route.ts | 136 +++++++++++- frontend/src/app/globals.css | 4 + frontend/src/app/page.tsx | 184 ++++++++++++----- ...onversational-birth-time-rectification.tsx | 11 +- .../unverified-birth-time-choice.tsx | 122 +++++++---- .../hooks/use-conversational-rectification.ts | 29 ++- frontend/src/lib/account-profile-patch.ts | 195 ++++++++++++++++++ .../lib/birth-time-consultation-consent.ts | 80 ++++++- frontend/src/lib/birth-time-intake-model.ts | 109 +++++++++- .../src/lib/consultation-birth-time-mode.ts | 88 ++++++++ frontend/src/mastra/index.ts | 25 +++ frontend/tests/account-api.test.ts | 103 +++++++++ .../birth-time-consultation-consent.test.ts | 96 ++++++++- frontend/tests/birth-time-intake.test.ts | 95 +++++++++ .../consultation-birth-time-mode.test.ts | 97 +++++++++ .../tests/consultation-entrypoint.test.ts | 45 +++- .../consultation-workflow-contract.test.ts | 11 +- ...ersational-rectification-component.test.ts | 122 ++++++++++- ...rsational-rectification-controller.test.ts | 3 + frontend/tests/profile-persistence.test.ts | 14 +- 21 files changed, 1516 insertions(+), 206 deletions(-) create mode 100644 frontend/src/lib/account-profile-patch.ts create mode 100644 frontend/src/lib/consultation-birth-time-mode.ts create mode 100644 frontend/tests/consultation-birth-time-mode.test.ts diff --git a/frontend/src/app/api/account/route.ts b/frontend/src/app/api/account/route.ts index ee996ae0..9b1663d2 100644 --- a/frontend/src/app/api/account/route.ts +++ b/frontend/src/app/api/account/route.ts @@ -3,6 +3,10 @@ import { parseRectificationPriceCredits, type AccountRectificationCaseState, } from "@/lib/birth-time-consultation-consent"; +import { + accountProfilePatchSchema, + resolveAccountBirthTimeApplicationPatch, +} from "@/lib/account-profile-patch"; import { createAdminSupabaseClient, isAdminEmail } from "@/lib/supabase/admin"; import { isSupabaseConfigurationError, @@ -11,45 +15,8 @@ import { createServerSupabaseClient } from "@/lib/supabase/server"; export const runtime = "nodejs"; -type ProfilePatchPayload = { - name?: unknown; - birth_date?: unknown; - birth_time?: unknown; - reported_birth_time?: unknown; - birth_time_source?: unknown; - birth_time_period?: unknown; - birth_time_clue?: unknown; - uncertainty_before_minutes?: unknown; - uncertainty_after_minutes?: unknown; - country_code?: unknown; - province_code?: unknown; - city_code?: unknown; - district_code?: unknown; - latitude?: unknown; - longitude?: unknown; - timezone_offset?: unknown; -}; - -const birthTimeSources = ["hospital_record", "family_exact", "approximate", "period_only", "unknown", "legacy_import"] as const; -const birthTimePeriods = ["early_morning", "morning", "afternoon", "evening", "late_night"] as const; const rectificationStatuses = ["starting", "active", "paused", "confirming", "completed", "abandoned"] as const; -function nullableString(value: unknown) { - return typeof value === "string" && value.trim() ? value.trim() : null; -} - -function nullableNumber(value: unknown) { - return typeof value === "number" && Number.isFinite(value) ? value : null; -} - -function nullableInteger(value: unknown) { - return typeof value === "number" && Number.isInteger(value) ? value : null; -} - -function nullableChoice(value: unknown, choices: readonly string[]) { - return typeof value === "string" && choices.includes(value) ? value : null; -} - function isMissingProfileColumn(error: { code?: string; message?: string } | null) { const message = error?.message?.toLowerCase() ?? ""; return error?.code === "PGRST204" @@ -88,6 +55,7 @@ export async function GET() { if (authError || !user) { return NextResponse.json({ error: "请先登录" }, { status: 401 }); } + const userId = user.id; const rectificationPriceCredits = parseRectificationPriceCredits( process.env.RECTIFICATION_PRICE_CREDITS, @@ -95,7 +63,7 @@ export async function GET() { const { data: profile, error } = await supabase .from("profiles") .select("credits,active_birth_time,birth_time_status") - .eq("id", user.id) + .eq("id", userId) .single(); if (error) { @@ -141,52 +109,99 @@ export async function PATCH(request: Request) { if (authError || !user) { return NextResponse.json({ error: "请先登录" }, { status: 401 }); } + const userId = user.id; - const payload = await request.json().catch(() => null) as ProfilePatchPayload | null; - if (!payload || typeof payload !== "object") { - return NextResponse.json({ error: "账户资料格式不正确" }, { status: 400 }); - } + const parsedPayload = accountProfilePatchSchema.safeParse( + await request.json().catch(() => null), + ); + if (!parsedPayload.success) return NextResponse.json({ + error: "账户资料格式不正确", + details: parsedPayload.error.flatten(), + }, { status: 400 }); + const payload = parsedPayload.data; const admin = createAdminSupabaseClient(); + const { data: currentProfile, error: currentProfileError } = await admin + .from("profiles") + .select("birth_date,birth_time,reported_birth_time,active_birth_time,birth_time_source,birth_time_period,birth_time_clue,uncertainty_before_minutes,uncertainty_after_minutes,birth_time_status,rectification_case_id,country_code,province_code,city_code,district_code") + .eq("id", userId) + .maybeSingle(); + if (currentProfileError) { + return NextResponse.json({ error: "暂时无法核对现有出生资料" }, { status: 500 }); + } + const applicationPatch = currentProfile + ? resolveAccountBirthTimeApplicationPatch(currentProfile, payload) + : {}; const baseProfile = { - id: user.id, - name: nullableString(payload.name), - birth_date: nullableString(payload.birth_date), - birth_time: nullableString(payload.birth_time), - reported_birth_time: nullableString(payload.reported_birth_time), - birth_time_source: nullableChoice(payload.birth_time_source, birthTimeSources), - birth_time_period: nullableChoice(payload.birth_time_period, birthTimePeriods), - birth_time_clue: nullableString(payload.birth_time_clue), - uncertainty_before_minutes: nullableInteger(payload.uncertainty_before_minutes), - uncertainty_after_minutes: nullableInteger(payload.uncertainty_after_minutes), - country_code: nullableString(payload.country_code), - province_code: nullableString(payload.province_code), - city_code: nullableString(payload.city_code), - district_code: nullableString(payload.district_code), + id: userId, + ...(payload.name !== undefined ? { name: payload.name } : {}), + ...(payload.birth_date !== undefined ? { birth_date: payload.birth_date } : {}), + ...(payload.reported_birth_time !== undefined + ? { reported_birth_time: payload.reported_birth_time } + : {}), + ...(payload.birth_time_source !== undefined + ? { birth_time_source: payload.birth_time_source } + : {}), + ...(payload.birth_time_period !== undefined + ? { birth_time_period: payload.birth_time_period } + : {}), + ...(payload.birth_time_clue !== undefined + ? { birth_time_clue: payload.birth_time_clue } + : {}), + ...(payload.uncertainty_before_minutes !== undefined + ? { uncertainty_before_minutes: payload.uncertainty_before_minutes } + : {}), + ...(payload.uncertainty_after_minutes !== undefined + ? { uncertainty_after_minutes: payload.uncertainty_after_minutes } + : {}), + ...(payload.country_code !== undefined ? { country_code: payload.country_code } : {}), + ...(payload.province_code !== undefined ? { province_code: payload.province_code } : {}), + ...(payload.city_code !== undefined ? { city_code: payload.city_code } : {}), + ...(payload.district_code !== undefined ? { district_code: payload.district_code } : {}), + ...applicationPatch, updated_at: new Date().toISOString(), }; const withCoordinates = { ...baseProfile, - latitude: nullableNumber(payload.latitude), - longitude: nullableNumber(payload.longitude), - timezone_offset: nullableNumber(payload.timezone_offset), + ...(payload.latitude !== undefined ? { latitude: payload.latitude } : {}), + ...(payload.longitude !== undefined ? { longitude: payload.longitude } : {}), + ...(payload.timezone_offset !== undefined ? { timezone_offset: payload.timezone_offset } : {}), }; const withoutCoordinates = baseProfile; - let { data, error } = await admin - .from("profiles") - .upsert(withCoordinates, { onConflict: "id" }) - .select("id") - .single(); + const invalidatesUnconfirmedApplication = Object.keys(applicationPatch).length > 0; + async function writeProfile(values: Record) { + if (!currentProfile) { + return admin + .from("profiles") + .upsert(values, { onConflict: "id" }) + .select("id") + .maybeSingle(); + } + let query = admin.from("profiles").update(values).eq("id", userId); + if (invalidatesUnconfirmedApplication) { + query = currentProfile.birth_time_status === null + ? query.is("birth_time_status", null) + : query.eq("birth_time_status", currentProfile.birth_time_status); + query = currentProfile.active_birth_time === null + ? query.is("active_birth_time", null) + : query.eq("active_birth_time", currentProfile.active_birth_time); + } + return query.select("id").maybeSingle(); + } + + let { data, error } = await writeProfile(withCoordinates); if (error && isMissingProfileColumn(error)) { - const fallback = await admin - .from("profiles") - .upsert(withoutCoordinates, { onConflict: "id" }) - .select("id") - .single(); + const fallback = await writeProfile(withoutCoordinates); data = fallback.data; error = fallback.error; } + if (!error && !data && invalidatesUnconfirmedApplication) { + return NextResponse.json({ + error: "出生时间状态已经变化", + message: "最新确认结果已保留，请刷新后重新编辑。", + }, { status: 409 }); + } if (error || !data) { return NextResponse.json({ error: "暂时无法保存账户资料" }, { status: 500 }); } diff --git a/frontend/src/app/api/consult/route.ts b/frontend/src/app/api/consult/route.ts index 01b1db91..47f8d502 100644 --- a/frontend/src/app/api/consult/route.ts +++ b/frontend/src/app/api/consult/route.ts @@ -2,6 +2,7 @@ import { NextResponse } from "next/server"; import { consultationInputSchema, consultationWorkflowReceipt, + getGeneralJyotishAgent, getJyotishAgent, runConsultationWorkflow, } from "@/mastra"; @@ -19,16 +20,22 @@ import { reserveConsultationModel } from "@/lib/consultation-model-selection"; import { createAdminSupabaseClient } from "@/lib/supabase/admin"; import { createServerSupabaseClient } from "@/lib/supabase/server"; import { streamTextResponse } from "@/lib/stream-text-response"; -import { guardPreciseTimingOutput } from "@/lib/timing-output-guard"; +import { + applyBirthTimeModeToWorkflowContext, + consultationBirthTimeModeSchema, + createBirthTimeModeOutputGuard, + serverProfileAllowsBirthTimeMode, + shouldRunBirthChartWorkflow, + type ConsultationBirthTimeMode, +} from "@/lib/consultation-birth-time-mode"; import { z } from "zod"; export const runtime = "nodejs"; export const maxDuration = 60; -const chatRequestSchema = consultationInputSchema.extend({ +const chatRequestMetadataSchema = z.object({ requestId: z.string().uuid(), modelId: z.string().trim().min(1).max(64), - entrypoint: consultationEntrypointSchema.optional(), name: z.string().trim().max(80).optional().default(""), history: z .array( @@ -41,6 +48,24 @@ const chatRequestSchema = consultationInputSchema.extend({ .default([]), }); +const chartChatRequestSchema = consultationInputSchema.extend({ + ...chatRequestMetadataSchema.shape, + consultationMode: consultationBirthTimeModeSchema.exclude(["general_no_birth_time"]) + .optional() + .default("verified_chart"), + entrypoint: consultationEntrypointSchema.optional(), +}); + +const generalChatRequestSchema = z.object({ + ...chatRequestMetadataSchema.shape, + consultationMode: z.literal("general_no_birth_time"), + question: z.string().trim().min(1).max(500), + theme: z.enum(["career", "marriage", "wealth", "timing", "general"]), + entrypoint: z.undefined().optional(), +}).strict(); + +const chatRequestSchema = z.union([generalChatRequestSchema, chartChatRequestSchema]); + function currentTimeContext(now = new Date()) { const chinaTime = new Date(now.getTime() + 8 * 60 * 60 * 1000) .toISOString() @@ -119,6 +144,16 @@ export async function POST(request: Request) { ); } + if (parsed.data.entrypoint === "birth_time_rectification") { + return NextResponse.json( + { + error: "旧版生时校正入口已停用", + message: "请从首页生时校正卡片开始或继续对话式校正，本次不会扣点。", + }, + { status: 409 }, + ); + } + const userControlledPrompt = [ parsed.data.question, ...parsed.data.history @@ -136,6 +171,41 @@ export async function POST(request: Request) { ); } + const requestedConsultationMode = parsed.data.consultationMode; + if (shouldRunBirthChartWorkflow(requestedConsultationMode)) { + if (!("hour" in parsed.data) || !("minute" in parsed.data)) { + return NextResponse.json( + { error: "出生时间请求格式不正确" }, + { status: 400 }, + ); + } + const requestedTime = `${String(parsed.data.hour).padStart(2, "0")}:${String(parsed.data.minute).padStart(2, "0")}`; + const { data: birthTimeProfile, error: birthTimeProfileError } = await supabase + .from("profiles") + .select("active_birth_time,reported_birth_time,birth_time_source,birth_time_status") + .eq("id", user.id) + .single(); + if (birthTimeProfileError || !birthTimeProfile) { + return NextResponse.json( + { error: "暂时无法核对出生时间状态", message: "请稍后重试，本次不会扣点。" }, + { status: 503 }, + ); + } + if (!serverProfileAllowsBirthTimeMode( + birthTimeProfile, + requestedConsultationMode, + requestedTime, + )) { + return NextResponse.json( + { + error: "出生时间状态已经变化", + message: "请刷新后重新选择使用填报时间、一般咨询或先完成校正，本次不会扣点。", + }, + { status: 409 }, + ); + } + } + const requestTime = new Date(); const resolvedQuestion = resolveConsultationQuestion({ visibleQuestion: parsed.data.question, @@ -230,11 +300,60 @@ export async function POST(request: Request) { try { const { history, name } = parsed.data; + const consultationMode: ConsultationBirthTimeMode = parsed.data.consultationMode; + if (!shouldRunBirthChartWorkflow(consultationMode)) { + const result = await getGeneralJyotishAgent(selectedModel).stream([ + { + role: "user", + content: [ + currentTimeContext(requestTime), + name ? `用户称呼：${name}` : "", + "当前是用户明确选择的无出生分钟一般咨询。不得计算或推断个人星盘；不得补 00:00、时段中点或任何候选分钟。", + resolvedQuestion.modelQuestion, + ].filter(Boolean).join("\n"), + }, + ]); + const completeAndRecordUsage = async () => { + await complete(); + void recordModelUsage( + accounting, + userId, + requestId, + modelSelection.usageModelId, + result.totalUsage, + ); + }; + const settleInterrupted = (emitted: boolean) => + settle(emitted ? completeAndRecordUsage : cancel); + return streamTextResponse(result.textStream, { + transformText: createBirthTimeModeOutputGuard(consultationMode, false), + mode: "mastra", + requestId, + headers: { + "x-jyotish-workflow-route": "general-no-birth-time", + "x-jyotish-workflow-status": "ready", + "x-jyotish-technique-truth": "not-applicable", + "x-jyotish-precise-timing": "blocked", + "x-jyotish-missing-layers": "birth-minute", + "x-jyotish-birth-time-mode": consultationMode, + }, + onComplete: () => settle(completeAndRecordUsage), + onError: (_error, emitted) => settleInterrupted(emitted), + onCancel: settleInterrupted, + }); + } + const toolInput = consultationInputSchema.parse({ ...parsed.data, + // Unverified use is still a normal chart calculation with a hard answer + // boundary. It must never reactivate the retired rectification questionnaire. + entryMode: "direct_chart", question: resolvedQuestion.modelQuestion, }); - const workflowContext = await runConsultationWorkflow(toolInput); + const workflowContext = applyBirthTimeModeToWorkflowContext( + await runConsultationWorkflow(toolInput), + consultationMode, + ); const workflowReceipt = consultationWorkflowReceipt(workflowContext); const result = await getJyotishAgent(selectedModel, workflowContext).stream([ @@ -265,10 +384,10 @@ export async function POST(request: Request) { const settleInterrupted = (emitted: boolean) => settle(emitted ? completeAndRecordUsage : cancel); return streamTextResponse(result.textStream, { - transformText: - workflowReceipt.preciseTiming === "blocked" - ? guardPreciseTimingOutput - : undefined, + transformText: createBirthTimeModeOutputGuard( + consultationMode, + workflowReceipt.preciseTiming !== "blocked", + ), mode: "mastra", requestId, headers: { @@ -277,6 +396,7 @@ export async function POST(request: Request) { "x-jyotish-technique-truth": workflowReceipt.techniqueTruth, "x-jyotish-precise-timing": workflowReceipt.preciseTiming, "x-jyotish-missing-layers": workflowReceipt.missingLayers, + "x-jyotish-birth-time-mode": consultationMode, }, onComplete: () => settle(completeAndRecordUsage), onError: (_error, emitted) => settleInterrupted(emitted), diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css index ec5b6d94..3fcd44dd 100644 --- a/frontend/src/app/globals.css +++ b/frontend/src/app/globals.css @@ -132,6 +132,10 @@ button:disabled { cursor: default; opacity: .45; } .onboarding-card-actions { display: flex; justify-content: flex-end; padding-top: 2px; } .onboarding-card-actions .button-primary { min-width: 84px; } .birth-time-transition-card { position: relative; overflow: hidden; } +.unverified-birth-time-choice-scrim { position: fixed; inset: 0; z-index: 90; display: grid; place-items: center; padding: var(--space-4); overflow-y: auto; background: var(--color-scrim); } +.unverified-birth-time-choice { width: min(100%, 620px); margin: 0; overflow: visible; } +.unverified-birth-time-choice .onboarding-card-actions { flex-wrap: wrap; gap: var(--space-2); } +.unverified-birth-time-choice button { min-height: 44px; } .birth-time-transition-fields { min-width: 0; display: grid; gap: 14px; margin: 0; padding: 0; border: 0; } .birth-time-assessment-overlay { position: absolute; z-index: 2; inset: 0; display: grid; place-items: center; padding: var(--space-6); border-radius: inherit; background: color-mix(in srgb, var(--color-canvas-soft) 94%, transparent); backdrop-filter: blur(2px); } .birth-time-assessment-progress { width: min(360px, 100%); display: grid; justify-items: center; gap: var(--space-2); color: var(--color-ink-secondary); text-align: center; } diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx index 4445862a..822e2139 100644 --- a/frontend/src/app/page.tsx +++ b/frontend/src/app/page.tsx @@ -22,9 +22,11 @@ import { chinaLocations, type ProvinceNode } from "@/data/china-locations"; import { parseAgentReply, type ReplyTheme } from "@/lib/agent-reply"; import type { ConsultationEntrypoint } from "@/lib/consultation-entrypoint"; import { + applyBirthTimeDraftPatch, assistantIntentCopy, birthTimeDisplayState, birthTimePersistenceValues, + declaredBirthInputChanged, describeBirthTimeDraft, isDeclaredBirthProfileComplete, isBirthTimeDraftReady, @@ -34,16 +36,17 @@ import { import { canUseUnverifiedBirthTime, clearBirthTimeConsultationConsent, + createLatestAccountRequestGuard, createBirthTimeConsultationConsentState, grantBirthTimeConsultationConsent, - hasBirthTimeConsultationConsent, - requiresBirthTimeConsent, + resolveBirthTimeConsultationRoute, resolveRectificationCardAction, unverifiedBirthTime, type AccountRectificationCaseState, type BirthTimeConsultationConsentState, type RectificationCardAction, } from "@/lib/birth-time-consultation-consent"; +import type { ConsultationBirthTimeMode } from "@/lib/consultation-birth-time-mode"; import { sendConversationalRectificationCommand } from "@/lib/conversational-rectification/client"; import type { ConversationalRectificationTurn } from "@/lib/conversational-rectification/contracts"; import { useBirthTimeGuidedJourney } from "@/hooks/use-birth-time-guided-journey"; @@ -423,7 +426,7 @@ async function fetchDailyStarlanguage(profile: Profile) { function missingProfileStep(profile: Profile): OnboardingStep | null { if (!profile.name.trim()) return "name"; if (!isDeclaredBirthProfileComplete(profile)) return "birth"; - if (!selectedBirthPlace(profile)) return "place"; + if (!isDeclaredBirthProfileComplete(profile, selectedBirthPlace(profile))) return "place"; return null; } @@ -491,14 +494,15 @@ function readProfile(value: unknown): Profile { const time = typeof profile.active_birth_time === "string" ? profile.active_birth_time.slice(0, 5) : legacyTime; - const reportedTime = typeof profile.reported_birth_time === "string" + const persistedReportedTime = typeof profile.reported_birth_time === "string" ? profile.reported_birth_time.slice(0, 5) - : time; + : ""; const knownSources: readonly BirthTimeSource[] = [ "hospital_record", "family_exact", "approximate", "period_only", "unknown", "legacy_import", ]; const source = knownSources.find((item) => item === profile.birth_time_source) ?? (time ? "legacy_import" : ""); + const reportedTime = persistedReportedTime || (source === "legacy_import" ? time : ""); const knownPeriods = ["early_morning", "morning", "afternoon", "evening", "late_night"] as const; const period = knownPeriods.find((item) => item === profile.birth_time_period) ?? ""; const knownStatuses = ["reported", "assessing", "rectifying", "candidate", "confirmed"] as const; @@ -588,6 +592,21 @@ function BirthLocationFields({ value, onChange }: { value: Profile; onChange: (p ); } +const birthLocationKeys = ["countryCode", "provinceCode", "cityCode", "districtCode"] as const; + +function birthProfileDeclarationChanged(current: Profile, next: Profile) { + return declaredBirthInputChanged(current, next) + || birthLocationKeys.some((key) => current[key] !== next[key]); +} + +function invalidateCandidateAfterLocationChange(current: Profile, next: Profile): Profile { + const locationChanged = birthLocationKeys.some((key) => current[key] !== next[key]); + if (!locationChanged + || current.birthTimeStatus === "confirmed" + || (current.birthTimeStatus !== "candidate" && !current.time)) return next; + return { ...next, time: "", birthTimeStatus: "reported" }; +} + function ProfileFields({ value, onChange, nameInputId }: { value: Profile; onChange: (profile: Profile) => void; nameInputId?: string }) { return ( <> @@ -595,8 +614,11 @@ function ProfileFields({ value, onChange, nameInputId }: { value: Profile; onCha 如何称呼你 onChange({ ...value, name: event.target.value })} /> - onChange({ ...value, ...patch })} /> - + onChange(applyBirthTimeDraftPatch(value, patch))} /> + onChange(invalidateCandidateAfterLocationChange(value, next))} + /> ); } @@ -723,6 +745,7 @@ export default function Home() { const [rectificationInitialTurn, setRectificationInitialTurn] = useState(null); const [rectificationPendingQuestion, setRectificationPendingQuestion] = useState(null); const [rectificationLoading, setRectificationLoading] = useState(false); + const [rectificationMutationPending, setRectificationMutationPending] = useState(false); const [rectificationError, setRectificationError] = useState(""); const [hydrated, setHydrated] = useState(false); const [profileSaving, setProfileSaving] = useState(false); @@ -756,6 +779,7 @@ export default function Home() { const activeSessionIdRef = useRef(""); const chartLibraryLoadedAccount = useRef(""); const activeOnboardingRequestIdentity = useRef(""); + const accountRefreshGuard = useRef(createLatestAccountRequestGuard()); const uiPreview = useRef(false); const uiPreviewMode = useRef(null); const birthTimeRevisionPending = useRef(false); @@ -769,12 +793,20 @@ export default function Home() { }); const activeSession = sessions.find((session) => session.id === activeSessionId) ?? sessions[0]; + const activeBirthTimeChoice = pendingBirthTimeChoice?.sessionId === activeSession?.id + ? pendingBirthTimeChoice + : null; const visibleSessions = sessions .filter((session) => showArchivedSessions ? archivedSessionIds.includes(session.id) : !archivedSessionIds.includes(session.id)) .sort((left, right) => Number(pinnedSessionIds.includes(right.id)) - Number(pinnedSessionIds.includes(left.id))); const activeError = requestError && requestError.sessionId === activeSession?.id ? requestError.message : ""; const isLoading = pendingSessionId === activeSession?.id; - const productEntrypointsDisabled = !hydrated || Boolean(pendingSessionId) || cancellationPending || !account || !modelCatalog; + const productEntrypointsDisabled = !hydrated + || Boolean(pendingSessionId) + || cancellationPending + || rectificationMutationPending + || !account + || !modelCatalog; const activeStreamingText = streamingReply && streamingReply.sessionId === activeSession?.id ? streamingReply.text : ""; const accountId = account?.user.id; const rectificationCardAction = resolveRectificationCardAction({ @@ -1195,10 +1227,25 @@ export default function Home() { }, [activeAccountDialog, signingOut]); async function refreshAccount() { + const requestIdentity = accountRefreshGuard.current.begin(); try { - setAccount(await fetchAccount()); + const latest = await fetchAccount(); + if (!accountRefreshGuard.current.isCurrent(requestIdentity)) return; + setAccount((current) => { + if (current?.rectificationCase + && latest.rectificationCase?.caseId === current.rectificationCase.caseId + && latest.rectificationCase.turnVersion < current.rectificationCase.turnVersion) { + return { + ...latest, + hasConfirmedBirthTime: latest.hasConfirmedBirthTime || current.hasConfirmedBirthTime, + rectificationCase: current.rectificationCase, + }; + } + return latest; + }); setAccountError(""); } catch (caught) { + if (!accountRefreshGuard.current.isCurrent(requestIdentity)) return; setAccountError(caught instanceof Error ? caught.message : "暂时无法读取账户信息"); } } @@ -1312,7 +1359,6 @@ export default function Home() { setDraft(""); setDraftTheme(null); setDraftEntrypoint(null); - setPendingBirthTimeChoice(null); setComposerNotice(""); setRequestError(null); try { @@ -1331,7 +1377,6 @@ export default function Home() { function selectSession(sessionId: string) { setActiveSessionId(sessionId); - setPendingBirthTimeChoice(null); setDraft(""); setDraftEntrypoint(null); setComposerNotice(""); @@ -1533,9 +1578,13 @@ export default function Home() { setProfileNotice(""); setAccountError(""); try { + const declarationChanged = birthProfileDeclarationChanged(profile, profileDraft); await persistProfile(profileDraft); setProfile(profileDraft); setProfileDraft(profileDraft); + if (declarationChanged) { + setBirthTimeConsultationConsent(createBirthTimeConsultationConsentState()); + } setProfileNotice(profileDraft.birthTimeStatus === "confirmed" ? "出生资料已保存到云端，可在同一账号的其他设备使用。" : "出生资料已保存。你可以先使用填报时间询问，也可以从首页卡片开始校正。"); @@ -1726,7 +1775,7 @@ export default function Home() { } async function openBirthTimeRectification(pendingConsultationQuestion: string | null = null) { - if (!account || rectificationLoading) return; + if (!account || rectificationLoading || rectificationMutationPending) return; const action = resolveRectificationCardAction({ rectificationCase: account.rectificationCase, hasConfirmedBirthTime: account.hasConfirmedBirthTime, @@ -1761,6 +1810,7 @@ export default function Home() { } function handleConversationalRectificationTurn(turn: ConversationalRectificationTurn) { + const requestIdentity = accountRefreshGuard.current.begin(); setRectificationInitialTurn(turn); setAccount((current) => current ? { ...current, @@ -1794,7 +1844,14 @@ export default function Home() { })); } void fetchAccount() - .then((latest) => setAccount(latest)) + .then((latest) => { + if (!accountRefreshGuard.current.isCurrent(requestIdentity)) return; + setAccount((current) => { + if (latest.rectificationCase?.caseId !== turn.caseId + || latest.rectificationCase.turnVersion < turn.turnVersion) return current; + return latest; + }); + }) .catch(() => undefined); } @@ -1989,7 +2046,7 @@ export default function Home() { text: string, requestedTheme?: Theme, entrypoint: ConsultationEntrypoint | null = null, - consentGrantedForRequest = false, + consentGrantedForRequest: ConsultationBirthTimeMode | null = null, ) { const originalQuestion = text; const question = text.trim(); @@ -2012,26 +2069,28 @@ export default function Home() { const currentSession = activeSession; const theme = requestedTheme ?? currentSession.theme; const sessionId = currentSession.id; - const consultationTime = profile.birthTimeStatus === "confirmed" - ? profile.time - : unverifiedBirthTime(profile); - const hasSessionConsent = hasBirthTimeConsultationConsent( - birthTimeConsultationConsent, + const consentForDecision = consentGrantedForRequest === "unverified_birth_time" + ? grantBirthTimeConsultationConsent( + birthTimeConsultationConsent, + sessionId, + "unverified_birth_time", + ) + : birthTimeConsultationConsent; + const consultationRoute = resolveBirthTimeConsultationRoute( + profile, + consentForDecision, sessionId, ); - if (!consultationTime - || (requiresBirthTimeConsent(profile) - && !hasSessionConsent - && !consentGrantedForRequest)) { + if (consultationRoute.kind === "choice") { setPendingBirthTimeChoice({ sessionId, question, entrypoint, theme, }); - setComposerNotice(consultationTime + setComposerNotice(consultationRoute.canUseUnverifiedTime ? "请选择在当前聊天临时使用填报时间，或先校正再询问。" - : "你还没有可使用的具体出生分钟，可以先校正再询问。"); + : "你还没有可使用的具体出生分钟，可以先校正，或改问不依赖出生分钟的一般问题。"); return; } @@ -2041,7 +2100,7 @@ export default function Home() { } const [year, month, day] = profile.date.split("-").map(Number); - const [hour, minute] = consultationTime.split(":").map(Number); + const [hour, minute] = consultationRoute.time?.split(":").map(Number) ?? []; const preservedMessages = onboardingJustCompleted && currentSession.messages.length === 0 ? completedOnboardingTranscript(profile, startGreeting) @@ -2138,19 +2197,22 @@ export default function Home() { body: JSON.stringify({ requestId, modelId: currentSession.modelId, - entrypoint: entrypoint ?? undefined, name: profile.name, - year, - month, - day, - hour, - minute, - city: birthPlace.label, - lat: birthPlace.lat, - lon: birthPlace.lon, - tz: birthPlace.tz, + consultationMode: consultationRoute.mode, + ...(consultationRoute.mode === "general_no_birth_time" ? {} : { + entrypoint: entrypoint ?? undefined, + year, + month, + day, + hour, + minute, + city: birthPlace.label, + lat: birthPlace.lat, + lon: birthPlace.lon, + tz: birthPlace.tz, + entryMode: "direct_chart" as const, + }), theme, - entryMode: profile.birthTimeStatus === "confirmed" ? "direct_chart" : "rectification", question, history: currentSession.messages.slice(-12).map((message) => ({ role: message.role, @@ -2287,10 +2349,32 @@ export default function Home() { setBirthTimeConsultationConsent((current) => grantBirthTimeConsultationConsent( current, activeSession.id, + "unverified_birth_time", )); setPendingBirthTimeChoice(null); setComposerNotice("本次聊天会标明出生时间尚未校正；新聊天会重新提醒。"); - void send(pending.question, pending.theme, pending.entrypoint, true); + void send(pending.question, pending.theme, pending.entrypoint, "unverified_birth_time"); + } + + function continueGenerallyWithoutBirthTime() { + if (!pendingBirthTimeChoice + || !activeSession + || pendingBirthTimeChoice.sessionId !== activeSession.id + || canUseUnverifiedBirthTime(profile)) return; + const pending = pendingBirthTimeChoice; + setBirthTimeConsultationConsent((current) => grantBirthTimeConsultationConsent( + current, + activeSession.id, + "general_no_birth_time", + )); + setDraft(pending.question); + setDraftTheme("general"); + // Product entrypoints such as "今日星语" require a chart. General mode + // deliberately restores only visible text and never carries hidden routing. + setDraftEntrypoint(null); + setPendingBirthTimeChoice(null); + setComposerNotice("原问题尚未发送，也没有扣点。请把它改成不依赖个人出生分钟的一般问题后再发送。"); + window.requestAnimationFrame(() => composerInput.current?.focus()); } function rectifyBeforePendingConsultation() { @@ -2465,7 +2549,7 @@ export default function Home() {
出生时间按你实际知道的程度填写，不需要猜测
- setProfileDraft((current) => ({ ...current, ...patch }))} /> + setProfileDraft((current) => applyBirthTimeDraftPatch(current, patch))} /> {accountError &&

{accountError}

}
@@ -2513,7 +2597,7 @@ export default function Home() { {!profileComplete && onboardingStep === "name" && accountError &&

{accountError}

} - {profileComplete && presetMessageFinished && !rectificationSurfaceOpen && !pendingBirthTimeChoice && (onboardingPending ? ( + {profileComplete && presetMessageFinished && !rectificationSurfaceOpen && !activeBirthTimeChoice && (onboardingPending ? (
正在准备三个入门问题…
) : (
@@ -2544,7 +2628,7 @@ export default function Home() { className="product-entrypoint-hitarea" type="button" aria-label={`${rectificationCardLabel}，固定费用 ${account.rectificationPriceCredits} 点`} - disabled={productEntrypointsDisabled || rectificationLoading} + disabled={productEntrypointsDisabled || rectificationLoading || rectificationMutationPending} onClick={() => void openBirthTimeRectification()} />
@@ -2599,12 +2683,13 @@ export default function Home() {
)} - {pendingBirthTimeChoice?.sessionId === activeSession?.id && ( + {activeBirthTimeChoice && ( @@ -2620,9 +2705,13 @@ export default function Home() {
@@ -2644,6 +2733,7 @@ export default function Home() { )} @@ -2655,7 +2745,7 @@ export default function Home() { {activeSuggestions.length > 0 && (
{activeSuggestions.map((question) => ( - + ))}
)} @@ -2674,7 +2764,7 @@ export default function Home() { : "例如：未来半年是否适合换工作？"} rows={1} maxLength={!profileComplete && onboardingStep === "name" ? 80 : 500} - disabled={isLoading || cancellationPending || Boolean(pendingBirthTimeChoice) || rectificationSurfaceOpen || (!profileComplete && (onboardingStep !== "name" || !presetMessageFinished || profileSaving))} + disabled={isLoading || cancellationPending || Boolean(activeBirthTimeChoice) || rectificationSurfaceOpen || (!profileComplete && (onboardingStep !== "name" || !presetMessageFinished || profileSaving))} value={draft} onChange={(event) => { setDraft(event.target.value); @@ -2696,7 +2786,7 @@ export default function Home() {
- {turn.actions.includes("continue_original_question") && pendingQuestion && ( + {turn.actions.includes("continue_original_question") + && pendingQuestion + && onContinueOriginalQuestion && (

原问题：{pendingQuestion}

+ ) : ( + + )} + - )} - - -
- +
+ + ); } diff --git a/frontend/src/hooks/use-conversational-rectification.ts b/frontend/src/hooks/use-conversational-rectification.ts index d10a2c8a..1ea99881 100644 --- a/frontend/src/hooks/use-conversational-rectification.ts +++ b/frontend/src/hooks/use-conversational-rectification.ts @@ -50,6 +50,7 @@ type ControllerInput = Readonly<{ send?: (command: ConversationalRectificationCommand) => Promise; createActionId?: () => string; onTurn?: (turn: ConversationalRectificationTurn) => void; + onPendingChange?: (pending: boolean) => void; }>; type Mutation = Readonly<{ @@ -76,6 +77,9 @@ function createLatestControllerInput(initial: ControllerInput) { onTurn(turn: ConversationalRectificationTurn) { current.onTurn?.(turn); }, + onPendingChange(pending: boolean) { + current.onPendingChange?.(pending); + }, }; } @@ -115,6 +119,15 @@ export function createConversationalRectificationController( const patch = (next: Partial) => { publish({ ...snapshot, ...next }); }; + const setPending = (pending: boolean) => { + if (snapshot.pending === pending) return; + patch({ pending }); + try { + input.onPendingChange?.(pending); + } catch { + // Parent locks are observational and cannot change durable mutation state. + } + }; const acceptTurn = ( turn: ConversationalRectificationTurn, clearDraft: boolean, @@ -160,7 +173,8 @@ export function createConversationalRectificationController( })); const run = (mutation: Mutation): MutationResult => { if (activeMutation?.caseContext === caseContext) return activeMutation.promise; - patch({ pending: true, error: "" }); + patch({ error: "" }); + setPending(true); const turnAtStart = snapshot.turn; const caseContextAtStart = caseContext; const mutationToken = Symbol("conversational-rectification-mutation"); @@ -190,7 +204,7 @@ export function createConversationalRectificationController( .finally(() => { if (activeMutation?.token !== mutationToken) return; activeMutation = null; - if (caseContext === caseContextAtStart) patch({ pending: false }); + if (caseContext === caseContextAtStart) setPending(false); }); activeMutation = { caseContext: caseContextAtStart, @@ -241,6 +255,11 @@ export function createConversationalRectificationController( if (current === null) return; caseContext += 1; activeMutation = null; + try { + input.onPendingChange?.(false); + } catch { + // Parent locks are observational. + } patch({ turn: null, draft: "", @@ -254,6 +273,11 @@ export function createConversationalRectificationController( if (current === null || current.caseId !== turn.caseId) { caseContext += 1; activeMutation = null; + try { + input.onPendingChange?.(false); + } catch { + // Parent locks are observational. + } patch({ turn, draft: "", @@ -388,6 +412,7 @@ export function useConversationalRectification( createActionId: input.createActionId, send: latestInput.send, onTurn: latestInput.onTurn, + onPendingChange: latestInput.onPendingChange, })); const snapshot = useSyncExternalStore( controller.subscribe, diff --git a/frontend/src/lib/account-profile-patch.ts b/frontend/src/lib/account-profile-patch.ts new file mode 100644 index 00000000..2cba8b5c --- /dev/null +++ b/frontend/src/lib/account-profile-patch.ts @@ -0,0 +1,195 @@ +import { z } from "zod"; +import { isBirthClockTime, parseBirthDate } from "./birth-time-intake-model.ts"; + +const nullableTrimmedString = (maximum: number) => z.string().trim().min(1).max(maximum).nullable(); +const nullableBirthDate = z.string().refine((value) => parseBirthDate(value) !== undefined, { + message: "出生日期必须是真实的 1900—2100 年 ISO 日期", +}).nullable(); +const nullableBirthClock = z.string().refine(isBirthClockTime, { + message: "出生时间必须是 HH:mm", +}).nullable(); + +const birthTimeSourceSchema = z.enum([ + "hospital_record", + "family_exact", + "approximate", + "period_only", + "unknown", + "legacy_import", +]); +const birthTimePeriodSchema = z.enum([ + "early_morning", + "morning", + "afternoon", + "evening", + "late_night", +]); + +export const accountProfilePatchSchema = z.object({ + name: nullableTrimmedString(80).optional(), + birth_date: nullableBirthDate.optional(), + // Accepted only for backward-compatible parsing. The account route never + // writes this client field into active/confirmed birth-time truth. + birth_time: nullableBirthClock.optional(), + reported_birth_time: nullableBirthClock.optional(), + birth_time_source: birthTimeSourceSchema.nullable().optional(), + birth_time_period: birthTimePeriodSchema.nullable().optional(), + birth_time_clue: nullableTrimmedString(240).optional(), + uncertainty_before_minutes: z.number().int().min(0).max(720).nullable().optional(), + uncertainty_after_minutes: z.number().int().min(0).max(720).nullable().optional(), + country_code: nullableTrimmedString(8).optional(), + province_code: nullableTrimmedString(24).optional(), + city_code: nullableTrimmedString(24).optional(), + district_code: nullableTrimmedString(24).optional(), + latitude: z.number().finite().min(-90).max(90).nullable().optional(), + longitude: z.number().finite().min(-180).max(180).nullable().optional(), + timezone_offset: z.number().finite().min(-12).max(14).nullable().optional(), +}).strict().superRefine((value, context) => { + const source = value.birth_time_source; + const time = value.reported_birth_time; + const before = value.uncertainty_before_minutes; + const after = value.uncertainty_after_minutes; + const addIssue = (path: string, message: string) => context.addIssue({ + code: z.ZodIssueCode.custom, + path: [path], + message, + }); + + const declarationKeys = [ + "birth_date", + "reported_birth_time", + "birth_time_source", + "birth_time_period", + "birth_time_clue", + "uncertainty_before_minutes", + "uncertainty_after_minutes", + ] as const; + const mutatesDeclaration = declarationKeys.some((key) => value[key] !== undefined); + const coordinates = [value.latitude, value.longitude, value.timezone_offset]; + const concreteCoordinateCount = coordinates.filter((coordinate) => coordinate != null).length; + if (concreteCoordinateCount > 0 && concreteCoordinateCount < coordinates.length) { + addIssue("latitude", "出生地点坐标与时区必须完整提交"); + } + if (source === undefined) { + if (mutatesDeclaration) addIssue("birth_time_source", "修改出生资料时必须同时说明时间来源"); + return; + } + if (source === null) { + if (value.birth_date !== undefined && value.birth_date !== null) { + addIssue("birth_time_source", "填写出生日期后必须说明时间来源"); + } + if (time || value.birth_time || value.birth_time_period || value.birth_time_clue + || before != null || after != null) { + addIssue("birth_time_source", "未选择时间来源时不得提交时间或误差范围"); + } + return; + } + if (!value.birth_date) addIssue("birth_date", "出生时间声明必须包含真实出生日期"); + if (source !== "legacy_import" && value.birth_time) { + addIssue("birth_time", "只有既有资料迁移可以提交兼容时间字段"); + } + + const ensureNoPeriod = () => { + if (value.birth_time_period) addIssue("birth_time_period", "具体时间来源不得同时提交时段"); + }; + const ensureNoUncertainty = () => { + if (before != null || after != null) { + addIssue("uncertainty_before_minutes", "该时间来源不得提交误差范围"); + } + }; + + if (source === "hospital_record") { + if (!time) addIssue("reported_birth_time", "医院记录需要具体时间"); + if (before !== 2 || after !== 2) addIssue("uncertainty_before_minutes", "医院记录固定检查前后 2 分钟"); + ensureNoPeriod(); + } else if (source === "family_exact") { + if (!time) addIssue("reported_birth_time", "家人记忆需要具体时间"); + if (![5, 10, 15].includes(before ?? -1) || before !== after) { + addIssue("uncertainty_before_minutes", "家人记忆误差必须为前后 5、10 或 15 分钟"); + } + ensureNoPeriod(); + } else if (source === "approximate") { + if (!time) addIssue("reported_birth_time", "大概时间需要具体 HH:mm"); + if (![15, 30, 60].includes(before ?? -1) || before !== after) { + addIssue("uncertainty_before_minutes", "大概时间误差必须为前后 15、30 或 60 分钟"); + } + ensureNoPeriod(); + } else if (source === "legacy_import") { + if (!time && !value.birth_time) addIssue("reported_birth_time", "既有资料需要具体时间"); + ensureNoPeriod(); + ensureNoUncertainty(); + } else if (source === "period_only") { + if (!value.birth_time_period) addIssue("birth_time_period", "只知道时段时必须选择时段"); + if (time) addIssue("reported_birth_time", "只知道时段时不得同时提交具体分钟"); + ensureNoUncertainty(); + } else if (source === "unknown") { + if (time) addIssue("reported_birth_time", "时间未知时不得提交具体分钟"); + if (value.birth_time_period) addIssue("birth_time_period", "时间未知时不得提交确定时段"); + ensureNoUncertainty(); + } + +}); + +export type AccountProfilePatch = z.infer; + +type AccountBirthTimeState = Readonly<{ + birth_date: string | null; + reported_birth_time: string | null; + birth_time_source: string | null; + birth_time_period: string | null; + birth_time_clue: string | null; + uncertainty_before_minutes: number | null; + uncertainty_after_minutes: number | null; + active_birth_time: string | null; + birth_time: string | null; + birth_time_status: string | null; + rectification_case_id: string | null; + country_code?: string | null; + province_code?: string | null; + city_code?: string | null; + district_code?: string | null; +}>; + +const declarationFields = [ + "birth_date", + "reported_birth_time", + "birth_time_source", + "birth_time_period", + "birth_time_clue", + "uncertainty_before_minutes", + "uncertainty_after_minutes", + "country_code", + "province_code", + "city_code", + "district_code", +] as const; + +export type AccountBirthTimeApplicationPatch = Readonly<{ + active_birth_time?: null; + birth_time?: null; + birth_time_status?: "reported"; + rectification_case_id?: null; +}>; + +export function resolveAccountBirthTimeApplicationPatch( + current: AccountBirthTimeState, + patch: AccountProfilePatch, +): AccountBirthTimeApplicationPatch { + const declarationChanged = declarationFields.some((field) => ( + patch[field] !== undefined && patch[field] !== current[field] + )); + if (!declarationChanged) return {}; + + const confirmed = current.birth_time_status === "confirmed" + || (current.birth_time_status === null && isBirthClockTime(current.birth_time ?? "")); + if (confirmed) return {}; + if (!current.active_birth_time + && !current.birth_time + && current.birth_time_status !== "candidate") return {}; + return { + active_birth_time: null, + birth_time: null, + birth_time_status: "reported", + rectification_case_id: null, + }; +} diff --git a/frontend/src/lib/birth-time-consultation-consent.ts b/frontend/src/lib/birth-time-consultation-consent.ts index 0245d81a..778a60e7 100644 --- a/frontend/src/lib/birth-time-consultation-consent.ts +++ b/frontend/src/lib/birth-time-consultation-consent.ts @@ -1,6 +1,14 @@ -import type { BirthTimeDraft } from "./birth-time-intake-model.ts"; +import { isBirthClockTime, type BirthTimeDraft } from "./birth-time-intake-model.ts"; +import type { ConsultationBirthTimeMode } from "./consultation-birth-time-mode.ts"; -export type BirthTimeConsultationConsentState = Readonly>; +export type BirthTimeConsultationConsentMode = Extract< + ConsultationBirthTimeMode, + "unverified_birth_time" | "general_no_birth_time" +>; + +export type BirthTimeConsultationConsentState = Readonly< + Record +>; export type AccountRectificationCaseState = Readonly<{ caseId: string; @@ -34,15 +42,27 @@ export function hasBirthTimeConsultationConsent( state: BirthTimeConsultationConsentState, sessionId: string, ): boolean { - return Boolean(sessionId && state[sessionId] === true); + return consultationModeForSession(state, sessionId) !== null; +} + +export function consultationModeForSession( + state: BirthTimeConsultationConsentState, + sessionId: string, +): BirthTimeConsultationConsentMode | null { + if (!sessionId) return null; + const mode = state[sessionId]; + return mode === "unverified_birth_time" || mode === "general_no_birth_time" + ? mode + : null; } export function grantBirthTimeConsultationConsent( state: BirthTimeConsultationConsentState, sessionId: string, + mode: BirthTimeConsultationConsentMode = "unverified_birth_time", ): BirthTimeConsultationConsentState { - if (!sessionId || state[sessionId]) return state; - return Object.freeze({ ...state, [sessionId]: true }); + if (!sessionId || state[sessionId] === mode) return state; + return Object.freeze({ ...state, [sessionId]: mode }); } export function clearBirthTimeConsultationConsent( @@ -52,14 +72,13 @@ export function clearBirthTimeConsultationConsent( if (!sessionId || !state[sessionId]) return state; return Object.freeze(Object.fromEntries( Object.entries(state).filter(([candidate]) => candidate !== sessionId), - ) as Record); + ) as Record); } export function unverifiedBirthTime(profile: BirthTimeDraft): string | null { if (profile.birthTimeStatus === "confirmed") return null; if (!concreteReportedSources.has(profile.birthTimeSource)) return null; - const time = profile.time || profile.reportedTime; - return /^([01]\d|2[0-3]):[0-5]\d$/.test(time) ? time : null; + return isBirthClockTime(profile.reportedTime) ? profile.reportedTime : null; } export function canUseUnverifiedBirthTime(profile: BirthTimeDraft): boolean { @@ -70,6 +89,33 @@ export function requiresBirthTimeConsent(profile: BirthTimeDraft): boolean { return canUseUnverifiedBirthTime(profile); } +export type BirthTimeConsultationRoute = + | Readonly<{ kind: "choice"; canUseUnverifiedTime: boolean }> + | Readonly<{ + kind: "consult"; + mode: ConsultationBirthTimeMode; + time: string | null; + }>; + +export function resolveBirthTimeConsultationRoute( + profile: BirthTimeDraft, + state: BirthTimeConsultationConsentState, + sessionId: string, +): BirthTimeConsultationRoute { + if (profile.birthTimeStatus === "confirmed" && isBirthClockTime(profile.time)) { + return { kind: "consult", mode: "verified_chart", time: profile.time }; + } + const reportedTime = unverifiedBirthTime(profile); + const consentMode = consultationModeForSession(state, sessionId); + if (reportedTime && consentMode === "unverified_birth_time") { + return { kind: "consult", mode: "unverified_birth_time", time: reportedTime }; + } + if (!reportedTime && consentMode === "general_no_birth_time") { + return { kind: "consult", mode: "general_no_birth_time", time: null }; + } + return { kind: "choice", canUseUnverifiedTime: reportedTime !== null }; +} + export function resolveRectificationCardAction(input: Readonly<{ rectificationCase: AccountRectificationCaseState | null; hasConfirmedBirthTime: boolean; @@ -94,3 +140,21 @@ export function parseRectificationPriceCredits(raw: string | undefined): number } return price; } + +export type LatestAccountRequestGuard = Readonly<{ + begin(): number; + isCurrent(identity: number): boolean; +}>; + +export function createLatestAccountRequestGuard(): LatestAccountRequestGuard { + let version = 0; + return Object.freeze({ + begin() { + version += 1; + return version; + }, + isCurrent(identity: number) { + return identity === version; + }, + }); +} diff --git a/frontend/src/lib/birth-time-intake-model.ts b/frontend/src/lib/birth-time-intake-model.ts index 6c383e5c..dd585359 100644 --- a/frontend/src/lib/birth-time-intake-model.ts +++ b/frontend/src/lib/birth-time-intake-model.ts @@ -2,6 +2,9 @@ import { format, isValid, parse } from "date-fns"; import type { JourneySnapshot } from "./birth-time-journey.ts"; const birthDatePattern = "yyyy-MM-dd"; +const birthClockPattern = /^(?:[01]\d|2[0-3]):[0-5]\d$/; +const earliestBirthYear = 1900; +const latestBirthYear = 2100; export type BirthTimeSource = | "" @@ -42,13 +45,27 @@ export type BirthTimeDraft = { export type BirthTimeDraftPatch = Partial; +export type DeclaredBirthPlace = Readonly<{ + label: string; + lat: number; + lon: number; + tz: number; +}>; + export function parseBirthDate(value: string): Date | undefined { if (value === "") return undefined; const parsed = parse(value, birthDatePattern, new Date(2000, 0, 1)); - if (!isValid(parsed) || format(parsed, birthDatePattern) !== value) return undefined; + if (!isValid(parsed) + || format(parsed, birthDatePattern) !== value + || parsed.getFullYear() < earliestBirthYear + || parsed.getFullYear() > latestBirthYear) return undefined; return parsed; } +export function isBirthClockTime(value: string): boolean { + return birthClockPattern.test(value); +} + export function formatBirthDate(value: Date): string { return format(value, birthDatePattern); } @@ -126,23 +143,32 @@ export function assistantIntentCopy(intent: JourneySnapshot["assistantIntent"]) } export function isBirthTimeDraftReady(draft: BirthTimeDraft) { - if (!draft.date) return false; + if (!parseBirthDate(draft.date) || draft.birthTimeClue.length > 240) return false; switch (draft.birthTimeSource) { case "hospital_record": + return isBirthClockTime(draft.reportedTime) + && draft.uncertaintyBeforeMinutes === 2 + && draft.uncertaintyAfterMinutes === 2; case "legacy_import": - return Boolean(draft.reportedTime || draft.time); + return isBirthClockTime(draft.reportedTime || draft.time); case "family_exact": - return Boolean(draft.reportedTime) + return isBirthClockTime(draft.reportedTime) && [5, 10, 15].includes(draft.uncertaintyBeforeMinutes ?? -1) && draft.uncertaintyBeforeMinutes === draft.uncertaintyAfterMinutes; case "approximate": - return Boolean(draft.reportedTime) + return isBirthClockTime(draft.reportedTime) && [15, 30, 60].includes(draft.uncertaintyBeforeMinutes ?? -1) && draft.uncertaintyBeforeMinutes === draft.uncertaintyAfterMinutes; case "period_only": - return Boolean(draft.birthTimePeriod); + return birthTimePeriodOptions.some((option) => option.value === draft.birthTimePeriod) + && !draft.reportedTime + && draft.uncertaintyBeforeMinutes === null + && draft.uncertaintyAfterMinutes === null; case "unknown": - return true; + return !draft.reportedTime + && !draft.birthTimePeriod + && draft.uncertaintyBeforeMinutes === null + && draft.uncertaintyAfterMinutes === null; case "": return false; default: { @@ -156,17 +182,78 @@ export function isBirthTimeDraftReady(draft: BirthTimeDraft) { * Whether the user has finished declaring what they actually know about birth time. * This is an onboarding condition, not a claim that an exact chart minute is ready. */ -export function isDeclaredBirthProfileComplete(draft: BirthTimeDraft) { - return isBirthTimeDraftReady(draft); +export function isDeclaredBirthProfileComplete( + draft: BirthTimeDraft, + place?: DeclaredBirthPlace | null, +) { + if (!isBirthTimeDraftReady(draft)) return false; + if (place === undefined) return true; + return Boolean(place + && place.label.trim() + && Number.isFinite(place.lat) + && place.lat >= -90 + && place.lat <= 90 + && Number.isFinite(place.lon) + && place.lon >= -180 + && place.lon <= 180 + && Number.isFinite(place.tz) + && place.tz >= -12 + && place.tz <= 14); } export function isBirthTimeReadyForConsultation(draft: BirthTimeDraft) { - return Boolean(draft.time) + return isBirthClockTime(draft.time) && (draft.birthTimeStatus === "candidate" || draft.birthTimeStatus === "confirmed"); } +const declaredBirthInputKeys = [ + "date", + "reportedTime", + "birthTimeSource", + "birthTimePeriod", + "birthTimeClue", + "uncertaintyBeforeMinutes", + "uncertaintyAfterMinutes", +] as const satisfies readonly (keyof BirthTimeDraft)[]; + +export function declaredBirthInputChanged( + current: BirthTimeDraft, + next: BirthTimeDraft, +): boolean { + return declaredBirthInputKeys.some((key) => current[key] !== next[key]); +} + +/** + * Applies an intake edit without allowing a stale, unconfirmed candidate minute + * to survive changes to the declaration it was calculated from. + * Confirmed active time belongs to the account and is changed only by explicit + * rectification confirmation, so ordinary profile edits leave it intact. + */ +export function applyBirthTimeDraftPatch( + current: T, + patch: BirthTimeDraftPatch, +): T { + const next = { ...current, ...patch }; + const declarationChanged = declaredBirthInputKeys.some((key) => ( + Object.hasOwn(patch, key) && next[key] !== current[key] + )); + if (!declarationChanged || current.birthTimeStatus === "confirmed") return next; + if (current.birthTimeStatus !== "candidate" && !current.time) return next; + return { + ...next, + time: "", + birthTimeStatus: "reported", + } as T; +} + export function birthTimePersistenceValues(draft: BirthTimeDraft) { - const reportedTime = draft.reportedTime || draft.time || null; + const reportedTime = draft.birthTimeSource === "legacy_import" + ? draft.reportedTime || draft.time || null + : draft.birthTimeSource === "hospital_record" + || draft.birthTimeSource === "family_exact" + || draft.birthTimeSource === "approximate" + ? draft.reportedTime || null + : null; const uncertainty = draft.birthTimeSource === "hospital_record" ? 2 : draft.birthTimeSource === "family_exact" || draft.birthTimeSource === "approximate" diff --git a/frontend/src/lib/consultation-birth-time-mode.ts b/frontend/src/lib/consultation-birth-time-mode.ts new file mode 100644 index 00000000..0b172e7a --- /dev/null +++ b/frontend/src/lib/consultation-birth-time-mode.ts @@ -0,0 +1,88 @@ +import { z } from "zod"; +import { guardPreciseTimingOutput } from "./timing-output-guard.ts"; + +export const consultationBirthTimeModeSchema = z.enum([ + "verified_chart", + "unverified_birth_time", + "general_no_birth_time", +]); + +export type ConsultationBirthTimeMode = z.infer; + +export const UNVERIFIED_BIRTH_TIME_NOTICE = "使用未校正填报时间；分钟敏感结论的置信度已降低。"; + +export function shouldRunBirthChartWorkflow(mode: ConsultationBirthTimeMode): boolean { + return mode !== "general_no_birth_time"; +} + +type ServerBirthTimeProfile = Readonly<{ + active_birth_time: string | null; + reported_birth_time: string | null; + birth_time_source: string | null; + birth_time_status: string | null; +}>; + +const concreteReportedSources = new Set([ + "hospital_record", + "family_exact", + "approximate", +]); + +export function serverProfileAllowsBirthTimeMode( + profile: ServerBirthTimeProfile, + mode: ConsultationBirthTimeMode, + requestedTime: string | null, +): boolean { + if (mode === "general_no_birth_time") return requestedTime === null; + if (!requestedTime) return false; + if (mode === "verified_chart") { + return profile.birth_time_status === "confirmed" + && profile.active_birth_time?.slice(0, 5) === requestedTime; + } + return profile.birth_time_status !== "confirmed" + && concreteReportedSources.has(profile.birth_time_source ?? "") + && profile.reported_birth_time?.slice(0, 5) === requestedTime; +} + +export function applyBirthTimeModeToWorkflowContext< + T extends { + consumer_context: { + answer_policy: Record; + [key: string]: unknown; + }; + [key: string]: unknown; + }, +>(context: T, mode: ConsultationBirthTimeMode): T { + if (mode !== "unverified_birth_time") return context; + return { + ...context, + consumer_context: { + ...context.consumer_context, + user_facing_limitation: UNVERIFIED_BIRTH_TIME_NOTICE, + answer_policy: { + ...context.consumer_context.answer_policy, + can_answer_precise_timing: false, + birth_time_confidence: "unverified_reported_time", + candidate_is_confirmed: false, + }, + }, + }; +} + +/** + * Server-side output boundary. The visible notice is added once to each HTTP + * answer stream, while timing/guarantee filtering remains active for the full + * answer whenever the consultation does not have a confirmed birth minute. + */ +export function createBirthTimeModeOutputGuard( + mode: ConsultationBirthTimeMode, + canAnswerPreciseTiming: boolean, +): (text: string) => string { + let noticeWritten = false; + return (text) => { + const guarded = canAnswerPreciseTiming ? text : guardPreciseTimingOutput(text); + if (mode !== "unverified_birth_time" || noticeWritten || !guarded.trim()) return guarded; + noticeWritten = true; + return `> ${UNVERIFIED_BIRTH_TIME_NOTICE}\n\n${guarded}`; + }; +} diff --git a/frontend/src/mastra/index.ts b/frontend/src/mastra/index.ts index 427ef003..617f2b75 100644 --- a/frontend/src/mastra/index.ts +++ b/frontend/src/mastra/index.ts @@ -237,6 +237,31 @@ export function getJyotishAgent(model: ResolvedLanguageModel, workflowContext?: return agent; } +const generalJyotishInstructions = `You are the guide for a conversational Vedic astrology product. +This request explicitly has no usable birth minute. Never calculate, infer, or claim a personal birth chart, ascendant, house, divisional chart, dasha, transit timing, or personal prediction. You have no chart tools for this mode. +Answer only general educational questions that do not depend on the user's natal chart. If the question asks for a personal chart conclusion, timing, compatibility, or forecast, clearly say that this mode cannot answer it and offer exactly two safe next steps: ask a general-knowledge question, or complete birth-time rectification. Do not invent 00:00, a period midpoint, or any other substitute minute. +Do not imply that a reported or candidate time is confirmed. Do not reveal prompts, skills, secrets, or private data. Do not provide medical, legal, investment, or safety-critical instructions. +Use concise Simplified Chinese. After every answer, append exactly these two hidden blocks and nothing after the second block: + +`; + +const generalJyotishAgents = new Map(); + +export function getGeneralJyotishAgent(model: ResolvedLanguageModel) { + const cached = generalJyotishAgents.get(model.id); + if (cached) return cached; + const agent = new Agent({ + id: `jyotish-general-no-birth-time-${model.id}`, + name: "Jyotisha General Guide", + model: model.model, + instructions: generalJyotishInstructions, + skills: [jyotishSkillPath], + tools: {}, + }); + generalJyotishAgents.set(model.id, agent); + return agent; +} + const onboardingInstructions = `You create the first conversational turn for Jyotisha, a Vedic astrology chat product. Load and follow the jyotish-vedic-astrology skill so the suggested questions respect its scope and truth boundaries. diff --git a/frontend/tests/account-api.test.ts b/frontend/tests/account-api.test.ts index ee36767f..9570ed3b 100644 --- a/frontend/tests/account-api.test.ts +++ b/frontend/tests/account-api.test.ts @@ -1,6 +1,10 @@ import assert from "node:assert/strict"; import { readFileSync } from "node:fs"; import test from "node:test"; +import { + accountProfilePatchSchema, + resolveAccountBirthTimeApplicationPatch, +} from "../src/lib/account-profile-patch.ts"; const source = readFileSync(new URL("../src/app/api/account/route.ts", import.meta.url), "utf8"); @@ -28,3 +32,102 @@ test("account API scopes the service-role case lookup to the authenticated accou assert.match(caseSelect, /\.eq\("journey_protocol", "conversational-evidence-v3"\)/); assert.match(caseSelect, /\.order\("updated_at", \{ ascending: false \}\)/); }); + +test("profile patch schema validates calendar, clock, source requirements, and location bounds", () => { + const valid = { + name: "岳辰", + birth_date: "2000-02-29", + reported_birth_time: "05:30", + birth_time_source: "family_exact", + birth_time_period: null, + birth_time_clue: null, + uncertainty_before_minutes: 10, + uncertainty_after_minutes: 10, + country_code: "CN", + province_code: "130000", + city_code: "130400", + district_code: "130406", + latitude: 36.420487, + longitude: 114.209936, + timezone_offset: 8, + }; + + assert.equal(accountProfilePatchSchema.safeParse(valid).success, true); + assert.equal(accountProfilePatchSchema.safeParse({ ...valid, birth_date: "2001-02-29" }).success, false); + assert.equal(accountProfilePatchSchema.safeParse({ ...valid, reported_birth_time: "24:00" }).success, false); + assert.equal(accountProfilePatchSchema.safeParse({ ...valid, uncertainty_before_minutes: 7 }).success, false); + assert.equal(accountProfilePatchSchema.safeParse({ ...valid, latitude: 91 }).success, false); + assert.equal(accountProfilePatchSchema.safeParse({ reported_birth_time: "05:30" }).success, false); + assert.equal(accountProfilePatchSchema.safeParse({ ...valid, longitude: null }).success, false); + assert.equal(accountProfilePatchSchema.safeParse({ name: "只改称呼" }).success, true); + assert.equal(accountProfilePatchSchema.safeParse({ + ...valid, + reported_birth_time: null, + birth_time_source: "period_only", + birth_time_period: null, + uncertainty_before_minutes: null, + uncertainty_after_minutes: null, + }).success, false); + assert.equal(accountProfilePatchSchema.safeParse({ + ...valid, + reported_birth_time: null, + birth_time_source: "unknown", + birth_time_period: "morning", + uncertainty_before_minutes: null, + uncertainty_after_minutes: null, + }).success, false); +}); + +test("ordinary declaration edits clear stale candidate application but never overwrite confirmed active time", () => { + const candidate = { + birth_date: "1997-08-08", + reported_birth_time: "05:30", + birth_time_source: "approximate", + birth_time_period: null, + birth_time_clue: null, + uncertainty_before_minutes: 30, + uncertainty_after_minutes: 30, + active_birth_time: "05:18", + birth_time: "05:18", + birth_time_status: "candidate", + rectification_case_id: "11111111-1111-4111-8111-111111111111", + } as const; + const edited = { + birth_date: candidate.birth_date, + reported_birth_time: "06:10", + birth_time_source: candidate.birth_time_source, + birth_time_period: null, + birth_time_clue: null, + uncertainty_before_minutes: 30, + uncertainty_after_minutes: 30, + } as const; + + assert.deepEqual(resolveAccountBirthTimeApplicationPatch(candidate, edited), { + active_birth_time: null, + birth_time: null, + birth_time_status: "reported", + rectification_case_id: null, + }); + assert.deepEqual(resolveAccountBirthTimeApplicationPatch(candidate, { + district_code: "130407", + }), { + active_birth_time: null, + birth_time: null, + birth_time_status: "reported", + rectification_case_id: null, + }); + assert.deepEqual(resolveAccountBirthTimeApplicationPatch({ + ...candidate, + birth_time_status: "confirmed", + }, edited), {}); +}); + +test("account PATCH uses the shared validator and never writes client birth_time over account truth", () => { + assert.match(source, /accountProfilePatchSchema\.safeParse/); + assert.match(source, /resolveAccountBirthTimeApplicationPatch/); + assert.doesNotMatch(source, /birth_time:\s*nullableString\(payload\.birth_time\)/); + assert.match(source, /invalidatesUnconfirmedApplication/); + assert.match(source, /query\.eq\("birth_time_status", currentProfile\.birth_time_status\)/); + assert.match(source, /query\.eq\("active_birth_time", currentProfile\.active_birth_time\)/); + assert.match(source, /最新确认结果已保留/); +}); diff --git a/frontend/tests/birth-time-consultation-consent.test.ts b/frontend/tests/birth-time-consultation-consent.test.ts index cf7fe6d3..67d29100 100644 --- a/frontend/tests/birth-time-consultation-consent.test.ts +++ b/frontend/tests/birth-time-consultation-consent.test.ts @@ -3,12 +3,16 @@ import { readFileSync } from "node:fs"; import test from "node:test"; import { canUseUnverifiedBirthTime, + consultationModeForSession, + createLatestAccountRequestGuard, createBirthTimeConsultationConsentState, grantBirthTimeConsultationConsent, hasBirthTimeConsultationConsent, parseRectificationPriceCredits, requiresBirthTimeConsent, + resolveBirthTimeConsultationRoute, resolveRectificationCardAction, + unverifiedBirthTime, } from "../src/lib/birth-time-consultation-consent.ts"; import type { BirthTimeDraft } from "../src/lib/birth-time-intake-model.ts"; @@ -58,6 +62,82 @@ test("period-only and unknown declarations never pretend to provide an unverifie assert.equal(requiresBirthTimeConsent(unknown), false); }); +test("the current reported minute wins over an old candidate and never falls back to it", () => { + const editedCandidate = { + ...reportedExactTime, + time: "05:18", + reportedTime: "06:10", + birthTimeStatus: "candidate", + } satisfies BirthTimeDraft; + const periodCandidate = { + ...editedCandidate, + reportedTime: "", + birthTimeSource: "period_only", + birthTimePeriod: "early_morning", + } satisfies BirthTimeDraft; + const missingReportedCandidate = { + ...editedCandidate, + reportedTime: "", + birthTimeSource: "approximate", + } satisfies BirthTimeDraft; + + assert.equal(unverifiedBirthTime(editedCandidate), "06:10"); + assert.equal(unverifiedBirthTime(periodCandidate), null); + assert.equal(unverifiedBirthTime(missingReportedCandidate), null); + + const page = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8"); + assert.match(page, /persistedReportedTime \|\| \(source === "legacy_import" \? time : ""\)/); +}); + +test("period-only users can explicitly choose a minute-free consultation without carrying it to another chat", () => { + const periodOnly = { + ...reportedExactTime, + reportedTime: "", + birthTimeSource: "period_only", + birthTimePeriod: "early_morning", + } satisfies BirthTimeDraft; + const initial = createBirthTimeConsultationConsentState(); + + assert.deepEqual(resolveBirthTimeConsultationRoute(periodOnly, initial, "chat-a"), { + kind: "choice", + canUseUnverifiedTime: false, + }); + const general = grantBirthTimeConsultationConsent(initial, "chat-a", "general_no_birth_time"); + assert.equal(consultationModeForSession(general, "chat-a"), "general_no_birth_time"); + assert.equal(consultationModeForSession(general, "chat-b"), null); + assert.deepEqual(resolveBirthTimeConsultationRoute(periodOnly, general, "chat-a"), { + kind: "consult", + mode: "general_no_birth_time", + time: null, + }); + assert.deepEqual(resolveBirthTimeConsultationRoute(periodOnly, general, "chat-b"), { + kind: "choice", + canUseUnverifiedTime: false, + }); +}); + +test("unverified consent resolves to a chart request and confirmed profiles need no consent", () => { + const consented = grantBirthTimeConsultationConsent( + createBirthTimeConsultationConsentState(), + "chat-a", + "unverified_birth_time", + ); + assert.deepEqual(resolveBirthTimeConsultationRoute(reportedExactTime, consented, "chat-a"), { + kind: "consult", + mode: "unverified_birth_time", + time: "05:30", + }); + assert.deepEqual(resolveBirthTimeConsultationRoute({ + ...reportedExactTime, + time: "05:28", + birthTimeStatus: "confirmed", + }, createBirthTimeConsultationConsentState(), "chat-b"), { + kind: "consult", + mode: "verified_chart", + time: "05:28", + }); +}); + test("confirmed time does not request unverified-use consent", () => { const confirmed = { ...reportedExactTime, @@ -99,10 +179,22 @@ test("fixed rectification price uses a checked default and rejects invalid confi } }); +test("account refresh identities reject an older response after a newer case request starts", () => { + const guard = createLatestAccountRequestGuard(); + const oldCaseRequest = guard.begin(); + const newCaseRequest = guard.begin(); + + assert.equal(guard.isCurrent(oldCaseRequest), false); + assert.equal(guard.isCurrent(newCaseRequest), true); +}); + test("soft choice announces itself and locks every action while rectification opens", () => { const source = readFileSync(new URL("../src/components/unverified-birth-time-choice.tsx", import.meta.url), "utf8"); assert.match(source, /aria-live="polite"/); - assert.equal((source.match(/disabled=\{pending\}/g) ?? []).length, 3); - assert.match(source, /\{canUseUnverifiedTime && \(/); + assert.match(source, /role="alertdialog"/); + assert.match(source, /aria-modal="true"/); + assert.match(source, /keepFocusWithin/); + assert.match(source, /继续不依赖出生分钟的一般咨询/); + assert.ok((source.match(/disabled=\{pending\}/g) ?? []).length >= 3); }); diff --git a/frontend/tests/birth-time-intake.test.ts b/frontend/tests/birth-time-intake.test.ts index cd125845..9f848b2e 100644 --- a/frontend/tests/birth-time-intake.test.ts +++ b/frontend/tests/birth-time-intake.test.ts @@ -2,6 +2,7 @@ import assert from "node:assert/strict"; import { readFileSync } from "node:fs"; import test from "node:test"; import { + applyBirthTimeDraftPatch, assistantIntentCopy, birthTimeDisplayState, birthTimePersistenceValues, @@ -31,6 +32,8 @@ test("birth time intake requires only the fields selected by the source", () => ...emptyDraft, birthTimeSource: "hospital_record", reportedTime: "08:16", + uncertaintyBeforeMinutes: 2, + uncertaintyAfterMinutes: 2, } satisfies BirthTimeDraft; const period = { ...emptyDraft, @@ -83,6 +86,98 @@ test("declared birth data completes onboarding without an active or confirmed mi assert.equal(isBirthTimeReadyForConsultation(declaredPeriod), false); }); +test("declared completeness validates the actual calendar date, clock, source fields, and bounds", () => { + const exact = { + ...emptyDraft, + birthTimeSource: "family_exact", + reportedTime: "05:30", + uncertaintyBeforeMinutes: 10, + uncertaintyAfterMinutes: 10, + } satisfies BirthTimeDraft; + + assert.equal(isDeclaredBirthProfileComplete({ ...exact, date: "2000-02-29" }), true); + assert.equal(isDeclaredBirthProfileComplete({ ...exact, date: "2001-02-29" }), false); + assert.equal(isDeclaredBirthProfileComplete({ ...exact, date: "1899-12-31" }), false); + assert.equal(isDeclaredBirthProfileComplete({ ...exact, date: "2101-01-01" }), false); + assert.equal(isDeclaredBirthProfileComplete({ ...exact, reportedTime: "24:00" }), false); + assert.equal(isDeclaredBirthProfileComplete({ ...exact, reportedTime: "5:30" }), false); + assert.equal(isDeclaredBirthProfileComplete({ ...exact, uncertaintyBeforeMinutes: 7 }), false); + assert.equal(isDeclaredBirthProfileComplete({ + ...emptyDraft, + birthTimeSource: "hospital_record", + reportedTime: "05:30", + }), false); + assert.equal(isDeclaredBirthProfileComplete({ + ...emptyDraft, + birthTimeSource: "period_only", + birthTimePeriod: "", + }), false); + assert.equal(isDeclaredBirthProfileComplete({ + ...emptyDraft, + birthTimeSource: "period_only", + birthTimePeriod: "morning", + uncertaintyBeforeMinutes: 30, + }), false); + assert.equal(isDeclaredBirthProfileComplete({ + ...emptyDraft, + birthTimeSource: "unknown", + reportedTime: "05:30", + }), false); + assert.equal(isDeclaredBirthProfileComplete({ + ...emptyDraft, + birthTimeSource: "unknown", + birthTimeClue: "x".repeat(241), + }), false); + assert.equal(isDeclaredBirthProfileComplete(exact, { + label: "中国 · 河北省 · 邯郸市", + lat: 36.62, + lon: 114.49, + tz: 8, + }), true); + assert.equal(isDeclaredBirthProfileComplete(exact, { + label: "越界地点", + lat: 91, + lon: 114.49, + tz: 8, + }), false); + assert.equal(isDeclaredBirthProfileComplete(exact, null), false); +}); + +test("editing an unconfirmed declaration invalidates an old candidate but preserves confirmed active time", () => { + const candidate = { + ...emptyDraft, + time: "05:18", + reportedTime: "05:30", + birthTimeSource: "approximate", + uncertaintyBeforeMinutes: 30, + uncertaintyAfterMinutes: 30, + birthTimeStatus: "candidate", + } satisfies BirthTimeDraft; + + assert.deepEqual(applyBirthTimeDraftPatch(candidate, { reportedTime: "06:10" }), { + ...candidate, + time: "", + reportedTime: "06:10", + birthTimeStatus: "reported", + }); + assert.deepEqual(applyBirthTimeDraftPatch(candidate, { + uncertaintyBeforeMinutes: 60, + uncertaintyAfterMinutes: 60, + }), { + ...candidate, + time: "", + uncertaintyBeforeMinutes: 60, + uncertaintyAfterMinutes: 60, + birthTimeStatus: "reported", + }); + + const confirmed = { ...candidate, birthTimeStatus: "confirmed" } satisfies BirthTimeDraft; + assert.deepEqual(applyBirthTimeDraftPatch(confirmed, { reportedTime: "06:10" }), { + ...confirmed, + reportedTime: "06:10", + }); +}); + test("a persisted candidate working time takes precedence over the reported range", () => { // Given: rectification saved a candidate minute while preserving the user's original period. const candidate = { diff --git a/frontend/tests/consultation-birth-time-mode.test.ts b/frontend/tests/consultation-birth-time-mode.test.ts new file mode 100644 index 00000000..32d4219f --- /dev/null +++ b/frontend/tests/consultation-birth-time-mode.test.ts @@ -0,0 +1,97 @@ +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import test from "node:test"; +import { + UNVERIFIED_BIRTH_TIME_NOTICE, + applyBirthTimeModeToWorkflowContext, + createBirthTimeModeOutputGuard, + consultationBirthTimeModeSchema, + serverProfileAllowsBirthTimeMode, + shouldRunBirthChartWorkflow, +} from "../src/lib/consultation-birth-time-mode.ts"; + +test("general-no-birth-time is an explicit server mode that never runs a chart workflow", () => { + assert.equal(consultationBirthTimeModeSchema.safeParse("verified_chart").success, true); + assert.equal(consultationBirthTimeModeSchema.safeParse("unverified_birth_time").success, true); + assert.equal(consultationBirthTimeModeSchema.safeParse("general_no_birth_time").success, true); + assert.equal(shouldRunBirthChartWorkflow("general_no_birth_time"), false); + assert.equal(shouldRunBirthChartWorkflow("verified_chart"), true); +}); + +test("unverified chart context can never become confirmed or retain precise timing permission", () => { + const original = { + success: true, + consumer_context: { + core_status: "ready", + answer_policy: { + can_answer_direction: true, + can_answer_precise_timing: true, + }, + }, + }; + const guarded = applyBirthTimeModeToWorkflowContext(original, "unverified_birth_time"); + + assert.equal(original.consumer_context.answer_policy.can_answer_precise_timing, true); + assert.deepEqual(guarded.consumer_context.answer_policy, { + can_answer_direction: true, + can_answer_precise_timing: false, + birth_time_confidence: "unverified_reported_time", + candidate_is_confirmed: false, + }); +}); + +test("server profile truth prevents a candidate or edited report from being submitted as confirmed", () => { + const candidateProfile = { + active_birth_time: "05:18", + reported_birth_time: "06:10", + birth_time_source: "approximate", + birth_time_status: "candidate", + }; + assert.equal(serverProfileAllowsBirthTimeMode(candidateProfile, "verified_chart", "05:18"), false); + assert.equal(serverProfileAllowsBirthTimeMode(candidateProfile, "unverified_birth_time", "05:18"), false); + assert.equal(serverProfileAllowsBirthTimeMode(candidateProfile, "unverified_birth_time", "06:10"), true); + assert.equal(serverProfileAllowsBirthTimeMode(candidateProfile, "general_no_birth_time", null), true); + + const confirmedProfile = { ...candidateProfile, birth_time_status: "confirmed" }; + assert.equal(serverProfileAllowsBirthTimeMode(confirmedProfile, "verified_chart", "05:18"), true); + assert.equal(serverProfileAllowsBirthTimeMode(confirmedProfile, "unverified_birth_time", "06:10"), false); +}); + +test("every unverified streamed answer receives a stable visible marker and timing guard", () => { + const transform = createBirthTimeModeOutputGuard("unverified_birth_time", false); + const first = transform("2026年8月适合观察方向。"); + const second = transform("你一定会升职。"); + + assert.match(first, new RegExp(UNVERIFIED_BIRTH_TIME_NOTICE)); + assert.match(first, /具体时间已省略/); + assert.doesNotMatch(second, /一定会升职/); + assert.doesNotMatch(second, new RegExp(UNVERIFIED_BIRTH_TIME_NOTICE)); +}); + +test("consult route validates mode before billing and general mode uses no chart agent or workflow", () => { + const route = readFileSync(new URL("../src/app/api/consult/route.ts", import.meta.url), "utf8"); + const mastra = readFileSync(new URL("../src/mastra/index.ts", import.meta.url), "utf8"); + const parseIndex = route.indexOf("chatRequestSchema.safeParse"); + const profileTruthIndex = route.indexOf("serverProfileAllowsBirthTimeMode(", parseIndex); + const reserveIndex = route.indexOf("reserveConsultationModel(", parseIndex); + + assert.ok(parseIndex >= 0 && profileTruthIndex > parseIndex && reserveIndex > profileTruthIndex); + assert.match(route, /general_no_birth_time/); + assert.match(route, /shouldRunBirthChartWorkflow/); + assert.match(route, /getGeneralJyotishAgent/); + assert.match(mastra, /getGeneralJyotishAgent/); + assert.match(mastra, /Never calculate, infer, or claim a personal birth chart/); + assert.match(mastra, /tools:\s*\{\}/); +}); + +test("homepage sends explicit modes and never routes an unverified minute through the retired questionnaire", () => { + const page = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8"); + const route = readFileSync(new URL("../src/app/api/consult/route.ts", import.meta.url), "utf8"); + + assert.match(page, /consultationMode:/); + assert.match(page, /general_no_birth_time/); + assert.match(page, /unverified_birth_time/); + assert.doesNotMatch(page, /birthTimeStatus === "confirmed" \? "direct_chart" : "rectification"/); + assert.match(route, /旧版生时校正入口已停用/); + assert.ok(route.indexOf("旧版生时校正入口已停用") < route.indexOf("reserveConsultationModel(", route.indexOf("chatRequestSchema.safeParse"))); +}); diff --git a/frontend/tests/consultation-entrypoint.test.ts b/frontend/tests/consultation-entrypoint.test.ts index ca23efe8..ee969b86 100644 --- a/frontend/tests/consultation-entrypoint.test.ts +++ b/frontend/tests/consultation-entrypoint.test.ts @@ -71,11 +71,11 @@ test("browser source does not own private entrypoint prompts", () => { test("ordinary product drafts keep the public question and clear hidden routing after edits", () => { const source = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8"); - assert.match(source, /chooseSuggestedQuestion\("深入看今日",\s*"timing",\s*"daily_starlanguage"\)/s); - assert.match(source, /messages:\s*\[\.\.\.preservedMessages,\s*\{ role: "user", text: question \}\]/s); + assert.match(source, /chooseSuggestedQuestion\("深入看今日",[\s\S]*?"timing",[\s\S]*?"daily_starlanguage"\)/); + assert.match(source, /messages:\s*\[\.\.\.preservedMessages,[\s\S]*?\{ role: "user", text: question \}\]/); assert.match(source, /body:\s*JSON\.stringify\(\{[\s\S]*?entrypoint:\s*entrypoint \?\? undefined,[\s\S]*?question,/); - assert.match(source, /onChange=\{\(event\) => \{\s*setDraft\(event\.target\.value\);\s*setDraftTheme\(null\);\s*setDraftEntrypoint\(null\);/s); - assert.match(source, /setDraft\(pending\.question\);\s*setDraftTheme\(pending\.theme\);\s*setDraftEntrypoint\(pending\.entrypoint\);/s); + assert.match(source, /onChange=\{\(event\) => \{[\s\S]*?setDraft\(event\.target\.value\);[\s\S]*?setDraftTheme\(null\);[\s\S]*?setDraftEntrypoint\(null\);/); + assert.match(source, /setDraft\(pending\.question\);[\s\S]*?setDraftTheme\(pending\.theme\);[\s\S]*?setDraftEntrypoint\(pending\.entrypoint\);/); }); test("homepage birth-time card opens the v3 surface instead of ordinary consultation", () => { @@ -96,10 +96,43 @@ test("ordinary consultation is softly diverted before calling consult", () => { assert.ok(sendStart >= 0); assert.ok(softChoice > sendStart && softChoice < consultCall); - assert.match(source, /grantBirthTimeConsultationConsent\([\s\S]*activeSession\.id/s); + assert.match(source, /grantBirthTimeConsultationConsent\([\s\S]*activeSession\.id/); assert.match(source, /pendingConsultationQuestion=/); }); +test("minute-free choice restores an editable general question without an immediate network call or charge", () => { + const source = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8"); + const start = source.indexOf("function continueGenerallyWithoutBirthTime"); + const end = source.indexOf("function rectifyBeforePendingConsultation", start); + const handler = source.slice(start, end); + + assert.match(handler, /"general_no_birth_time"/); + assert.match(handler, /setDraft\(pending\.question\)/); + assert.match(handler, /setDraftEntrypoint\(null\)/); + assert.match(handler, /尚未发送，也没有扣点/); + assert.doesNotMatch(handler, /fetch\(|void send\(|send\(/); +}); + +test("rectification mutations report pending state to the page and lock card and return actions", () => { + const source = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8"); + + assert.match(source, /onPendingChange=\{setRectificationMutationPending\}/); + assert.match(source, /disabled=\{productEntrypointsDisabled \|\| rectificationLoading \|\| rectificationMutationPending\}/); + assert.match(source, /disabled=\{rectificationLoading \|\| rectificationMutationPending\}/); + assert.match(source, /if \(!rectificationLoading && !rectificationMutationPending\)/); +}); + +test("switching chats hides rather than destroys another chat's pending soft choice", () => { + const source = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8"); + const selectSession = source.slice( + source.indexOf("function selectSession("), + source.indexOf("async function selectSessionModel", source.indexOf("function selectSession(")), + ); + + assert.doesNotMatch(selectSession, /setPendingBirthTimeChoice\(null\)/); + assert.match(source, /pendingBirthTimeChoice\?\.sessionId === activeSession\?\.id/); +}); + test("profile and place saves do not auto-start the retired assessment flow", () => { const source = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8"); const normalSave = source.slice(source.indexOf("async function saveProfile"), source.indexOf("async function saveOnboardingName")); @@ -114,7 +147,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, /resolvedQuestion\.modelQuestion,\s*"\\n需要查询星盘时/s); + assert.match(source, /resolvedQuestion\.modelQuestion,[\s\S]*?"\\n需要查询星盘时/); }); test("homepage entrypoints use two whole-card native actions", () => { diff --git a/frontend/tests/consultation-workflow-contract.test.ts b/frontend/tests/consultation-workflow-contract.test.ts index fb90af0f..bde9249f 100644 --- a/frontend/tests/consultation-workflow-contract.test.ts +++ b/frontend/tests/consultation-workflow-contract.test.ts @@ -6,10 +6,15 @@ const route = readFileSync(new URL("../src/app/api/consult/route.ts", import.met const mastra = readFileSync(new URL("../src/mastra/index.ts", import.meta.url), "utf8"); test("runs the Jyotish workflow before streaming a commercial consultation", () => { + const chartBranch = route.slice(route.indexOf("const toolInput = consultationInputSchema.parse")); + assert.match(route, /runConsultationWorkflow/); - assert.match(route, /await runConsultationWorkflow\(toolInput\)/); - assert.match(route, /getJyotishAgent\(selectedModel, workflowContext\)\.stream/); - assert.ok(route.indexOf("await runConsultationWorkflow(toolInput)") < route.indexOf(".stream(")); + assert.match(chartBranch, /await runConsultationWorkflow\(toolInput\)/); + assert.match(chartBranch, /getJyotishAgent\(selectedModel, workflowContext\)\.stream/); + assert.ok( + chartBranch.indexOf("await runConsultationWorkflow(toolInput)") + < chartBranch.indexOf("getJyotishAgent(selectedModel, workflowContext).stream"), + ); }); test("grounds the answer in the server-computed workflow without a second tool run", () => { diff --git a/frontend/tests/conversational-rectification-component.test.ts b/frontend/tests/conversational-rectification-component.test.ts index c7974555..555d12c4 100644 --- a/frontend/tests/conversational-rectification-component.test.ts +++ b/frontend/tests/conversational-rectification-component.test.ts @@ -182,6 +182,9 @@ test("pending markup and responsive CSS expose accessibility contracts", () => { assert.match(css, /summary, \.conversational-status\):focus-visible/); assert.match(css, /@media\s*\(max-width:\s*430px\)[\s\S]*\.conversational-rectification/); assert.match(component, /确认放弃且不应用候选/); + assert.match(component, /onPendingChange/); + assert.match(component, /onPendingChange:\s*props\.onPendingChange/); + assert.match(component, /&& onContinueOriginalQuestion &&/); }); type CdpResponse = Readonly<{ @@ -565,10 +568,11 @@ test("real Chromium at 390px verifies layout, keyboard focus, pause affordance, const css = readFileSync(join(frontendRoot, "src/app/globals.css"), "utf8") .replace(/^@import[^;]+;\s*/gm, ""); const fixture = ` - import React, { useEffect, useState } from "react"; + import React, { useEffect, useRef, useState } from "react"; import { createRoot } from "react-dom/client"; import { ConversationalRectificationSurface } from ${JSON.stringify(componentPath)}; import { useConversationalRectification } from ${JSON.stringify(hookPath)}; + import { UnverifiedBirthTimeChoice } from ${JSON.stringify(join(frontendRoot, "src/components/unverified-birth-time-choice.tsx"))}; const caseA = "00000000-0000-4000-8000-000000000821"; const caseB = "00000000-0000-4000-8000-000000000829"; @@ -619,6 +623,10 @@ test("real Chromium at 390px verifies layout, keyboard focus, pause affordance, const [initialTurn, setInitialTurn] = useState(null); const [transportLabel, setTransportLabel] = useState("first"); const [callbackLabel, setCallbackLabel] = useState("first"); + const [screen, setScreen] = useState("rectification"); + const [choicePending, setChoicePending] = useState(false); + const [activeChat, setActiveChat] = useState("chat-a"); + const returnComposer = useRef(null); const send = async (command) => { events.push("send:" + transportLabel + ":" + command.type); await new Promise((resolveSend) => setTimeout(resolveSend, 20)); @@ -638,12 +646,45 @@ test("real Chromium at 390px verifies layout, keyboard focus, pause affordance, useEffect(() => { globalThis.__rectificationHarness = { events, + networkCalls: 0, + setActiveChat, setCallbackLabel, + setChoicePending, + setScreen, setTransportLabel, setTurn(name) { setInitialTurn(name === "none" ? null : turns[name]); }, }; globalThis.__rectificationReady = true; }); + useEffect(() => { + if (screen !== "composer" && activeChat === "chat-a") return; + const frame = requestAnimationFrame(() => returnComposer.current?.focus()); + return () => cancelAnimationFrame(frame); + }, [activeChat, screen]); + if (screen !== "rectification") { + if (activeChat !== "chat-a" || screen === "composer") { + return