From 3bcf4458c540b2c78fd439d806254701dcf990f4 Mon Sep 17 00:00:00 2001 From: temp Date: Sun, 23 Aug 2026 19:57:17 +0800 Subject: [PATCH] Fix finalization cleanup for pending tool executions --- internal/agentfinalizer/decision.go | 6 - internal/agentfinalizer/decision_test.go | 21 ++++ internal/database/conversation.go | 32 ++++- .../database/process_details_summary_test.go | 26 ++++ internal/handler/agent.go | 38 +++--- internal/handler/batch_queue_executor.go | 24 ++-- .../conversation_process_details_test.go | 59 +++++++++ internal/handler/eino_single_agent.go | 50 +++++--- .../handler/finalization_auto_continue.go | 107 ++++++++++++++++ .../finalization_auto_continue_test.go | 72 +++++++++++ internal/handler/multi_agent.go | 48 ++++--- web/static/js/chat.js | 2 +- web/static/js/monitor.js | 118 ++++++++++++++++-- 13 files changed, 522 insertions(+), 81 deletions(-) diff --git a/internal/agentfinalizer/decision.go b/internal/agentfinalizer/decision.go index 5aa0d00c..a050ab22 100644 --- a/internal/agentfinalizer/decision.go +++ b/internal/agentfinalizer/decision.go @@ -65,12 +65,6 @@ func FromRunResult(db *database.DB, result *multiagent.RunResult, in Input) Deci if len(in.MCPExecutionIDs) == 0 { in.MCPExecutionIDs = result.MCPExecutionIDs } - if strings.TrimSpace(in.Status) == "" { - in.Status = result.Status - } - if strings.TrimSpace(in.CompletionReason) == "" { - in.CompletionReason = result.CompletionReason - } } d := Decide(db, in) if result != nil { diff --git a/internal/agentfinalizer/decision_test.go b/internal/agentfinalizer/decision_test.go index c31755a3..d9e7c398 100644 --- a/internal/agentfinalizer/decision_test.go +++ b/internal/agentfinalizer/decision_test.go @@ -7,6 +7,7 @@ import ( "cyberstrike-ai/internal/database" "cyberstrike-ai/internal/mcp" + "cyberstrike-ai/internal/multiagent" "go.uber.org/zap" ) @@ -130,3 +131,23 @@ func TestDecideAllowsInformationalAnswerWhenExecutionEvidenceIsNotRequired(t *te t.Fatalf("informational response should finalize when execution evidence is not required: %+v", d) } } + +func TestFromRunResultDoesNotReusePreviousFinalizationStatusAsRunStatus(t *testing.T) { + db := newDecisionTestDB(t) + saveDecisionTestExecution(t, db, "run-slow", mcp.ToolExecutionStatusRunning) + result := &multiagent.RunResult{ + Response: "工具已触发，按用户要求直接总结。", + MCPExecutionIDs: []string{"run-slow"}, + } + + first := FromRunResult(db, result, Input{}) + if first.Finalizable || first.CompletionReason != ReasonPendingTools || result.Status != StatusInProgress { + t.Fatalf("first decision should mark pending and write metadata: decision=%+v result=%+v", first, result) + } + + saveDecisionTestExecution(t, db, "run-slow", mcp.ToolExecutionStatusCancelled) + second := FromRunResult(db, result, Input{}) + if !second.Finalizable || !second.Finalized || second.Status != StatusCompleted { + t.Fatalf("second decision should ignore previous result status after pending cleanup: decision=%+v result=%+v", second, result) + } +} diff --git a/internal/database/conversation.go b/internal/database/conversation.go index 52cbbd2a..fac4b894 100644 --- a/internal/database/conversation.go +++ b/internal/database/conversation.go @@ -1538,6 +1538,11 @@ LIMIT 1`, messageID).Scan(&terminalEvent, &terminalCreatedAt) return nil, fmt.Errorf("统计工具调用详情失败: %w", err) } + pendingToolStatus := "result_missing" + if summary.Status == "running" { + pendingToolStatus = "running" + } + execRows, err := db.Query( "SELECT id, event_type, data FROM process_details WHERE message_id = ? AND event_type IN ('tool_call', 'tool_result') ORDER BY created_at ASC, rowid ASC", messageID, @@ -1578,10 +1583,10 @@ LIMIT 1`, messageID).Scan(&terminalEvent, &terminalCreatedAt) ProcessDetailID: strings.TrimSpace(detailID), ToolName: toolName, ToolCallID: toolCallID, - // This summary is reconstructed from persisted history, not live - // execution state. Until a matching result is found the honest state - // is "result_missing", never "running". - Status: "result_missing", + // This summary is reconstructed from persisted history. For an + // active assistant turn, a missing result means the call is still + // pending; after the turn is terminal it is genuinely incomplete. + Status: pendingToolStatus, }) matchedToolIndexes = append(matchedToolIndexes, false) if toolCallID != "" { @@ -1636,6 +1641,7 @@ LIMIT 1`, messageID).Scan(&terminalEvent, &terminalCreatedAt) return nil, fmt.Errorf("遍历工具执行摘要失败: %w", err) } execRows.Close() + db.applyPersistedToolExecutionStatuses(summary.ToolExecutions) rows, err := db.Query( "SELECT data FROM process_details WHERE message_id = ? AND event_type = 'iteration' ORDER BY created_at ASC, rowid ASC", @@ -1704,6 +1710,24 @@ func toolResultStatusFromPayload(payload map[string]interface{}, eventType strin return "completed" } +func (db *DB) applyPersistedToolExecutionStatuses(executions []ProcessDetailsToolExecution) { + for i := range executions { + execID := strings.TrimSpace(executions[i].ExecutionID) + if execID == "" { + continue + } + var status string + if err := db.QueryRow(`SELECT status FROM tool_executions WHERE id = ?`, execID).Scan(&status); err != nil { + continue + } + status = strings.ToLower(strings.TrimSpace(status)) + if status == "" { + continue + } + executions[i].Status = status + } +} + func matchToolExecutionIndex( executions []ProcessDetailsToolExecution, matched []bool, diff --git a/internal/database/process_details_summary_test.go b/internal/database/process_details_summary_test.go index 141ea44d..9419b2d7 100644 --- a/internal/database/process_details_summary_test.go +++ b/internal/database/process_details_summary_test.go @@ -165,6 +165,32 @@ func TestProcessDetailsSummaryDoesNotReportPersistedOrphanAsRunning(t *testing.T } } +func TestProcessDetailsSummaryReportsUnmatchedToolCallAsRunningForActiveTurn(t *testing.T) { + db, conversationID, messageID := setupProcessDetailsSummaryTest(t) + if _, err := db.Exec( + "UPDATE messages SET content = ?, updated_at = ? WHERE id = ?", + "处理中...", "2026-08-10T08:00:00Z", messageID, + ); err != nil { + t.Fatalf("update running message: %v", err) + } + if err := db.AddProcessDetail(messageID, conversationID, "tool_call", "call", map[string]interface{}{ + "toolName": "execute", "toolCallId": "pending", + }); err != nil { + t.Fatalf("AddProcessDetail(tool_call): %v", err) + } + + summary, err := db.GetProcessDetailsSummary(messageID) + if err != nil { + t.Fatalf("GetProcessDetailsSummary: %v", err) + } + if summary.Status != "running" { + t.Fatalf("summary status = %q, want running", summary.Status) + } + if len(summary.ToolExecutions) != 1 || summary.ToolExecutions[0].Status != "running" { + t.Fatalf("tool executions = %#v, want running", summary.ToolExecutions) + } +} + func TestProcessDetailsSummaryIncludesPersistedTurnTiming(t *testing.T) { db, _, messageID := setupProcessDetailsSummaryTest(t) startedAt := "2026-08-10T08:00:00Z" diff --git a/internal/handler/agent.go b/internal/handler/agent.go index 350aee0a..072b7141 100644 --- a/internal/handler/agent.go +++ b/internal/handler/agent.go @@ -698,18 +698,19 @@ func (h *AgentHandler) mergeAssistantMessagePartialOnCancel(messageID, partial s // ChatResponse 聊天响应 type ChatResponse struct { - Response string `json:"response"` - MCPExecutionIDs []string `json:"mcpExecutionIds,omitempty"` // 本次对话中执行的MCP调用ID列表 - ConversationID string `json:"conversationId"` // 对话ID - Time time.Time `json:"time"` - Finalizable bool `json:"finalizable"` - Finalized bool `json:"finalized"` - Status string `json:"status,omitempty"` - CompletionReason string `json:"completionReason,omitempty"` - EvidenceVerified bool `json:"evidenceVerified"` - EvidenceRefs []string `json:"evidenceRefs,omitempty"` - PendingExecutionIDs []string `json:"pendingExecutionIds,omitempty"` - MissingChecks []string `json:"missingChecks,omitempty"` + Response string `json:"response"` + MCPExecutionIDs []string `json:"mcpExecutionIds,omitempty"` // 本次对话中执行的MCP调用ID列表 + ConversationID string `json:"conversationId"` // 对话ID + Time time.Time `json:"time"` + Finalizable bool `json:"finalizable"` + Finalized bool `json:"finalized"` + Status string `json:"status,omitempty"` + CompletionReason string `json:"completionReason,omitempty"` + EvidenceVerified bool `json:"evidenceVerified"` + EvidenceRefs []string `json:"evidenceRefs,omitempty"` + PendingExecutionIDs []string `json:"pendingExecutionIds,omitempty"` + MissingChecks []string `json:"missingChecks,omitempty"` + AutoCancelledPendingExecutionIDs []string `json:"autoCancelledPendingExecutionIds,omitempty"` } func (h *AgentHandler) finalizeRobotAgentError(ctx context.Context, assistantMessageID, conversationID string, resultMA *multiagent.RunResult, errMA error) (string, string, error) { @@ -724,8 +725,13 @@ func (h *AgentHandler) finalizeRobotAgentError(ctx context.Context, assistantMes return "", conversationID, errMA } -func (h *AgentHandler) finalizeRobotAgentSuccess(assistantMessageID, conversationID string, resultMA *multiagent.RunResult) (string, string, error) { - decision := h.finalizeAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, "robot", resultMA, resultMA.MCPExecutionIDs, multiagent.AggregatedReasoningFromTraceJSON(resultMA.LastAgentTraceInput), true) +func (h *AgentHandler) finalizeRobotAgentSuccess(taskCtx context.Context, assistantMessageID, conversationID string, resultMA *multiagent.RunResult) (string, string, error) { + reasoningContent := multiagent.AggregatedReasoningFromTraceJSON(resultMA.LastAgentTraceInput) + decision := h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, "robot", resultMA, resultMA.MCPExecutionIDs, true) + if cancelled := h.cleanupPendingToolExecutionsAfterIteration(taskCtx, conversationID, decision, nil); len(cancelled) > 0 { + decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, "robot", resultMA, resultMA.MCPExecutionIDs, true) + } + h.persistFinalizationDecision(conversationID, assistantMessageID, "robot", resultMA.MCPExecutionIDs, reasoningContent, decision) responseText := decision.FinalText if !decision.Finalizable { responseText = finalizationBlockedMessage(decision) @@ -758,7 +764,7 @@ func (h *AgentHandler) runRobotEinoSingleWithRetry( *taskStatus = "failed" return h.finalizeRobotAgentError(taskCtx, assistantMessageID, conversationID, resultMA, errMA) } - return h.finalizeRobotAgentSuccess(assistantMessageID, conversationID, resultMA) + return h.finalizeRobotAgentSuccess(taskCtx, assistantMessageID, conversationID, resultMA) } func (h *AgentHandler) runRobotMultiAgentWithRetry( @@ -779,7 +785,7 @@ func (h *AgentHandler) runRobotMultiAgentWithRetry( *taskStatus = "failed" return h.finalizeRobotAgentError(taskCtx, assistantMessageID, conversationID, resultMA, errMA) } - return h.finalizeRobotAgentSuccess(assistantMessageID, conversationID, resultMA) + return h.finalizeRobotAgentSuccess(taskCtx, assistantMessageID, conversationID, resultMA) } // ProcessMessageForRobot 供机器人（企业微信/钉钉/飞书）调用：Eino 单/多代理执行路径（含 progressCallback、过程详情），仅不发送 SSE，最后返回完整回复 diff --git a/internal/handler/batch_queue_executor.go b/internal/handler/batch_queue_executor.go index 14456126..53eed890 100644 --- a/internal/handler/batch_queue_executor.go +++ b/internal/handler/batch_queue_executor.go @@ -281,7 +281,12 @@ func (h *AgentHandler) executeOneBatchSubTask(queueID string, queue *BatchTaskQu if useBatchMulti { agentMode = "batch_eino_" + batchOrch } - decision := h.finalizeAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, agentMode, resultMA, mcpIDs, reasoningContent, true) + decision := h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, agentMode, resultMA, mcpIDs, true) + autoCancelledPendingExecutionIDs := h.cleanupPendingToolExecutionsAfterIteration(taskCtx, conversationID, decision, progressCallback) + if len(autoCancelledPendingExecutionIDs) > 0 { + decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, agentMode, resultMA, mcpIDs, true) + } + h.persistFinalizationDecision(conversationID, assistantMessageID, agentMode, mcpIDs, reasoningContent, decision) resText := decision.FinalText if !decision.Finalizable { resText = finalizationBlockedMessage(decision) @@ -289,14 +294,15 @@ func (h *AgentHandler) executeOneBatchSubTask(queueID string, queue *BatchTaskQu sendEvent("finalization_check", resText, decision) } sendEvent("response", resText, finalizationResponsePayload(decision, map[string]interface{}{ - "conversationId": conversationID, - "messageId": assistantMessageID, - "agentMode": agentMode, - "mcpExecutionIds": mcpIDs, - "batchQueueId": queueID, - "batchTaskId": task.ID, - "batchTaskStatus": map[bool]string{true: string(BatchTaskStatusCompleted), false: string(BatchTaskStatusFailed)}[decision.Finalizable], - "candidatePreview": safeTruncateString(resultMA.Response, 500), + "conversationId": conversationID, + "messageId": assistantMessageID, + "agentMode": agentMode, + "mcpExecutionIds": mcpIDs, + "batchQueueId": queueID, + "batchTaskId": task.ID, + "batchTaskStatus": map[bool]string{true: string(BatchTaskStatusCompleted), false: string(BatchTaskStatusFailed)}[decision.Finalizable], + "candidatePreview": safeTruncateString(resultMA.Response, 500), + "autoCancelledPendingExecutionIds": autoCancelledPendingExecutionIDs, })) if assistantMessageID == "" { diff --git a/internal/handler/conversation_process_details_test.go b/internal/handler/conversation_process_details_test.go index df8e0fea..18473ab3 100644 --- a/internal/handler/conversation_process_details_test.go +++ b/internal/handler/conversation_process_details_test.go @@ -76,6 +76,65 @@ func TestProcessDetailsPageIncludesTerminalToolStatusAcrossPageBoundary(t *testi } } +func TestProcessDetailsPageUsesPersistedExecutionStatusAfterBackgroundCancel(t *testing.T) { + gin.SetMode(gin.TestMode) + db, err := database.NewDB(filepath.Join(t.TempDir(), "process-details-cancelled.db"), zap.NewNop()) + if err != nil { + t.Fatalf("NewDB: %v", err) + } + t.Cleanup(func() { _ = db.Close() }) + conversation, err := db.CreateConversation("cancelled background", database.ConversationCreateMeta{}) + if err != nil { + t.Fatalf("CreateConversation: %v", err) + } + message, err := db.AddMessage(conversation.ID, "assistant", "done", nil) + if err != nil { + t.Fatalf("AddMessage: %v", err) + } + execID := "exec-cancelled-after-background" + if err := db.AddProcessDetail(message.ID, conversation.ID, "tool_call", "call", map[string]interface{}{ + "toolName": "exec", "toolCallId": "call-cancelled", "index": 1, "total": 1, + }); err != nil { + t.Fatalf("AddProcessDetail(tool_call): %v", err) + } + if err := db.AddProcessDetail(message.ID, conversation.ID, "tool_result", "background", map[string]interface{}{ + "toolName": "exec", "toolCallId": "call-cancelled", "executionId": execID, "status": "background_running", "success": true, + }); err != nil { + t.Fatalf("AddProcessDetail(tool_result): %v", err) + } + now := time.Now() + if err := db.SaveToolExecution(&mcp.ToolExecution{ + ID: execID, + ToolName: "exec", + Status: mcp.ToolExecutionStatusCancelled, + StartTime: now, + EndTime: &now, + }); err != nil { + t.Fatalf("SaveToolExecution: %v", err) + } + + w := httptest.NewRecorder() + c, _ := gin.CreateTestContext(w) + c.Request = httptest.NewRequest("GET", "/api/messages/"+message.ID+"/process-details?limit=10&offset=0", nil) + c.Params = gin.Params{{Key: "id", Value: message.ID}} + NewConversationHandler(db, zap.NewNop()).GetMessageProcessDetails(c) + if w.Code != 200 { + t.Fatalf("status = %d: %s", w.Code, w.Body.String()) + } + var response struct { + ToolExecutions []database.ProcessDetailsToolExecution `json:"toolExecutions"` + } + if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil { + t.Fatalf("decode response: %v", err) + } + if len(response.ToolExecutions) != 1 { + t.Fatalf("tool executions = %d, want 1", len(response.ToolExecutions)) + } + if got := response.ToolExecutions[0].Status; got != mcp.ToolExecutionStatusCancelled { + t.Fatalf("tool execution status = %q, want cancelled", got) + } +} + func TestProcessDetailsFullBackfillsEmptyToolCallArgumentsFromExecution(t *testing.T) { gin.SetMode(gin.TestMode) db, err := database.NewDB(filepath.Join(t.TempDir(), "process-details-args.db"), zap.NewNop()) diff --git a/internal/handler/eino_single_agent.go b/internal/handler/eino_single_agent.go index 8ec130f0..1691b40d 100644 --- a/internal/handler/eino_single_agent.go +++ b/internal/handler/eino_single_agent.go @@ -192,6 +192,7 @@ func (h *AgentHandler) EinoSingleAgentLoopStream(c *gin.Context) { var emptyResponseContinueAttempt int var finalizationAutoContinueAttempt int var decision agentfinalizer.Decision + var autoCancelledPendingExecutionIDs []string for { segmentMainIterationMax := 0 @@ -268,6 +269,10 @@ func (h *AgentHandler) EinoSingleAgentLoopStream(c *gin.Context) { continue } decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, "eino_single", result, cumulativeMCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + if cancelled := h.cleanupPendingToolExecutionsAfterIteration(taskCtx, conversationID, decision, progressCallback); len(cancelled) > 0 { + autoCancelledPendingExecutionIDs = mergeMCPExecutionIDLists(autoCancelledPendingExecutionIDs, cancelled) + decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, "eino_single", result, cumulativeMCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + } if h.tryAutoContinueAfterFinalization(taskCtx, conversationID, result, decision, &finalizationAutoContinueAttempt, &curHistory, &curFinalMessage, progressCallback) { mainIterationOffset += segmentMainIterationMax timeoutCancel() @@ -384,6 +389,10 @@ func (h *AgentHandler) EinoSingleAgentLoopStream(c *gin.Context) { if decision.CompletionReason == "" { decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, "eino_single", result, cumulativeMCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + if cancelled := h.cleanupPendingToolExecutionsAfterIteration(taskCtx, conversationID, decision, nil); len(cancelled) > 0 { + autoCancelledPendingExecutionIDs = mergeMCPExecutionIDLists(autoCancelledPendingExecutionIDs, cancelled) + decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, "eino_single", result, cumulativeMCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + } } h.persistFinalizationDecision(conversationID, assistantMessageID, "eino_single", cumulativeMCPExecutionIDs, multiagent.AggregatedReasoningFromTraceJSON(result.LastAgentTraceInput), decision) @@ -401,10 +410,11 @@ func (h *AgentHandler) EinoSingleAgentLoopStream(c *gin.Context) { h.tasks.UpdateTaskStatus(conversationID, taskStatus) } sendEvent("response", responseText, finalizationResponsePayload(decision, map[string]interface{}{ - "mcpExecutionIds": cumulativeMCPExecutionIDs, - "conversationId": conversationID, - "messageId": assistantMessageID, - "agentMode": "eino_single", + "mcpExecutionIds": cumulativeMCPExecutionIDs, + "conversationId": conversationID, + "messageId": assistantMessageID, + "agentMode": "eino_single", + "autoCancelledPendingExecutionIds": autoCancelledPendingExecutionIDs, })) sendEvent("done", "", map[string]interface{}{"conversationId": conversationID}) } @@ -464,6 +474,7 @@ func (h *AgentHandler) EinoSingleAgentLoop(c *gin.Context) { var emptyResponseContinueAttempt int var finalizationAutoContinueAttempt int var decision agentfinalizer.Decision + var autoCancelledPendingExecutionIDs []string for { result, runErr = multiagent.RunEinoSingleChatModelAgent( taskCtx, @@ -493,6 +504,10 @@ func (h *AgentHandler) EinoSingleAgentLoop(c *gin.Context) { continue } decision = h.decideAgentRunForDeliveryWithPolicy(prep.ConversationID, prep.AssistantMessageID, "eino_single", result, result.MCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + if cancelled := h.cleanupPendingToolExecutionsAfterIteration(taskCtx, prep.ConversationID, decision, progressCallback); len(cancelled) > 0 { + autoCancelledPendingExecutionIDs = mergeMCPExecutionIDLists(autoCancelledPendingExecutionIDs, cancelled) + decision = h.decideAgentRunForDeliveryWithPolicy(prep.ConversationID, prep.AssistantMessageID, "eino_single", result, result.MCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + } if h.tryAutoContinueAfterFinalization(taskCtx, prep.ConversationID, result, decision, &finalizationAutoContinueAttempt, &curHist, &curMsg, progressCallback) { continue } @@ -509,18 +524,19 @@ func (h *AgentHandler) EinoSingleAgentLoop(c *gin.Context) { responseText = finalizationBlockedMessage(decision) } c.JSON(http.StatusOK, gin.H{ - "response": responseText, - "conversationId": prep.ConversationID, - "mcpExecutionIds": result.MCPExecutionIDs, - "assistantMessageId": prep.AssistantMessageID, - "agentMode": "eino_single", - "finalized": decision.Finalized, - "finalizable": decision.Finalizable, - "status": decision.Status, - "completionReason": decision.CompletionReason, - "evidenceVerified": decision.EvidenceVerified, - "evidenceRefs": decision.EvidenceRefs, - "pendingExecutionIds": decision.PendingExecutionIDs, - "missingChecks": decision.MissingChecks, + "response": responseText, + "conversationId": prep.ConversationID, + "mcpExecutionIds": result.MCPExecutionIDs, + "assistantMessageId": prep.AssistantMessageID, + "agentMode": "eino_single", + "finalized": decision.Finalized, + "finalizable": decision.Finalizable, + "status": decision.Status, + "completionReason": decision.CompletionReason, + "evidenceVerified": decision.EvidenceVerified, + "evidenceRefs": decision.EvidenceRefs, + "pendingExecutionIds": decision.PendingExecutionIDs, + "missingChecks": decision.MissingChecks, + "autoCancelledPendingExecutionIds": autoCancelledPendingExecutionIDs, }) } diff --git a/internal/handler/finalization_auto_continue.go b/internal/handler/finalization_auto_continue.go index 2aca373c..4a16d00d 100644 --- a/internal/handler/finalization_auto_continue.go +++ b/internal/handler/finalization_auto_continue.go @@ -2,16 +2,21 @@ package handler import ( "context" + "strings" "time" "cyberstrike-ai/internal/agent" "cyberstrike-ai/internal/agentfinalizer" + "cyberstrike-ai/internal/mcp" "cyberstrike-ai/internal/multiagent" "go.uber.org/zap" ) const finalizationAutoContinueMaxAttempts = 2 +const finalizationPendingToolCancelWait = 2 * time.Second +const finalizationPendingToolCancelPoll = 50 * time.Millisecond +const finalizationPendingToolCancelNote = "Agent 迭代已结束，最终回复前自动终止未完成的工具执行" func shouldAutoContinueAfterFinalization(d agentfinalizer.Decision, attempt int) bool { if d.Finalizable || d.Finalized { @@ -75,3 +80,105 @@ func finalizationAutoContinueBackoff(attempt int) time.Duration { } return time.Duration(attempt) * time.Second } + +func (h *AgentHandler) cleanupPendingToolExecutionsAfterIteration( + taskCtx context.Context, + conversationID string, + decision agentfinalizer.Decision, + progressCallback func(eventType, message string, data interface{}), +) []string { + if h == nil || h.agent == nil || decision.CompletionReason != agentfinalizer.ReasonPendingTools { + return nil + } + pending := uniqueNonEmptyStrings(decision.PendingExecutionIDs) + if len(pending) == 0 { + return nil + } + cancelled := make([]string, 0, len(pending)) + for _, executionID := range pending { + if h.agent.CancelMCPToolExecutionWithNote(executionID, finalizationPendingToolCancelNote) { + cancelled = append(cancelled, executionID) + } else if h.logger != nil { + h.logger.Warn("finalization pending tool cleanup could not cancel execution", + zap.String("conversationId", conversationID), + zap.String("executionId", executionID)) + } + } + if len(cancelled) == 0 { + return nil + } + if progressCallback != nil { + progressCallback("finalization_pending_tools_cancelled", "迭代结束，已自动终止仍在运行的工具执行。", map[string]interface{}{ + "conversationId": conversationID, + "source": "finalizer", + "autoCancelledPendingExecutionIds": cancelled, + "pendingExecutionIds": pending, + "reason": agentfinalizer.ReasonPendingTools, + }) + } + h.waitForToolExecutionsToLeavePending(taskCtx, cancelled, finalizationPendingToolCancelWait) + return cancelled +} + +func (h *AgentHandler) waitForToolExecutionsToLeavePending(ctx context.Context, executionIDs []string, wait time.Duration) { + if h == nil || h.db == nil || len(executionIDs) == 0 || wait <= 0 { + return + } + timer := time.NewTimer(wait) + defer timer.Stop() + ticker := time.NewTicker(finalizationPendingToolCancelPoll) + defer ticker.Stop() + for { + if !h.hasPendingToolExecutions(executionIDs) { + return + } + select { + case <-contextDone(ctx): + return + case <-timer.C: + return + case <-ticker.C: + } + } +} + +func (h *AgentHandler) hasPendingToolExecutions(executionIDs []string) bool { + if h == nil || h.db == nil { + return false + } + for _, executionID := range uniqueNonEmptyStrings(executionIDs) { + exec, err := h.db.GetToolExecution(executionID) + if err != nil || exec == nil { + continue + } + switch strings.TrimSpace(exec.Status) { + case mcp.ToolExecutionStatusQueued, mcp.ToolExecutionStatusRunning: + return true + } + } + return false +} + +func uniqueNonEmptyStrings(values []string) []string { + seen := make(map[string]struct{}, len(values)) + out := make([]string, 0, len(values)) + for _, value := range values { + value = strings.TrimSpace(value) + if value == "" { + continue + } + if _, ok := seen[value]; ok { + continue + } + seen[value] = struct{}{} + out = append(out, value) + } + return out +} + +func contextDone(ctx context.Context) <-chan struct{} { + if ctx == nil { + return nil + } + return ctx.Done() +} diff --git a/internal/handler/finalization_auto_continue_test.go b/internal/handler/finalization_auto_continue_test.go index 1ce68d4c..1835042d 100644 --- a/internal/handler/finalization_auto_continue_test.go +++ b/internal/handler/finalization_auto_continue_test.go @@ -1,9 +1,18 @@ package handler import ( + "context" + "path/filepath" "testing" + "time" + agentpkg "cyberstrike-ai/internal/agent" "cyberstrike-ai/internal/agentfinalizer" + "cyberstrike-ai/internal/config" + "cyberstrike-ai/internal/database" + "cyberstrike-ai/internal/mcp" + + "go.uber.org/zap" ) func TestShouldAutoContinueAfterFinalization(t *testing.T) { @@ -57,3 +66,66 @@ func TestRequestRequiresExecutionEvidenceUsesExplicitPolicyOnly(t *testing.T) { t.Fatal("explicit false policy should not require execution evidence") } } + +func TestCleanupPendingToolExecutionsAfterIterationAllowsFinalization(t *testing.T) { + logger := zap.NewNop() + db, err := database.NewDB(filepath.Join(t.TempDir(), "cleanup-finalization.db"), logger) + if err != nil { + t.Fatalf("NewDB: %v", err) + } + t.Cleanup(func() { _ = db.Close() }) + + server := mcp.NewServerWithStorage(logger, db) + server.ConfigureToolWaitTimeoutSeconds(1) + server.RegisterTool(mcp.Tool{Name: "block", InputSchema: map[string]interface{}{"type": "object"}}, func(ctx context.Context, args map[string]interface{}) (*mcp.ToolResult, error) { + <-ctx.Done() + return nil, ctx.Err() + }) + ag := agentpkg.NewAgent(&config.OpenAIConfig{}, &config.AgentConfig{}, server, nil, logger, 10) + h := &AgentHandler{agent: ag, db: db, logger: logger} + + callCtx := mcp.WithMCPConversationID(context.Background(), "conv-cleanup") + result, execID, err := server.CallTool(callCtx, "block", nil) + if err != nil { + t.Fatalf("CallTool: %v", err) + } + if result == nil || !result.IsError || execID == "" { + t.Fatalf("expected background wait result, result=%#v execID=%q", result, execID) + } + + decision := agentfinalizer.Decide(db, agentfinalizer.Input{ + Response: "基于已完成信息的阶段性总结。", + MCPExecutionIDs: []string{execID}, + }) + if decision.CompletionReason != agentfinalizer.ReasonPendingTools { + t.Fatalf("decision reason = %s, want pending tools: %+v", decision.CompletionReason, decision) + } + + var eventType string + cancelled := h.cleanupPendingToolExecutionsAfterIteration(context.Background(), "conv-cleanup", decision, func(et, _ string, _ interface{}) { + eventType = et + }) + if len(cancelled) != 1 || cancelled[0] != execID { + t.Fatalf("cancelled = %#v, want [%s]", cancelled, execID) + } + if eventType != "finalization_pending_tools_cancelled" { + t.Fatalf("event type = %q", eventType) + } + + deadline := time.Now().Add(time.Second) + for time.Now().Before(deadline) { + exec, err := db.GetToolExecution(execID) + if err == nil && exec != nil && exec.Status == mcp.ToolExecutionStatusCancelled { + after := agentfinalizer.Decide(db, agentfinalizer.Input{ + Response: "基于已完成信息的阶段性总结。", + MCPExecutionIDs: []string{execID}, + }) + if !after.Finalizable || !after.Finalized { + t.Fatalf("decision should finalize after cleanup: %+v", after) + } + return + } + time.Sleep(10 * time.Millisecond) + } + t.Fatal("execution did not become cancelled") +} diff --git a/internal/handler/multi_agent.go b/internal/handler/multi_agent.go index d68f0c28..7da4e76f 100644 --- a/internal/handler/multi_agent.go +++ b/internal/handler/multi_agent.go @@ -205,6 +205,7 @@ func (h *AgentHandler) MultiAgentLoopStream(c *gin.Context) { } agentMode := "eino_" + effectiveOrch var decision agentfinalizer.Decision + var autoCancelledPendingExecutionIDs []string for { segmentMainIterationMax := 0 @@ -282,6 +283,10 @@ func (h *AgentHandler) MultiAgentLoopStream(c *gin.Context) { continue } decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, agentMode, result, cumulativeMCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + if cancelled := h.cleanupPendingToolExecutionsAfterIteration(taskCtx, conversationID, decision, progressCallback); len(cancelled) > 0 { + autoCancelledPendingExecutionIDs = mergeMCPExecutionIDLists(autoCancelledPendingExecutionIDs, cancelled) + decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, agentMode, result, cumulativeMCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + } if h.tryAutoContinueAfterFinalization(taskCtx, conversationID, result, decision, &finalizationAutoContinueAttempt, &curHistory, &curFinalMessage, progressCallback) { mainIterationOffset += segmentMainIterationMax timeoutCancel() @@ -398,6 +403,10 @@ func (h *AgentHandler) MultiAgentLoopStream(c *gin.Context) { if decision.CompletionReason == "" { decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, agentMode, result, cumulativeMCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + if cancelled := h.cleanupPendingToolExecutionsAfterIteration(taskCtx, conversationID, decision, nil); len(cancelled) > 0 { + autoCancelledPendingExecutionIDs = mergeMCPExecutionIDLists(autoCancelledPendingExecutionIDs, cancelled) + decision = h.decideAgentRunForDeliveryWithPolicy(conversationID, assistantMessageID, agentMode, result, cumulativeMCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + } } h.persistFinalizationDecision(conversationID, assistantMessageID, agentMode, cumulativeMCPExecutionIDs, multiagent.AggregatedReasoningFromTraceJSON(result.LastAgentTraceInput), decision) @@ -415,10 +424,11 @@ func (h *AgentHandler) MultiAgentLoopStream(c *gin.Context) { h.tasks.UpdateTaskStatus(conversationID, taskStatus) } sendEvent("response", responseText, finalizationResponsePayload(decision, map[string]interface{}{ - "mcpExecutionIds": cumulativeMCPExecutionIDs, - "conversationId": conversationID, - "messageId": assistantMessageID, - "agentMode": agentMode, + "mcpExecutionIds": cumulativeMCPExecutionIDs, + "conversationId": conversationID, + "messageId": assistantMessageID, + "agentMode": agentMode, + "autoCancelledPendingExecutionIds": autoCancelledPendingExecutionIDs, })) sendEvent("done", "", map[string]interface{}{"conversationId": conversationID}) } @@ -478,6 +488,7 @@ func (h *AgentHandler) MultiAgentLoop(c *gin.Context) { } agentMode := "eino_" + effectiveOrch var decision agentfinalizer.Decision + var autoCancelledPendingExecutionIDs []string for { result, runErr = multiagent.RunDeepAgent( taskCtx, @@ -514,6 +525,10 @@ func (h *AgentHandler) MultiAgentLoop(c *gin.Context) { continue } decision = h.decideAgentRunForDeliveryWithPolicy(prep.ConversationID, prep.AssistantMessageID, agentMode, result, result.MCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + if cancelled := h.cleanupPendingToolExecutionsAfterIteration(taskCtx, prep.ConversationID, decision, progressCallback); len(cancelled) > 0 { + autoCancelledPendingExecutionIDs = mergeMCPExecutionIDLists(autoCancelledPendingExecutionIDs, cancelled) + decision = h.decideAgentRunForDeliveryWithPolicy(prep.ConversationID, prep.AssistantMessageID, agentMode, result, result.MCPExecutionIDs, requestRequiresExecutionEvidence(&req)) + } if h.tryAutoContinueAfterFinalization(taskCtx, prep.ConversationID, result, decision, &finalizationAutoContinueAttempt, &curHist, &curMsg, progressCallback) { continue } @@ -533,18 +548,19 @@ func (h *AgentHandler) MultiAgentLoop(c *gin.Context) { responseText = finalizationBlockedMessage(decision) } c.JSON(http.StatusOK, ChatResponse{ - Response: responseText, - MCPExecutionIDs: result.MCPExecutionIDs, - ConversationID: prep.ConversationID, - Time: time.Now(), - Finalizable: decision.Finalizable, - Finalized: decision.Finalized, - Status: decision.Status, - CompletionReason: decision.CompletionReason, - EvidenceVerified: decision.EvidenceVerified, - EvidenceRefs: decision.EvidenceRefs, - PendingExecutionIDs: decision.PendingExecutionIDs, - MissingChecks: decision.MissingChecks, + Response: responseText, + MCPExecutionIDs: result.MCPExecutionIDs, + ConversationID: prep.ConversationID, + Time: time.Now(), + Finalizable: decision.Finalizable, + Finalized: decision.Finalized, + Status: decision.Status, + CompletionReason: decision.CompletionReason, + EvidenceVerified: decision.EvidenceVerified, + EvidenceRefs: decision.EvidenceRefs, + PendingExecutionIDs: decision.PendingExecutionIDs, + MissingChecks: decision.MissingChecks, + AutoCancelledPendingExecutionIDs: autoCancelledPendingExecutionIDs, }) } diff --git a/web/static/js/chat.js b/web/static/js/chat.js index 9998c24c..0735c74c 100644 --- a/web/static/js/chat.js +++ b/web/static/js/chat.js @@ -4428,7 +4428,7 @@ function renderProcessDetails(messageId, processDetails, options) { } } } - if (!timelineOpts.toolStatus && eventType === 'tool_call' && detail.id && toolStatusByProcessDetailId.has(String(detail.id))) { + if (eventType === 'tool_call' && detail.id && toolStatusByProcessDetailId.has(String(detail.id))) { timelineOpts.toolStatus = toolStatusByProcessDetailId.get(String(detail.id)); } const itemId = addTimelineItem(timeline, eventType, timelineOpts); diff --git a/web/static/js/monitor.js b/web/static/js/monitor.js index 16422874..f684287d 100644 --- a/web/static/js/monitor.js +++ b/web/static/js/monitor.js @@ -3372,6 +3372,18 @@ function handleStreamEvent(event, progressElement, progressId, }); break; + case 'finalization_pending_tools_cancelled': { + const d = event.data || {}; + markToolExecutionItemsCancelled(timeline, autoCancelledExecutionIdsFromData(d)); + addTimelineItem(timeline, 'progress', { + title: '工具执行已收尾', + message: event.message, + data: d, + expanded: false + }); + break; + } + case 'hitl_audit_agent_started': { const auditData = Object.assign({}, event.data || {}, { reviewer: 'audit_agent', @@ -3984,6 +3996,7 @@ function handleStreamEvent(event, progressElement, progressId, const responseData = event.data || {}; const mcpIds = mergeMcpExecutionIDLists(typeof getMcpIds === 'function' ? (getMcpIds() || []) : [], responseData.mcpExecutionIds || []); setMcpIds(mcpIds); + markToolExecutionItemsCancelled(timeline, autoCancelledExecutionIdsFromData(responseData)); // 更新对话ID if (responseData.conversationId) { @@ -5886,6 +5899,9 @@ function getToolResultDisplayState(data, opts) { } return { kind: 'background_running', isError: false, success: false }; } + if (explicitStatus === 'cancelled' || explicitStatus === 'canceled') { + return { kind: 'cancelled', isError: true, success: false }; + } const parts = []; if (opts.rawText != null) parts.push(String(opts.rawText)); collectToolResultTextParts(data.result, parts, 0); @@ -5917,6 +5933,13 @@ function getBackgroundRunningToolLabel() { return '后台执行中'; } +function toolDisplayStatusFromState(displayState) { + if (!displayState) return 'completed'; + if (displayState.kind === 'background_running') return 'background_running'; + if (displayState.kind === 'cancelled') return 'cancelled'; + return displayState.isError ? 'failed' : 'completed'; +} + function buildToolResultSectionHtml(data, opts) { opts = opts || {}; const _t = function (k, o) { @@ -6158,7 +6181,10 @@ function mergeToolResultIntoCallItem(item, data, options) { } item.dataset.toolResultMerged = '1'; item.dataset.toolSuccess = (!displayState.isError && !backgroundRunning) ? '1' : '0'; - item.dataset.toolDisplayStatus = backgroundRunning ? 'background_running' : (displayState.isError ? 'failed' : 'completed'); + item.dataset.toolDisplayStatus = toolDisplayStatusFromState(displayState); + if (data.executionId != null && String(data.executionId).trim() !== '') { + item.dataset.toolExecutionId = String(data.executionId).trim(); + } item.classList.remove('tool-call-running', 'tool-call-completed', 'tool-call-failed'); item.classList.add(backgroundRunning ? 'tool-call-running' : (displayState.isError ? 'tool-call-failed' : 'tool-call-completed')); applyToolCallStatus(item, item.dataset.toolDisplayStatus); @@ -6198,7 +6224,10 @@ function mergeToolResultIntoCallItem(item, data, options) { item.dataset.toolResultMerged = '1'; item.dataset.toolSuccess = (!displayState.isError && !backgroundRunning) ? '1' : '0'; - item.dataset.toolDisplayStatus = backgroundRunning ? 'background_running' : (displayState.isError ? 'failed' : 'completed'); + item.dataset.toolDisplayStatus = toolDisplayStatusFromState(displayState); + if (data.executionId != null && String(data.executionId).trim() !== '') { + item.dataset.toolExecutionId = String(data.executionId).trim(); + } item.classList.remove('tool-call-running', 'tool-call-completed', 'tool-call-failed'); item.classList.add(backgroundRunning ? 'tool-call-running' : (displayState.isError ? 'tool-call-failed' : 'tool-call-completed')); applyToolCallStatus(item, item.dataset.toolDisplayStatus); @@ -6361,6 +6390,9 @@ function getToolCallStatusPresentation(status) { if (normalized === 'failed') { return { status: normalized, itemClass: 'tool-call-failed', badgeClass: 'tool-status-failed', label: translate('timeline.execFailed', '执行失败'), icon: '❌ ' }; } + if (normalized === 'cancelled' || normalized === 'canceled') { + return { status: 'cancelled', itemClass: 'tool-call-failed', badgeClass: 'tool-status-failed', label: translate('tasks.statusCancelled', '已取消'), icon: '⛔ ' }; + } if (normalized === 'result_missing') { return { status: normalized, itemClass: 'tool-call-incomplete', badgeClass: 'tool-status-incomplete', label: translate('timeline.resultMissing', '结果记录缺失'), icon: '⚠️ ' }; } @@ -6401,6 +6433,52 @@ function updateToolCallStatus(progressId, toolCallId, status) { applyToolCallStatus(item, status); } +function normalizeExecutionIdList(value) { + const input = Array.isArray(value) ? value : (value == null ? [] : [value]); + const seen = new Set(); + const out = []; + input.forEach(function (v) { + const s = String(v == null ? '' : v).trim(); + if (!s || seen.has(s)) return; + seen.add(s); + out.push(s); + }); + return out; +} + +function autoCancelledExecutionIdsFromData(data) { + data = data || {}; + return normalizeExecutionIdList(data.autoCancelledPendingExecutionIds || data.autoCancelledExecutionIds || []); +} + +function markToolExecutionItemsCancelled(root, executionIds) { + const ids = normalizeExecutionIdList(executionIds); + if (!root || ids.length === 0) return 0; + const idSet = new Set(ids); + let count = 0; + root.querySelectorAll('.timeline-item[data-tool-execution-id]').forEach(function (item) { + const execId = String(item.dataset.toolExecutionId || '').trim(); + if (!execId || !idSet.has(execId)) return; + item.dataset.toolSuccess = '0'; + item.dataset.toolDisplayStatus = 'cancelled'; + item.classList.remove('tool-call-running', 'tool-call-completed', 'tool-call-incomplete'); + item.classList.add('tool-call-failed'); + const state = toolCallDetailStateByItemId.get(item.id); + if (state && state.resultData && typeof state.resultData === 'object') { + state.resultData = Object.assign({}, state.resultData, { + status: 'cancelled', + success: false, + isError: true + }); + state.pending = false; + setToolCallDetailState(item, state); + } + applyToolCallStatus(item, 'cancelled'); + count++; + }); + return count; +} + // 添加时间线项目 function buildWorkflowConditionResultHtml(data) { const output = (data && data.output) || {}; @@ -6547,17 +6625,23 @@ function addTimelineItem(timeline, type, options) { const mergedDisplayState = merged ? getToolResultDisplayState(merged) : null; const mergedBackgroundRunning = mergedDisplayState && mergedDisplayState.kind === 'background_running'; const terminalStatus = String(options.toolStatus || '').toLowerCase(); + const forcedStatus = (terminalStatus === 'completed' || terminalStatus === 'failed' || terminalStatus === 'cancelled' || terminalStatus === 'canceled') + ? (terminalStatus === 'canceled' ? 'cancelled' : terminalStatus) + : ''; if (merged) { item.dataset.toolResultMerged = '1'; - item.dataset.toolSuccess = (!mergedDisplayState.isError && !mergedBackgroundRunning) ? '1' : '0'; - item.dataset.toolDisplayStatus = mergedBackgroundRunning ? 'background_running' : (mergedDisplayState.isError ? 'failed' : 'completed'); - item.classList.add(mergedBackgroundRunning ? 'tool-call-running' : (mergedDisplayState.isError ? 'tool-call-failed' : 'tool-call-completed')); + item.dataset.toolSuccess = forcedStatus ? (forcedStatus === 'completed' ? '1' : '0') : ((!mergedDisplayState.isError && !mergedBackgroundRunning) ? '1' : '0'); + item.dataset.toolDisplayStatus = forcedStatus || toolDisplayStatusFromState(mergedDisplayState); + if (merged.executionId != null && String(merged.executionId).trim() !== '') { + item.dataset.toolExecutionId = String(merged.executionId).trim(); + } + item.classList.add(item.dataset.toolDisplayStatus === 'background_running' ? 'tool-call-running' : (item.dataset.toolDisplayStatus === 'completed' ? 'tool-call-completed' : 'tool-call-failed')); if (d._mergedResultDetailId) { item.dataset.toolResultDetailId = String(d._mergedResultDetailId); } - } else if (terminalStatus === 'completed' || terminalStatus === 'failed') { + } else if (terminalStatus === 'completed' || terminalStatus === 'failed' || terminalStatus === 'cancelled' || terminalStatus === 'canceled') { item.dataset.toolSuccess = terminalStatus === 'completed' ? '1' : '0'; - item.dataset.toolDisplayStatus = terminalStatus; + item.dataset.toolDisplayStatus = terminalStatus === 'canceled' ? 'cancelled' : terminalStatus; item.classList.add(terminalStatus === 'completed' ? 'tool-call-completed' : 'tool-call-failed'); } else if (terminalStatus === 'result_missing') { item.dataset.toolDisplayStatus = 'result_missing'; @@ -6588,7 +6672,10 @@ function addTimelineItem(timeline, type, options) { } item.dataset.toolName = (d.toolName != null && d.toolName !== '') ? String(d.toolName) : ''; item.dataset.toolSuccess = (!displayState.isError && displayState.kind !== 'background_running') ? '1' : '0'; - item.dataset.toolDisplayStatus = displayState.kind === 'background_running' ? 'background_running' : (displayState.isError ? 'failed' : 'completed'); + item.dataset.toolDisplayStatus = toolDisplayStatusFromState(displayState); + if (d.executionId != null && String(d.executionId).trim() !== '') { + item.dataset.toolExecutionId = String(d.executionId).trim(); + } } if (type === 'eino_usage_summary' && options.data) { const d = options.data; @@ -6658,10 +6745,14 @@ function addTimelineItem(timeline, type, options) { const mergedDisplayState = merged ? getToolResultDisplayState(merged) : null; const mergedBackgroundRunning = mergedDisplayState && mergedDisplayState.kind === 'background_running'; const terminalStatus = String(options.toolStatus || '').toLowerCase(); - const hasTerminalStatus = terminalStatus === 'completed' || terminalStatus === 'failed'; + const forcedStatus = (terminalStatus === 'completed' || terminalStatus === 'failed' || terminalStatus === 'cancelled' || terminalStatus === 'canceled') + ? (terminalStatus === 'canceled' ? 'cancelled' : terminalStatus) + : ''; + const hasTerminalStatus = terminalStatus === 'completed' || terminalStatus === 'failed' || terminalStatus === 'cancelled' || terminalStatus === 'canceled'; const hasHistoricalStatus = hasTerminalStatus || terminalStatus === 'result_missing'; if (merged) { - item.classList.add(mergedBackgroundRunning ? 'tool-call-running' : (mergedDisplayState.isError ? 'tool-call-failed' : 'tool-call-completed')); + const statusForClass = forcedStatus || toolDisplayStatusFromState(mergedDisplayState); + item.classList.add(statusForClass === 'background_running' ? 'tool-call-running' : (statusForClass === 'completed' ? 'tool-call-completed' : 'tool-call-failed')); } else if (hasTerminalStatus) { item.classList.add(terminalStatus === 'completed' ? 'tool-call-completed' : 'tool-call-failed'); } else if (terminalStatus === 'result_missing') { @@ -6671,7 +6762,7 @@ function addTimelineItem(timeline, type, options) { } setToolCallDetailState(item, { args: args, - resultData: merged || null, + resultData: (merged && forcedStatus) ? Object.assign({}, merged, { status: forcedStatus, success: forcedStatus === 'completed', isError: forcedStatus !== 'completed' }) : (merged || null), pending: !merged && !hasHistoricalStatus && !options.skipPendingResult, processDetailId: options.processDetailId || '', resultDetailId: data._mergedResultDetailId || (merged && merged.processDetailId) || '', @@ -6723,7 +6814,10 @@ function addTimelineItem(timeline, type, options) { payloadDeferred: data._payloadDeferred === true, payloadLoaded: data._payloadDeferred !== true }); - item.dataset.toolDisplayStatus = displayState.kind === 'background_running' ? 'background_running' : (displayState.isError ? 'failed' : 'completed'); + item.dataset.toolDisplayStatus = toolDisplayStatusFromState(displayState); + if (data.executionId != null && String(data.executionId).trim() !== '') { + item.dataset.toolExecutionId = String(data.executionId).trim(); + } item.classList.add(displayState.kind === 'background_running' ? 'tool-call-running' : (displayState.isError ? 'tool-call-failed' : 'tool-call-completed')); } else if (type === 'cancelled') { const taskCancelledLabel = typeof window.t === 'function' ? window.t('chat.taskCancelled') : '任务已取消';