From 3226af322cb7c7f7a93a91e98651538b1bec54ee Mon Sep 17 00:00:00 2001 From: Peter Stone Date: Tue, 10 Mar 2026 17:16:49 +0000 Subject: task: promote validTransitions to package-level var; fix ADR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hoists the map out of ValidTransition so it's not reallocated on every call. Adds missing CANCELLED→QUEUED and BUDGET_EXCEEDED→QUEUED entries to the ADR transition table to match the implemented state machine. Co-Authored-By: Claude Sonnet 4.6 --- internal/task/task.go | 37 +++++++++++++++++++++---------------- internal/task/task_test.go | 1 + 2 files changed, 22 insertions(+), 16 deletions(-) (limited to 'internal') diff --git a/internal/task/task.go b/internal/task/task.go index c0aa036..9968b15 100644 --- a/internal/task/task.go +++ b/internal/task/task.go @@ -52,10 +52,10 @@ type Task struct { ID string `yaml:"id" json:"id"` ParentTaskID string `yaml:"parent_task_id" json:"parent_task_id"` Name string `yaml:"name" json:"name"` - Description string `yaml:"description" json:"description"` - Agent AgentConfig `yaml:"agent" json:"agent"` - Timeout Duration `yaml:"timeout" json:"timeout"` - Retry RetryConfig `yaml:"retry" json:"retry"` + Description string `yaml:"description" json:"description"` + Agent AgentConfig `yaml:"agent" json:"agent"` + Timeout Duration `yaml:"timeout" json:"timeout"` + Retry RetryConfig `yaml:"retry" json:"retry"` Priority Priority `yaml:"priority" json:"priority"` Tags []string `yaml:"tags" json:"tags"` DependsOn []string `yaml:"depends_on" json:"depends_on"` @@ -93,20 +93,25 @@ type BatchFile struct { Tasks []Task `yaml:"tasks"` } +// validTransitions maps each state to the set of states it may transition into. +// Terminal state COMPLETED has no outgoing edges. +// CANCELLED, FAILED, TIMED_OUT, and BUDGET_EXCEEDED all allow re-entry at QUEUED +// (restart or retry). +var validTransitions = map[State][]State{ + StatePending: {StateQueued, StateCancelled}, + StateQueued: {StateRunning, StateCancelled}, + StateRunning: {StateReady, StateCompleted, StateFailed, StateTimedOut, StateCancelled, StateBudgetExceeded, StateBlocked}, + StateReady: {StateCompleted, StatePending}, + StateFailed: {StateQueued}, // retry + StateTimedOut: {StateQueued}, // retry or resume + StateCancelled: {StateQueued}, // restart + StateBudgetExceeded: {StateQueued}, // retry + StateBlocked: {StateQueued, StateReady}, +} + // ValidTransition returns true if moving from the current state to next is allowed. func ValidTransition(from, to State) bool { - transitions := map[State][]State{ - StatePending: {StateQueued, StateCancelled}, - StateQueued: {StateRunning, StateCancelled}, - StateRunning: {StateReady, StateCompleted, StateFailed, StateTimedOut, StateCancelled, StateBudgetExceeded, StateBlocked}, - StateReady: {StateCompleted, StatePending}, - StateFailed: {StateQueued}, // retry - StateTimedOut: {StateQueued}, // retry - StateCancelled: {StateQueued}, // restart - StateBudgetExceeded: {StateQueued}, // retry - StateBlocked: {StateQueued, StateReady}, // answer received → re-queue as resume execution - } - for _, allowed := range transitions[from] { + for _, allowed := range validTransitions[from] { if allowed == to { return true } diff --git a/internal/task/task_test.go b/internal/task/task_test.go index 637baf5..9873084 100644 --- a/internal/task/task_test.go +++ b/internal/task/task_test.go @@ -26,6 +26,7 @@ func TestValidTransition_AllowedTransitions(t *testing.T) { {"blocked to queued (answer resume)", StateBlocked, StateQueued}, {"blocked to ready (parent unblocked by subtasks)", StateBlocked, StateReady}, {"budget exceeded to queued (retry)", StateBudgetExceeded, StateQueued}, + {"cancelled to queued (restart)", StateCancelled, StateQueued}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { -- cgit v1.2.3