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
refactor(repo): extract overlayIssueMRState from applyMRDeliveryStates (#481)
fx-kurumibd867a90d1ed
diff --git a/internal/repo/delivery.go b/internal/repo/delivery.goindex 69e23a7b..d6748ad6 100644--- a/internal/repo/delivery.go+++ b/internal/repo/delivery.go@@ -1228,6 +1228,26 @@ func (r *DeliveryRepo) buildDeliveries(filter domain.AnalyticsFilter, now time.Treturn out}+// overlayIssueMRState merges the state the work item itself recorded for+// the MR at url into the looked-up state: an empty/unknown lookup falls back+// to the recorded state, otherwise the recorded state may only upgrade it+// (see domain.EffectiveAnalyticsMRState).+func overlayIssueMRState(state, url string, own []domain.DeliveryMR) string {+ for _, mr := range own {+ if !domain.SameGongfengMR(mr.URL, url) {+ continue+ }+ if state == "" || state == "unknown" {+ if mr.State != "" {+ return mr.State+ }+ return state+ }+ return domain.EffectiveAnalyticsMRState(state, mr.State)+ }+ return state+}+func (r *DeliveryRepo) applyMRDeliveryStates(items []domain.AnalyticsDelivery, mrsByIssue map[string][]mrRef, issues map[string]domain.Issue) {if len(items) == 0 {return@@ -1288,6 +1308,7 @@ func (r *DeliveryRepo) applyMRDeliveryStates(items []domain.AnalyticsDelivery, mpreferProject, preferIID = p, iid}}+ own := issues[items[i].IssueID].DeliveryMRList()var best *mrRefbestState := ""items[i].MRs = nil@@ -1302,18 +1323,7 @@ func (r *DeliveryRepo) applyMRDeliveryStates(items []domain.AnalyticsDelivery, mif ok {mr.State = classify(st)}- for _, own := range issues[items[i].IssueID].DeliveryMRList() {- if domain.SameGongfengMR(own.URL, mr.URL) {- if mr.State == "" || mr.State == "unknown" {- if own.State != "" {- mr.State = own.State- }- } else {- mr.State = domain.EffectiveAnalyticsMRState(mr.State, own.State)- }- break- }- }+ mr.State = overlayIssueMRState(mr.State, mr.URL, own)key := domain.MRDeliveryKey{Project: strings.ToLower(ref.project), IID: ref.iid}if !seen[key] {items[i].MRs = append(items[i].MRs, mr)diff --git a/internal/repo/delivery_overlay_state_test.go b/internal/repo/delivery_overlay_state_test.gonew file mode 100644index 00000000..f5582370--- /dev/null+++ b/internal/repo/delivery_overlay_state_test.go@@ -0,0 +1,38 @@+package repo++import (+ "testing"++ "agentflow/internal/domain"+)++func TestOverlayIssueMRState(t *testing.T) {+ const url = "https://git.example.com/org/repo/-/merge_requests/286"+ own := []domain.DeliveryMR{+ {URL: "https://git.example.com/org/repo/merge_requests/282", State: "closed"},+ {URL: "https://git.example.com/ORG/repo/merge_requests/286", State: "merged"},+ }+ cases := []struct {+ name string+ state string+ url string+ own []domain.DeliveryMR+ want string+ }{+ {name: "no own MRs", state: "opened", url: url, own: nil, want: "opened"},+ {name: "no matching MR", state: "unknown", url: "https://git.example.com/org/repo/merge_requests/999", own: own, want: "unknown"},+ {name: "unknown falls back to recorded", state: "unknown", url: url, own: own, want: "merged"},+ {name: "empty falls back to recorded", state: "", url: url, own: own, want: "merged"},+ {name: "empty recorded keeps unknown", state: "unknown", url: url, own: []domain.DeliveryMR{{URL: url}}, want: "unknown"},+ {name: "integrated upgraded by merged", state: "integrated", url: url, own: own, want: "merged"},+ {name: "opened not overridden", state: "opened", url: url, own: own, want: "opened"},+ {name: "first match wins", state: "unknown", url: url, own: []domain.DeliveryMR{{URL: url, State: "opened"}, {URL: url, State: "merged"}}, want: "opened"},+ }+ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ if got := overlayIssueMRState(tc.state, tc.url, tc.own); got != tc.want {+ t.Fatalf("overlayIssueMRState(%q) = %q, want %q", tc.state, got, tc.want)+ }+ })+ }+}