修复:智能分析空回答与工具结束条件冲突

统一自主分析工具范围与执行前校验,严格核验正常结束、最终正文和图表恢复状态,并显示空回答及恢复失败原因。

包含两次已上线修复及回归测试,保留已有回答与业务数据。

验证:1101 项 Python、469 项前端、97 项后端测试通过;前后端构建和真实模型、页面验收通过。
This commit is contained in:
2026-11-03 08:56:49 +08:00
parent 7ffb5cdb9c
commit 52d92c95d8
20 changed files with 387 additions and 37 deletions
+4 -2
View File
@@ -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} />}
+14
View File
@@ -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> : {};
+3 -1
View File
@@ -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');
@@ -0,0 +1,28 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { emptyAnalysisNotice } from '../src/analysisConversationState.ts';
test('the reported empty native answer explains the missing body without claiming analysis success', () => {
const result = { answer: '', answerQuality: { dataComplete: true, narrativeComplete: false } };
assert.equal(emptyAnalysisNotice({ status: 'PARTIAL', result }, ''), '数据查询已完成,但未生成分析正文。请重新分析。');
assert.equal(emptyAnalysisNotice({ status: 'PARTIAL', ...result }, ''), '数据查询已完成,但未生成分析正文。请重新分析。');
});
test('running, successful, clarification and nonempty answers retain their existing display', () => {
for (const status of ['QUEUED', 'RUNNING', 'NEEDS_CLARIFICATION']) assert.equal(emptyAnalysisNotice({ status }, ''), '');
for (const status of ['PARTIAL', 'FAILED', 'CANCELLED']) assert.equal(emptyAnalysisNotice({ status }, '原文'), '');
});
test('a historical empty completed record is visible without pretending its completed turn can be retried',()=>{
assert.equal(emptyAnalysisNotice({status:'COMPLETED'},''),'此记录没有可显示的回答,请新建会话重试。');
assert.equal(emptyAnalysisNotice({status:'COMPLETED'},'已保存原文'),'');
});
test('failure, incomplete data and cancellation receive accurate, bounded notices', () => {
assert.equal(emptyAnalysisNotice({ status: 'FAILED', stopReason: 'private diagnostics' }, ''), '本轮未生成可显示的回答,请重新分析。');
assert.equal(emptyAnalysisNotice({ status: 'PARTIAL', answerQuality: { dataComplete: false } }, ''), '本轮未生成可显示的回答,请重新分析。');
assert.equal(emptyAnalysisNotice({ status: 'CANCELLED' }, ''), '分析已停止,尚未生成回答。');
});
test('structured lists and reports do not need an additional prose answer', () => {
for (const [key, value] of [['memberList', {}], ['recordList', []], ['reportMarkdown', '报告'], ['reportHtml', '<p>报告</p>']]) {
assert.equal(emptyAnalysisNotice({ status: 'PARTIAL', result: { [key]: value } }, ''), '');
assert.equal(emptyAnalysisNotice({ status: 'PARTIAL', [key]: value }, ''), '');
}
});
@@ -4,6 +4,7 @@ import fs from 'node:fs';
import ts from 'typescript';
import React from 'react';
import { renderToStaticMarkup } from 'react-dom/server';
import { emptyAnalysisNotice } from '../src/analysisConversationState.ts';
import {
analysisMemberListFullyRead,
analysisMemberListPage,
@@ -113,12 +114,17 @@ test('member-list display is opt-in, keeping earlier Markdown answers on their e
const source = fs.readFileSync(new URL('../src/ManagementPages.tsx', import.meta.url), 'utf8');
const turn = source.slice(source.indexOf('function AnalysisTurn('), source.indexOf('function AnalysisTurnMetadata('))
.replace('function AnalysisTurn(', 'function AnalysisTurn(');
const component = new Function('React', 'useAnalysisVisualRecovery', 'partialAnswerIsOnlyProgress', 'analysisScopeText', 'isObjectRecord', 'AnalysisProcess', 'AnalysisTurnMetadata', 'AiMarkdown', 'AnalysisNarrative', 'NativeAnalysisReport', 'AnalysisReportExport', 'Button', 'AnalysisMemberListPanel',
const component = new Function('React', 'useAnalysisVisualRecovery', 'partialAnswerIsOnlyProgress', 'analysisScopeText', 'isObjectRecord', 'AnalysisProcess', 'AnalysisTurnMetadata', 'AiMarkdown', 'AnalysisNarrative', 'NativeAnalysisReport', 'AnalysisReportExport', 'Button', 'AnalysisMemberListPanel', 'emptyAnalysisNotice',
ts.transpileModule(`${turn}\nreturn AnalysisTurn;`, { fileName: 'analysis-turn.tsx', compilerOptions: { target: ts.ScriptTarget.ES2022, jsx: ts.JsxEmit.React } }).outputText
)(React, turn => ({turn,available:false,recovering:false,error:''}), () => false, () => '', value => Boolean(value) && typeof value === 'object' && !Array.isArray(value), () => null, () => null, ({ content }) => React.createElement('p', null, content),
({ answer }) => React.createElement('div', { className: 'legacy-markdown' }, answer), () => null, () => null, ({ children }) => React.createElement('button', null, children), () => null);
)(React, turn => ({turn,available:false,recovering:false,error:turn.recoveryError||''}), () => false, () => '', value => Boolean(value) && typeof value === 'object' && !Array.isArray(value), () => null, () => null, ({ content }) => React.createElement('p', null, content),
({ answer }) => React.createElement('div', { className: 'legacy-markdown' }, answer), () => null, () => null, ({ children }) => React.createElement('button', null, children), () => null, emptyAnalysisNotice);
const html = renderToStaticMarkup(React.createElement(component, { turn: { id: 'old-turn', status: 'COMPLETED', answer: '| old | Markdown table |' }, onUnauthorized: () => false }));
assert.match(html, /legacy-markdown/);
assert.match(html, /\| old \| Markdown table \|/);
assert.doesNotMatch(html, /analysis-member-list/);
const empty = renderToStaticMarkup(React.createElement(component, { turn: { id: 'empty-turn', status: 'PARTIAL', answer: '', answerQuality: { dataComplete: true, narrativeComplete: false } }, onUnauthorized: () => false, onRetry: () => {} }));
assert.match(empty, /role="status">数据查询已完成,但未生成分析正文。请重新分析。/);
assert.match(empty, /<button>重新分析<\/button>/);
const failedRecovery=renderToStaticMarkup(React.createElement(component,{turn:{id:'old-turn',status:'PARTIAL',answer:'原答案',recoveryError:'图表恢复暂不可用'},onUnauthorized:()=>false}));
assert.match(failedRecovery,/role="alert">图表恢复暂不可用/);assert.match(failedRecovery,/原答案/);
});
@@ -22,6 +22,12 @@ function fixture(request){let cursor=0,dirty=false,queue=[],source=saved(),value
const snapshot=new Function('api',snapshotBody+';return {analysisSnapshotResult};')({});
const canRecover=new Function('analysisSnapshotResult',hookBody.slice(0,hookBody.indexOf('/**'))+';return canRecoverAnalysisVisuals;')(snapshot.analysisSnapshotResult);
test('only a saved protocol task requesting a chart offers recovery',()=>{assert.equal(canRecover(saved()),true);for(const source of [{...saved(),status:'RUNNING'},{...saved(),plan:{...saved().plan,protocolVersion:0}},{...saved(),plan:{...saved().plan,task:{...saved().plan.task,visualPreference:'none'}}},{...complete(saved())}])assert.equal(canRecover(source),false);});
test('native auto charts offer recovery for real rendering gaps without requiring a queryPlan',()=>{
const source=saved();source.plan.task={kind:'analysis',executionMode:'native_agent',visualPreference:'auto'};
source.executionCoverage={visualGaps:['总体比较图未生成']};source.visualState='ready';assert.equal(canRecover(source),true);
source.executionCoverage={visualGaps:[]};source.answerQuality={chartsComplete:false};source.status='COMPLETED';assert.equal(canRecover(source),false);
source.visualState='failed';assert.equal(canRecover(source),true);
});
test('a duplicate click recovers only charts and retains facts',async()=>{const response=deferred(),ui=fixture(()=>response.promise);ui.render();const a=ui.value.recover(),b=ui.value.recover();ui.render();assert.equal(ui.calls.api,1);response.resolve(complete(ui.source));await Promise.all([a,b]);await ui.settle();assert.equal(ui.value.turn.status,'COMPLETED');assert.equal(ui.value.turn.answer,'原答案');assert.equal(ui.value.available,false);ui.unmount();});
test('a changed fact, source execution, or returned turn is rejected',async()=>{for(const change of [v=>({...v,answer:'换了答案'}),v=>({...v,id:'turn2'}),v=>({...v,plan:{...v.plan,executionId:'exec2'}})]){let ui;ui=fixture(async()=>change(complete(ui.source)));ui.render();await ui.value.recover();await ui.settle();assert.equal(ui.value.turn.status,'PARTIAL');assert.match(ui.value.error,/原分析已变化/);ui.unmount();}});
test('late recovery cannot overwrite a changed revision or an unmounted view',async()=>{const response=deferred(),ui=fixture(()=>response.promise);ui.render();const before=structuredClone(ui.source),request=ui.value.recover();ui.replace({...before,plan:{...before.plan,revision:3},answer:'新答案'});response.resolve(complete(before));await request;await ui.settle();assert.equal(ui.value.turn.answer,'新答案');assert.equal(ui.value.turn.status,'PARTIAL');ui.unmount();});