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
【架构优化】从 markIssueDelivered 中拆出交付守卫判断 issueDeliverySkipped (#791)
fx-kurumiba1059ddf83c
diff --git a/internal/repo/delivery.go b/internal/repo/delivery.goindex 4840f200..82ef7930 100644--- a/internal/repo/delivery.go+++ b/internal/repo/delivery.go@@ -206,30 +206,10 @@ func (r *DeliveryRepo) markIssueDelivered(issueID string, mrs []domain.DeliveryMif !ok {return nil}- // A manually closed issue is an explicit terminal state. Background MR- // polling and stale SOP callbacks must not change it.- if issue.ManuallyClosed() {- return nil- }if deliveredAt.IsZero() {deliveredAt = time.Now().UTC()}- // A human reopen must stay open until a new SOP succeeds. MR poll / reconcile- // uses "now" as checkedAt and would otherwise immediately lock the item again.- if strings.EqualFold(issue.DeliveryState, "reopened") && !fromSOP {- return nil- }- // Poll / reconcile may see leftover MRs from earlier SOP runs. Those rows- // stay in mr_delivery_states for analytics, but must not replace the- // work item's delivery MRs.- if !fromSOP {- for _, mr := range mrs {- if len(issue.DeliveryMRList()) > 0 && !issue.HasDeliveryMR(mr.URL) {- return nil- }- }- }- if issue.DeliveryState == "merged" && !deliveredAt.After(issue.DeliveryUpdatedAt) {+ if issueDeliverySkipped(issue, mrs, deliveredAt, fromSOP) {return nil}issue.DeliveryState = "merged"@@ -260,6 +240,32 @@ func (r *DeliveryRepo) markIssueDelivered(issueID string, mrs []domain.DeliveryMreturn r.issues.PutIssue(issue)}+// issueDeliverySkipped reports whether a delivery signal must leave the work+// item untouched. deliveredAt must already be resolved (non-zero).+func issueDeliverySkipped(issue domain.Issue, mrs []domain.DeliveryMR, deliveredAt time.Time, fromSOP bool) bool {+ // A manually closed issue is an explicit terminal state. Background MR+ // polling and stale SOP callbacks must not change it.+ if issue.ManuallyClosed() {+ return true+ }+ // A human reopen must stay open until a new SOP succeeds. MR poll / reconcile+ // uses "now" as checkedAt and would otherwise immediately lock the item again.+ if strings.EqualFold(issue.DeliveryState, "reopened") && !fromSOP {+ return true+ }+ // Poll / reconcile may see leftover MRs from earlier SOP runs. Those rows+ // stay in mr_delivery_states for analytics, but must not replace the+ // work item's delivery MRs.+ if !fromSOP {+ for _, mr := range mrs {+ if len(issue.DeliveryMRList()) > 0 && !issue.HasDeliveryMR(mr.URL) {+ return true+ }+ }+ }+ return issue.DeliveryState == "merged" && !deliveredAt.After(issue.DeliveryUpdatedAt)+}+func (r *DeliveryRepo) ReopenDeliveredIssue(issueID string) (domain.Issue, error) {issue, ok := r.issues.Issue(strings.TrimSpace(issueID))if !ok {diff --git a/internal/repo/delivery_skip_test.go b/internal/repo/delivery_skip_test.gonew file mode 100644index 00000000..3af3ec9b--- /dev/null+++ b/internal/repo/delivery_skip_test.go@@ -0,0 +1,49 @@+package repo++import (+ "testing"+ "time"++ "agentflow/internal/domain"+)++func TestIssueDeliverySkipped(t *testing.T) {+ const (+ ownURL = "https://git.example.com/org/repo/merge_requests/286"+ otherURL = "https://git.example.com/org/repo/merge_requests/282"+ )+ at := time.Date(2026, 11, 14, 10, 0, 0, 0, time.UTC)+ own := []domain.DeliveryMR{{URL: ownURL}}+ other := []domain.DeliveryMR{{URL: otherURL}}+ withOwn := domain.Issue{ID: "i-1", Status: "in_review", DeliveryMRs: own}++ cases := []struct {+ name string+ issue domain.Issue+ mrs []domain.DeliveryMR+ at time.Time+ fromSOP bool+ want bool+ }{+ {name: "manually closed blocks poll", issue: domain.Issue{Status: "closed"}, mrs: own, at: at, want: true},+ {name: "manually closed blocks SOP", issue: domain.Issue{Status: "closed"}, mrs: own, at: at, fromSOP: true, want: true},+ {name: "externally closed is not manual", issue: domain.Issue{Status: "closed", CloseSource: "external"}, mrs: own, at: at, want: false},+ {name: "reopened blocks poll", issue: domain.Issue{DeliveryState: "Reopened"}, mrs: own, at: at, want: true},+ {name: "reopened allows SOP", issue: domain.Issue{DeliveryState: "reopened"}, mrs: own, at: at, fromSOP: true, want: false},+ {name: "leftover MR blocks poll", issue: withOwn, mrs: other, at: at, want: true},+ {name: "leftover MR allowed for SOP", issue: withOwn, mrs: other, at: at, fromSOP: true, want: false},+ {name: "own MR allows poll", issue: withOwn, mrs: own, at: at, want: false},+ {name: "no recorded MRs allows poll", issue: domain.Issue{}, mrs: other, at: at, want: false},+ {name: "merged with older signal", issue: domain.Issue{DeliveryState: "merged", DeliveryUpdatedAt: at}, mrs: nil, at: at.Add(-time.Minute), want: true},+ {name: "merged with same time", issue: domain.Issue{DeliveryState: "merged", DeliveryUpdatedAt: at}, mrs: nil, at: at, want: true},+ {name: "merged with newer signal", issue: domain.Issue{DeliveryState: "merged", DeliveryUpdatedAt: at}, mrs: nil, at: at.Add(time.Minute), want: false},+ {name: "merged older blocks SOP too", issue: domain.Issue{DeliveryState: "merged", DeliveryUpdatedAt: at}, mrs: nil, at: at.Add(-time.Minute), fromSOP: true, want: true},+ }+ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ if got := issueDeliverySkipped(tc.issue, tc.mrs, tc.at, tc.fromSOP); got != tc.want {+ t.Fatalf("issueDeliverySkipped() = %v, want %v", got, tc.want)+ }+ })+ }+}diff --git a/internal/repo/delivery_skip_wiring_test.go b/internal/repo/delivery_skip_wiring_test.gonew file mode 100644index 00000000..44352e95--- /dev/null+++ b/internal/repo/delivery_skip_wiring_test.go@@ -0,0 +1,96 @@+package repo++import (+ "testing"+ "time"++ "agentflow/internal/domain"+)++// The time comparison only protects an already merged delivery; any other+// state (including a human reopen that refreshed DeliveryUpdatedAt) must not+// be skipped just because the signal is older than the last delivery update.+func TestIssueDeliverySkippedOnlyComparesTimeForMerged(t *testing.T) {+ at := time.Date(2026, 11, 14, 10, 0, 0, 0, time.UTC)+ later := at.Add(time.Hour)+ cases := []struct {+ name string+ issue domain.Issue+ fromSOP bool+ }{+ {name: "no delivery state", issue: domain.Issue{Status: "in_review", DeliveryUpdatedAt: later}},+ {name: "opened delivery state", issue: domain.Issue{Status: "in_review", DeliveryState: "opened", DeliveryUpdatedAt: later}},+ {name: "reopened via SOP", issue: domain.Issue{Status: "todo", DeliveryState: "reopened", DeliveryUpdatedAt: later}, fromSOP: true},+ }+ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ if issueDeliverySkipped(tc.issue, nil, at, tc.fromSOP) {+ t.Fatalf("older signal must not skip a %q delivery", tc.issue.DeliveryState)+ }+ })+ }+}++func TestMarkIssueDeliveredZeroTimeUsesNow(t *testing.T) {+ s, err := OpenTest()+ if err != nil {+ t.Fatal(err)+ }+ t.Cleanup(s.Close)+ past := time.Now().UTC().Add(-time.Hour)+ issue := domain.Issue{+ ID: "tapd-zero", ProjectID: "platform", Source: "tapd",+ Status: "done", DeliveryState: "merged", DeliveryUpdatedAt: past,+ }+ if err := s.PutIssue(issue); err != nil {+ t.Fatal(err)+ }+ before := time.Now().UTC().Add(-time.Second)+ if err := s.MarkIssueDelivered(issue.ID, "https://git.example.com/org/repo/merge_requests/7", time.Time{}); err != nil {+ t.Fatal(err)+ }+ got, _ := s.Issue(issue.ID)+ if got.DeliveryUpdatedAt.Before(before) {+ t.Fatalf("zero deliveredAt must default to now, got DeliveryUpdatedAt=%s (before %s)", got.DeliveryUpdatedAt, before)+ }+ if !got.DeliveryLocked() {+ t.Fatalf("issue should stay locked after delivery: %+v", got)+ }+}++func TestMarkIssueDeliveredPollKeepsOwnMRAgainstLeftover(t *testing.T) {+ s, err := OpenTest()+ if err != nil {+ t.Fatal(err)+ }+ t.Cleanup(s.Close)+ const (+ ownURL = "https://git.example.com/org/repo/merge_requests/286"+ leftoverURL = "https://git.example.com/org/repo/merge_requests/282"+ )+ issue := domain.Issue{ID: "tapd-own", ProjectID: "platform", Source: "tapd", Status: "in_review"}+ if err := s.PutIssue(issue); err != nil {+ t.Fatal(err)+ }+ sopAt := time.Now().UTC().Add(-time.Hour).Truncate(time.Second)+ if err := s.MarkIssueDeliveredFromSOP(issue.ID, ownURL, sopAt); err != nil {+ t.Fatal(err)+ }+ delivered, _ := s.Issue(issue.ID)+ if !delivered.HasDeliveryMR(ownURL) {+ t.Fatalf("SOP delivery should record its MR: %+v", delivered.DeliveryMRList())+ }++ // A poll reporting a leftover MR from an earlier run, with a newer+ // timestamp, must leave the work item untouched.+ if err := s.MarkIssueDelivered(issue.ID, leftoverURL, time.Now().UTC()); err != nil {+ t.Fatal(err)+ }+ got, _ := s.Issue(issue.ID)+ if !got.DeliveryUpdatedAt.Equal(delivered.DeliveryUpdatedAt) {+ t.Fatalf("leftover MR poll touched delivery time: %s -> %s", delivered.DeliveryUpdatedAt, got.DeliveryUpdatedAt)+ }+ if got.HasDeliveryMR(leftoverURL) || len(got.DeliveryMRList()) != len(delivered.DeliveryMRList()) {+ t.Fatalf("leftover MR leaked into delivery MRs: %+v", got.DeliveryMRList())+ }+}