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(tracker): share layered Gongfeng MR payload decoding via visitGongfengMRPayload (#514)
fx-kurumi6b2b549fefec
diff --git a/internal/tracker/gongfeng_mr_payload_test.go b/internal/tracker/gongfeng_mr_payload_test.gonew file mode 100644index 00000000..e58cf97b--- /dev/null+++ b/internal/tracker/gongfeng_mr_payload_test.go@@ -0,0 +1,76 @@+package tracker++import (+ "reflect"+ "testing"+)++func visitedIIDs(raw string, stopAt int) [][]int {+ var out [][]int+ visitGongfengMRPayload(raw, func(items []gongfengListedMR) bool {+ iids := make([]int, 0, len(items))+ for _, item := range items {+ iids = append(iids, item.IID)+ }+ out = append(out, iids)+ return len(out) == stopAt+ })+ return out+}++func TestVisitGongfengMRPayloadOrder(t *testing.T) {+ for _, tc := range []struct {+ name string+ raw string+ want [][]int+ }{+ // A wrapped list also decodes as a bare object (iid 0) with empty items.+ {"wrapped list", `{"data":[{"iid":1},{"iid":2}]}`, [][]int{{1, 2}, {}, {0}}},+ {"wrapped object", `{"data":{"iid":3}}`, [][]int{{3}, {}, {0}}},+ {"items", `{"items":[{"iid":4}]}`, [][]int{{4}, {0}}},+ {"bare list", `[{"iid":5},{"iid":6}]`, [][]int{{5, 6}}},+ {"bare object", `{"iid":7}`, [][]int{{}, {7}}},+ {"invalid", `not json`, nil},+ } {+ t.Run(tc.name, func(t *testing.T) {+ if got := visitedIIDs(tc.raw, -1); !reflect.DeepEqual(got, tc.want) {+ t.Fatalf("visited %v, want %v", got, tc.want)+ }+ })+ }+}++func TestVisitGongfengMRPayloadStops(t *testing.T) {+ if got := visitedIIDs(`{"data":[{"iid":1}]}`, 1); !reflect.DeepEqual(got, [][]int{{1}}) {+ t.Fatalf("visited %v, want stop after first list", got)+ }+}++func TestGongfengMRPayloadCallers(t *testing.T) {+ for _, raw := range []string{+ `{"data":[{"id":90,"iid":9,"state":"opened","target_branch":"main"}]}`,+ `{"data":{"id":90,"iid":9,"state":"opened","target_branch":"main"}}`,+ `{"items":[{"id":90,"iid":9,"state":"opened","target_branch":"main"}]}`,+ `[{"id":90,"iid":9,"state":"opened","target_branch":"main"}]`,+ `{"id":90,"iid":9,"state":"opened","target_branch":"main"}`,+ } {+ if state, target, _ := parseGongfengMRDetails(raw, 9); state != "opened" || target != "main" {+ t.Fatalf("%s: details state=%q target=%q", raw, state, target)+ }+ if id, iid, ok := parseGongfengOpenMR(raw, "main"); !ok || id != 90 || iid != 9 {+ t.Fatalf("%s: open MR id=%d iid=%d ok=%v", raw, id, iid, ok)+ }+ if _, _, ok := parseGongfengOpenMR(raw, "release"); ok {+ t.Fatalf("%s: open MR should skip other target branch", raw)+ }+ if records := parseGongfengMRRecords(raw); len(records) != 1 || records[0].IID != 9 {+ t.Fatalf("%s: records=%+v", raw, records)+ }+ }+ if state, _, _ := parseGongfengMRDetails(`{"data":[{"iid":1,"state":"merged"}]}`, 2); state != "" {+ t.Fatalf("other iid should not match, got %q", state)+ }+ if _, _, ok := parseGongfengOpenMR(`{"data":[{"iid":1,"state":"merged"}]}`, ""); ok {+ t.Fatal("merged MR is not open")+ }+}diff --git a/internal/tracker/merge_mr.go b/internal/tracker/merge_mr.goindex 8d643342..d3668699 100644--- a/internal/tracker/merge_mr.go+++ b/internal/tracker/merge_mr.go@@ -211,29 +211,10 @@ func parseGongfengMRRecords(raw string) []gongfengListedMR {out = append(out, item)}}- var wrapped struct {- Data json.RawMessage `json:"data"`- Items []gongfengListedMR `json:"items"`- }- if json.Unmarshal([]byte(raw), &wrapped) == nil {- var list []gongfengListedMR- if json.Unmarshal(wrapped.Data, &list) == nil {- add(list)- }- var one gongfengListedMR- if json.Unmarshal(wrapped.Data, &one) == nil {- add([]gongfengListedMR{one})- }- add(wrapped.Items)- }- var list []gongfengListedMR- if json.Unmarshal([]byte(raw), &list) == nil {- add(list)- }- var one gongfengListedMR- if json.Unmarshal([]byte(raw), &one) == nil {- add([]gongfengListedMR{one})- }+ visitGongfengMRPayload(raw, func(items []gongfengListedMR) bool {+ add(items)+ return false+ })return out}@@ -283,42 +264,40 @@ func parseGongfengOpenMR(raw, wantTarget string) (globalID, iid int, ok bool) {}return 0, 0, false}- return decodeGongfengMRList(raw, first)+ visitGongfengMRPayload(raw, func(items []gongfengListedMR) bool {+ globalID, iid, ok = first(items)+ return ok+ })+ return globalID, iid, ok}-func decodeGongfengMRList(raw string, first func([]gongfengListedMR) (int, int, bool)) (globalID, iid int, ok bool) {+// visitGongfengMRPayload hands each candidate MR list of a search_merge_request+// payload to visit, in order: {"data":[...]}, {"data":{...}}, {"items":[...]},+// a bare array, then a bare object. It stops as soon as visit returns true.+func visitGongfengMRPayload(raw string, visit func([]gongfengListedMR) bool) {var wrapped struct {Data json.RawMessage `json:"data"`Items []gongfengListedMR `json:"items"`}if json.Unmarshal([]byte(raw), &wrapped) == nil {var list []gongfengListedMR- if json.Unmarshal(wrapped.Data, &list) == nil {- if id, miid, found := first(list); found {- return id, miid, true- }+ if json.Unmarshal(wrapped.Data, &list) == nil && visit(list) {+ return}var one gongfengListedMR- if json.Unmarshal(wrapped.Data, &one) == nil {- if id, miid, found := first([]gongfengListedMR{one}); found {- return id, miid, true- }+ if json.Unmarshal(wrapped.Data, &one) == nil && visit([]gongfengListedMR{one}) {+ return}- if id, miid, found := first(wrapped.Items); found {- return id, miid, true+ if visit(wrapped.Items) {+ return}}var list []gongfengListedMR- if json.Unmarshal([]byte(raw), &list) == nil {- if id, miid, found := first(list); found {- return id, miid, true- }+ if json.Unmarshal([]byte(raw), &list) == nil && visit(list) {+ return}var one gongfengListedMRif json.Unmarshal([]byte(raw), &one) == nil {- if id, miid, found := first([]gongfengListedMR{one}); found {- return id, miid, true- }+ visit([]gongfengListedMR{one})}- return 0, 0, false}diff --git a/internal/tracker/mr_state_lookup.go b/internal/tracker/mr_state_lookup.goindex 3c63ebfb..83705499 100644--- a/internal/tracker/mr_state_lookup.go+++ b/internal/tracker/mr_state_lookup.go@@ -67,40 +67,11 @@ func parseGongfengMRDetails(raw string, wantIID int) (state, targetBranch string}return "", "", time.Time{}}- var wrapped struct {- Data json.RawMessage `json:"data"`- Items []gongfengListedMR `json:"items"`- }- if json.Unmarshal([]byte(raw), &wrapped) == nil {- var list []gongfengListedMR- if json.Unmarshal(wrapped.Data, &list) == nil {- if parsed, target, at := try(list); parsed != "" {- return parsed, target, at- }- }- var one gongfengListedMR- if json.Unmarshal(wrapped.Data, &one) == nil {- if parsed, target, at := try([]gongfengListedMR{one}); parsed != "" {- return parsed, target, at- }- }- if parsed, target, at := try(wrapped.Items); parsed != "" {- return parsed, target, at- }- }- var list []gongfengListedMR- if json.Unmarshal([]byte(raw), &list) == nil {- if parsed, target, at := try(list); parsed != "" {- return parsed, target, at- }- }- var one gongfengListedMR- if json.Unmarshal([]byte(raw), &one) == nil {- if parsed, target, at := try([]gongfengListedMR{one}); parsed != "" {- return parsed, target, at- }- }- return "", "", time.Time{}+ visitGongfengMRPayload(raw, func(items []gongfengListedMR) bool {+ state, targetBranch, mergedAt = try(items)+ return state != ""+ })+ return state, targetBranch, mergedAt}func parseGongfengSourceCommit(raw string, wantIID int) string {