merge: synchronize remote main

This commit is contained in:
Jesse_Chen
2026-07-21 22:57:50 +08:00
130 changed files with 10441 additions and 553 deletions
@@ -1,9 +1,5 @@
import { NextResponse } from "next/server";
import { z } from "zod";
import { candidateWorkingTime } from "@/lib/birth-time-candidate-completion";
import { createAdminSupabaseClient } from "@/lib/supabase/admin";
import { isSupabaseConfigurationError } from "@/lib/supabase/config";
import { createServerSupabaseClient } from "@/lib/supabase/server";
export const runtime = "nodejs";
@@ -13,57 +9,12 @@ const requestSchema = z.object({
time: z.string().regex(/^([01]\d|2[0-3]):[0-5]\d$/),
}).strict();
/** Compatibility endpoint for stale clients; unconfirmed candidates never write profiles. */
export async function POST(request: Request) {
try {
const supabase = await createServerSupabaseClient();
const { data: { user }, error: authError } = await supabase.auth.getUser();
if (authError || !user) {
return NextResponse.json({ error: "请先登录" }, { status: 401 });
}
const parsed = requestSchema.safeParse(await request.json().catch(() => null));
if (!parsed.success) {
return NextResponse.json({ error: "候选时间格式不正确" }, { status: 400 });
}
const admin = createAdminSupabaseClient();
const { data: stored, error: caseError } = await admin
.from("birth_time_rectification_cases")
.select("id,user_id,journey_protocol,status,candidate_result_id,candidate_result,turn_state")
.eq("id", parsed.data.caseId)
.eq("user_id", user.id)
.maybeSingle();
const time = candidateWorkingTime(stored, { ...parsed.data, userId: user.id });
if (caseError || !time) {
return NextResponse.json(
{ error: "候选结果已变化", message: "请使用当前评估结果继续。" },
{ status: 409 },
);
}
const { data: profile, error: profileError } = await admin
.from("profiles")
.update({
active_birth_time: time,
birth_time_status: "candidate",
updated_at: new Date().toISOString(),
})
.eq("id", user.id)
.eq("rectification_case_id", parsed.data.caseId)
.select("id")
.maybeSingle();
if (profileError || !profile) {
return NextResponse.json(
{ error: "候选时间暂时无法保存", message: "当前评估结果仍已保留,请稍后重试。" },
{ status: 503 },
);
}
return NextResponse.json({ ok: true, activeTime: time, birthTimeStatus: "candidate" });
} catch (error) {
if (isSupabaseConfigurationError(error)) {
return NextResponse.json({ error: "Supabase 尚未配置" }, { status: 503 });
}
return NextResponse.json({ error: "候选时间暂时无法保存" }, { status: 500 });
}
const parsed = requestSchema.safeParse(await request.json().catch(() => null));
if (!parsed.success) return NextResponse.json({ error: "候选时间格式不正确" }, { status: 400 });
return NextResponse.json(
{ error: "候选时间不能直接采用", message: "候选范围已保留;请补充资料,或在高置信结果出现后通过正式确认继续。" },
{ status: 409 },
);
}
+8
View File
@@ -4,6 +4,8 @@ import {
conversationalRectificationDeploymentShaFromEnvironment,
} from "../../../lib/conversational-rectification/creation-policy.ts";
import { getTruthSourceRuntimeIdentity } from "@/lib/truth-source-runtime-identity";
type Check = {
status: "ok" | "degraded" | "blocked";
message?: string;
@@ -61,12 +63,17 @@ export async function GET() {
const rectificationV3MigrationsReady =
process.env.RECTIFICATION_V3_MIGRATIONS_READY?.trim().toLowerCase() === "true";
const creationPolicy = conversationalRectificationCreationPolicyFromEnvironment();
const truthSourceIdentity = getTruthSourceRuntimeIdentity();
const checks = {
web: { status: "ok" } satisfies Check,
supabasePublicConfig: envCheck(["NEXT_PUBLIC_SUPABASE_URL", "NEXT_PUBLIC_SUPABASE_ANON_KEY"]),
supabaseServiceRole: envCheck(["SUPABASE_SERVICE_ROLE_KEY"]),
modelProvider: anyEnvCheck(["LLM_MODELS_JSON", "OPENAI_API_KEY", "LLM_API_KEY", "DEEPSEEK_API_KEY"]),
jyotishApi: await jyotishApiCheck(),
researchTruthSource: {
status: truthSourceIdentity.status,
message: truthSourceIdentity.mountStatus === "mounted" ? undefined : truthSourceIdentity.mountStatus,
} satisfies Check,
};
const status = aggregate(checks);
const rectificationV3Ready = status === "ok"
@@ -88,6 +95,7 @@ export async function GET() {
readyForNewCases: rectificationV3Ready,
},
},
truthSource: truthSourceIdentity,
checks,
},
{ status: status === "ok" ? 200 : 503 },
+21 -2
View File
@@ -84,6 +84,7 @@
--space-12: 48px;
--space-16: 64px;
--space-24: 96px;
--composer-reserve: 148px;
--ease-out: cubic-bezier(.22, 1, .36, 1);
--sidebar-background: var(--color-sidebar);
--sidebar-solid: var(--color-sidebar-solid);
@@ -150,6 +151,17 @@ button:disabled { cursor: default; opacity: .45; }
.message-markdown { color: var(--color-ink); font-size: 17px; line-height: 1.65; }
.message-markdown > *:first-child { margin-top: 0; }
.message-markdown > *:last-child { margin-bottom: 0; }
.claim-boundary-badge { width: fit-content; margin: 0 0 var(--space-2); padding: 4px 9px; border: 1px solid color-mix(in srgb, var(--color-action) 24%, transparent); border-radius: 999px; background: var(--color-action-soft); color: var(--color-action-hover); font-size: 12px; line-height: 1.45; }
.evidence-audit-panel { margin: 0 0 var(--space-3); border: 1px solid var(--color-border); border-radius: var(--radius-md); background: color-mix(in srgb, var(--color-canvas-soft) 68%, transparent); }
.evidence-audit-panel summary { cursor: pointer; padding: var(--space-2) var(--space-3); color: var(--color-ink-secondary); font-size: 13px; }
.evidence-audit-table { display: grid; gap: 1px; padding: 0 var(--space-3) var(--space-3); }
.evidence-audit-row { display: grid; grid-template-columns: minmax(120px, 1fr) auto minmax(160px, 1.2fr); gap: var(--space-3); align-items: center; padding: var(--space-2) 0; border-top: 1px solid color-mix(in srgb, var(--color-border) 64%, transparent); font-size: 12px; }
.evidence-audit-row b { color: var(--color-action-hover); font-weight: 600; }
.evidence-audit-row small { color: var(--color-ink-tertiary); line-height: 1.45; }
.raw-evidence-receipt { margin: 0 var(--space-3) var(--space-3); border-top: 1px solid color-mix(in srgb, var(--color-border) 64%, transparent); padding-top: var(--space-2); }
.raw-evidence-receipt summary { padding: var(--space-1) 0; color: var(--color-ink-tertiary); font-size: 12px; }
.raw-evidence-receipt pre { max-height: 180px; overflow: auto; margin: var(--space-2) 0 0; padding: var(--space-3); border-radius: var(--radius-md); background: var(--color-canvas); color: var(--color-ink-secondary); font-size: 11px; line-height: 1.5; }
.report-download-button { margin-top: var(--space-3); border: 1px solid var(--color-border); border-radius: var(--radius-md); background: var(--color-canvas-soft); color: var(--color-ink-secondary); cursor: pointer; padding: 7px 10px; font-size: 12px; }
.message-markdown p { margin: 0 0 14px; }
.message-markdown ul, .message-markdown ol { margin: 10px 0 16px; padding-left: 24px; }
.message-markdown li { margin: 6px 0; }
@@ -331,7 +343,7 @@ button:disabled { cursor: default; opacity: .45; }
.status-loading { background: var(--color-action); }
.credit-button { min-height: 44px; display: inline-flex; align-items: center; justify-content: center; gap: 6px; padding: 0 11px; cursor: pointer; font-size: 13px; font-variant-numeric: tabular-nums; transition: background-color 120ms ease-out, transform 120ms ease-out; min-width: 64px; border: 1px solid var(--color-border); border-radius: var(--radius-md); background: var(--color-canvas-soft); color: var(--color-ink-secondary); font-weight: 500; }
.conversation { min-width: 0; min-height: 0; overflow-x: hidden; overflow-y: auto; overscroll-behavior: contain; scrollbar-gutter: stable; background: var(--color-canvas); }
.conversation { min-width: 0; min-height: 0; overflow-x: hidden; overflow-y: auto; overscroll-behavior: contain; scrollbar-gutter: stable; padding-bottom: var(--composer-reserve); background: var(--color-canvas); }
.conversation.is-empty { display: grid; place-items: center; padding: var(--space-8); }
.welcome { width: min(820px, 100%); padding: var(--space-10) 0 var(--space-16); }
.welcome > .onboarding-message:first-child { padding-bottom: var(--space-8); }
@@ -535,6 +547,13 @@ button:disabled { cursor: default; opacity: .45; }
.product-entrypoint-action .starter-arrow { width: 15px; height: 15px; color: currentColor; }
.starter-loading { color: var(--color-ink-secondary); margin-left: 0; padding: var(--space-5); border-radius: var(--radius-lg); background: var(--color-canvas-muted); font-size: 14px; }
.starter-note { margin: 10px 0 0; color: var(--color-ink-secondary); line-height: 1.5; grid-column: 1 / -1; font-size: 13px; }
.parameter-freeze-panel { display: grid; grid-column: 1 / -1; gap: var(--space-3); padding: var(--space-4); border: 1px solid var(--color-border); border-radius: var(--radius-lg); background: var(--color-canvas); }
.parameter-freeze-panel > div { display: flex; flex-wrap: wrap; justify-content: space-between; gap: var(--space-2); color: var(--color-ink-secondary); font-size: var(--type-caption); }
.parameter-freeze-panel b { color: var(--color-ink); font-size: var(--type-title-sm); }
.parameter-freeze-panel dl { display: grid; grid-template-columns: repeat(auto-fit, minmax(132px, 1fr)); gap: var(--space-2); margin: 0; }
.parameter-freeze-panel dl > div { min-width: 0; padding: var(--space-2); border-radius: var(--radius-md); background: var(--color-canvas-soft); }
.parameter-freeze-panel dt { color: var(--color-ink-tertiary); font-size: 11px; }
.parameter-freeze-panel dd { overflow: hidden; margin: 2px 0 0; color: var(--color-ink); text-overflow: ellipsis; white-space: nowrap; font-size: 12px; }
.message-list { margin: 0 auto; width: min(900px, 100%); padding: var(--space-8) var(--space-8) var(--space-16); }
.message { display: flex; animation: message-enter 160ms var(--ease-out) both; padding: var(--space-2) 0; }
@@ -554,7 +573,7 @@ button:disabled { cursor: default; opacity: .45; }
.thinking i { width: 5px; height: 5px; border-radius: 50%; animation: pulse 850ms ease-in-out infinite alternate; background: var(--color-action); }
.error-message { margin: 12px 0 0; padding: 12px 14px; border-left: 3px solid var(--color-danger); background: var(--color-danger-muted); color: var(--color-danger); font-size: 13px; line-height: 1.6; border-color: var(--color-danger); border-radius: 0 var(--radius-md) var(--radius-md) 0; }
.composer-wrap { z-index: 2; min-width: 0; border-top: 1px solid color-mix(in srgb, var(--color-border) 70%, transparent); padding: var(--space-3) var(--space-6) var(--space-4); background: var(--color-frosted); backdrop-filter: saturate(130%) blur(20px); }
.composer-wrap { position: sticky; bottom: 0; z-index: 2; min-width: 0; border-top: 1px solid color-mix(in srgb, var(--color-border) 70%, transparent); padding: var(--space-3) var(--space-6) var(--space-4); background: var(--color-frosted); backdrop-filter: saturate(130%) blur(20px); }
.composer-suggestions { width: min(680px, 100%); margin: 0 auto 9px; overflow-x: auto; overscroll-behavior-x: contain; scroll-snap-type: x proximity; scrollbar-width: none; touch-action: pan-x; -webkit-overflow-scrolling: touch; display: grid; grid-template-columns: repeat(auto-fit, minmax(96px, 1fr)); gap: var(--space-2); margin-bottom: var(--space-3); overflow: visible; }
.composer-suggestions button { flex: 0 0 clamp(176px, 56vw, 230px); overflow: hidden; border: 1px solid var(--color-border); color: var(--color-ink-secondary); cursor: pointer; scroll-snap-align: start; text-overflow: ellipsis; white-space: nowrap; transition: border-color 120ms ease-out, color 120ms ease-out, transform 120ms ease-out; width: 100%; min-width: 0; min-height: 44px; padding: 0 var(--space-2); border-color: var(--color-border); border-radius: var(--radius-md); background: var(--color-canvas-soft); font-size: var(--type-caption); }
.composer { width: min(760px, 100%); display: flex; align-items: flex-end; gap: 10px; margin: 0 auto; border: 1px solid var(--color-border); transition: border-color 140ms ease-out; min-height: 60px; padding: var(--space-2) var(--space-2) var(--space-2) var(--space-4); border-color: var(--color-border-strong); border-radius: var(--radius-lg); background: var(--color-canvas); box-shadow: 0 0 0 1px color-mix(in srgb, var(--color-border) 42%, transparent); }
+33 -26
View File
@@ -16,6 +16,7 @@ import { ConversationalBirthTimeRectification } from "@/components/conversationa
import { ChatMessageContent } from "@/components/chat-message-content";
import { AgentAvatar, ChatMessageRow } from "@/components/chat-message-row";
import { ModelSelector } from "@/components/model-selector";
import { ParameterFreezePanel, type ParameterFreezeRow } from "@/components/parameter-freeze-panel";
import { Button } from "@/components/ui/button";
import { SidebarInset, SidebarProvider, SidebarTrigger } from "@/components/ui/sidebar";
import { Textarea } from "@/components/ui/textarea";
@@ -64,9 +65,11 @@ import {
isGuidedBirthTimePreview,
previewRectificationJourney,
} from "@/lib/birth-time-guided-preview";
import { defaultGuidedJyotishTopics } from "@/lib/guided-jyotish-topics";
import { keepFocusWithin } from "@/lib/focus-trap";
import { chatMessageViews, type ChatMessage } from "@/lib/chat-message-view";
import { persistExistingChatSession } from "@/lib/chat-session-persistence";
import { consultationReportMarkdown } from "@/lib/consultation-report-export";
import {
OnboardingAuthenticationError,
type OnboardingContent,
@@ -196,11 +199,7 @@ type PendingConsultation = {
const undoWindowMs = 2_500;
const china = chinaLocations.country;
const themes: Array<{ id: Exclude<Theme, "general">; label: string; prompt: string }> = [
{ id: "career", label: "事业", prompt: "未来一年,事业和收入该关注什么?" },
{ id: "marriage", label: "关系", prompt: "我的关系模式是什么?" },
{ id: "timing", label: "时运", prompt: "未来哪些阶段值得把握?" },
];
const themes = defaultGuidedJyotishTopics;
const rectificationCardLabels = {
start: "开始生时校正",
@@ -852,7 +851,6 @@ export default function Home() {
preview: process.env.NODE_ENV === "development" && uiPreview.current,
onJourney: setBirthTimeJourney,
onReady: completeGuidedBirthTime,
onCandidateComplete: completeCandidateBirthTime,
onEditBirthTimeDetails: editDeclaredBirthTimeDetails,
});
@@ -993,6 +991,16 @@ export default function Home() {
const profileComplete = isProfileComplete(profile);
const birthTimeDisplay = birthTimeDisplayState(profile);
const profileBirthPlace = selectedBirthPlace(profile);
const parameterFreezeRows: ParameterFreezeRow[] = profileComplete && profileBirthPlace ? [
{ label: "出生时间", value: `${profile.date} ${profile.time || "未定"}` },
{ label: "出生地点", value: profileBirthPlace.label },
{ label: "经纬度", value: `${profileBirthPlace.lat.toFixed(4)}, ${profileBirthPlace.lon.toFixed(4)}` },
{ label: "时区", value: `UTC+${profileBirthPlace.tz}` },
{ label: "Ayanamsa", value: "Lahiri / Sidereal" },
{ label: "Node mode", value: "True Node" },
{ label: "出生时间精度", value: birthTimeDisplay?.kind === "candidate" ? "候选时间" : birthTimeDisplay?.kind === "confirmed" ? "已确认" : "待校正" },
] : [];
const dailyStarlanguage = dailyStarlanguageCard ?? (profileComplete ? buildDailyStarlanguageCard(profile) : null);
const onboardingPending = profileComplete && !onboarding && !onboardingError;
const currentOnboardingMessage = onboardingJustCompleted
@@ -1436,11 +1444,15 @@ export default function Home() {
message_count: session.messages.length,
messages: session.messages.map((message) => ({ role: message.role, text: message.text })),
};
const reportMarkdown = consultationReportMarkdown({ title: session.title, messages: session.messages });
const transcript = [
`Jyotisha 对话:${session.title}`,
"",
...session.messages.map((message) => `${message.role === "user" ? "我" : "Jyotisha"}${message.text}`),
"",
"---- Markdown 报告 ----",
reportMarkdown,
"",
"---- JSON 分享包 ----",
JSON.stringify(sharePayload, null, 2),
].join("\n");
@@ -1807,21 +1819,6 @@ export default function Home() {
setOnboardingJustCompleted(false);
}
function completeCandidateBirthTime(result: JourneyClientResponse, time: string) {
const candidateProfile: Profile = {
...profileDraft,
time,
birthTimeStatus: "candidate",
rectificationCaseId: result.caseId,
};
setProfile(candidateProfile);
setProfileDraft(candidateProfile);
setBirthTimeJourney(null);
setPresetMessageLength(0);
setStartGreeting(createStartGreeting(candidateProfile.name));
setOnboardingJustCompleted(false);
}
async function retryBirthTimeAssessment() {
if (!account || profileSaving) return;
setProfileSaving(true);
@@ -2535,6 +2532,15 @@ export default function Home() {
}
if (!response.body) throw new Error("浏览器未收到可读取的回答流");
const techniqueTruth = response.headers.get("x-jyotish-technique-truth") ?? "unknown";
const workflowReceipt = {
route: response.headers.get("x-jyotish-workflow-route") ?? "unknown",
status: response.headers.get("x-jyotish-workflow-status") ?? "unknown",
preciseTiming: response.headers.get("x-jyotish-precise-timing") ?? "unknown",
missingLayers: (response.headers.get("x-jyotish-missing-layers") ?? "none")
.split(",")
.map((item) => item.trim())
.filter((item) => item && item !== "none"),
};
const reader = response.body.getReader();
const decoder = new TextDecoder();
@@ -2565,7 +2571,7 @@ export default function Home() {
title: currentSession.messages.length === 0
? resolveSessionTitle(question, reply.title)
: userSession.title,
messages: [...userSession.messages, { role: "assistant", text: reply.text, suggestions: reply.suggestions, techniqueTruth }],
messages: [...userSession.messages, { role: "assistant", text: reply.text, suggestions: reply.suggestions, techniqueTruth, workflowReceipt }],
updatedAt: timestamp(),
};
updateSession(sessionId, () => completedSession);
@@ -2622,16 +2628,16 @@ export default function Home() {
await persistSession(interruptedSession);
setRequestError({
sessionId,
message: "回答中途断开,已保留生成内容;本次已开始生成并计费。",
message: "回答中途断开,已保留生成内容;请复制现有内容或继续追问,系统正在以账户记录为准同步点数。",
});
} catch (persistError) {
setRequestError({
sessionId,
message: `${persistError instanceof Error ? persistError.message : "云端同步失败"} 已计费的部分回答仍保留在当前页面,请复制保存。`,
message: `${persistError instanceof Error ? persistError.message : "云端同步失败"} 部分回答仍保留在当前页面,请复制保存后继续追问`,
});
}
if (activeSessionIdRef.current === sessionId) {
setComposerNotice("回答中途断开,已保留现有内容,本次已计费。");
setComposerNotice("回答中途断开,已保留现有内容;请继续追问或复制保存。");
}
}
return Boolean(partialReply);
@@ -2977,6 +2983,7 @@ export default function Home() {
<div className="starter-loading" role="status"></div>
) : (
<div className="starter-list" aria-label="Jyotisha 推荐的初始问题">
{parameterFreezeRows.length > 0 && <ParameterFreezePanel rows={parameterFreezeRows} />}
<div className="product-entrypoints" aria-label="常用占星入口">
<article className="daily-starlanguage-card product-entrypoint-card" aria-label="今日星语">
<button
@@ -3039,7 +3046,7 @@ export default function Home() {
const theme = themes.find((candidate) => candidate.id === item.theme);
return (
<button key={`${item.theme}-${item.text}`} type="button" disabled={!hydrated || Boolean(pendingSessionId) || cancellationPending || !account || !modelCatalog} onClick={() => chooseSuggestedQuestion(item.text, item.theme)}>
<span className="starter-content"><b>{theme?.label || "开始"}</b><span>{item.text}</span></span>
<span className="starter-content"><b>{theme?.label || "开始"}</b><span>{item.text}</span>{theme && <small>{theme.evidencePreview.join(" / ")} · {theme.claimBoundary}</small>}</span>
<ArrowUpRight className="starter-arrow" aria-hidden="true" />
</button>
);