Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixed-15129.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- The merge-eligible list no longer includes contributor PRs the merge relay's contributor-lane policy refuses (for example newcomer-tier authors), so agents stop wasting a `hive merge` attempt on them every kick ([#15093](https://github.com/hivecommons/hive/issues/15093), [#15129](https://github.com/hivecommons/hive/pull/15129)).
2 changes: 2 additions & 0 deletions src/cmd/hive/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2571,6 +2571,8 @@ func (b *boot) bootAgentsWith(deps bootAgentsDeps) {
return b.cfg != nil && b.cfg.AutoMerge.MergeForwardTrustedHumanFor(repo)
}
b.requestRelays = newRequestRelaySupervisor(b.ctx, func(ctx context.Context, client *github.Client) <-chan struct{} {
laneGate := relayLanePolicyGate(autoMergeOpts)(client)
setMergeEligibleLaneGate(laneGate)
relaysDone := deps.startRequestRelays(ctx, client, requestRelays{
prOpen: b.agentMgr.AuthorizePROpen,
holdLabel: holdLabel,
Expand Down
48 changes: 48 additions & 0 deletions src/cmd/hive/merge_eligibility.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package main

import (
"context"
"encoding/json"
"fmt"
"log/slog"
"os"
"strings"
"sync"
"time"

"github.com/hivecommons/hive/pkg/config"
Expand Down Expand Up @@ -392,6 +394,46 @@ func relayLanePolicyGate(opts automerge.Options) func(*github.Client) github.Mer
}
}

var (
mergeEligibleLaneGateMu sync.RWMutex
mergeEligibleLaneGate github.MergeRequestPolicyGate
)

// setMergeEligibleLaneGate installs the lane-policy gate the merge relay
// uses so the merge-eligible classifier asks the same question.
func setMergeEligibleLaneGate(g github.MergeRequestPolicyGate) {
mergeEligibleLaneGateMu.Lock()
mergeEligibleLaneGate = g
mergeEligibleLaneGateMu.Unlock()
}

// relayLaneRefusal returns the contributor-lane refusal the merge relay would
// give for pr, or "" when the relay would let it through. A PR the relay
// refuses must not be listed merge-eligible: hive-merge on it is a wasted
// attempt every kick, and the contributor lane merges it itself when ready.
// It reuses the relay's gate (automerge.Engine.RelayMergeRefusal) rather than
// restating the rule. Hive-authored PRs bypass the lane, and an unreadable
// gate leaves the PR listed — the relay still re-checks it at merge time.
func relayLaneRefusal(pr github.PullRequest, fullRepo string, logger *slog.Logger) string {
mergeEligibleLaneGateMu.RLock()
gate := mergeEligibleLaneGate
mergeEligibleLaneGateMu.RUnlock()
if gate == nil || hiveAuthoredPR(pr) {
return ""
}
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
refusal, err := gate(ctx, fullRepo, pr.Number, pr.HeadSHA)
if err != nil {
logger.Warn("merge-eligible lane gate could not evaluate PR; leaving it listed", "repo", fullRepo, "number", pr.Number, "error", err)
return ""
}
if refusal != "" {
logger.Info("excluding PR from merge-eligible: contributor lane refuses the merge relay", "repo", fullRepo, "number", pr.Number, "refusal", refusal)
}
return refusal
}

// mergeableJSON renders a tri-state mergeability verdict for the
// merge-eligible.json marker, mapping the unknown zero value to an explicit
// "unknown" rather than an empty string.
Expand Down Expand Up @@ -1037,6 +1079,12 @@ func writeMergeEligible(actionable *github.ActionableResult, hold github.HoldRes
adopted := adoptedInPlace(fullRepo, pr.Number)
prGates.adopted = adopted
bucket, verdict, intentReason := classifyMergeEligibility(pr, held, fullRepo, prGates)
if bucket == mergeBucketEligible {
if refusal := relayLaneRefusal(pr, fullRepo, logger); refusal != "" {
bucket = mergeBucketSkip
verdict = github.MergeVerdict{State: github.MergeVerdictOutstanding, Reason: refusal}
}
}
verdicts[github.MergeVerdictKey(pr)] = verdict
if intentReason != "" {
iv := intentVerdicts[fmt.Sprintf("%s/%d", fullRepo, pr.Number)]
Expand Down
60 changes: 60 additions & 0 deletions src/cmd/hive/merge_eligible_lane_gate_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package main

import (
"context"
"encoding/json"
"os"
"path/filepath"
"testing"

"github.com/hivecommons/hive/pkg/github"
)

// A PR the merge relay's contributor-lane gate refuses (a newcomer-tier
// author) must not be listed merge-eligible: hive-merge on it is refused
// every kick.
func TestWriteMergeEligible_ExcludesPRsTheRelayLaneRefuses(t *testing.T) {
origMerge, origFail := mergeEligiblePath, ciFailingPath
dir := t.TempDir()
mergeEligiblePath = filepath.Join(dir, "merge-eligible.json")
ciFailingPath = filepath.Join(dir, "ci-failing.json")
t.Cleanup(func() {
mergeEligiblePath = origMerge
ciFailingPath = origFail
setMergeEligibleLaneGate(nil)
})
setMergeEligibleLaneGate(func(_ context.Context, _ string, number int, _ string) (string, error) {
if number == 15086 {
return "contributor-lane policy refuses the merge relay for @Karibhou's PR: contributor-lane:claim-tier-untrusted (author tier \"newcomer\", require_tiers merger, trusted)", nil
}
return "", nil
})

green := func(number int, author string) github.PullRequest {
return github.PullRequest{Repo: "hive", Number: number, Author: author, CIStatus: "success", Mergeable: github.MergeableYes, HeadSHA: "cafe"}
}
actionable := &github.ActionableResult{PRs: github.PRResult{Items: []github.PullRequest{
green(15086, "Karibhou"),
green(15087, "trusted-human"),
}}}
verdicts := writeMergeEligible(actionable, github.HoldResult{}, "hivecommons", nil, false, nil, false, nil, nil, nil, discardLogger())

data, err := os.ReadFile(mergeEligiblePath)
if err != nil {
t.Fatal(err)
}
var out struct {
Eligible []struct {
Number int `json:"number"`
} `json:"merge_eligible"`
}
if err := json.Unmarshal(data, &out); err != nil {
t.Fatal(err)
}
if len(out.Eligible) != 1 || out.Eligible[0].Number != 15087 {
t.Fatalf("merge_eligible = %+v, want only #15087", out.Eligible)
}
if v := verdicts[github.MergeVerdictKey(actionable.PRs.Items[0])]; v.State == github.MergeVerdictEligible {
t.Fatalf("refused PR verdict = %+v, want not eligible", v)
}
}
Loading