feat(agent): harden verifier evidence references
This commit is contained in:
@@ -289,13 +289,9 @@ public class QueryLogsTools {
|
||||
logs.addAll(buildSystemEventsLogs(now, normalizedQuery, limit));
|
||||
break;
|
||||
default:
|
||||
logs.addAll(buildGenericLogs(now, normalizedQuery, limit));
|
||||
return logs;
|
||||
}
|
||||
|
||||
if (logs.isEmpty()) {
|
||||
logs.addAll(buildGenericLogs(now, normalizedQuery, limit));
|
||||
}
|
||||
|
||||
|
||||
// 限制返回条数
|
||||
|
||||
if (logs.size() > limit) {
|
||||
@@ -400,6 +396,10 @@ public class QueryLogsTools {
|
||||
*/
|
||||
private List<LogEntry> buildApplicationLogs(Instant now, String query, int limit) {
|
||||
List<LogEntry> logs = new ArrayList<>();
|
||||
|
||||
if (isHikariPoolQuery(query) && targetsOrderService(query)) {
|
||||
logs.addAll(buildHikariPoolLogs(now));
|
||||
}
|
||||
|
||||
// ERROR 级别日志
|
||||
if (query.contains("error") || query.contains("fatal") || query.contains("500")) {
|
||||
@@ -514,6 +514,58 @@ public class QueryLogsTools {
|
||||
|
||||
return logs;
|
||||
}
|
||||
|
||||
private boolean isHikariPoolQuery(String query) {
|
||||
return query.contains("hikaricp")
|
||||
|| query.contains("hikaripool")
|
||||
|| query.contains("connection pool")
|
||||
|| query.contains("数据库连接池")
|
||||
|| query.contains("连接池耗尽")
|
||||
|| query.contains("active=50/50")
|
||||
|| query.contains("waiting")
|
||||
|| query.contains("request timed out after 30000ms");
|
||||
}
|
||||
|
||||
private boolean targetsOrderService(String query) {
|
||||
if (query.contains("inventory-service") || query.contains("payment-service") || query.contains("user-service")) {
|
||||
return false;
|
||||
}
|
||||
return query.contains("order-service") || isHikariPoolQuery(query);
|
||||
}
|
||||
|
||||
private List<LogEntry> buildHikariPoolLogs(Instant now) {
|
||||
List<LogEntry> logs = new ArrayList<>();
|
||||
|
||||
LogEntry timeout = new LogEntry();
|
||||
timeout.setTimestamp(FORMATTER.format(now.minus(2, ChronoUnit.MINUTES)));
|
||||
timeout.setLevel("ERROR");
|
||||
timeout.setService("order-service");
|
||||
timeout.setInstance("pod-order-service-5c7d8e9f1-m3n2p");
|
||||
timeout.setMessage("HikariPool-1 - Connection is not available, request timed out after 30000ms");
|
||||
timeout.setMetrics(Map.of(
|
||||
"pool", "HikariPool-1",
|
||||
"error_type", "ConnectionPoolExhaustedException",
|
||||
"timeout_ms", "30000"
|
||||
));
|
||||
logs.add(timeout);
|
||||
|
||||
LogEntry stats = new LogEntry();
|
||||
stats.setTimestamp(FORMATTER.format(now.minus(1, ChronoUnit.MINUTES)));
|
||||
stats.setLevel("WARN");
|
||||
stats.setService("order-service");
|
||||
stats.setInstance("pod-order-service-5c7d8e9f1-m3n2p");
|
||||
stats.setMessage("HikariCP pool stats: active=50/50, idle=0, waiting=32");
|
||||
stats.setMetrics(Map.of(
|
||||
"pool", "HikariPool-1",
|
||||
"active", "50",
|
||||
"max", "50",
|
||||
"idle", "0",
|
||||
"waiting", "32"
|
||||
));
|
||||
logs.add(stats);
|
||||
|
||||
return logs;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建数据库慢查询日志(与慢响应告警关联)
|
||||
|
||||
@@ -17,9 +17,12 @@ import org.springframework.ai.chat.messages.AssistantMessage;
|
||||
import org.springframework.ai.chat.messages.Message;
|
||||
import org.springframework.ai.chat.messages.UserMessage;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Replaces verifier history with an explicit structured payload.
|
||||
@@ -60,14 +63,18 @@ public class VerifierInputHook extends MessagesModelHook {
|
||||
executorFinalAnswer = extractLastAssistantText(previousMessages);
|
||||
}
|
||||
|
||||
ExecutorOutputParseResult parseResult = parseExecutorOutput(executorFinalAnswer);
|
||||
VerifierContextHolder.setExecutorStructuredOutput(parseResult.structuredOutput());
|
||||
VerifierContextHolder.setExecutorOutputParseStatus(parseResult.status());
|
||||
|
||||
List<Map<String, Object>> toolTraceSummary =
|
||||
toolTraceSummaryService.buildVerifierTraceSummary(sessionId, executorFinalAnswer);
|
||||
VerifierContextHolder.setToolTraceSummary(toolTraceSummary);
|
||||
|
||||
ExecutorOutputParseResult parseResult = parseExecutorOutput(executorFinalAnswer);
|
||||
parseResult = new ExecutorOutputParseResult(
|
||||
enrichExecutorStructuredOutput(parseResult.structuredOutput(), toolTraceSummary),
|
||||
parseResult.status()
|
||||
);
|
||||
VerifierContextHolder.setExecutorStructuredOutput(parseResult.structuredOutput());
|
||||
VerifierContextHolder.setExecutorOutputParseStatus(parseResult.status());
|
||||
|
||||
Map<String, Object> gatekeeperResult = runGatekeeper(sessionId, parseResult);
|
||||
VerifierContextHolder.setGatekeeperResult(gatekeeperResult);
|
||||
|
||||
@@ -105,6 +112,8 @@ public class VerifierInputHook extends MessagesModelHook {
|
||||
private Map<String, Object> passGatekeeperResult() {
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("status", "pass");
|
||||
result.put("severity", "none");
|
||||
result.put("checked_bindings", List.of());
|
||||
result.put("failed_rules", List.of());
|
||||
result.put("warnings", List.of());
|
||||
result.put("errors", List.of());
|
||||
@@ -135,6 +144,129 @@ public class VerifierInputHook extends MessagesModelHook {
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private Map<String, Object> enrichExecutorStructuredOutput(Map<String, Object> structuredOutput,
|
||||
List<Map<String, Object>> toolTraceSummary) {
|
||||
if (structuredOutput == null) {
|
||||
return null;
|
||||
}
|
||||
Map<String, List<Long>> invocationIdsByTool = invocationIdsByTool(toolTraceSummary);
|
||||
List<Map<String, Object>> warnings = new ArrayList<>();
|
||||
enrichEvidenceBindingsInSection(structuredOutput.get("claims"), invocationIdsByTool, warnings);
|
||||
enrichEvidenceBindingsInSection(structuredOutput.get("recommended_actions"), invocationIdsByTool, warnings);
|
||||
if (!warnings.isEmpty()) {
|
||||
structuredOutput.put("_gatekeeper_warnings", warnings);
|
||||
}
|
||||
return structuredOutput;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private void enrichEvidenceBindingsInSection(Object sectionValue,
|
||||
Map<String, List<Long>> invocationIdsByTool,
|
||||
List<Map<String, Object>> warnings) {
|
||||
if (!(sectionValue instanceof List<?> items)) {
|
||||
return;
|
||||
}
|
||||
for (Object itemValue : items) {
|
||||
if (!(itemValue instanceof Map<?, ?> item)) {
|
||||
continue;
|
||||
}
|
||||
Object bindingsValue = item.get("evidence_bindings");
|
||||
if (!(bindingsValue instanceof List<?> bindings)) {
|
||||
continue;
|
||||
}
|
||||
for (Object bindingValue : bindings) {
|
||||
if (!(bindingValue instanceof Map<?, ?> rawBinding)) {
|
||||
continue;
|
||||
}
|
||||
Map<String, Object> binding = (Map<String, Object>) rawBinding;
|
||||
String normalizedToolName = normalizeToolName(binding.get("tool_name"));
|
||||
if (!normalizedToolName.isBlank()) {
|
||||
binding.put("tool_name", normalizedToolName);
|
||||
}
|
||||
if (!hasInvocationId(binding)) {
|
||||
List<Long> ids = invocationIdsByTool.getOrDefault(normalizedToolName, List.of());
|
||||
if (ids.size() == 1) {
|
||||
binding.put("source_invocation_id", ids.get(0));
|
||||
warnings.add(Map.of(
|
||||
"rule", "evidence.invocation_auto_backfill",
|
||||
"message", "source_invocation_id was auto-filled from the unique tool invocation candidate; raw_path remains missing if Executor did not provide it",
|
||||
"tool_name", normalizedToolName,
|
||||
"source_invocation_id", ids.get(0)
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, List<Long>> invocationIdsByTool(List<Map<String, Object>> toolTraceSummary) {
|
||||
Map<String, Set<Long>> idsByTool = new LinkedHashMap<>();
|
||||
for (Map<String, Object> summary : toolTraceSummary == null ? List.<Map<String, Object>>of() : toolTraceSummary) {
|
||||
String toolName = normalizeToolName(summary.get("tool_name"));
|
||||
if (toolName.isBlank()) {
|
||||
continue;
|
||||
}
|
||||
List<Long> ids = toLongList(summary.get("source_invocation_ids"));
|
||||
if (ids.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
idsByTool.computeIfAbsent(toolName, ignored -> new LinkedHashSet<>()).addAll(ids);
|
||||
}
|
||||
|
||||
Map<String, List<Long>> result = new LinkedHashMap<>();
|
||||
for (Map.Entry<String, Set<Long>> entry : idsByTool.entrySet()) {
|
||||
result.put(entry.getKey(), new ArrayList<>(entry.getValue()));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private boolean hasInvocationId(Map<String, Object> binding) {
|
||||
if (asLong(binding.get("source_invocation_id")) != null) {
|
||||
return true;
|
||||
}
|
||||
return toLongList(binding.get("source_invocation_ids")).size() == 1;
|
||||
}
|
||||
|
||||
private List<Long> toLongList(Object value) {
|
||||
if (!(value instanceof List<?> values)) {
|
||||
return List.of();
|
||||
}
|
||||
List<Long> ids = new ArrayList<>();
|
||||
for (Object item : values) {
|
||||
Long id = asLong(item);
|
||||
if (id != null) {
|
||||
ids.add(id);
|
||||
}
|
||||
}
|
||||
return ids;
|
||||
}
|
||||
|
||||
private Long asLong(Object value) {
|
||||
if (value instanceof Number number) {
|
||||
return number.longValue();
|
||||
}
|
||||
if (value instanceof String text) {
|
||||
try {
|
||||
return Long.parseLong(text);
|
||||
} catch (NumberFormatException ignored) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private String normalizeToolName(Object value) {
|
||||
String toolName = value == null ? "" : String.valueOf(value);
|
||||
return switch (toolName) {
|
||||
case "lookupKnowledge" -> "lookup_knowledge";
|
||||
case "queryLogs" -> "query_logs";
|
||||
case "queryPrometheusAlerts" -> "query_metrics";
|
||||
case "getAvailableLogTopics" -> "get_available_log_topics";
|
||||
default -> toolName;
|
||||
};
|
||||
}
|
||||
|
||||
private String sanitizeJsonPayload(String raw) {
|
||||
String trimmed = raw.trim();
|
||||
int fenceStart = trimmed.indexOf("```");
|
||||
|
||||
@@ -711,6 +711,13 @@ public class ChatService {
|
||||
if (gatekeeperResult == null || !"fail".equals(String.valueOf(gatekeeperResult.get("status")))) {
|
||||
return verdict;
|
||||
}
|
||||
String severity = String.valueOf(gatekeeperResult.getOrDefault("severity", ""));
|
||||
if (ExecutorGatekeeperService.SEVERITY_REJECT.equals(severity)) {
|
||||
return "REJECT";
|
||||
}
|
||||
if (ExecutorGatekeeperService.SEVERITY_LOW_CONFID.equals(severity)) {
|
||||
return "PASS".equals(verdict) ? "LOW_CONFID" : verdict;
|
||||
}
|
||||
if (containsRule(gatekeeperResult.get("failed_rules"), ExecutorGatekeeperService.RULE_INVOCATION_REF)) {
|
||||
return "REJECT";
|
||||
}
|
||||
@@ -885,7 +892,8 @@ public class ChatService {
|
||||
Optional.ofNullable(VerifierContextHolder.getToolTraceSummary()).orElse(List.of()));
|
||||
verifierEvaluation.put("gatekeeper_result",
|
||||
Optional.ofNullable(VerifierContextHolder.getGatekeeperResult())
|
||||
.orElse(Map.of("status", "pass", "failed_rules", List.of(), "warnings", List.of(), "errors", List.of())));
|
||||
.orElse(Map.of("status", "pass", "severity", "none", "checked_bindings", List.of(),
|
||||
"failed_rules", List.of(), "warnings", List.of(), "errors", List.of())));
|
||||
if (composerOutput != null) {
|
||||
verifierEvaluation.put("composer_output", composerOutput);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.superbiz.agent.service;
|
||||
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.superbiz.agent.domain.entity.ToolInvocation;
|
||||
import com.superbiz.agent.repository.ToolInvocationRepository;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -21,12 +23,22 @@ import java.util.stream.Collectors;
|
||||
public class ExecutorGatekeeperService {
|
||||
|
||||
public static final String STATUS_PASS = "pass";
|
||||
public static final String STATUS_WARN = "warn";
|
||||
public static final String STATUS_FAIL = "fail";
|
||||
public static final String SEVERITY_NONE = "none";
|
||||
public static final String SEVERITY_LOW_CONFID = "low_confid";
|
||||
public static final String SEVERITY_REJECT = "reject";
|
||||
public static final String RULE_SCHEMA = "schema.executor_v2";
|
||||
public static final String RULE_INVOCATION_REF = "evidence.invocation_ref";
|
||||
public static final String RULE_RAW_PATH = "evidence.raw_path";
|
||||
public static final String RULE_EXCERPT_MISMATCH = "evidence.excerpt_mismatch";
|
||||
public static final String RULE_EVIDENCE_MISSING = "evidence.missing";
|
||||
|
||||
private static final TypeReference<Map<String, Object>> MAP_TYPE = new TypeReference<>() {
|
||||
};
|
||||
private static final double MIN_TOKEN_OVERLAP = 0.5;
|
||||
|
||||
private final ToolInvocationRepository toolInvocationRepository;
|
||||
private final ObjectMapper objectMapper = new ObjectMapper();
|
||||
|
||||
public ExecutorGatekeeperService(ToolInvocationRepository toolInvocationRepository) {
|
||||
this.toolInvocationRepository = toolInvocationRepository;
|
||||
@@ -39,6 +51,7 @@ public class ExecutorGatekeeperService {
|
||||
validateSchema(structuredOutput, parseStatus, result);
|
||||
if (structuredOutput != null) {
|
||||
validateInvocationRefs(sessionId, structuredOutput, result);
|
||||
importWarnings(structuredOutput, result);
|
||||
}
|
||||
return result.toMap();
|
||||
}
|
||||
@@ -49,7 +62,7 @@ public class ExecutorGatekeeperService {
|
||||
|
||||
public Map<String, Object> fail(String ruleId, String target, String message) {
|
||||
GatekeeperResult result = new GatekeeperResult();
|
||||
result.fail(ruleId, target, message);
|
||||
result.fail(ruleId, target, message, SEVERITY_REJECT);
|
||||
return result.toMap();
|
||||
}
|
||||
|
||||
@@ -59,31 +72,35 @@ public class ExecutorGatekeeperService {
|
||||
String status = parseStatus == null ? "" : String.valueOf(parseStatus.getOrDefault("status", ""));
|
||||
if (structuredOutput == null) {
|
||||
if ("valid".equals(status)) {
|
||||
result.fail(RULE_SCHEMA, "executor_structured_output", "structured output is missing after valid parse");
|
||||
result.fail(RULE_SCHEMA, "executor_structured_output",
|
||||
"structured output is missing after valid parse", SEVERITY_LOW_CONFID);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!"executor_evidence_v2".equals(String.valueOf(structuredOutput.get("answer_version")))) {
|
||||
result.fail(RULE_SCHEMA, "answer_version", "answer_version must be executor_evidence_v2");
|
||||
result.fail(RULE_SCHEMA, "answer_version", "answer_version must be executor_evidence_v2",
|
||||
SEVERITY_LOW_CONFID);
|
||||
}
|
||||
if (structuredOutput.containsKey("diagnosis_summary")) {
|
||||
result.fail(RULE_SCHEMA, "diagnosis_summary", "diagnosis_summary is removed from executor_evidence_v2");
|
||||
result.fail(RULE_SCHEMA, "diagnosis_summary", "diagnosis_summary is removed from executor_evidence_v2",
|
||||
SEVERITY_REJECT);
|
||||
}
|
||||
if (structuredOutput.containsKey("user_facing_answer")) {
|
||||
result.fail(RULE_SCHEMA, "user_facing_answer", "user_facing_answer is removed from executor_evidence_v2");
|
||||
result.fail(RULE_SCHEMA, "user_facing_answer", "user_facing_answer is removed from executor_evidence_v2",
|
||||
SEVERITY_REJECT);
|
||||
}
|
||||
|
||||
Object claimsValue = structuredOutput.get("claims");
|
||||
if (!(claimsValue instanceof List<?> claims)) {
|
||||
result.fail(RULE_SCHEMA, "claims", "claims must be an array");
|
||||
result.fail(RULE_SCHEMA, "claims", "claims must be an array", SEVERITY_LOW_CONFID);
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < claims.size(); i++) {
|
||||
String target = "claims[" + i + "]";
|
||||
Object claimValue = claims.get(i);
|
||||
if (!(claimValue instanceof Map<?, ?> claim)) {
|
||||
result.fail(RULE_SCHEMA, target, "claim must be an object");
|
||||
result.fail(RULE_SCHEMA, target, "claim must be an object", SEVERITY_LOW_CONFID);
|
||||
continue;
|
||||
}
|
||||
requireString(claim, "claim_id", target, result);
|
||||
@@ -91,11 +108,13 @@ public class ExecutorGatekeeperService {
|
||||
requireString(claim, "claim_text", target, result);
|
||||
String supportLevel = stringValue(claim.get("support_level"));
|
||||
if (!"direct".equals(supportLevel) && !"indirect".equals(supportLevel)) {
|
||||
result.fail(RULE_SCHEMA, target + ".support_level", "support_level must be direct or indirect");
|
||||
result.fail(RULE_SCHEMA, target + ".support_level", "support_level must be direct or indirect",
|
||||
SEVERITY_LOW_CONFID);
|
||||
}
|
||||
Object bindings = claim.get("evidence_bindings");
|
||||
if (!(bindings instanceof List<?> bindingList) || bindingList.isEmpty()) {
|
||||
result.fail(RULE_SCHEMA, target + ".evidence_bindings", "claims must include non-empty evidence_bindings");
|
||||
result.fail(RULE_EVIDENCE_MISSING, target + ".evidence_bindings",
|
||||
"claims must include non-empty evidence_bindings", SEVERITY_LOW_CONFID);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,7 +125,8 @@ public class ExecutorGatekeeperService {
|
||||
|
||||
private void validateInvocationRefs(String sessionId, Map<String, Object> structuredOutput, GatekeeperResult result) {
|
||||
if (sessionId == null || sessionId.isBlank()) {
|
||||
result.fail(RULE_INVOCATION_REF, "session_id", "session id is required to validate source_invocation_ids");
|
||||
result.fail(RULE_INVOCATION_REF, "session_id", "session id is required to validate source_invocation_id",
|
||||
SEVERITY_LOW_CONFID);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -132,62 +152,254 @@ public class ExecutorGatekeeperService {
|
||||
String target = "claims[" + claimIndex + "].evidence_bindings[" + bindingIndex + "]";
|
||||
Object bindingValue = bindings.get(bindingIndex);
|
||||
if (!(bindingValue instanceof Map<?, ?> binding)) {
|
||||
result.fail(RULE_INVOCATION_REF, target, "evidence binding must be an object");
|
||||
result.fail(RULE_INVOCATION_REF, target, "evidence binding must be an object",
|
||||
SEVERITY_LOW_CONFID);
|
||||
continue;
|
||||
}
|
||||
validateBindingInvocationIds(binding, validInvocations, target, result);
|
||||
validateEvidenceBinding(binding, validInvocations, target, claim.get("claim_id"), result);
|
||||
}
|
||||
}
|
||||
|
||||
Object actionsValue = structuredOutput.get("recommended_actions");
|
||||
if (!(actionsValue instanceof List<?> actions)) {
|
||||
return;
|
||||
}
|
||||
for (int actionIndex = 0; actionIndex < actions.size(); actionIndex++) {
|
||||
Object actionValue = actions.get(actionIndex);
|
||||
if (!(actionValue instanceof Map<?, ?> action)) {
|
||||
continue;
|
||||
}
|
||||
Object bindingsValue = action.get("evidence_bindings");
|
||||
if (!(bindingsValue instanceof List<?> bindings)) {
|
||||
continue;
|
||||
}
|
||||
for (int bindingIndex = 0; bindingIndex < bindings.size(); bindingIndex++) {
|
||||
String target = "recommended_actions[" + actionIndex + "].evidence_bindings[" + bindingIndex + "]";
|
||||
Object bindingValue = bindings.get(bindingIndex);
|
||||
if (!(bindingValue instanceof Map<?, ?> binding)) {
|
||||
result.fail(RULE_INVOCATION_REF, target, "evidence binding must be an object",
|
||||
SEVERITY_LOW_CONFID);
|
||||
continue;
|
||||
}
|
||||
validateEvidenceBinding(binding, validInvocations, target, action.get("action_id"), result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void validateBindingInvocationIds(Map<?, ?> binding,
|
||||
Map<Long, ToolInvocation> validInvocations,
|
||||
String target,
|
||||
GatekeeperResult result) {
|
||||
Object idsValue = binding.get("source_invocation_ids");
|
||||
if (!(idsValue instanceof List<?> ids) || ids.isEmpty()) {
|
||||
result.fail(RULE_INVOCATION_REF, target + ".source_invocation_ids",
|
||||
"source_invocation_ids must be a non-empty array");
|
||||
private void validateEvidenceBinding(Map<?, ?> binding,
|
||||
Map<Long, ToolInvocation> validInvocations,
|
||||
String target,
|
||||
Object ownerId,
|
||||
GatekeeperResult result) {
|
||||
Map<String, Object> checked = new LinkedHashMap<>();
|
||||
checked.put("claim_id", ownerId == null ? "" : String.valueOf(ownerId));
|
||||
checked.put("tool_name", stringValue(binding.get("tool_name")));
|
||||
checked.put("source_invocation_id", binding.get("source_invocation_id"));
|
||||
checked.put("raw_path", stringValue(binding.get("raw_path")));
|
||||
|
||||
Long id = singleInvocationId(binding);
|
||||
if (id == null) {
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_INVOCATION_REF);
|
||||
checked.put("message", "source_invocation_id is required");
|
||||
result.checked(checked);
|
||||
result.fail(RULE_INVOCATION_REF, target + ".source_invocation_id",
|
||||
"source_invocation_id is required", SEVERITY_LOW_CONFID);
|
||||
return;
|
||||
}
|
||||
checked.put("source_invocation_id", id);
|
||||
|
||||
String claimedToolName = stringValue(binding.get("tool_name"));
|
||||
if (claimedToolName.isBlank()) {
|
||||
result.fail(RULE_INVOCATION_REF, target + ".tool_name", "tool_name is required");
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_INVOCATION_REF);
|
||||
checked.put("message", "tool_name is required");
|
||||
result.checked(checked);
|
||||
result.fail(RULE_INVOCATION_REF, target + ".tool_name", "tool_name is required", SEVERITY_LOW_CONFID);
|
||||
return;
|
||||
}
|
||||
|
||||
Set<Long> checkedIds = new HashSet<>();
|
||||
for (Object idValue : ids) {
|
||||
Long id = asLong(idValue);
|
||||
if (id == null) {
|
||||
result.fail(RULE_INVOCATION_REF, target + ".source_invocation_ids",
|
||||
"source_invocation_ids must contain numeric ids");
|
||||
continue;
|
||||
}
|
||||
if (!checkedIds.add(id)) {
|
||||
continue;
|
||||
}
|
||||
ToolInvocation invocation = validInvocations.get(id);
|
||||
if (invocation == null) {
|
||||
result.fail(RULE_INVOCATION_REF, target, "source_invocation_ids not found in current session: " + id);
|
||||
continue;
|
||||
}
|
||||
if (!claimedToolName.isBlank() && !Objects.equals(claimedToolName, invocation.getToolName())) {
|
||||
result.fail(RULE_INVOCATION_REF, target + ".tool_name",
|
||||
"tool_name does not match invocation " + id + ": expected " + invocation.getToolName());
|
||||
ToolInvocation invocation = validInvocations.get(id);
|
||||
if (invocation == null) {
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_INVOCATION_REF);
|
||||
checked.put("message", "source_invocation_id not found in current session: " + id);
|
||||
result.checked(checked);
|
||||
result.fail(RULE_INVOCATION_REF, target,
|
||||
"source_invocation_id not found in current session: " + id, SEVERITY_REJECT);
|
||||
return;
|
||||
}
|
||||
if (!Objects.equals(claimedToolName, invocation.getToolName())) {
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_INVOCATION_REF);
|
||||
checked.put("message", "tool_name does not match invocation " + id + ": expected " + invocation.getToolName());
|
||||
result.checked(checked);
|
||||
result.fail(RULE_INVOCATION_REF, target + ".tool_name",
|
||||
"tool_name does not match invocation " + id + ": expected " + invocation.getToolName(),
|
||||
SEVERITY_REJECT);
|
||||
return;
|
||||
}
|
||||
|
||||
String rawPath = stringValue(binding.get("raw_path"));
|
||||
if (rawPath.isBlank()) {
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_RAW_PATH);
|
||||
checked.put("message", "raw_path is required for precise evidence reference");
|
||||
result.checked(checked);
|
||||
result.fail(RULE_RAW_PATH, target + ".raw_path",
|
||||
"raw_path is required for precise evidence reference", SEVERITY_LOW_CONFID);
|
||||
return;
|
||||
}
|
||||
|
||||
Map<String, String> refs = evidenceRefsByRawPath(invocation.getRetrievalDetails());
|
||||
if (refs.isEmpty()) {
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_EVIDENCE_MISSING);
|
||||
checked.put("message", "invocation has no retrieval_details.evidence_refs");
|
||||
result.checked(checked);
|
||||
result.fail(RULE_EVIDENCE_MISSING, target,
|
||||
"invocation has no retrieval_details.evidence_refs", SEVERITY_LOW_CONFID);
|
||||
return;
|
||||
}
|
||||
|
||||
String matchedText = refs.get(rawPath);
|
||||
if (matchedText == null) {
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_RAW_PATH);
|
||||
checked.put("message", "raw_path not found in retrieval_details.evidence_refs");
|
||||
result.checked(checked);
|
||||
result.fail(RULE_RAW_PATH, target + ".raw_path",
|
||||
"raw_path not found in retrieval_details.evidence_refs", SEVERITY_REJECT);
|
||||
return;
|
||||
}
|
||||
checked.put("matched_text", matchedText);
|
||||
|
||||
String excerpt = stringValue(binding.get("evidence_excerpt"));
|
||||
if (normalized(excerpt).length() < 8) {
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_EXCERPT_MISMATCH);
|
||||
checked.put("message", "evidence_excerpt is too short to compare");
|
||||
result.checked(checked);
|
||||
result.fail(RULE_EXCERPT_MISMATCH, target + ".evidence_excerpt",
|
||||
"evidence_excerpt is too short to compare", SEVERITY_LOW_CONFID);
|
||||
return;
|
||||
}
|
||||
if (!isExcerptSupported(excerpt, matchedText)) {
|
||||
checked.put("status", STATUS_FAIL);
|
||||
checked.put("rule", RULE_EXCERPT_MISMATCH);
|
||||
checked.put("message", "evidence_excerpt is not supported by matched evidence ref text");
|
||||
result.checked(checked);
|
||||
result.fail(RULE_EXCERPT_MISMATCH, target + ".evidence_excerpt",
|
||||
"evidence_excerpt is not supported by matched evidence ref text", SEVERITY_REJECT);
|
||||
return;
|
||||
}
|
||||
|
||||
checked.put("status", STATUS_PASS);
|
||||
result.checked(checked);
|
||||
}
|
||||
|
||||
private Long singleInvocationId(Map<?, ?> binding) {
|
||||
Long singular = asLong(binding.get("source_invocation_id"));
|
||||
if (singular != null) {
|
||||
return singular;
|
||||
}
|
||||
Object idsValue = binding.get("source_invocation_ids");
|
||||
if (!(idsValue instanceof List<?> ids) || ids.size() != 1) {
|
||||
return null;
|
||||
}
|
||||
return asLong(ids.get(0));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private void importWarnings(Map<String, Object> structuredOutput, GatekeeperResult result) {
|
||||
Object warningsValue = structuredOutput.remove("_gatekeeper_warnings");
|
||||
if (!(warningsValue instanceof List<?> warnings)) {
|
||||
return;
|
||||
}
|
||||
for (Object warning : warnings) {
|
||||
if (warning instanceof Map<?, ?> map) {
|
||||
result.warn((Map<String, Object>) map);
|
||||
} else if (warning != null) {
|
||||
result.warn(Map.of("message", String.valueOf(warning)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, String> evidenceRefsByRawPath(String retrievalDetails) {
|
||||
if (retrievalDetails == null || retrievalDetails.isBlank()) {
|
||||
return Map.of();
|
||||
}
|
||||
try {
|
||||
Map<String, Object> details = objectMapper.readValue(retrievalDetails, MAP_TYPE);
|
||||
Object refsValue = details.get("evidence_refs");
|
||||
if (!(refsValue instanceof List<?> refs)) {
|
||||
return Map.of();
|
||||
}
|
||||
Map<String, String> result = new LinkedHashMap<>();
|
||||
for (Object refValue : refs) {
|
||||
if (!(refValue instanceof Map<?, ?> ref)) {
|
||||
continue;
|
||||
}
|
||||
String rawPath = stringValue(ref.get("raw_path"));
|
||||
String text = stringValue(ref.get("text"));
|
||||
if (!rawPath.isBlank() && !text.isBlank()) {
|
||||
result.put(rawPath, text);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
} catch (Exception ignored) {
|
||||
return Map.of();
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isExcerptSupported(String excerpt, String matchedText) {
|
||||
String normalizedExcerpt = normalized(excerpt);
|
||||
String normalizedMatched = normalized(matchedText);
|
||||
if (normalizedMatched.contains(normalizedExcerpt) || normalizedExcerpt.contains(normalizedMatched)) {
|
||||
return true;
|
||||
}
|
||||
Set<String> excerptTokens = tokens(normalizedExcerpt);
|
||||
if (excerptTokens.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
Set<String> matchedTokens = tokens(normalizedMatched);
|
||||
int overlap = 0;
|
||||
for (String token : excerptTokens) {
|
||||
if (matchedTokens.contains(token)) {
|
||||
overlap++;
|
||||
}
|
||||
}
|
||||
return (double) overlap / excerptTokens.size() >= MIN_TOKEN_OVERLAP;
|
||||
}
|
||||
|
||||
private String normalized(String value) {
|
||||
return value == null ? "" : value.toLowerCase()
|
||||
.replaceAll("[\\p{Punct}\\s,。;:、()【】《》“”‘’]+", " ")
|
||||
.trim();
|
||||
}
|
||||
|
||||
private Set<String> tokens(String text) {
|
||||
if (text == null || text.isBlank()) {
|
||||
return Set.of();
|
||||
}
|
||||
Set<String> result = new HashSet<>();
|
||||
for (String token : text.split("\\s+")) {
|
||||
if (token.length() >= 2) {
|
||||
result.add(token);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void requireArray(Map<String, Object> output, String field, GatekeeperResult result) {
|
||||
if (!(output.get(field) instanceof List<?>)) {
|
||||
result.fail(RULE_SCHEMA, field, field + " must be an array");
|
||||
result.fail(RULE_SCHEMA, field, field + " must be an array", SEVERITY_LOW_CONFID);
|
||||
}
|
||||
}
|
||||
|
||||
private void requireString(Map<?, ?> object, String field, String target, GatekeeperResult result) {
|
||||
if (stringValue(object.get(field)).isBlank()) {
|
||||
result.fail(RULE_SCHEMA, target + "." + field, field + " is required");
|
||||
result.fail(RULE_SCHEMA, target + "." + field, field + " is required", SEVERITY_LOW_CONFID);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,23 +423,42 @@ public class ExecutorGatekeeperService {
|
||||
|
||||
private static final class GatekeeperResult {
|
||||
private final List<String> failedRules = new ArrayList<>();
|
||||
private final List<String> warnings = new ArrayList<>();
|
||||
private final List<Map<String, Object>> checkedBindings = new ArrayList<>();
|
||||
private final List<Map<String, Object>> warnings = new ArrayList<>();
|
||||
private final List<Map<String, Object>> errors = new ArrayList<>();
|
||||
private String severity = SEVERITY_NONE;
|
||||
|
||||
void fail(String ruleId, String target, String message) {
|
||||
void fail(String ruleId, String target, String message, String failureSeverity) {
|
||||
if (!failedRules.contains(ruleId)) {
|
||||
failedRules.add(ruleId);
|
||||
}
|
||||
if (SEVERITY_REJECT.equals(failureSeverity)) {
|
||||
severity = SEVERITY_REJECT;
|
||||
} else if (!SEVERITY_REJECT.equals(severity)) {
|
||||
severity = SEVERITY_LOW_CONFID;
|
||||
}
|
||||
Map<String, Object> error = new LinkedHashMap<>();
|
||||
error.put("rule_id", ruleId);
|
||||
error.put("rule", ruleId);
|
||||
error.put("target", target);
|
||||
error.put("message", message);
|
||||
error.put("severity", failureSeverity);
|
||||
errors.add(error);
|
||||
}
|
||||
|
||||
void checked(Map<String, Object> checked) {
|
||||
checkedBindings.add(checked);
|
||||
}
|
||||
|
||||
void warn(Map<String, Object> warning) {
|
||||
warnings.add(new LinkedHashMap<>(warning));
|
||||
}
|
||||
|
||||
Map<String, Object> toMap() {
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("status", failedRules.isEmpty() ? (warnings.isEmpty() ? STATUS_PASS : STATUS_WARN) : STATUS_FAIL);
|
||||
result.put("status", failedRules.isEmpty() ? STATUS_PASS : STATUS_FAIL);
|
||||
result.put("severity", failedRules.isEmpty() ? SEVERITY_NONE : severity);
|
||||
result.put("checked_bindings", checkedBindings);
|
||||
result.put("failed_rules", failedRules);
|
||||
result.put("warnings", warnings);
|
||||
result.put("errors", errors);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.superbiz.agent.service;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.superbiz.agent.domain.entity.ToolInvocation;
|
||||
import com.superbiz.agent.dto.ContextPack;
|
||||
@@ -87,6 +88,10 @@ public class ToolInvocationRecorder {
|
||||
if (extraDetails != null && !extraDetails.isEmpty()) {
|
||||
details.putAll(extraDetails);
|
||||
}
|
||||
List<Map<String, Object>> evidenceRefs = extractEvidenceRefs(toolName, output, details);
|
||||
if (!evidenceRefs.isEmpty()) {
|
||||
details.put("evidence_refs", evidenceRefs);
|
||||
}
|
||||
|
||||
ToolInvocation invocation = ToolInvocation.builder()
|
||||
.toolName(toolName)
|
||||
@@ -139,6 +144,10 @@ public class ToolInvocationRecorder {
|
||||
details.put("evidence_block_count", record.evidenceBlockCount());
|
||||
}
|
||||
details.put("evidence_blocks", record.evidenceBlocks() == null ? List.of() : record.evidenceBlocks());
|
||||
List<Map<String, Object>> evidenceRefs = evidenceRefsFromEvidenceBlocks(record.evidenceBlocks());
|
||||
if (!evidenceRefs.isEmpty()) {
|
||||
details.put("evidence_refs", evidenceRefs);
|
||||
}
|
||||
details.put("query_transform", record.queryTransform() == null ? Map.of() : record.queryTransform());
|
||||
details.put("retrieval_trace", record.retrievalTrace() == null ? Map.of() : record.retrievalTrace());
|
||||
details.put("context_pack_summary", record.contextPack() == null ? Map.of() : record.contextPack());
|
||||
@@ -186,6 +195,132 @@ public class ToolInvocationRecorder {
|
||||
return success ? EVIDENCE_STATUS_SUPPORTED : EVIDENCE_STATUS_FAILED;
|
||||
}
|
||||
|
||||
private List<Map<String, Object>> extractEvidenceRefs(String toolName, String output, Map<String, Object> details) {
|
||||
if (output == null || output.isBlank()) {
|
||||
return List.of();
|
||||
}
|
||||
if ("lookup_knowledge".equals(toolName)) {
|
||||
return evidenceRefsFromEvidenceBlocks(asMapList(details.get("evidence_blocks")));
|
||||
}
|
||||
|
||||
try {
|
||||
JsonNode root = objectMapper.readTree(output);
|
||||
if ("query_metrics".equals(toolName)) {
|
||||
return evidenceRefsFromArray(root.path("alerts"), "$.alerts", this::alertText);
|
||||
}
|
||||
if ("query_logs".equals(toolName)) {
|
||||
return evidenceRefsFromArray(root.path("logs"), "$.logs", this::logText);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.debug("extract evidence_refs failed for tool={}", toolName, e);
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private List<Map<String, Object>> evidenceRefsFromArray(JsonNode arrayNode,
|
||||
String pathPrefix,
|
||||
java.util.function.Function<JsonNode, String> textExtractor) {
|
||||
if (!arrayNode.isArray()) {
|
||||
return List.of();
|
||||
}
|
||||
List<Map<String, Object>> refs = new ArrayList<>();
|
||||
for (int i = 0; i < arrayNode.size(); i++) {
|
||||
String text = textExtractor.apply(arrayNode.get(i));
|
||||
if (text == null || text.isBlank()) {
|
||||
continue;
|
||||
}
|
||||
refs.add(Map.of(
|
||||
"raw_path", pathPrefix + "[" + i + "]",
|
||||
"text", bounded(text, 500)
|
||||
));
|
||||
}
|
||||
return refs;
|
||||
}
|
||||
|
||||
private String alertText(JsonNode alert) {
|
||||
List<String> parts = new ArrayList<>();
|
||||
addPart(parts, textField(alert, "alert_name"));
|
||||
addPart(parts, textField(alert, "state"));
|
||||
addPart(parts, textField(alert, "description"));
|
||||
addPart(parts, "active_at=" + textField(alert, "active_at"));
|
||||
addPart(parts, "duration=" + textField(alert, "duration"));
|
||||
return String.join(", ", parts);
|
||||
}
|
||||
|
||||
private String logText(JsonNode log) {
|
||||
List<String> parts = new ArrayList<>();
|
||||
addPart(parts, textField(log, "timestamp"));
|
||||
addPart(parts, textField(log, "level"));
|
||||
addPart(parts, textField(log, "service"));
|
||||
addPart(parts, textField(log, "message"));
|
||||
JsonNode metrics = log.path("metrics");
|
||||
if (metrics.isObject() && !metrics.isEmpty()) {
|
||||
addPart(parts, "metrics=" + metrics.toString());
|
||||
}
|
||||
return String.join(" ", parts);
|
||||
}
|
||||
|
||||
private List<Map<String, Object>> evidenceRefsFromEvidenceBlocks(List<Map<String, Object>> blocks) {
|
||||
if (blocks == null || blocks.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
List<Map<String, Object>> refs = new ArrayList<>();
|
||||
for (int i = 0; i < blocks.size(); i++) {
|
||||
Map<String, Object> block = blocks.get(i);
|
||||
String text = firstNonBlank(block.get("content_preview"), block.get("content"),
|
||||
block.get("title"), block.get("source"));
|
||||
if (text.isBlank()) {
|
||||
continue;
|
||||
}
|
||||
refs.add(Map.of(
|
||||
"raw_path", "$.evidence_blocks[" + i + "]",
|
||||
"text", bounded(text, 500)
|
||||
));
|
||||
}
|
||||
return refs;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private List<Map<String, Object>> asMapList(Object value) {
|
||||
if (!(value instanceof List<?> list)) {
|
||||
return List.of();
|
||||
}
|
||||
List<Map<String, Object>> result = new ArrayList<>();
|
||||
for (Object item : list) {
|
||||
if (item instanceof Map<?, ?> map) {
|
||||
result.add((Map<String, Object>) map);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private String textField(JsonNode node, String field) {
|
||||
JsonNode value = node.path(field);
|
||||
return value.isMissingNode() || value.isNull() ? "" : value.asText("");
|
||||
}
|
||||
|
||||
private void addPart(List<String> parts, String value) {
|
||||
if (value != null && !value.isBlank() && !value.endsWith("=")) {
|
||||
parts.add(value);
|
||||
}
|
||||
}
|
||||
|
||||
private String firstNonBlank(Object... values) {
|
||||
for (Object value : values) {
|
||||
if (value != null && !String.valueOf(value).isBlank()) {
|
||||
return String.valueOf(value);
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
private String bounded(String value, int limit) {
|
||||
if (value == null) {
|
||||
return "";
|
||||
}
|
||||
return value.length() <= limit ? value : value.substring(0, limit) + "...";
|
||||
}
|
||||
|
||||
private String preview(String output) {
|
||||
if (output == null) {
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user