Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.
JavaScript agent-orchestrationagentic-workflowai-agentsai-codingclaude-codecode-reviewcodebuddycodexcoding-agentscursordeveloper-toolshuman-on-the-loopllmmcpmulti-agentsdlcself-hostedsopworkflow-automationworkflow-engine
【架构优化】从 finishAt 中拆出活动节点判断 hasActiveNode 与残留执行节点收敛 cancelRunningNodes (#825)
fx-kurumi08d7e2fafecf
diff --git a/internal/engine/node_outcome.go b/internal/engine/node_outcome.goindex 6a51cd9e..994f10cb 100644--- a/internal/engine/node_outcome.go+++ b/internal/engine/node_outcome.go@@ -339,33 +339,13 @@ func (e *Engine) finishAt(id string, generation int, status, msg string) {e.event(r, "", "run.finish_ignored", "失败节点已被打回,忽略过期的失败收尾")return}- if status == "failed" {- for _, nr := range r.Nodes {- if nr != nil && (nr.Status == "running" || nr.Status == "waiting_approval" || nr.Status == "pending_input") {- ignored = true- e.event(r, "", "run.finish_ignored", "仍有活动节点,忽略过期的失败收尾")- return- }- }+ if status == "failed" && hasActiveNode(*r) {+ ignored = true+ e.event(r, "", "run.finish_ignored", "仍有活动节点,忽略过期的失败收尾")+ return}- // 运行被取消或失败时,把仍停留在"执行中"的节点收敛为已取消。- // 否则一旦执行协程卡死(如子进程无超时阻塞),节点会残留在 running,- // 使后续重试的 resumeNodeID 既选不到失败/取消节点、也选不到就绪节点,- // 最终报 "retry node not found"。if status == "cancelled" || status == "failed" {- for nodeID, nr := range r.Nodes {- if nr == nil || nr.Status != "running" {- continue- }- nr.Status = "cancelled"- if nr.FinishedAt.IsZero() {- nr.FinishedAt = time.Now().UTC()- }- if strings.TrimSpace(nr.Activity) == "" {- nr.Activity = "运行终止时仍在执行,已收敛为已取消"- }- e.event(r, nodeID, "node.cancelled", "运行终止,节点由执行中收敛为已取消")- }+ e.cancelRunningNodes(r)}r.Status = statuse.event(r, "", "run."+status, msg)@@ -394,3 +374,34 @@ func (e *Engine) finishAt(id string, generation int, status, msg string) {e.cleanupRunWorkspace(id)}}++// hasActiveNode reports whether any node is still executing or waiting on a+// person, which makes a late failure settlement stale.+func hasActiveNode(r domain.Run) bool {+ for _, nr := range r.Nodes {+ if nr != nil && (nr.Status == "running" || nr.Status == "waiting_approval" || nr.Status == "pending_input") {+ return true+ }+ }+ return false+}++// cancelRunningNodes 在运行被取消或失败时,把仍停留在"执行中"的节点收敛为已取消。+// 否则一旦执行协程卡死(如子进程无超时阻塞),节点会残留在 running,+// 使后续重试的 resumeNodeID 既选不到失败/取消节点、也选不到就绪节点,+// 最终报 "retry node not found"。+func (e *Engine) cancelRunningNodes(r *domain.Run) {+ for nodeID, nr := range r.Nodes {+ if nr == nil || nr.Status != "running" {+ continue+ }+ nr.Status = "cancelled"+ if nr.FinishedAt.IsZero() {+ nr.FinishedAt = time.Now().UTC()+ }+ if strings.TrimSpace(nr.Activity) == "" {+ nr.Activity = "运行终止时仍在执行,已收敛为已取消"+ }+ e.event(r, nodeID, "node.cancelled", "运行终止,节点由执行中收敛为已取消")+ }+}diff --git a/internal/engine/node_outcome_finish_test.go b/internal/engine/node_outcome_finish_test.gonew file mode 100644index 00000000..6302a8ee--- /dev/null+++ b/internal/engine/node_outcome_finish_test.go@@ -0,0 +1,66 @@+package engine++import (+ "testing"+ "time"++ "agentflow/internal/domain"+)++func TestHasActiveNode(t *testing.T) {+ for _, active := range []string{"running", "waiting_approval", "pending_input"} {+ run := domain.Run{Nodes: map[string]*domain.NodeRun{+ "done": {NodeID: "done", Status: "succeeded"},+ "live": {NodeID: "live", Status: active},+ }}+ if !hasActiveNode(run) {+ t.Fatalf("%s node not treated as active", active)+ }+ }+ settled := domain.Run{Nodes: map[string]*domain.NodeRun{+ "nil": nil,+ "failed": {NodeID: "failed", Status: "failed"},+ "cancelled": {NodeID: "cancelled", Status: "cancelled"},+ "pending": {NodeID: "pending", Status: "pending"},+ }}+ if hasActiveNode(settled) {+ t.Fatal("settled nodes treated as active")+ }+ if hasActiveNode(domain.Run{}) {+ t.Fatal("run without nodes treated as active")+ }+}++func TestCancelRunningNodesConvergesOnlyRunningNodes(t *testing.T) {+ finished := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)+ run := &domain.Run{ID: "run-cancel", Nodes: map[string]*domain.NodeRun{+ "nil": nil,+ "blank": {NodeID: "blank", Status: "running"},+ "kept": {NodeID: "kept", Status: "running", FinishedAt: finished, Activity: "执行测试"},+ "failed": {NodeID: "failed", Status: "failed"},+ "waiting": {NodeID: "waiting", Status: "waiting_approval"},+ }}+ (&Engine{}).cancelRunningNodes(run)++ blank := run.Nodes["blank"]+ if blank.Status != "cancelled" || blank.FinishedAt.IsZero() || blank.Activity != "运行终止时仍在执行,已收敛为已取消" {+ t.Fatalf("blank running node = %+v", blank)+ }+ kept := run.Nodes["kept"]+ if kept.Status != "cancelled" || !kept.FinishedAt.Equal(finished) || kept.Activity != "执行测试" {+ t.Fatalf("running node with existing details = %+v", kept)+ }+ if run.Nodes["failed"].Status != "failed" || run.Nodes["waiting"].Status != "waiting_approval" {+ t.Fatalf("non-running nodes changed: failed=%q waiting=%q", run.Nodes["failed"].Status, run.Nodes["waiting"].Status)+ }+ cancelledEvents := map[string]bool{}+ for _, event := range run.Events {+ if event.Type != "node.cancelled" || event.RunID != run.ID || event.Message != "运行终止,节点由执行中收敛为已取消" {+ t.Fatalf("unexpected event %+v", event)+ }+ cancelledEvents[event.NodeID] = true+ }+ if len(run.Events) != 2 || !cancelledEvents["blank"] || !cancelledEvents["kept"] {+ t.Fatalf("events = %+v, want node.cancelled for blank and kept", run.Events)+ }+}