修复:智能分析空回答与工具结束条件冲突
统一自主分析工具范围与执行前校验,严格核验正常结束、最终正文和图表恢复状态,并显示空回答及恢复失败原因。 包含两次已上线修复及回归测试,保留已有回答与业务数据。 验证:1101 项 Python、469 项前端、97 项后端测试通过;前后端构建和真实模型、页面验收通过。
This commit is contained in:
@@ -50,7 +50,7 @@ import { AnalysisReportExport, NativeAnalysisReport } from './AnalysisReportExpo
|
||||
import { AiMarkdown } from './AiMarkdown';
|
||||
import { authorizeAnalysisSnapshot } from './analysisSnapshot';
|
||||
import { AnalysisApiSettings } from './AnalysisApiSettings';
|
||||
import { acceptAnalysisEvent, analysisScrollFollows, analysisStreamStatus, partialAnswerIsOnlyProgress, type AnalysisScrollIntent } from './analysisConversationState';
|
||||
import { acceptAnalysisEvent, analysisScrollFollows, analysisStreamStatus, emptyAnalysisNotice, partialAnswerIsOnlyProgress, type AnalysisScrollIntent } from './analysisConversationState';
|
||||
import { AnalysisProcess } from './AnalysisProcess';
|
||||
import { AnalysisMemberListPanel } from './AnalysisMemberList';
|
||||
import { AnalysisRecordListPanel } from './AnalysisRecordList';
|
||||
@@ -1806,6 +1806,7 @@ function AnalysisTurn({ turn: sourceTurn, onResume, onRetry, onClarify, onUnauth
|
||||
const recordList = result.recordList ?? turn.recordList;
|
||||
const answer = partialAnswerIsOnlyProgress(turn) ? '' : typeof result.answer === 'string' ? result.answer : typeof turn.answer === 'string' ? turn.answer : '';
|
||||
const status = String(turn.status || result.status || '').toUpperCase();
|
||||
const emptyNotice = emptyAnalysisNotice(turn, answer);
|
||||
const visuals = result.visualSchemaVersion === 1 ? result.visuals : undefined;
|
||||
const reportMarkdown = typeof result.reportMarkdown === 'string' ? result.reportMarkdown : typeof turn.reportMarkdown === 'string' ? turn.reportMarkdown : '';
|
||||
const reportHtml = typeof result.reportHtml === 'string' ? result.reportHtml : typeof turn.reportHtml === 'string' ? turn.reportHtml : undefined;
|
||||
@@ -1817,7 +1818,8 @@ function AnalysisTurn({ turn: sourceTurn, onResume, onRetry, onClarify, onUnauth
|
||||
{status === 'NEEDS_CLARIFICATION' && onClarify ? <AnalysisClarification turn={turn} disabled={retryDisabled} onContinue={onClarify} /> : answer ? <>
|
||||
{resumable ? <AiMarkdown content={answer} className="ai-answer" />
|
||||
: <AnalysisNarrative answer={answer} visuals={visuals} visualState={result.visualState} question={question} turnId={String(turn.id || '')} beforeExport={() => authorizeAnalysisSnapshot(turn)} turn={turn} />}
|
||||
</> : null}
|
||||
</> : emptyNotice ? <p role="status">{emptyNotice}</p> : null}
|
||||
{recovery.error && <p role="alert">{recovery.error}</p>}
|
||||
<div className="analysis-message-actions">
|
||||
{(reportMarkdown.trim() || reportHtml?.trim()) && <NativeAnalysisReport turn={turn} reportMarkdown={reportMarkdown} reportHtml={reportHtml} />}
|
||||
{!reportMarkdown.trim() && !reportHtml?.trim() && answer && ['COMPLETED', 'PARTIAL'].includes(status) && <AnalysisReportExport turn={turn} />}
|
||||
|
||||
@@ -102,6 +102,20 @@ export function partialAnalysisNotice(reason: unknown, result: Record<string, un
|
||||
return '本轮分析未完整结束,已保存现有结果。可以重试或继续追问。';
|
||||
}
|
||||
|
||||
/** An ended turn without a visible answer still needs an explanation beside retry. */
|
||||
export function emptyAnalysisNotice(turn: Record<string, unknown>, displayedAnswer: string): string {
|
||||
const result = turn.result && typeof turn.result === 'object' && !Array.isArray(turn.result)
|
||||
? turn.result as Record<string, unknown> : turn;
|
||||
const status = String(turn.status || result.status || '').toUpperCase();
|
||||
if (displayedAnswer.trim() || !['PARTIAL', 'FAILED', 'CANCELLED', 'COMPLETED'].includes(status)) return '';
|
||||
if ([result.memberList, turn.memberList, result.recordList, turn.recordList].some(value => value !== undefined && value !== null)
|
||||
|| [result.reportMarkdown, turn.reportMarkdown, result.reportHtml, turn.reportHtml].some(value => typeof value === 'string' && value.trim())) return '';
|
||||
if (status === 'CANCELLED') return '分析已停止,尚未生成回答。';
|
||||
if (status === 'COMPLETED') return '此记录没有可显示的回答,请新建会话重试。';
|
||||
const quality = result.answerQuality && typeof result.answerQuality === 'object' ? result.answerQuality as Record<string, unknown> : {};
|
||||
return quality.dataComplete === true ? '数据查询已完成,但未生成分析正文。请重新分析。' : '本轮未生成可显示的回答,请重新分析。';
|
||||
}
|
||||
|
||||
/** Old answers keep their original wording; surface their explicitly recorded scope limitation. */
|
||||
export function hasUnreconciledEvidence(turn: Record<string, unknown>): boolean {
|
||||
const record = (value: unknown): Record<string, unknown> => value && typeof value === 'object' && !Array.isArray(value) ? value as Record<string, unknown> : {};
|
||||
|
||||
@@ -12,7 +12,9 @@ export function canRecoverAnalysisVisuals(turn: Row): boolean {
|
||||
const planned=Array.isArray(task.queryPlan)&&task.queryPlan.some(raw=>{
|
||||
const node=object(raw);return ['ranking','trend','defects'].includes(String(node.purpose))&&node.visualPreference!=='none';
|
||||
});
|
||||
const requested=task.trendRequired===true||task.visualPreference==='required'||Boolean(task.visualType)||planned;
|
||||
const gaps=object(result.executionCoverage).visualGaps;
|
||||
const nativeGap=task.executionMode==='native_agent'&&(['failed','unavailable'].includes(state)||Array.isArray(gaps)&&gaps.length>0);
|
||||
const requested=task.trendRequired===true||task.visualPreference==='required'||Boolean(task.visualType)||planned||nativeGap;
|
||||
return plan.protocolVersion===1&&['metrics','analysis'].includes(String(task.kind))
|
||||
&&['COMPLETED','PARTIAL'].includes(status)&&task.visualPreference!=='none'&&requested
|
||||
&&object(result.visualRecovery).complete!==true&&(state!=='ready'||status==='PARTIAL');
|
||||
|
||||
Reference in New Issue
Block a user