fix: keep rectification questions context-aware
This commit is contained in:
@@ -39,9 +39,9 @@ const phaseLabels = {
|
||||
extracting_evidence: "正在整理你刚才提到的经历…",
|
||||
scoring_candidates: "正在扫描候选时间…",
|
||||
checking_robustness: "正在检查候选范围的稳定性…",
|
||||
planning_question: "正在选择下一条最有信息量的问题…",
|
||||
reasoning: "正在结合上下文决定下一步…",
|
||||
rendering: "正在组织下一条回复…",
|
||||
planning_question: "正在生成语义问题机会…",
|
||||
reasoning: "正在选择下一步动作…",
|
||||
rendering: "正在生成安全回复…",
|
||||
complete: "分析已完成",
|
||||
} as const;
|
||||
|
||||
@@ -380,12 +380,12 @@ export function RectificationV4Panel(props: RectificationV4PanelProps) {
|
||||
});
|
||||
return (
|
||||
<div className="rectification-message-entry" key={message.renderKey}>
|
||||
<RectificationMessageRow message={regenerating
|
||||
? { ...message, text: "", state: "thinking" }
|
||||
: message} />
|
||||
{message.role === "assistant" && message.state === "settled" && message.analysisTrace && (
|
||||
<RectificationAnalysisDetails trace={message.analysisTrace} />
|
||||
)}
|
||||
<RectificationMessageRow message={regenerating
|
||||
? { ...message, text: "", state: "thinking" }
|
||||
: message} />
|
||||
{showActions && !regenerating && (
|
||||
<div className="rectification-message-actions" aria-label="Agent 回答操作">
|
||||
<button
|
||||
|
||||
@@ -24,6 +24,16 @@ function friendly(error: unknown): string {
|
||||
return error instanceof Error ? error.message : "暂时无法处理,请稍后再试。";
|
||||
}
|
||||
|
||||
export function applyRectificationV4JobUpdate(
|
||||
data: RectificationV4ApiResponse | null,
|
||||
job: RectificationV4Job,
|
||||
): RectificationV4ApiResponse | null {
|
||||
if (data?.job?.id !== job.id) return data;
|
||||
if (["completed", "failed", "stale"].includes(data.job.status)) return data;
|
||||
if (job.updatedAt < data.job.updatedAt) return data;
|
||||
return { ...data, job };
|
||||
}
|
||||
|
||||
export function useRectificationV4(input: {
|
||||
readonly pendingConsultationQuestion?: string | null;
|
||||
readonly onPendingChange?: (pending: boolean) => void;
|
||||
@@ -31,13 +41,17 @@ export function useRectificationV4(input: {
|
||||
const onPendingChange = input.onPendingChange;
|
||||
const pendingConsultationQuestion = input.pendingConsultationQuestion?.trim() || null;
|
||||
const [data, setData] = useState<RectificationV4ApiResponse | null>(null);
|
||||
const [job, setJob] = useState<RectificationV4Job | null>(null);
|
||||
const [handoff, setHandoff] = useState<RectificationV4Handoff | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [pending, setPending] = useState(false);
|
||||
const [error, setError] = useState("");
|
||||
const mounted = useRef(true);
|
||||
|
||||
const job = data?.job ?? null;
|
||||
const jobId = job?.id ?? null;
|
||||
const jobStatus = job?.status ?? null;
|
||||
const caseId = data?.case.id ?? null;
|
||||
|
||||
const setBusy = useCallback((value: boolean) => {
|
||||
setPending(value);
|
||||
onPendingChange?.(value);
|
||||
@@ -47,7 +61,6 @@ export function useRectificationV4(input: {
|
||||
const result = caseId ? await loadRectificationV4(caseId) : await loadActiveRectificationV4();
|
||||
if (mounted.current) {
|
||||
setData(result);
|
||||
setJob(result?.job ?? null);
|
||||
}
|
||||
return result;
|
||||
}, []);
|
||||
@@ -74,7 +87,6 @@ export function useRectificationV4(input: {
|
||||
}
|
||||
if (mounted.current) {
|
||||
setData(result);
|
||||
setJob(result.job);
|
||||
setHandoff(nextHandoff);
|
||||
}
|
||||
} catch (caught) {
|
||||
@@ -87,23 +99,30 @@ export function useRectificationV4(input: {
|
||||
}, [pendingConsultationQuestion]);
|
||||
|
||||
useEffect(() => {
|
||||
const jobId = job?.id;
|
||||
if (!jobId || !["pending", "processing"].includes(job.status)) return;
|
||||
const timer = window.setInterval(() => {
|
||||
void loadRectificationV4Job(jobId).then(async (next) => {
|
||||
if (!mounted.current) return;
|
||||
setJob(next);
|
||||
if (["completed", "failed", "stale"].includes(next.status) && data) {
|
||||
window.clearInterval(timer);
|
||||
const latest = await refresh(data.case.id);
|
||||
if (!jobId || !jobStatus || !["pending", "processing"].includes(jobStatus)) return;
|
||||
let cancelled = false;
|
||||
let timer: number | null = null;
|
||||
const poll = async () => {
|
||||
try {
|
||||
const next = await loadRectificationV4Job(jobId);
|
||||
if (cancelled || !mounted.current) return;
|
||||
setData((current) => applyRectificationV4JobUpdate(current, next));
|
||||
if (["completed", "failed", "stale"].includes(next.status) && caseId) {
|
||||
const latest = await refresh(caseId);
|
||||
if (next.status === "failed" && latest) setError("这次比较没有完成,回答已经保留,请再试一次。");
|
||||
return;
|
||||
}
|
||||
}).catch((caught) => {
|
||||
if (mounted.current) setError(friendly(caught));
|
||||
});
|
||||
}, 1_000);
|
||||
return () => window.clearInterval(timer);
|
||||
}, [data, job, refresh]);
|
||||
} catch (caught) {
|
||||
if (!cancelled && mounted.current) setError(friendly(caught));
|
||||
}
|
||||
if (!cancelled) timer = window.setTimeout(() => void poll(), 1_000);
|
||||
};
|
||||
timer = window.setTimeout(() => void poll(), 1_000);
|
||||
return () => {
|
||||
cancelled = true;
|
||||
if (timer !== null) window.clearTimeout(timer);
|
||||
};
|
||||
}, [caseId, jobId, jobStatus, refresh]);
|
||||
|
||||
const mutate = useCallback(async (operation: () => Promise<RectificationV4ApiResponse>) => {
|
||||
setBusy(true);
|
||||
@@ -112,7 +131,6 @@ export function useRectificationV4(input: {
|
||||
const result = await operation();
|
||||
if (mounted.current) {
|
||||
setData(result);
|
||||
setJob(result.job);
|
||||
}
|
||||
return result;
|
||||
} catch (caught) {
|
||||
|
||||
@@ -16,12 +16,12 @@ const domainPolicy: Readonly<Record<Exclude<EvidenceDomain, "family" | "other">,
|
||||
recallEase: number;
|
||||
privacyCost: number;
|
||||
}>>> = {
|
||||
education: { goal: "收集一件有大致日期的教育转折。", fallbackPrompt: (anchor) => anchor ? `在“${anchor}”之外,你还记得哪次入学、毕业或专业变化大概发生在哪年哪月?` : "你还记得哪次入学、毕业或专业变化大概发生在哪年哪月?", keywords: /大学|学校|入学|毕业|考试|专业|读书/, recallEase: .82, privacyCost: .03 },
|
||||
relocation: { goal: "收集一件有大致日期的迁居经历。", fallbackPrompt: (anchor) => anchor ? `以“${anchor}”为时间参照,你哪次搬到新城市或长期离乡的年月最确定?` : "你哪次搬到新城市或长期离乡的年月最确定?", keywords: /搬家|迁居|离家|外地|城市|北京|上海|出国/, recallEase: .78, privacyCost: .04 },
|
||||
relationship: { goal: "在用户愿意的前提下收集一件有大致日期的关系转折。", fallbackPrompt: (anchor) => anchor ? `说到“${anchor}”这段时期,如果你愿意,哪次关系变化的大概年月还记得?` : "如果你愿意,哪次关系变化的大概年月还记得?", keywords: /恋爱|关系|结婚|离婚|分手|伴侣|对象/, recallEase: .62, privacyCost: .22 },
|
||||
career: { goal: "收集一件有大致日期的职业转折。", fallbackPrompt: (anchor) => anchor ? `在“${anchor}”之后,哪次工作或职责明显变化的年月你还记得?` : "哪次工作或职责明显变化的年月你还记得?", keywords: /工作|实习|公司|研究院|职业|入职|离职|创业|负责/, recallEase: .85, privacyCost: .03 },
|
||||
finance: { goal: "在用户愿意的前提下收集一件有大致日期的财务转折。", fallbackPrompt: (anchor) => anchor ? `以“${anchor}”为时间参照,如果方便,哪次财务状况明显变化的年月你还记得?` : "如果方便,哪次财务状况明显变化的年月你还记得?", keywords: /收入|负债|投资|资产|财务|买房|卖房/, recallEase: .6, privacyCost: .18 },
|
||||
health_pressure: { goal: "在用户愿意的前提下收集一件本人有大致日期的健康转折。", fallbackPrompt: (anchor) => anchor ? `说到“${anchor}”前后,如果方便,你本人哪次健康变化的大概年月还记得?` : "如果方便,你本人哪次健康变化的大概年月还记得?", keywords: /住院|手术|事故|健康|生病|确诊|康复/, recallEase: .58, privacyCost: .28 },
|
||||
education: { goal: "收集一件有大致日期的教育转折。", fallbackPrompt: (anchor) => anchor ? `除了“${anchor}”,你还记得哪次入学、毕业或专业变化大概发生在哪年哪月?` : "你还记得哪次入学、毕业或专业变化大概发生在哪年哪月?", keywords: /大学|学校|入学|毕业|考试|专业|读书/, recallEase: .82, privacyCost: .03 },
|
||||
relocation: { goal: "收集一件有大致日期的迁居经历。", fallbackPrompt: (anchor) => anchor ? `除了“${anchor}”,你还记得哪次独立搬家或迁居大概发生在哪年哪月?` : "你还记得哪次搬家或迁居大概发生在哪年哪月?", keywords: /搬家|搬到|搬去|迁居|迁到|迁往|移居|定居|长期居住/, recallEase: .78, privacyCost: .04 },
|
||||
relationship: { goal: "在用户愿意的前提下收集一件有大致日期的关系转折。", fallbackPrompt: (anchor) => anchor ? `除了“${anchor}”,如果你愿意,哪次关系变化的大概年月还记得?` : "如果你愿意,哪次关系变化的大概年月还记得?", keywords: /恋爱|关系|结婚|离婚|分手|伴侣|对象/, recallEase: .62, privacyCost: .22 },
|
||||
career: { goal: "收集一件有大致日期的职业转折。", fallbackPrompt: (anchor) => anchor ? `除了“${anchor}”,哪次工作或职责明显变化的年月你还记得?` : "哪次工作或职责明显变化的年月你还记得?", keywords: /工作|实习|公司|研究院|职业|入职|离职|创业|负责/, recallEase: .85, privacyCost: .03 },
|
||||
finance: { goal: "在用户愿意的前提下收集一件有大致日期的财务转折。", fallbackPrompt: (anchor) => anchor ? `除了“${anchor}”,如果方便,哪次财务状况明显变化的年月你还记得?` : "如果方便,哪次财务状况明显变化的年月你还记得?", keywords: /收入|负债|投资|资产|财务|买房|卖房/, recallEase: .6, privacyCost: .18 },
|
||||
health_pressure: { goal: "在用户愿意的前提下收集一件本人有大致日期的健康转折。", fallbackPrompt: (anchor) => anchor ? `除了“${anchor}”,如果方便,你本人哪次健康变化的大概年月还记得?` : "如果方便,你本人哪次健康变化的大概年月还记得?", keywords: /住院|手术|事故|健康|生病|确诊|康复/, recallEase: .58, privacyCost: .28 },
|
||||
};
|
||||
|
||||
function stableUuid(value: string): string {
|
||||
@@ -182,13 +182,15 @@ export function buildQuestionOpportunities(input: Readonly<{
|
||||
for (const [domain, policy] of Object.entries(domainPolicy) as [Exclude<EvidenceDomain, "family" | "other">, (typeof domainPolicy)[Exclude<EvidenceDomain, "family" | "other">]][]) {
|
||||
if (refusedDomains.has(domain)) continue;
|
||||
const covered = scoreableDomains.has(domain);
|
||||
const themeBonus = policy.keywords.test(latestContext) ? .22 : 0;
|
||||
const themeBonus = latestEvent
|
||||
? latestEvent.domain === domain ? .22 : 0
|
||||
: policy.keywords.test(latestContext) ? .22 : 0;
|
||||
const alreadyAsked = input.turns.some((turn) => turn.questionDomain === domain && !turn.questionTargetEventId);
|
||||
const latestAnchor = latestEvent ? anchorFor(latestEvent) : null;
|
||||
opportunities.push(opportunity(input.caseId, {
|
||||
kind: "ask_new_event", domain, targetEventId: null, goal: policy.goal,
|
||||
requestedFields: ["new_dated_event"], anchors: latestAnchor ? [latestAnchor] : [],
|
||||
contextFacts: [`已有 ${scoreableCount} 件可评分事件。`, `该领域${covered ? "已有覆盖" : "尚未覆盖"}。`],
|
||||
contextFacts: [`已有 ${scoreableCount} 件可评分事件。`, `该领域${covered ? "已有覆盖" : "尚未覆盖"}。`, "需要另一件独立事件,不要把最新事件换词重问。"],
|
||||
fallbackPrompt: policy.fallbackPrompt(latestAnchor), reason: covered ? "继续收集可区分候选的独立事件。" : "补足证据领域覆盖。",
|
||||
expectedInformationGain: covered ? .54 + themeBonus : .65 + themeBonus / 2,
|
||||
dateSensitivity: input.snapshot ? .5 : .35,
|
||||
|
||||
@@ -12,9 +12,19 @@ const bannedAcknowledgement = /(?:这个信息很有用|它不是单纯的|而
|
||||
const overinterpretedAcknowledgement = /(?:职业方向正式落地|人生意义|意味着你|说明你(?:已经|开始|正式)|标志着你)/;
|
||||
const internalTerms = /(?:opportunityId|snapshotId|eventId|targetEventId|requestedFields|fallbackPrompt|tool\s*call|tool_call|score|评分|模型名|opportunity|snapshot|D\d{1,2}|KP\b|Vimshottari)/i;
|
||||
const multiQuestionMoves = /(?:另外|还有|同时再说|并且告诉我|顺便|再告诉我)/;
|
||||
const cannedQuestion = /(?:承接[“\"']?.{0,80}[”\"']?,?请再说一件|接下来请继续讲另一件|我会顺着你的叙述继续核对)/;
|
||||
const cannedQuestion = /(?:承接[“\"']?.{0,80}[”\"']?,?请再说一件|接下来请继续讲另一件|我会顺着你的叙述继续核对|以[“\"']?.{0,80}[”\"']?为(?:时间)?参照|搬到新城市|长期离乡)/;
|
||||
const exactClockMinute = /(?:[01]?\d|2[0-3])[::][0-5]\d|(?:[零〇一二两三四五六七八九十]{1,3}|(?:[01]?\d|2[0-3]))点(?:[零〇一二两三四五六七八九十]{1,3}|[0-5]?\d)分/;
|
||||
const exactMinuteClaim = /(?:唯一|准确|精确|确切|确认|确定|代表).{0,12}(?:出生|生时)?(?:时间|时刻|分钟)|(?:出生|生时)(?:时间|时刻|分钟)?.{0,12}(?:唯一|准确|精确|确切|确认|确定|代表|就是)/;
|
||||
const distinctEventMove = /(?:除了|另一(?:件|次)|下(?:一|1)次|之后|后来|此后|还记得)/;
|
||||
const explicitAnchorReference = /(?:这次经历|这段经历|刚才那段|刚才这段|你刚说的|你刚提到的|刚说的|刚提到的|前面那段|这件事)/;
|
||||
const newEventDomainTerms: Readonly<Partial<Record<QuestionOpportunity["domain"], RegExp>>> = {
|
||||
education: /(?:入学|升学|毕业|学校|大学|专业|考试|读书)/,
|
||||
relocation: /(?:搬家|搬到|搬去|迁居|迁到|迁往|移居|定居)/,
|
||||
relationship: /(?:恋爱|关系|结婚|离婚|分手|伴侣|对象)/,
|
||||
career: /(?:工作|实习|公司|研究院|职业|入职|离职|创业|职责|负责)/,
|
||||
finance: /(?:收入|负债|投资|资产|财务|买房|卖房)/,
|
||||
health_pressure: /(?:住院|手术|事故|健康|生病|确诊|康复)/,
|
||||
};
|
||||
const questionRealizationSchema = z.object({ question: z.string().trim().min(1).max(1_000) }).strict();
|
||||
|
||||
function agentFor(modelId: string | null): { id: string; agent: Agent } | null {
|
||||
@@ -37,14 +47,32 @@ function normalized(value: string): string {
|
||||
return value.normalize("NFKC").replace(/[“”"'\s,,。.!!??::;;]/g, "");
|
||||
}
|
||||
|
||||
function includesAnchor(question: string, anchor: string): boolean {
|
||||
function matchingAnchorFragment(question: string, anchor: string): string | null {
|
||||
const normalizedQuestion = normalized(question);
|
||||
const normalizedAnchor = normalized(anchor);
|
||||
if (normalizedQuestion.includes(normalizedAnchor)) return true;
|
||||
for (let start = 0; start <= normalizedAnchor.length - 4; start += 1) {
|
||||
if (normalizedQuestion.includes(normalizedAnchor.slice(start, start + 4))) return true;
|
||||
if (!normalizedAnchor) return null;
|
||||
if (normalizedQuestion.includes(normalizedAnchor)) return normalizedAnchor;
|
||||
for (let length = Math.min(normalizedQuestion.length, normalizedAnchor.length); length >= 4; length -= 1) {
|
||||
for (let start = 0; start <= normalizedAnchor.length - length; start += 1) {
|
||||
const fragment = normalizedAnchor.slice(start, start + length);
|
||||
if (normalizedQuestion.includes(fragment)) return fragment;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return null;
|
||||
}
|
||||
|
||||
function includesStrictAnchor(question: string, anchor: string): boolean {
|
||||
const normalizedAnchor = normalized(anchor);
|
||||
return normalizedAnchor.length > 0 && normalized(question).includes(normalizedAnchor);
|
||||
}
|
||||
|
||||
function withoutMatchedAnchors(question: string, anchors: readonly string[]): string {
|
||||
let remaining = normalized(question);
|
||||
for (const anchor of anchors) {
|
||||
const matched = matchingAnchorFragment(remaining, anchor);
|
||||
if (matched) remaining = remaining.replace(matched, "");
|
||||
}
|
||||
return remaining;
|
||||
}
|
||||
|
||||
function visibleTextSafetyIssues(value: string): string[] {
|
||||
@@ -65,8 +93,15 @@ export function validateQuestionRealization(question: unknown, opportunity: Ques
|
||||
issues.push(...visibleTextSafetyIssues(value));
|
||||
if (multiQuestionMoves.test(value)) issues.push("multiple_question_instruction");
|
||||
if (cannedQuestion.test(value)) issues.push("canned_question_forbidden");
|
||||
if (opportunity.targetEventId || (opportunity.kind === "ask_new_event" && opportunity.anchors.length > 0)) {
|
||||
if (!opportunity.anchors.some((anchor) => includesAnchor(value, anchor))) issues.push("target_anchor_missing");
|
||||
if (opportunity.targetEventId) {
|
||||
if (!opportunity.anchors.some((anchor) => includesStrictAnchor(value, anchor))) issues.push("target_anchor_missing");
|
||||
} else if (opportunity.kind === "ask_new_event") {
|
||||
const anchorMatched = opportunity.anchors.some((anchor) => matchingAnchorFragment(value, anchor) !== null);
|
||||
if (opportunity.anchors.length > 0 && !anchorMatched && !explicitAnchorReference.test(value)) issues.push("target_anchor_missing");
|
||||
if (opportunity.anchors.length > 0 && !distinctEventMove.test(value)) issues.push("new_event_not_distinct");
|
||||
const domainTerms = newEventDomainTerms[opportunity.domain];
|
||||
const questionWithoutAnchor = withoutMatchedAnchors(value, opportunity.anchors);
|
||||
if (domainTerms && !domainTerms.test(questionWithoutAnchor)) issues.push("new_event_domain_mismatch");
|
||||
}
|
||||
for (const field of opportunity.requestedFields) {
|
||||
if (field === "event_subject" && !/(?:本人|你自己|家人|伴侣|配偶)/.test(value)) issues.push("event_subject_not_requested");
|
||||
|
||||
@@ -26,16 +26,19 @@ export function createRectificationV4CaseService(
|
||||
const realizeQuestion = options.regenerateQuestion ?? regenerateQuestionRealization;
|
||||
|
||||
async function response(userId: string, caseValue: RectificationV4Case, jobId?: string): Promise<RectificationV4ApiResponse> {
|
||||
const [events, turns, analysis] = await Promise.all([
|
||||
const [events, turns, analysis, job] = await Promise.all([
|
||||
store.loadEvents(userId, caseValue.id),
|
||||
store.loadTurns(userId, caseValue.id),
|
||||
caseValue.deploymentMode === "v5_agent"
|
||||
? store.loadAnalysisMessages(userId, caseValue.id)
|
||||
: Promise.resolve([]),
|
||||
jobId
|
||||
? store.loadJob(userId, jobId)
|
||||
: caseValue.status === "processing" ? store.loadActiveJob(userId, caseValue.id) : null,
|
||||
]);
|
||||
return {
|
||||
case: caseValue,
|
||||
job: jobId ? await store.loadJob(userId, jobId) : null,
|
||||
job,
|
||||
events: [...events],
|
||||
turns: [...turns],
|
||||
analysis: [...analysis],
|
||||
|
||||
@@ -230,6 +230,12 @@ export function createRectificationV4MemoryStore(): RectificationV4Store & {
|
||||
owned(userId, job.caseId);
|
||||
return job;
|
||||
},
|
||||
async loadActiveJob(userId, caseId) {
|
||||
owned(userId, caseId);
|
||||
return [...jobs.values()]
|
||||
.filter((job) => job.caseId === caseId && ["pending", "processing"].includes(job.status))
|
||||
.sort((left, right) => right.createdAt.localeCompare(left.createdAt))[0] ?? null;
|
||||
},
|
||||
async updateJobPhase(input) {
|
||||
const job = jobs.get(input.jobId);
|
||||
if (!job || job.workerId !== input.workerId || job.status !== "processing") throw new RectificationV4StoreError("lease_lost");
|
||||
|
||||
@@ -90,6 +90,7 @@ export interface RectificationV4Store {
|
||||
readonly now: string;
|
||||
}): Promise<RectificationV4Case>;
|
||||
loadJob(userId: string, jobId: string): Promise<RectificationV4Job | null>;
|
||||
loadActiveJob(userId: string, caseId: string): Promise<RectificationV4Job | null>;
|
||||
updateJobPhase(input: { readonly workerId: string; readonly jobId: string; readonly phase: RectificationV4Phase; readonly now: string }): Promise<void>;
|
||||
claimNextJob(workerId: string, now: string): Promise<ClaimedRectificationV4Job | null>;
|
||||
completeJob(input: CompleteRectificationV4JobInput, now: string): Promise<RectificationV4Case>;
|
||||
|
||||
@@ -345,6 +345,14 @@ export function createRectificationV4SupabaseStore(supabase: SupabaseClient): Re
|
||||
if (!row || row.user_id !== userId) return null;
|
||||
return jobValue(row);
|
||||
},
|
||||
async loadActiveJob(userId, caseId) {
|
||||
const { data, error } = await supabase.from("birth_time_rectification_v4_jobs")
|
||||
.select("*").eq("user_id", userId).eq("case_id", caseId)
|
||||
.in("status", ["pending", "processing"])
|
||||
.order("created_at", { ascending: false }).limit(1).maybeSingle();
|
||||
if (error) throw storeError(error);
|
||||
return data ? jobValue(data as Row) : null;
|
||||
},
|
||||
async updateJobPhase(input) {
|
||||
await rpc("update_birth_time_rectification_v4_job_phase", {
|
||||
p_worker_id: input.workerId,
|
||||
|
||||
Reference in New Issue
Block a user