f915b5ba3b
watchpr only reported meaningful changes as transitions from the poll baseline. A PR already merged or closed when the watch started was captured as the baseline and never produced a transition, so the loop polled the dead PR forever (process alive, never exiting) -- the single-PR --interval case observed in production. Add a terminal-state check applied to the baseline snapshot: a PR that is already merged or closed the moment watchpr starts is reported and exits immediately, since it can never change again. Extract the baseline+poll loop into agent.Watch behind a StateFetcher interface so the loop, its open->merged/close detection, and its poll-error resilience are unit-testable with a fake client.
168 lines
5.6 KiB
Go
168 lines
5.6 KiB
Go
package agent
|
|
|
|
import "time"
|
|
|
|
// PRState is a point-in-time snapshot of the PR attributes watchpr tracks.
|
|
type PRState struct {
|
|
Ref PRRef `json:"ref"`
|
|
State string `json:"state"` // open / closed
|
|
Merged bool `json:"merged"`
|
|
HeadSHA string `json:"head_sha"`
|
|
Mergeable bool `json:"mergeable"`
|
|
CIStatus string `json:"ci_status"` // success / pending / failure / error / ""
|
|
NonAgentComments int `json:"non_agent_comments"`
|
|
Title string `json:"title"`
|
|
URL string `json:"url"`
|
|
}
|
|
|
|
// FetchState builds a PRState for the given ref. agentLogin's comments are
|
|
// excluded from the non-agent comment count.
|
|
func FetchState(c *GiteaClient, ref PRRef, agentLogin string) (PRState, error) {
|
|
pr, err := c.GetPR(ref.RepoPath(), ref.Number)
|
|
if err != nil {
|
|
return PRState{}, err
|
|
}
|
|
ci, err := c.CommitStatus(ref.RepoPath(), pr.Head.Sha)
|
|
if err != nil {
|
|
return PRState{}, err
|
|
}
|
|
comments, err := c.ListComments(ref.RepoPath(), ref.Number)
|
|
if err != nil {
|
|
return PRState{}, err
|
|
}
|
|
return PRState{
|
|
Ref: ref,
|
|
State: pr.State,
|
|
Merged: pr.Merged,
|
|
HeadSHA: pr.Head.Sha,
|
|
Mergeable: pr.Mergeable,
|
|
CIStatus: ci,
|
|
NonAgentComments: countNonAgentComments(comments, agentLogin),
|
|
Title: pr.Title,
|
|
URL: pr.HTMLURL,
|
|
}, nil
|
|
}
|
|
|
|
// StateFetcher fetches the current PRState for a ref. *GiteaClient satisfies it
|
|
// via its FetchState method; tests inject fakes.
|
|
type StateFetcher interface {
|
|
FetchState(ref PRRef, agentLogin string) (PRState, error)
|
|
}
|
|
|
|
// FetchState makes *GiteaClient a StateFetcher.
|
|
func (c *GiteaClient) FetchState(ref PRRef, agentLogin string) (PRState, error) {
|
|
return FetchState(c, ref, agentLogin)
|
|
}
|
|
|
|
// WatchResult is the change that ended a watch.
|
|
type WatchResult struct {
|
|
Ref PRRef
|
|
Reason string
|
|
State PRState
|
|
}
|
|
|
|
// terminalState reports whether a PR has reached a final state from which no
|
|
// further meaningful change is possible, with a human-readable reason. Unlike a
|
|
// transition (see MeaningfulChange) this holds for a single snapshot, so it also
|
|
// catches a PR that is already merged/closed the moment watchpr starts.
|
|
func terminalState(st PRState) (bool, string) {
|
|
if st.Merged {
|
|
return true, "PR merged"
|
|
}
|
|
if st.State == "closed" {
|
|
return true, "PR closed without merging"
|
|
}
|
|
return false, ""
|
|
}
|
|
|
|
// Watch establishes a baseline for each ref, then polls on every tick until a
|
|
// tracked PR changes meaningfully, returning the first such change. A PR that is
|
|
// already terminal (merged/closed) at baseline is reported immediately rather
|
|
// than polled forever. Poll errors are handed to onError and never stop the
|
|
// loop; only a baseline fetch error aborts. onBaseline, if set, fires once after
|
|
// all baselines are captured and before the first tick.
|
|
func Watch(f StateFetcher, refs []PRRef, agentLogin string, ticks <-chan time.Time, onBaseline func(), onError func(PRRef, error)) (WatchResult, error) {
|
|
prev := make(map[string]PRState, len(refs))
|
|
for _, ref := range refs {
|
|
st, err := f.FetchState(ref, agentLogin)
|
|
if err != nil {
|
|
return WatchResult{}, err
|
|
}
|
|
if terminal, reason := terminalState(st); terminal {
|
|
return WatchResult{Ref: ref, Reason: reason, State: st}, nil
|
|
}
|
|
prev[ref.String()] = st
|
|
}
|
|
if onBaseline != nil {
|
|
onBaseline()
|
|
}
|
|
for range ticks {
|
|
for _, ref := range refs {
|
|
key := ref.String()
|
|
cur, err := f.FetchState(ref, agentLogin)
|
|
if err != nil {
|
|
if onError != nil {
|
|
onError(ref, err)
|
|
}
|
|
continue
|
|
}
|
|
if changed, reason := MeaningfulChange(prev[key], cur); changed {
|
|
return WatchResult{Ref: ref, Reason: reason, State: cur}, nil
|
|
}
|
|
prev[key] = cur
|
|
}
|
|
}
|
|
return WatchResult{}, nil
|
|
}
|
|
|
|
// countNonAgentComments counts comments authored by anyone other than agentLogin.
|
|
func countNonAgentComments(comments []Comment, agentLogin string) int {
|
|
n := 0
|
|
for _, cm := range comments {
|
|
if cm.User.Login != agentLogin {
|
|
n++
|
|
}
|
|
}
|
|
return n
|
|
}
|
|
|
|
// isFailedCI reports whether a combined CI state is a terminal failure.
|
|
func isFailedCI(state string) bool {
|
|
return state == "failure" || state == "error"
|
|
}
|
|
|
|
// MeaningfulChange compares a previous state to the current one and reports
|
|
// whether a change warrants alerting the operator, with a human-readable
|
|
// reason. Benign transitions (CI pending→success, the agent's own comments, an
|
|
// unchanged snapshot) return false.
|
|
//
|
|
// Alerting conditions:
|
|
// - the PR merged
|
|
// - the PR closed without merging
|
|
// - a new comment from someone other than the agent
|
|
// - CI transitioned into failure/error
|
|
// - the PR lost mergeability (a conflict appeared) for two consecutive polls
|
|
func MeaningfulChange(prev, cur PRState) (bool, string) {
|
|
if !prev.Merged && cur.Merged {
|
|
return true, "PR merged"
|
|
}
|
|
// Closed (not merged): only alert on the open→closed edge.
|
|
if prev.State == "open" && cur.State == "closed" && !cur.Merged {
|
|
return true, "PR closed without merging"
|
|
}
|
|
if cur.NonAgentComments > prev.NonAgentComments {
|
|
return true, "new comment from a non-agent user"
|
|
}
|
|
if isFailedCI(cur.CIStatus) && !isFailedCI(prev.CIStatus) {
|
|
return true, "CI failed (" + cur.CIStatus + ")"
|
|
}
|
|
// Gitea computes mergeability asynchronously, so a PR can briefly report
|
|
// mergeable=false right after a push. Require the loss to persist across two
|
|
// consecutive polls (both prev and cur false, still open) before treating it
|
|
// as a real conflict; a single false poll is debounced.
|
|
if !prev.Mergeable && !cur.Mergeable && cur.State == "open" {
|
|
return true, "PR lost mergeability (conflict)"
|
|
}
|
|
return false, ""
|
|
}
|