Skip to content

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.

refactor(engine): 删除 isTerminalRunStatus 重复实现,复用 domain.TerminalRunStatus (#501)

fx-kurumi7c51f0e59112
diff --git a/internal/engine/engine_observe.go b/internal/engine/engine_observe.go
index ad621523..acd781e0 100644
--- a/internal/engine/engine_observe.go
+++ b/internal/engine/engine_observe.go
@@ -106,7 +106,7 @@ func (e *Engine) takePendingObservations(runID string) []pendingObservation {
}
func (e *Engine) applyObservation(r *domain.Run, nodeID string, observation domain.TelemetryEvent) {
- if isTerminalRunStatus(r.Status) && observation.Name != "sandbox.closed" {
+ if domain.TerminalRunStatus(r.Status) && observation.Name != "sandbox.closed" {
return
}
// Worker/OTLP retries must be idempotent. Preserve a producer supplied ID
diff --git a/internal/engine/lifecycle.go b/internal/engine/lifecycle.go
index c7761c63..23eb9c59 100644
--- a/internal/engine/lifecycle.go
+++ b/internal/engine/lifecycle.go
@@ -52,15 +52,6 @@ func resetInFlightNodesForResume(r *domain.Run, activity string) {
}
}
-func isTerminalRunStatus(status string) bool {
- switch status {
- case "succeeded", "failed", "cancelled":
- return true
- default:
- return false
- }
-}
-
func hasRunningNode(r domain.Run) bool {
for _, nr := range r.Nodes {
if nr != nil && (nr.Status == "running" || nr.Status == "pending_input") {
@@ -158,7 +149,7 @@ func (e *Engine) forceTerminate(runID, status, msg string) {
nr.FinishedAt = now
}
}
- if status == "cancelled" || !isTerminalRunStatus(r.Status) {
+ if status == "cancelled" || !domain.TerminalRunStatus(r.Status) {
r.Status = status
e.event(r, "", "run."+status, msg)
}
diff --git a/internal/engine/node_execute.go b/internal/engine/node_execute.go
index b46d984f..23a24f62 100644
--- a/internal/engine/node_execute.go
+++ b/internal/engine/node_execute.go
@@ -88,7 +88,7 @@ func (e *Engine) execute(ctx context.Context, runID string) {
default:
}
r, ok := e.repo.RunState(runID)
- if !ok || isTerminalRunStatus(r.Status) || r.IsWorkspace() || r.HistoricalGroup() {
+ if !ok || domain.TerminalRunStatus(r.Status) || r.IsWorkspace() || r.HistoricalGroup() {
return
}
if r.CancelRequested {
diff --git a/internal/engine/node_outcome.go b/internal/engine/node_outcome.go
index 5395c315..6a51cd9e 100644
--- a/internal/engine/node_outcome.go
+++ b/internal/engine/node_outcome.go
@@ -233,7 +233,7 @@ func (e *Engine) parkForResumeAt(runID string, generation int, message string) {
if r.Generation != generation || ((r.OwnerInstanceID != "" || r.Generation > 0) && !e.ownsRun(*r)) {
return
}
- if isTerminalRunStatus(r.Status) {
+ if domain.TerminalRunStatus(r.Status) {
return
}
resetInFlightNodesForResume(r, "执行实例退出,等待恢复")
@@ -330,7 +330,7 @@ func (e *Engine) finishAt(id string, generation int, status, msg string) {
ignored = true
return
}
- if isTerminalRunStatus(r.Status) {
+ if domain.TerminalRunStatus(r.Status) {
ignored = true
return
}
diff --git a/internal/engine/run_events.go b/internal/engine/run_events.go
index 6bd9db60..95041e20 100644
--- a/internal/engine/run_events.go
+++ b/internal/engine/run_events.go
@@ -19,7 +19,7 @@ func (e *Engine) event(r *domain.Run, nodeID, t, msg string) {
}
func (e *Engine) observe(runID, nodeID string, observation domain.TelemetryEvent) {
- if current, ok := e.repo.RunState(runID); ok && isTerminalRunStatus(current.Status) && observation.Name != "sandbox.closed" {
+ if current, ok := e.repo.RunState(runID); ok && domain.TerminalRunStatus(current.Status) && observation.Name != "sandbox.closed" {
return
}
e.enqueueObservation(runID, nodeID, observation)
diff --git a/internal/engine/run_ops.go b/internal/engine/run_ops.go
index c082f1b4..39eb87c1 100644
--- a/internal/engine/run_ops.go
+++ b/internal/engine/run_ops.go
@@ -58,7 +58,7 @@ func (e *Engine) Cancel(runID string) error {
return fmt.Errorf("run not found")
}
if !isLiveStatus(r.Status) {
- if isTerminalRunStatus(r.Status) && hasRunningNode(r) {
+ if domain.TerminalRunStatus(r.Status) && hasRunningNode(r) {
e.forceTerminate(runID, "cancelled", "流水线已取消")
return nil
}
@@ -822,7 +822,7 @@ func (e *Engine) RefreshRunSOP(runID string) error {
if !ok {
return fmt.Errorf("run not found")
}
- if r.Status == "running" || hasRunningNode(r) || (r.Status != "waiting" && !isTerminalRunStatus(r.Status)) {
+ if r.Status == "running" || hasRunningNode(r) || (r.Status != "waiting" && !domain.TerminalRunStatus(r.Status)) {
return fmt.Errorf("only a stopped run can update its SOP")
}
if e.executes() {
diff --git a/internal/engine/sop_node.go b/internal/engine/sop_node.go
index da64bef7..f1898f86 100644
--- a/internal/engine/sop_node.go
+++ b/internal/engine/sop_node.go
@@ -233,7 +233,7 @@ func (e *Engine) waitChildRun(ctx context.Context, parentID, childID string) (do
if !ok {
return domain.Run{}, fmt.Errorf("子 SOP 运行消失")
}
- if isTerminalRunStatus(child.Status) {
+ if domain.TerminalRunStatus(child.Status) {
return child, nil
}
}
diff --git a/internal/engine/sop_node_test.go b/internal/engine/sop_node_test.go
index 549fefb0..05e0eee8 100644
--- a/internal/engine/sop_node_test.go
+++ b/internal/engine/sop_node_test.go
@@ -335,7 +335,7 @@ func TestSOPNodeRepointedWhilePausedStartsNewChild(t *testing.T) {
if err := e.ResumePaused(run.ID, ""); err != nil {
t.Fatal(err)
}
- got := waitRun(t, s, run.ID, 5*time.Second, func(got domain.Run) bool { return isTerminalRunStatus(got.Status) })
+ got := waitRun(t, s, run.ID, 5*time.Second, func(got domain.Run) bool { return domain.TerminalRunStatus(got.Status) })
if got.Status != "succeeded" {
t.Fatalf("parent = %s", got.Status)
}
@@ -527,7 +527,7 @@ func TestSOPNodeFollowsCancelledChildOnResume(t *testing.T) {
if err := e.ResumePaused(parentID, ""); err != nil {
t.Fatal(err)
}
- got := waitRun(t, s, parentID, 5*time.Second, func(got domain.Run) bool { return isTerminalRunStatus(got.Status) })
+ got := waitRun(t, s, parentID, 5*time.Second, func(got domain.Run) bool { return domain.TerminalRunStatus(got.Status) })
if got.Status != "failed" || childRunsOf(s, parentID) != 1 {
t.Fatalf("parent=%s children=%d, want failed with the one cancelled child", got.Status, childRunsOf(s, parentID))
}
@@ -550,7 +550,7 @@ func TestSOPRetryEarlierNodeCancelsLiveChild(t *testing.T) {
if err := os.WriteFile(marker, nil, 0o600); err != nil {
t.Fatal(err)
}
- got := waitRun(t, s, parentID, 5*time.Second, func(got domain.Run) bool { return isTerminalRunStatus(got.Status) })
+ got := waitRun(t, s, parentID, 5*time.Second, func(got domain.Run) bool { return domain.TerminalRunStatus(got.Status) })
if got.Status != "succeeded" || got.Nodes["sub"].ChildRunID == oldChild {
t.Fatalf("parent=%s child=%s", got.Status, got.Nodes["sub"].ChildRunID)
}
diff --git a/internal/engine/state_helpers_cases_test.go b/internal/engine/state_helpers_cases_test.go
index c5e430fb..3717c38a 100644
--- a/internal/engine/state_helpers_cases_test.go
+++ b/internal/engine/state_helpers_cases_test.go
@@ -32,7 +32,7 @@ func TestLifecycleResetSettleAndForceTerminate(t *testing.T) {
}
resetNodeForResume(&run, nil, "x")
resetNodeForResume(&run, run.Nodes["done"], "x")
- if !isTerminalRunStatus("cancelled") || isTerminalRunStatus("waiting") || hasRunningNode(run) {
+ if !domain.TerminalRunStatus("cancelled") || domain.TerminalRunStatus("waiting") || hasRunningNode(run) {
t.Fatal("status helpers")
}
run.Nodes["script"].Status, run.Nodes["agent"].Status = "succeeded", "succeeded"