|
|
@@ -143,6 +143,21 @@ public class AiTurnFinisher {
|
|
|
routeRecorder.finishRun(route.routeRunId, route, status, reason, durationMs);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 按助手消息主键收尾编排运行(入口智能体自身的 HITL 恢复段没有新的 {@link AiRouteContext})。
|
|
|
+ *
|
|
|
+ * <p>首段暂停时 {@link #finishRoute} 已把 {@code message_id} 写入编排行,恢复段据此找回同一条
|
|
|
+ * 编排并回写终态;否则「编排运行」会一直停留在「待人工确认」,与实际结果不符(实测缺陷)。</p>
|
|
|
+ *
|
|
|
+ * @param messageId 本轮助手消息主键(首段暂停时落库)
|
|
|
+ * @param status 最终状态(success / aborted / pending)
|
|
|
+ * @param degradeReason 终止原因(可空)
|
|
|
+ * @param durationMs 恢复段耗时(毫秒,累加到原耗时上)
|
|
|
+ */
|
|
|
+ void finishRouteByMessage(Long messageId, String status, String degradeReason, long durationMs) {
|
|
|
+ routeRecorder.finishRunByMessage(messageId, status, degradeReason, durationMs);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 取消收尾(用户停止 / SSE 断连):按「已中止」落库并留痕,关闭流。
|
|
|
*
|
|
|
@@ -164,25 +179,38 @@ public class AiTurnFinisher {
|
|
|
null, null, null, CANCELLED_TEXT);
|
|
|
// 与 done 同口径的助手消息主键:首段中止取本次落库的消息,恢复段为同一 messageId
|
|
|
Long messageId = resumeMessageId;
|
|
|
+ Long totalDuration = durationMs;
|
|
|
try {
|
|
|
if (resumeMessageId == null) {
|
|
|
AiMessage assistant = sessionService.persistAssistantAborted(sessionId, state.answer.toString(),
|
|
|
durationMs, state.sources);
|
|
|
messageId = assistant == null ? null : assistant.getId();
|
|
|
+ if (assistant != null && assistant.getDurationMs() != null) {
|
|
|
+ totalDuration = assistant.getDurationMs();
|
|
|
+ }
|
|
|
+ // 重新生成中途被停止:新中止回答已落库,此时才删除被替换的旧回答。
|
|
|
+ // 与 finish() 同口径——落库失败时保留旧回答,避免「已中止 + 旧答案丢失」
|
|
|
+ if (messageId != null) {
|
|
|
+ deleteReplacedAnswers(sessionId, state);
|
|
|
+ }
|
|
|
} else {
|
|
|
- messageId = sessionService.appendAssistantTurn(resumeMessageId, "",
|
|
|
+ AiMessage assistant = sessionService.appendAssistantTurn(resumeMessageId, "",
|
|
|
AiMessage.STATUS_ABORTED, durationMs, buildDoneToolLogs(state, route), state.toTokenUsage(),
|
|
|
- state.sources).getId();
|
|
|
+ state.sources);
|
|
|
+ messageId = assistant.getId();
|
|
|
+ if (assistant.getDurationMs() != null) {
|
|
|
+ totalDuration = assistant.getDurationMs();
|
|
|
+ }
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
log.error("落库已停止消息异常,sessionId={}, messageId={}", sessionId, resumeMessageId, e);
|
|
|
}
|
|
|
// 与 done / pending 同口径:写本轮实际落库的助手消息 id(首段中止时 resumeMessageId 为空)
|
|
|
finishRoute(route, messageId, AiRouteRun.STATUS_ABORTED, CANCELLED_TEXT, durationMs);
|
|
|
- // 载荷与 done 同款字段:前端据 messageId 归位、据 durationMs 渲染耗时
|
|
|
+ // 载荷与 done 同款字段:前端据 messageId 归位、据 durationMs 渲染耗时(取整轮累计值)
|
|
|
Map<String, Object> payload = AiSseSupport.envelope(EVENT_ABORTED);
|
|
|
payload.put("messageId", messageId);
|
|
|
- payload.put("durationMs", durationMs);
|
|
|
+ payload.put("durationMs", totalDuration);
|
|
|
AiSseSupport.send(emitter, payload);
|
|
|
AiSseSupport.complete(emitter);
|
|
|
}
|
|
|
@@ -244,13 +272,18 @@ public class AiTurnFinisher {
|
|
|
// 专家调用的工具同样补「实际执行」的决策留痕(REQ-AI-30 Phase 2):按专家维度记账,
|
|
|
// 被拒绝(DENIED,多为「需确认」档)的不记,避免出现与实际结果相反的「允许」行
|
|
|
recordExpertAllowDecisions(route, assistant.getId(), state);
|
|
|
+ // 恢复段(HITL 暂停 → 确认续跑)的落库消息是**累加**后的整轮口径:
|
|
|
+ // 前端消息尾部与链路时间线都必须取它,否则只显示最后一段的工具数 / Token(实测缺陷)
|
|
|
+ int totalToolCalls = assistant.getToolCallCount() == null ? logs.size() : assistant.getToolCallCount();
|
|
|
+ Integer totalTokens = assistant.getTotalTokens();
|
|
|
+ Long totalDuration = assistant.getDurationMs() == null ? durationMs : assistant.getDurationMs();
|
|
|
// 链路追踪(REQ-AI-28):回填消息主键并累加收尾信息(恢复段累加,不覆盖首段)
|
|
|
traceService.attachMessage(state.traceId, assistant.getId());
|
|
|
traceService.accumulate(state.traceId, AiTrace.STATUS_SUCCESS, durationMs, logs.size(),
|
|
|
tokens == null ? null : tokens.promptTokens(), tokens == null ? null : tokens.completionTokens(),
|
|
|
tokens == null ? null : tokens.totalTokens(), null);
|
|
|
traceService.appendTransition(state.traceId, "done",
|
|
|
- "工具 " + logs.size() + " 次" + (tokens == null ? "" : ",合计 " + tokens.totalTokens() + " tokens"));
|
|
|
+ "工具 " + totalToolCalls + " 次" + (totalTokens == null ? "" : ",合计 " + totalTokens + " tokens"));
|
|
|
// 恢复段不重复计一次请求数(同一次提问的两段生成)
|
|
|
usageStatService.accumulate(state.userId, state.agentId, state.modelId, tokens, logs.size(),
|
|
|
resumeMessageId == null ? 1 : 0);
|
|
|
@@ -258,10 +291,12 @@ public class AiTurnFinisher {
|
|
|
payload.put("type", EVENT_DONE);
|
|
|
payload.put("messageId", assistant.getId());
|
|
|
payload.put("replyId", replyId);
|
|
|
- payload.put("durationMs", durationMs);
|
|
|
- payload.put("toolCallCount", logs.size());
|
|
|
- if (tokens != null) {
|
|
|
- payload.put("totalTokens", tokens.totalTokens());
|
|
|
+ // 耗时同样取整轮累计值(与刷新后消息记录一致)
|
|
|
+ payload.put("durationMs", totalDuration);
|
|
|
+ // 整轮累计口径(含 HITL 前序段已落库的工具数与 Token)
|
|
|
+ payload.put("toolCallCount", totalToolCalls);
|
|
|
+ if (totalTokens != null) {
|
|
|
+ payload.put("totalTokens", totalTokens);
|
|
|
}
|
|
|
if (!state.sources.isEmpty()) {
|
|
|
// 参考来源:与 references 事件同一 VO 序列化,前端刷新前也可据此回填
|
|
|
@@ -314,12 +349,14 @@ public class AiTurnFinisher {
|
|
|
AiConfirmPendingStore.ExpertResume expertResume = route == null ? null : route.pendingResume;
|
|
|
// 专家链路的暂停:正文用**平台文案**,不落入口智能体在暂停后可能续写的残句
|
|
|
String content = expertResume == null ? state.answer.toString() : PENDING_EXPERT_TEXT;
|
|
|
+ // 暂停前已完成的工具调用(如被拒前的只读探测)同样计次:链路追踪按本段实际落库数累加
|
|
|
+ List<AiToolCallLog> logs = buildDoneToolLogs(state, route);
|
|
|
AiMessage assistant;
|
|
|
try {
|
|
|
// 本段已完成(含被拒)的工具调用照常落明细:暂停发生在工具首次请求之后,
|
|
|
// 之前已执行的读/内置工具不应因为「本轮暂停」而从审计里消失
|
|
|
assistant = sessionService.persistPendingTurn(sessionId, content, state.pendingReplyId, durationMs,
|
|
|
- buildDoneToolLogs(state, route), state.toTokenUsage(), state.userId, state.sources);
|
|
|
+ logs, state.toTokenUsage(), state.userId, state.sources);
|
|
|
} catch (Exception e) {
|
|
|
log.error("落库待确认消息异常,sessionId={}", sessionId, e);
|
|
|
sendPendingSaveError(emitter, e);
|
|
|
@@ -327,7 +364,7 @@ public class AiTurnFinisher {
|
|
|
}
|
|
|
// 重新生成落入待确认态:卡片已挂到新消息上,旧回答同样在此刻删除
|
|
|
deleteReplacedAnswers(sessionId, state);
|
|
|
- afterPendingPersisted(emitter, state, durationMs, assistant, 1, expertResume);
|
|
|
+ afterPendingPersisted(emitter, state, durationMs, assistant, 1, expertResume, logs.size());
|
|
|
return assistant.getId();
|
|
|
}
|
|
|
|
|
|
@@ -351,18 +388,19 @@ public class AiTurnFinisher {
|
|
|
AiConfirmPendingStore.ExpertResume expertResume = route == null ? null : route.pendingResume;
|
|
|
// 专家链路的暂停文案在首次暂停时已写入同一条消息,再次暂停不再重复追加(空串=只回写状态)
|
|
|
String content = expertResume == null ? state.answer.toString() : "";
|
|
|
+ List<AiToolCallLog> logs = buildDoneToolLogs(state, route);
|
|
|
AiMessage assistant;
|
|
|
try {
|
|
|
// 同上:暂停前已完成的工具调用(如用户刚确认并已执行的写操作)必须落行,
|
|
|
// 否则恢复段换了新的编排上下文,这些明细就丢了
|
|
|
assistant = sessionService.appendAssistantTurn(messageId, content, AiMessage.STATUS_PENDING_CONFIRM,
|
|
|
- durationMs, buildDoneToolLogs(state, route), state.toTokenUsage(), state.sources);
|
|
|
+ durationMs, logs, state.toTokenUsage(), state.sources);
|
|
|
} catch (Exception e) {
|
|
|
log.error("落库待确认消息异常(恢复段),sessionId={}, messageId={}", sessionId, messageId, e);
|
|
|
sendPendingSaveError(emitter, e);
|
|
|
return;
|
|
|
}
|
|
|
- afterPendingPersisted(emitter, state, durationMs, assistant, 0, expertResume);
|
|
|
+ afterPendingPersisted(emitter, state, durationMs, assistant, 0, expertResume, logs.size());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -373,15 +411,18 @@ public class AiTurnFinisher {
|
|
|
* @param durationMs 本段耗时(毫秒)
|
|
|
* @param assistant 已落库的待确认助手消息
|
|
|
* @param requestCount 本段计入的请求数(首段 1,恢复段 0,避免同一次提问重复计数)
|
|
|
+ * @param expertResume 专家续跑信息(可空)
|
|
|
+ * @param toolLogCount 本段实际落库的工具调用数(链路追踪按段累加,须与消息明细同口径)
|
|
|
*/
|
|
|
private void afterPendingPersisted(SseEmitter emitter, AiStreamState state, long durationMs,
|
|
|
AiMessage assistant, int requestCount,
|
|
|
- AiConfirmPendingStore.ExpertResume expertResume) {
|
|
|
+ AiConfirmPendingStore.ExpertResume expertResume, int toolLogCount) {
|
|
|
ChatTokenUsage tokens = state.toTokenUsage();
|
|
|
- usageStatService.accumulate(state.userId, state.agentId, state.modelId, tokens, 0, requestCount);
|
|
|
+ // 暂停段已执行的工具同样计入用量统计:否则「用量与配额」页会低估工具调用次数
|
|
|
+ usageStatService.accumulate(state.userId, state.agentId, state.modelId, tokens, toolLogCount, requestCount);
|
|
|
// 链路追踪(REQ-AI-28):暂停也是一种终态,回填消息主键并记录待确认工具
|
|
|
traceService.attachMessage(state.traceId, assistant.getId());
|
|
|
- traceService.accumulate(state.traceId, AiTrace.STATUS_PENDING_CONFIRM, durationMs, 0,
|
|
|
+ traceService.accumulate(state.traceId, AiTrace.STATUS_PENDING_CONFIRM, durationMs, toolLogCount,
|
|
|
tokens == null ? null : tokens.promptTokens(), tokens == null ? null : tokens.completionTokens(),
|
|
|
tokens == null ? null : tokens.totalTokens(), null);
|
|
|
traceService.appendTransition(state.traceId, "pending_confirm",
|
|
|
@@ -407,7 +448,7 @@ public class AiTurnFinisher {
|
|
|
payload.put("expiresInSec", aiProperties.getChat().getPendingConfirmTtlMinutes() * 60);
|
|
|
payload.put("toolCalls", buildToolCallPayloads(state.pendingToolCalls));
|
|
|
AiSseSupport.send(emitter, payload);
|
|
|
- emitter.complete();
|
|
|
+ AiSseSupport.complete(emitter);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -447,7 +488,7 @@ public class AiTurnFinisher {
|
|
|
payload.put("type", EVENT_ERROR);
|
|
|
payload.put("message", "等待确认的消息保存失败:" + cause.getMessage());
|
|
|
AiSseSupport.send(emitter, payload);
|
|
|
- emitter.complete();
|
|
|
+ AiSseSupport.complete(emitter);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -563,9 +604,7 @@ public class AiTurnFinisher {
|
|
|
Map<String, Object> payload = AiSseSupport.envelope(EVENT_ERROR);
|
|
|
payload.put("message", message);
|
|
|
AiSseSupport.send(emitter, payload);
|
|
|
- if (emitter != null) {
|
|
|
- emitter.completeWithError(error);
|
|
|
- }
|
|
|
+ AiSseSupport.completeWithError(emitter, error);
|
|
|
}
|
|
|
|
|
|
}
|