feat: 统一自动化任务调度配置并增强聊天流恢复
This commit is contained in:
@@ -187,6 +187,7 @@ class AgUiService {
|
||||
String? eventType;
|
||||
String? eventId;
|
||||
var hasBoundExpectedRun = false;
|
||||
var hasSeenTerminalForRun = false;
|
||||
final dataBuffer = StringBuffer();
|
||||
final done = Completer<void>();
|
||||
late final StreamSubscription<String> subscription;
|
||||
@@ -257,6 +258,7 @@ class AgUiService {
|
||||
eventThreadId == null || eventThreadId == threadId;
|
||||
if (isTerminalEvent &&
|
||||
(isTargetRun || (hasBoundExpectedRun && isThreadMatched))) {
|
||||
hasSeenTerminalForRun = true;
|
||||
stopStream();
|
||||
return;
|
||||
}
|
||||
@@ -291,6 +293,16 @@ class AgUiService {
|
||||
stopStream(error: error, stackTrace: stackTrace);
|
||||
},
|
||||
onDone: () {
|
||||
if (streamToken != _activeStreamToken) {
|
||||
stopStream();
|
||||
return;
|
||||
}
|
||||
if (!hasSeenTerminalForRun) {
|
||||
stopStream(
|
||||
error: StateError('SSE closed before terminal event for run'),
|
||||
);
|
||||
return;
|
||||
}
|
||||
stopStream();
|
||||
},
|
||||
cancelOnError: false,
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
enum AgentStage { execution, memory }
|
||||
enum AgentStage { routing, execution, memory }
|
||||
|
||||
AgentStage? stageFromStepName(String value) {
|
||||
switch (value) {
|
||||
case 'router':
|
||||
return AgentStage.routing;
|
||||
case 'worker':
|
||||
return AgentStage.execution;
|
||||
case 'memory':
|
||||
@@ -13,6 +15,7 @@ AgentStage? stageFromStepName(String value) {
|
||||
|
||||
String stageLabel(AgentStage? stage) {
|
||||
return switch (stage) {
|
||||
AgentStage.routing => '意图识别中',
|
||||
AgentStage.execution => '任务执行中',
|
||||
AgentStage.memory => '记忆提取中',
|
||||
null => '任务处理中',
|
||||
|
||||
@@ -408,6 +408,11 @@ class ChatBloc extends Cubit<ChatState> {
|
||||
uploadedAttachments: sendResult.uploadedAttachments,
|
||||
);
|
||||
} catch (error) {
|
||||
final sseClosedBeforeTerminal = _isSseClosedBeforeTerminalError(error);
|
||||
var recoveredFromHistory = false;
|
||||
if (sseClosedBeforeTerminal) {
|
||||
recoveredFromHistory = await _recoverFromAbnormalSseClose();
|
||||
}
|
||||
_markAttachmentUploadDone(messageId);
|
||||
emit(
|
||||
state.copyWith(
|
||||
@@ -415,12 +420,45 @@ class ChatBloc extends Cubit<ChatState> {
|
||||
isWaitingFirstToken: false,
|
||||
isStreaming: false,
|
||||
isCancelling: false,
|
||||
error: error.toString(),
|
||||
currentStage: null,
|
||||
error: sseClosedBeforeTerminal
|
||||
? (recoveredFromHistory ? null : '连接中断,请重试')
|
||||
: error.toString(),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
bool _isSseClosedBeforeTerminalError(Object error) {
|
||||
final text = error.toString().toLowerCase();
|
||||
return text.contains('sse closed before terminal event');
|
||||
}
|
||||
|
||||
Future<bool> _recoverFromAbnormalSseClose() async {
|
||||
try {
|
||||
final snapshot = await _service.loadHistory();
|
||||
final historyItems = _convertHistoryMessages(snapshot.messages);
|
||||
final mergedById = <String, ChatListItem>{
|
||||
for (final item in historyItems) item.id: item,
|
||||
};
|
||||
for (final item in state.items) {
|
||||
mergedById[item.id] = item;
|
||||
}
|
||||
final merged = mergedById.values.toList()
|
||||
..sort((a, b) => a.timestamp.compareTo(b.timestamp));
|
||||
emit(
|
||||
state.copyWith(
|
||||
items: merged,
|
||||
oldestLoadedDate: _extractDateFromItems(merged),
|
||||
hasEarlierHistory: snapshot.hasMore,
|
||||
),
|
||||
);
|
||||
return true;
|
||||
} catch (_) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void _syncUploadedAttachments({
|
||||
required String messageId,
|
||||
required List<UploadedAttachment> uploadedAttachments,
|
||||
@@ -484,10 +522,18 @@ class ChatBloc extends Cubit<ChatState> {
|
||||
try {
|
||||
final snapshot = await _service.loadHistory();
|
||||
final newItems = _convertHistoryMessages(snapshot.messages);
|
||||
final oldestDate = _extractDateFromItems(newItems);
|
||||
final mergedById = <String, ChatListItem>{
|
||||
for (final item in newItems) item.id: item,
|
||||
};
|
||||
for (final item in state.items) {
|
||||
mergedById[item.id] = item;
|
||||
}
|
||||
final merged = mergedById.values.toList()
|
||||
..sort((a, b) => a.timestamp.compareTo(b.timestamp));
|
||||
final oldestDate = _extractDateFromItems(merged);
|
||||
emit(
|
||||
state.copyWith(
|
||||
items: newItems,
|
||||
items: merged,
|
||||
oldestLoadedDate: oldestDate,
|
||||
hasEarlierHistory: snapshot.hasMore,
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user