root/Jyotisha
1
0
Fork 0
Code Issues 1 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

fix: restore bound rectification sessions

Browse Source
This commit is contained in:
Jesse_Chen
2026-07-22 21:11:23 +08:00
parent a9d2edbbb4
commit 87f6ff7c05
3 changed files with 72 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/app/page.tsx
+38 -20
View File
@@ -1913,18 +1913,27 @@ export default function Home() {
rectificationCase: account.rectificationCase,
hasConfirmedBirthTime: account.hasConfirmedBirthTime,
});
const resumableSession = action === "resume" && account.rectificationCase
const sourceBoundCaseId = sourceSession.sessionType === "birth_time_rectification"
? sourceSession.rectificationCaseId
: null;
const accountResumeCase = action === "resume" ? account.rectificationCase : null;
const resumeTarget = sourceBoundCaseId
? {
caseId: sourceBoundCaseId,
turnVersion: accountResumeCase?.caseId === sourceBoundCaseId
? accountResumeCase.turnVersion
: 0,
}
: accountResumeCase;
const resumableSession = !sourceBoundCaseId && accountResumeCase
? sessions.find((session) => session.sessionType === "birth_time_rectification"
&& session.rectificationCaseId === account.rectificationCase?.caseId)
&& session.rectificationCaseId === accountResumeCase.caseId)
?? sessions.find((session) => session.sessionType === "birth_time_rectification"
&& session.rectificationCaseId === null)
?? null
: null;
const canReuseSourceRectificationSession = action === "resume"
&& sourceSession.sessionType === "birth_time_rectification"
&& account.rectificationCase !== null
&& (sourceSession.rectificationCaseId === account.rectificationCase.caseId
|| sourceSession.rectificationCaseId === null);
const canReuseSourceRectificationSession = sourceSession.sessionType === "birth_time_rectification"
&& (sourceBoundCaseId !== null || accountResumeCase !== null);
const rectificationSession = canReuseSourceRectificationSession
? sourceSession
: resumableSession ?? createSession(modelCatalog.defaultModelId, "birth_time_rectification");
@@ -1957,7 +1966,7 @@ export default function Home() {
setActiveSessionId(rectificationSession.id);
try {
let turn: ConversationalRectificationTurn;
if (action !== "resume" || !account.rectificationCase) {
if (!resumeTarget) {
const durable = await durableRectificationQuestionHandoff.current.load();
turn = durable && durable.status !== "consumed"
? durable.turn
@@ -1967,8 +1976,10 @@ export default function Home() {
pendingConsultationQuestion: requestedQuestion,
});
} else {
let current = account.rectificationCase;
if (pendingConsultationQuestion) {
let current = resumeTarget;
const canAttachQuestion = pendingConsultationQuestion
&& accountResumeCase?.caseId === current.caseId;
if (canAttachQuestion) {
try {
turn = await durableRectificationQuestionHandoff.current.attach({
caseId: current.caseId,
@@ -2063,16 +2074,22 @@ export default function Home() {
...current,
hasConfirmedBirthTime: current.hasConfirmedBirthTime
|| (turn.status === "completed" && turn.candidate.status === "confirmed"),
rectificationCase: {
caseId: turn.caseId,
journeyProtocol: "conversational-evidence-v3",
status: turn.status,
turnVersion: turn.turnVersion,
isRevision: current.rectificationCase?.isRevision
?? current.hasConfirmedBirthTime,
preservesActiveTime: current.rectificationCase?.preservesActiveTime
?? current.hasConfirmedBirthTime,
},
rectificationCase: ["active", "paused", "confirming"].includes(turn.status)
? {
caseId: turn.caseId,
journeyProtocol: "conversational-evidence-v3",
status: turn.status,
turnVersion: turn.turnVersion,
isRevision: current.rectificationCase?.caseId === turn.caseId
? current.rectificationCase.isRevision
: current.hasConfirmedBirthTime,
preservesActiveTime: current.rectificationCase?.caseId === turn.caseId
? current.rectificationCase.preservesActiveTime
: current.hasConfirmedBirthTime,
}
: current.rectificationCase?.caseId === turn.caseId
? null
: current.rectificationCase,
} : current);
if (turn.status === "completed"
&& turn.candidate.status === "confirmed"
@@ -2094,6 +2111,7 @@ export default function Home() {
.then((latest) => {
if (!accountRefreshGuard.current.isCurrent(requestIdentity)) return;
setAccount((current) => {
if (turn.status === "completed" || turn.status === "abandoned") return latest;
if (latest.rectificationCase?.caseId !== turn.caseId
|| latest.rectificationCase.turnVersion < turn.turnVersion) return current;
return latest;
frontend/tests/consultation-entrypoint.test.ts
+18 -6
View File
@@ -149,21 +149,33 @@ test("homepage reuses the session bound to an unfinished rectification case", ()
const end = source.indexOf("function handleConversationalRectificationTurn", start);
const handler = source.slice(start, end);
assert.match(handler, /action === "resume" && account\.rectificationCase/);
assert.match(handler, /session\.rectificationCaseId === account\.rectificationCase\?\.caseId/);
assert.match(handler, /const accountResumeCase = action === "resume" \? account\.rectificationCase : null/);
assert.match(handler, /session\.rectificationCaseId === accountResumeCase\.caseId/);
assert.match(handler, /resumableSession \?\? createSession/);
});
test("starting again after a completed rectification creates a new dedicated session", () => {
test("a bound rectification session resumes its own case while a homepage restart stays dedicated", () => {
const source = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8");
const start = source.indexOf("async function openBirthTimeRectification");
const end = source.indexOf("function handleConversationalRectificationTurn", start);
const handler = source.slice(start, end);
assert.match(handler, /const canReuseSourceRectificationSession = action === "resume"/);
assert.match(handler, /sourceSession\.rectificationCaseId === account\.rectificationCase\.caseId/);
assert.match(handler, /const sourceBoundCaseId = sourceSession\.sessionType === "birth_time_rectification"/);
assert.match(handler, /const resumeTarget = sourceBoundCaseId/);
assert.match(handler, /caseId: sourceBoundCaseId/);
assert.match(handler, /if \(!resumeTarget\) \{[\s\S]*?type: "start"/);
assert.match(handler, /const rectificationSession = canReuseSourceRectificationSession[\s\S]*?: resumableSession \?\? createSession/);
assert.doesNotMatch(handler, /const rectificationSession = sourceSession\.sessionType === "birth_time_rectification"/);
assert.match(handler, /type: "resume",[\s\S]*?caseId: current\.caseId/);
});
test("historical completed rectification does not replace the account's unfinished case", () => {
const source = readFileSync(new URL("../src/app/page.tsx", import.meta.url), "utf8");
const start = source.indexOf("function handleConversationalRectificationTurn");
const end = source.indexOf("async function draftSynastryQuestionFromChart", start);
const handler = source.slice(start, end);
assert.match(handler, /current\.rectificationCase\?\.caseId === turn\.caseId[\s\S]*?\? null[\s\S]*?: current\.rectificationCase/);
assert.match(handler, /turn\.status === "completed" \|\| turn\.status === "abandoned"\) return latest/);
});
test("rectify-first suggestions hand the source question to a dedicated rectification session", () => {