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
【架构优化】合并 tracker/github.go 中重复的 PR 已合并判断与 #编号 引用拼接 (#290)
fx-kurumi9bdb8028d1dc
diff --git a/internal/tracker/github.go b/internal/tracker/github.goindex 75489fe4..b4a6ec2d 100644--- a/internal/tracker/github.go+++ b/internal/tracker/github.go@@ -96,9 +96,16 @@ type githubPull struct {} `json:"base"`}+// merged reports whether GitHub considers the pull request merged; either+// flag is enough because list responses may omit "merged".+func (p githubPull) merged() bool { return p.Merged || p.MergedAt != nil }++// ref is the "#N" reference returned to delivery callers.+func (p githubPull) ref() string { return "#" + strconv.Itoa(p.Number) }+func (p githubPull) delivery(project string) domain.DeliveryMR {state := "opened"- if p.Merged || p.MergedAt != nil {+ if p.merged() {state = "merged"} else if p.State == "closed" {state = "closed"@@ -158,8 +165,8 @@ func (s *Service) githubMergeBranch(project, branch, target, title, descriptionif err != nil {return "", err}- if found && (p.Merged || p.MergedAt != nil) {- return "#" + strconv.Itoa(p.Number), nil+ if found && p.merged() {+ return p.ref(), nil}if !found || p.State == "closed" {if target == "" {@@ -181,7 +188,7 @@ func (s *Service) githubMergeBranch(project, branch, target, title, descriptionif !result.Merged {return "", fmt.Errorf("GitHub did not merge pull request #%d", p.Number)}- return "#" + strconv.Itoa(p.Number), nil+ return p.ref(), nil}func (s *Service) pullGitHubIssues(store IssueStoreAdapter, repo domain.Repository) (int, error) {diff --git a/internal/tracker/github_test.go b/internal/tracker/github_test.goindex bf335e3b..1fe8b888 100644--- a/internal/tracker/github_test.go+++ b/internal/tracker/github_test.go@@ -7,6 +7,7 @@ import ("net/http""net/http/httptest""testing"+ "time")func TestGitHubImportPreservesLocalWorkAndMergeChecksConfirmation(t *testing.T) {@@ -79,3 +80,100 @@ func TestGitHubImportPreservesLocalWorkAndMergeChecksConfirmation(t *testing.T)t.Fatalf("merge: %s %v", ref, err)}}++func TestGitHubPullMergedRefAndDeliveryState(t *testing.T) {+ at := time.Date(2026, 11, 13, 4, 0, 0, 0, time.UTC)+ cases := []struct {+ name string+ pull githubPull+ merged bool+ state string+ }{+ {"merged flag", githubPull{Number: 7, Merged: true, State: "closed"}, true, "merged"},+ {"merged_at only", githubPull{Number: 7, MergedAt: &at, State: "closed"}, true, "merged"},+ {"closed unmerged", githubPull{Number: 7, State: "closed"}, false, "closed"},+ {"open", githubPull{Number: 7, State: "open"}, false, "opened"},+ }+ for _, c := range cases {+ if got := c.pull.merged(); got != c.merged {+ t.Fatalf("%s: merged()=%v want %v", c.name, got, c.merged)+ }+ if got := c.pull.delivery("github:example/repo").State; got != c.state {+ t.Fatalf("%s: delivery state=%q want %q", c.name, got, c.state)+ }+ if got := c.pull.ref(); got != "#7" {+ t.Fatalf("%s: ref()=%q", c.name, got)+ }+ }+}++func TestGitHubMergeBranchShortCircuitsMergedPullAndReopensClosed(t *testing.T) {+ st, err := repo.OpenTest()+ if err != nil {+ t.Fatal(err)+ }+ t.Cleanup(st.Close)+ if err := st.PutUser(domain.User{LoginName: "github-owner", GitToken: "project-owner-token"}); err != nil {+ t.Fatal(err)+ }+ u, _ := st.UserByLoginName("github-owner")+ if err := st.PutProject(domain.Project{ID: "public", Name: "Public", OwnerID: u.ID}); err != nil {+ t.Fatal(err)+ }+ r := domain.Repository{ID: "github-repo", ProjectID: "public", Provider: "github", Name: "repo", GongfengProjectID: "github:example/repo", DefaultBranch: "main", WebURL: "https://github.com/example/repo"}+ if err := st.PutRepository(r); err != nil {+ t.Fatal(err)+ }+ pulls := map[string]string{+ "merged-flag": `[{"number":11,"state":"closed","merged":true,"head":{"ref":"merged-flag","sha":"a"},"base":{"ref":"main"}}]`,+ "merged-at": `[{"number":12,"state":"closed","merged_at":"2026-11-13T04:00:00Z","head":{"ref":"merged-at","sha":"b"},"base":{"ref":"main"}}]`,+ "closed": `[{"number":13,"state":"closed","head":{"ref":"closed","sha":"c"},"base":{"ref":"main"}}]`,+ }+ var writes []string+ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ w.Header().Set("Content-Type", "application/json")+ switch {+ case r.Method == "GET" && r.URL.Path == "/repos/example/repo/pulls":+ head := r.URL.Query().Get("head")+ if r.URL.Query().Get("base") != "main" {+ t.Errorf("findPull must filter by target base, got %q", r.URL.RawQuery)+ }+ _, _ = w.Write([]byte(pulls[head[len("example:"):]]))+ case r.Method == "POST" && r.URL.Path == "/repos/example/repo/pulls":+ writes = append(writes, "POST")+ _, _ = w.Write([]byte(`{"number":21,"state":"open","head":{"ref":"closed","sha":"new-head"},"base":{"ref":"main"}}`))+ case r.Method == "PUT" && r.URL.Path == "/repos/example/repo/pulls/21/merge":+ writes = append(writes, "PUT 21")+ var body map[string]any+ _ = json.NewDecoder(r.Body).Decode(&body)+ if body["sha"] != "new-head" {+ t.Errorf("merge must bind to the reopened pull head, got %v", body["sha"])+ }+ _ = json.NewEncoder(w).Encode(map[string]bool{"merged": true})+ default:+ t.Errorf("unexpected request %s %s", r.Method, r.URL.Path)+ w.WriteHeader(404)+ }+ }))+ defer srv.Close()+ s := NewService()+ s.ConfigureWithStore(domain.SyncConfig{}, st)+ s.githubAPIBase = srv.URL++ for branch, want := range map[string]string{"merged-flag": "#11", "merged-at": "#12"} {+ ref, err := s.EnsureAndMergeBranchMR(r.GongfengProjectID, branch, "main", "Title", "")+ if err != nil || ref != want {+ t.Fatalf("%s: ref=%q err=%v want %q", branch, ref, err, want)+ }+ }+ if len(writes) != 0 {+ t.Fatalf("already merged pulls must not be re-created or re-merged: %v", writes)+ }+ ref, err := s.EnsureAndMergeBranchMR(r.GongfengProjectID, "closed", "main", "", "")+ if err != nil || ref != "#21" {+ t.Fatalf("closed unmerged pull: ref=%q err=%v want #21", ref, err)+ }+ if len(writes) != 2 || writes[0] != "POST" || writes[1] != "PUT 21" {+ t.Fatalf("closed unmerged pull must be re-opened then merged: %v", writes)+ }+}