diff --git a/ai/nao-quality/agent/prompts/system.md b/ai/nao-quality/agent/prompts/system.md
index e418321..94d7283 100644
--- a/ai/nao-quality/agent/prompts/system.md
+++ b/ai/nao-quality/agent/prompts/system.md
@@ -27,6 +27,14 @@ releaseId、发布版本号、候选发布状态、Story ID/slug/version 仅作
## 输出与收尾
+报告与聊天均按“结论—对应图表—解释—依据”的阅读关系组织内容。平台会将图表插入相应语义章节,不再在末尾统一堆放。根据本轮真实问题选择章节:整体比较、阶段变化、产业部变化、业务分组变化、正式报废类别、具体缺陷、重点产品/规格、交叉核查、下一步;不强制窄范围问答套整套章节。章节标题保留对应业务词,并用简短判断说明本节要点;图表由平台提供,正文不要写“见下图”或虚构图号。
+
+整体变化先用简短摘要说清变化方向、主要阶段和优先核查线索,再展开各节。每节先写一到三句解释已确认的现象及实际含义,必要时附一张紧凑数据表,不只连续抄表、不在“重点关注”重复全部数字。阶段数学影响沿用 stageDecomposition 的服务端结果,不能把阶段自身率变化当作对综合率贡献,也不把数学拆解称现场生产根因。亮片报废下降而投入下降更多时,要明确解释合格率仍可能下降。
+
+常规整体分析的重点规格优先结合报废增量、当前规模、率变化和分阶段有效投入确定核查优先级。单按合格率降幅返回的小批量、0率或阶段缺失规格,另列“极端率变化线索”,不能只因降幅大就称整体主要原因;两期分母未查清时不推断停产、退出或全批报废。用户明确只看降幅排名时保留真实排名与批量背景。不得自设未授权的最低批量阈值或忽略小批量的安全/质量异常。
+
+组织、规格和具体缺陷之间的关系只写实际交叉查询已经核对的联系;没有交叉证据时保持各自范围,不把两个独立排名拼成因果链。最后只列能执行的优先核查问题,分清已确认现象与待验证原因,不编造责任人、完成期限或闭环结果。所有图文继续复用同一轮证据;不要为了报告样式重复查询、重新计算核心指标或自动生成故事。
+
工具结果足以回答后,立即用最终答复收尾,不继续写研究过程。即使有部分工具失败,也要交代已确认的结果和具体缺口,不陷入重复尝试或无限思考。不得声称工具失败时完成了对应分析。
按问题组织答案,不套用固定两张TOP表。整体变化应清楚呈现:总体与阶段判断、各产业部变化、各业务分组变化、报废大类与具体缺陷、重点产品/规格、按优先级排列的关注方向与核查行动。产业部和业务分组分别呈现,较少时逐项列出,多时可分组简述但不遗漏重要恶化与改善;不要让读者从TOP规格推测组织情况。产品、缺陷的重点之间说明已核对的联系。简短追问只回答新增问题。必要内容优先,避免重复与冗长导致截断,不以1000字限制牺牲已要求的分析角度。长规格名保留原文。TOP规格严格取工具rank=1至5,不能把其他关注规格替换进入TOP5;额外关注对象另列一句。表格最多4列,报废增量、当前重量与率可择要,投入只有在分阶段核对后再表述。每张表就近标注真实证据编号及排序口径。
diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccess.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccess.java
index 49baeb1..8776f5b 100644
--- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccess.java
+++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccess.java
@@ -19,14 +19,15 @@ import tools.jackson.databind.json.JsonMapper;
public final class AnalysisVisualSnapshotAccess {
public static final int SCHEMA_VERSION = 1;
public static final int MAX_SNAPSHOT_BYTES = 256 * 1024;
- private static final int MAX_VISUALS = 3;
+ private static final int MAX_VISUALS = 12;
private static final int MAX_CATEGORIES = 36;
private static final int MAX_SERIES = 1;
private static final int MAX_TEXT_BYTES = 2048;
private static final Pattern SAFE_KEY = Pattern.compile("[A-Za-z0-9][A-Za-z0-9_.:-]{0,119}");
private static final Pattern SAFE_EVIDENCE_REF = Pattern.compile("[A-Za-z0-9:_-]{1,160}");
private static final Set CHART_KEYS = Set.of("id", "type", "title", "subtitle", "unit", "categories", "series",
- "evidenceRefs", "requiredFields", "scope", "period", "comparisonPeriod", "stage", "metric", "coverage", "note", "originTurnId");
+ "evidenceRefs", "requiredFields", "scope", "period", "comparisonPeriod", "stage", "metric", "coverage", "note",
+ "originTurnId", "sectionKey", "dimension");
private static final Set SCOPE_KEYS = Set.of("year", "month", "quarter", "department", "group", "product",
"projectGroup", "view", "includeUnassigned", "releaseId", "extraFilters", "stage", "category", "defect");
private static final Set PERIOD_KEYS = Set.of("start", "end", "label", "granularity", "year", "month", "quarter");
@@ -122,12 +123,18 @@ public final class AnalysisVisualSnapshotAccess {
String id = text(input.get("id"), 120, true);
if (!SAFE_KEY.matcher(id).matches()) return null;
- String type = enumText(input.get("type"), Set.of("bar", "line", "column", "area", "heatmap", "donut", "pareto"));
+ String type = enumText(input.get("type"), Set.of("bar", "line", "column", "area", "heatmap", "donut", "pareto", "waterfall"));
String title = text(input.get("title"), 200, false);
String subtitle = input.containsKey("subtitle") ? text(input.get("subtitle"), 400, false) : null;
String unit = enumText(input.get("unit"), Set.of("ratio", "kg", "pp", "count"));
String metric = enumText(input.get("metric"), metricNames());
String origin = text(input.get("originTurnId"), 64, true);
+ String sectionKey = input.containsKey("sectionKey")
+ ? enumText(input.get("sectionKey"), Set.of("overview", "stage", "department", "group", "product",
+ "category_black", "category_bright", "defect_black", "defect_bright", "trend", "composition")) : null;
+ String dimension = input.containsKey("dimension")
+ ? enumText(input.get("dimension"), Set.of("department", "group", "product", "category", "defect")) : null;
+ if (input.containsKey("sectionKey") && sectionKey == null || input.containsKey("dimension") && dimension == null) return null;
if (turnId == null || !turnId.equals(origin)) return null;
MetricSemantics semantics = semantics(metric, input.get("stage"));
@@ -152,12 +159,14 @@ public final class AnalysisVisualSnapshotAccess {
Map coverage = normalizeCoverage(input.get("coverage"), requiredFields, semantics.stage(), type);
if (coverage == null) return null;
if (!validCompositionChart(type, metric, unit, semantics, categories, series, coverage, comparisonPeriod)
- || !validPeriodChart(type, metric, semantics, period, comparisonPeriod, categories, series)) return null;
+ || !validPeriodChart(type, metric, semantics, period, comparisonPeriod, categories, series)
+ || !validWaterfallChart(type, metric, unit, semantics, categories, series, coverage, period, comparisonPeriod)) return null;
if (!allowedFields.contains("*") && !allowedFields.containsAll(requiredFields)) return null;
Map scope = normalizeScope(input.get("scope"), visibleExtraFilterKeys, expectedScope);
Object scopedStage = scope == null ? null : scope.get("stage");
if (scope == null || scopedStage != null && !"all".equals(scopedStage)
&& (semantics.stage() == null || !semantics.stage().equals(scopedStage))) return null;
+ if (!validChapterMetadata(sectionKey, dimension, type, metric, semantics, scope, period)) return null;
if (semantics.sourceDefect() && !sourceDefectScopeMatches(scope, semantics.stage(), categories)) return null;
String note = input.containsKey("note") ? text(input.get("note"), 500, false) : null;
@@ -171,6 +180,8 @@ public final class AnalysisVisualSnapshotAccess {
if (semantics.stage() != null) result.put("stage", semantics.stage());
result.put("metric", metric); result.put("coverage", coverage);
if (note != null) result.put("note", note);
+ if (sectionKey != null) result.put("sectionKey", sectionKey);
+ if (dimension != null) result.put("dimension", dimension);
result.put("originTurnId", turnId);
return result;
}
@@ -219,7 +230,8 @@ public final class AnalysisVisualSnapshotAccess {
"bright_headquarters_scrap", "bright_plating_scrap", "bright_material_scrap",
"bright_processing_scrap", "bright_diffusion_scrap", "current_scrap_weight",
"source_defect_weight").contains(metric) && decimal.signum() < 0) return null;
- if ("rate_drop_pp".equals(metric) && decimal.abs().compareTo(BigDecimal.valueOf(100)) > 0) return null;
+ if (Set.of("rate_drop_pp", "composite_impact_pp").contains(metric)
+ && decimal.abs().compareTo(BigDecimal.valueOf(100)) > 0) return null;
numbers.add(decimal);
}
}
@@ -409,6 +421,86 @@ public final class AnalysisVisualSnapshotAccess {
return sum.signum() > 0;
}
+ private static boolean validWaterfallChart(String type, String metric, String unit, MetricSemantics semantics,
+ List
${fallbackNode.current?.innerHTML || ''}`);
+ return integrateNativeReportNarrative(html, turn, visualReport.images);
}, [reportHtml, turn, visualReport.images]);
const title = useMemo(() => {
const nativeTitle = safeHtml ? new DOMParser().parseFromString(safeHtml, 'text/html').title : '';
@@ -267,13 +256,14 @@ export function NativeAnalysisReport({ turn, reportMarkdown, reportHtml }: {
}, [safeHtml, reportMarkdown, turn.question]);
const saveHtml = async () => {
- if (!safeHtml) return;
+ const html = safeHtml || `