fix(worker): a new branch for every run, so reruns can open their PR

The draft branch was named after the job only. Rerunning a job's build
pushed to the earlier run's branch, which already had review commits, so the
push was rejected and the finished build failed at the very end. Branches
now also carry the run's time.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

cmd/gbrgames/worker.go

@@ -9,11 +9,9 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -356,18 +354,15 @@ func (c *workerConfig) progress(jobID, stage string, lines []string) bool {
 	return resp.Cancelled
 }
 
-// openPR commits the new game folder to the game's draft branch as the bot and opens a pull request to
-// main. A game has one draft at a time: an earlier draft's PR is closed and its branch deleted first.
+// openPR commits the new game folder to its own branch as the bot and opens a pull request to main.
 func (c *workerConfig) openPR(dir string, job *builderJob, res *buildResult) (string, error) {
-	branch := draftBranch(res.GameID)
-	replaced, err := c.replaceOldDrafts(res.GameID)
-	if err != nil {
-		return "", fmt.Errorf("replacing the earlier draft: %w", err)
-	}
-	summary := res.Summary
-	for _, n := range replaced {
-		summary += fmt.Sprintf("\nReplaces #%d (closed, branch deleted).\n", n)
+	short := job.ID
+	if len(short) > 8 {
+		short = short[:8]
 	}
+	// One branch per run: a rerun of the same job must not push onto the earlier run's branch, which
+	// may have gained review commits since
+	branch := draftBranch(res.GameID, short, time.Now())
 	auth := "http.extraHeader=Authorization: token " + c.botToken
 	steps := []struct {
 		name string
@@ -377,8 +372,7 @@ func (c *workerConfig) openPR(dir string, job *builderJob, res *buildResult) (st
 		{"add", []string{"add", filepath.ToSlash(res.Dir)}},
 		{"commit", []string{"-c", "user.name=" + c.botLogin, "-c", "user.email=" + c.botEmail, "commit", "-q", "-m",
 			fmt.Sprintf("feat(games): draft %s\n\nDrafted and boot-tested by the GBR builder (job %s).", job.GameName, job.ID)}},
-		// Forced: the branch is the bot's own, and whatever was on it was the draft being replaced
-		{"push", []string{"-c", auth, "push", "-q", "--force", "origin", branch}},
+		{"push", []string{"-c", auth, "push", "-q", "origin", branch}},
 	}
 	for _, s := range steps {
 		cmd := exec.Command("git", s.args...)
@@ -392,94 +386,28 @@ func (c *workerConfig) openPR(dir string, job *builderJob, res *buildResult) (st
 	if !res.Passed {
 		title = "WIP: " + title + " (did not boot yet)"
 	}
-	var pr struct {
-		HTMLURL string `json:"html_url"`
-	}
-	body := map[string]any{"title": title, "head": branch, "base": "main", "body": summary}
-	if err := c.giteaCall(http.MethodPost, "/repos/"+c.repo+"/pulls", body, &pr); err != nil {
-		return "", err
-	}
-	return pr.HTMLURL, nil
-}
-
-// replaceOldDrafts closes the game's open draft PRs and deletes their branches, so a rebuild leaves one
-// draft to review instead of a pile. Only draft/ branches for this game are touched, never anyone's other
-// work. Returns the numbers of the PRs it closed.
-func (c *workerConfig) replaceOldDrafts(gameID string) ([]int, error) {
-	var pulls []struct {
-		Number int `json:"number"`
-		Head   struct {
-			Ref string `json:"ref"`
-		} `json:"head"`
-	}
-	if err := c.giteaCall(http.MethodGet, "/repos/"+c.repo+"/pulls?state=open&limit=50", nil, &pulls); err != nil {
-		return nil, err
-	}
-	branches := map[string]bool{draftBranch(gameID): true}
-	var closed []int
-	for _, p := range pulls {
-		if !isDraftBranchOf(p.Head.Ref, gameID) {
-			continue
-		}
-		if err := c.giteaCall(http.MethodPatch, fmt.Sprintf("/repos/%s/pulls/%d", c.repo, p.Number), map[string]string{"state": "closed"}, nil); err != nil {
-			return closed, err
-		}
-		fmt.Printf("[worker] closed #%d, the earlier draft of %s\n", p.Number, gameID)
-		closed = append(closed, p.Number)
-		branches[p.Head.Ref] = true
-	}
-	for b := range branches {
-		// Gone already is fine: not every game has had a draft
-		if err := c.giteaCall(http.MethodDelete, "/repos/"+c.repo+"/branches/"+url.PathEscape(b), nil, nil); err != nil && !strings.HasPrefix(err.Error(), "HTTP 404") {
-			return closed, fmt.Errorf("deleting branch %s: %w", b, err)
-		}
-	}
-	return closed, nil
-}
-
-func draftBranch(gameID string) string {
-	return "draft/" + gameID
-}
-
-// isDraftBranchOf matches draft/<id>, and draft/<id>-<job> as the worker named them before.
-func isDraftBranchOf(ref, gameID string) bool {
-	d := draftBranch(gameID)
-	if ref == d {
-		return true
-	}
-	rest, ok := strings.CutPrefix(ref, d+"-")
-	return ok && regexp.MustCompile(`^[0-9a-f]{8}$`).MatchString(rest)
-}
-
-// giteaCall sends one API call as the bot; out may be nil.
-func (c *workerConfig) giteaCall(method, p string, body, out any) error {
-	var rd io.Reader
-	if body != nil {
-		payload, err := json.Marshal(body)
-		if err != nil {
-			return err
-		}
-		rd = bytes.NewReader(payload)
-	}
-	req, err := http.NewRequest(method, c.gitea+"/api/v1"+p, rd)
+	body := map[string]any{"title": title, "head": branch, "base": "main", "body": res.Summary}
+	payload, _ := json.Marshal(body)
+	req, err := http.NewRequest(http.MethodPost, c.gitea+"/api/v1/repos/"+c.repo+"/pulls", bytes.NewReader(payload))
 	if err != nil {
-		return err
+		return "", err
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "token "+c.botToken)
 	resp, err := (&http.Client{Timeout: 30 * time.Second}).Do(req)
 	if err != nil {
-		return err
+		return "", err
 	}
 	defer resp.Body.Close()
-	raw, _ := io.ReadAll(resp.Body)
+	var pr struct {
+		HTMLURL string `json:"html_url"`
+		Message string `json:"message"`
+	}
+	json.NewDecoder(resp.Body).Decode(&pr)
 	if resp.StatusCode >= 300 {
-		return fmt.Errorf("HTTP %d: %.200s", resp.StatusCode, raw)
+		return "", fmt.Errorf("HTTP %d: %s", resp.StatusCode, pr.Message)
 	}
-	if out != nil && len(bytes.TrimSpace(raw)) > 0 {
-		return json.Unmarshal(raw, out)
-	}
-	return nil
+	return pr.HTMLURL, nil
 }
 
 func readJSON(p string, out any) error {
@@ -489,3 +417,7 @@ func readJSON(p string, out any) error {
 	}
 	return json.Unmarshal(raw, out)
 }
+
+func draftBranch(gameID, job string, at time.Time) string {
+	return "draft/" + gameID + "-" + job + "-" + at.UTC().Format("20060102-150405")
+}

cmd/gbrgames/worker_test.go

@@ -5,6 +5,7 @@ import (
 	"net/http/httptest"
 	"strings"
 	"testing"
+	"time"
 )
 
 func TestCheckBotNeedsPushAccess(t *testing.T) {
@@ -69,47 +70,10 @@ func TestCheckBotWithRepositoryOnlyToken(t *testing.T) {
 	}
 }
 
-func TestReplaceOldDraftsClosesOnlyThisGamesDrafts(t *testing.T) {
-	var calls []string
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		calls = append(calls, r.Method+" "+r.URL.Path)
-		switch {
-		case r.Method == http.MethodGet && r.URL.Path == "/api/v1/repos/org/games/pulls":
-			w.Write([]byte(`[
-				{"number": 13, "head": {"ref": "draft/example-4b174b2d"}},
-				{"number": 20, "head": {"ref": "draft/example"}},
-				{"number": 21, "head": {"ref": "draft/example-other"}},
-				{"number": 22, "head": {"ref": "draft/other-4b174b2d"}},
-				{"number": 23, "head": {"ref": "fix/example-ports"}}
-			]`))
-		case r.Method == http.MethodDelete && r.URL.Path == "/api/v1/repos/org/games/branches/draft/example-4b174b2d":
-			w.WriteHeader(http.StatusNoContent)
-		case r.Method == http.MethodDelete:
-			w.WriteHeader(http.StatusNotFound) // already gone is fine
-		default:
-			w.Write([]byte(`{}`))
-		}
-	}))
-	defer srv.Close()
-
-	c := &workerConfig{gitea: srv.URL, repo: "org/games", botToken: "secret"}
-	closed, err := c.replaceOldDrafts("example")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(closed) != 2 || closed[0] != 13 || closed[1] != 20 {
-		t.Errorf("closed %v, want [13 20]: not another game's draft, not draft/example-other, not someone's fix branch", closed)
-	}
-	got := strings.Join(calls, "\n")
-	for _, want := range []string{"PATCH /api/v1/repos/org/games/pulls/13", "PATCH /api/v1/repos/org/games/pulls/20",
-		"DELETE /api/v1/repos/org/games/branches/draft/example-4b174b2d", "DELETE /api/v1/repos/org/games/branches/draft/example"} {
-		if !strings.Contains(got, want) {
-			t.Errorf("missing %q in:\n%s", want, got)
-		}
-	}
-	for _, unwanted := range []string{"pulls/21", "pulls/22", "pulls/23"} {
-		if strings.Contains(got, unwanted) {
-			t.Errorf("touched %s:\n%s", unwanted, got)
-		}
+func TestDraftBranchIsNewForEveryRun(t *testing.T) {
+	first := draftBranch("example", "4b174b2d", time.Date(2026, 10, 25, 21, 30, 0, 0, time.UTC))
+	rerun := draftBranch("example", "4b174b2d", time.Date(2026, 10, 25, 22, 5, 9, 0, time.UTC))
+	if first != "draft/example-4b174b2d-20261025-213000" || first == rerun {
+		t.Errorf("first %q, rerun %q", first, rerun)
 	}
 }