CalvinBackup/CyberStrikeAI
1
0
Fork 0
mirror of https://github.com/Ed1s0nZ/CyberStrikeAI.git synced 2026-09-17 23:22:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: manage task process lifetimes and preserve turn history

Browse Source
This commit is contained in:
Ed1s0nZ
2026-09-16 17:52:58 +08:00
parent fd1c13a43d
commit f7882be546
54 changed files with 3650 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handler/agent.go
+23 -8
View File
@@ -221,13 +221,19 @@ func (h *AgentHandler) CancelRunningTaskForConversation(conversationID string) {
if h == nil || conversationID == "" || h.tasks == nil {
return
}
h.cancelRunningMCPToolsForConversation(conversationID)
h.tasks.AbortActiveEinoExecute(conversationID, "")
if ok, err := h.tasks.CancelTask(conversationID, ErrTaskCancelled); ok {
h.logger.Info("已取消会话运行中任务", zap.String("conversationId", conversationID))
} else if err != nil {
h.logger.Warn("取消会话运行中任务失败", zap.String("conversationId", conversationID), zap.Error(err))
ok, err := h.tasks.CancelTask(conversationID, ErrTaskCancelled)
if !ok {
h.cancelRunningMCPToolsForConversation(conversationID)
h.tasks.AbortActiveEinoExecute(conversationID, "")
}
if h.logger != nil {
if err != nil {
h.logger.Warn("取消会话运行中任务失败", zap.String("conversationId", conversationID), zap.Error(err))
} else if ok {
h.logger.Info("已取消会话运行中任务", zap.String("conversationId", conversationID))
}
}
}
// ConversationTaskRuntimeState exposes the authoritative live state and start
@@ -893,15 +899,24 @@ func (h *AgentHandler) ProcessMessageForRobot(ctx context.Context, platform stri
taskCtx, cancelWithCause := context.WithCancelCause(ctx)
defer cancelWithCause(nil)
taskStatus := "completed"
var taskRunID string
defer func() {
h.tasks.FinishTask(conversationID, taskStatus)
if taskRunID == "" {
return
}
if cleanupErr := h.tasks.FinishTaskRun(conversationID, taskRunID, taskStatus); cleanupErr != nil {
err = errors.Join(err, cleanupErr)
}
}()
if _, err := h.tasks.StartTask(conversationID, message, cancelWithCause); err != nil {
if startedTask, err := h.tasks.StartTask(conversationID, message, cancelWithCause); err != nil {
if errors.Is(err, ErrTaskAlreadyRunning) {
return "", conversationID, fmt.Errorf("当前会话已有任务正在执行中，请稍后再试")
}
return "", conversationID, fmt.Errorf("无法启动任务: %w", err)
} else {
taskRunID = startedTask.RunID
}
taskCtx = h.tasks.BindProcessScope(taskCtx, conversationID, taskRunID)
progressCallback := h.createProgressCallback(taskCtx, cancelWithCause, conversationID, assistantMessageID, nil)
robotMode := config.NormalizeAgentMode(agentMode)