Repository navigation
π fix: never-policy 072 row stops promising adoption it can't back - #15738
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Hive filed review findings that do not block this PR as backlog items:
Cap: 10 backlog item(s) per PR per day. |
There was a problem hiding this comment.
Reviewed (correctness) β Go change holds up; one rebase hazard, one adjacent gap.
The premise is verified in the engine: maintainerHoldsAdoption is only reached after due (src/pkg/github/automerge/automerge_contributor_adopt.go:641-662, :1576-1590), so no AdoptionBlocked record exists pre-due and the two new hedged cases in stage_tracker_adoption.go:217-224 are the right place to say so. New test TestStageTrackerAdoptionNeverHedgesBeforeDue covers both the due and countdown branches; dashboard test shards are green at this head.
-
In-scope, advisory (rebase): the PR is
CONFLICTINGwithv5because the paragraph edited atsrc/docs/labels-and-control-signals.md:1931-1938was moved on v5 tosrc/docs/labels-and-control-signals/stage-labels.md:923("tracker's 072 pill readsβ¦ β hive adopts it in 3m unless a new head lands"). When resolving, re-target the doc hunk to that file rather than dropping it β otherwise the docs keep promising the old unhedged text. -
Out-of-scope (adjacent):
maintainer_policy: askhas the same pre-due gap βmaintainerHoldsAdoption(automerge_contributor_adopt.go:1580-1589) holds a maintainer's head underasktoo, but the row still reads "hive adopts it in Nm" (stage_tracker_adoption.go:225-228) until it flips to "adopt?". Not this PR's contract (title/#15692 arenever-only); backlog candidate.
β hive: agent=adjudicator-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
docs-currency β one in-scope fix.
-
Doc hunk lands in a file that no longer holds this section on
v5. The diff editssrc/docs/labels-and-control-signals.md:1931-1938, but onv5(since #15712, the merge-base) that file is a 33-line index; the paragraph now lives atsrc/docs/labels-and-control-signals/stage-labels.md:923-926(tracker's 072 pill reads β¦ β hive adopts it in 3m unless a new head lands).git merge-tree origin/v5 pr15738reportsCONFLICT (content): Merge conflict in src/docs/labels-and-control-signals.mdβ this is the conflict the PR body references. Please drop the monolith hunk and apply the samemaintainer_policy: neversentence afterstage-labels.md:926so the operator-facing doc actually describes the new strings insrc/pkg/dashboard/stage_tracker_adoption.go:217-224. -
(low)
src/docs/dashboard-sections/activity-monitor.md:247enumerates the 072 pill wordings per policy and gives onlyβ¦ β not adopted: maintainer_policy is neverfornever; the two new pre-due variants (β¦ unless the author maintains this repository) are not listed there. Worth a clause while you're relocating the other paragraph.
β hive: agent=adjudicator-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Style review (head ea23fb2, reading the diff plus stage_tracker_adoption.go at head and current v5).
-
Doc hunk targets a page that moved on
v5. The diff editssrc/docs/labels-and-control-signals.md:1931-1938, but onv5the 072 pill copy (β¦ hive adopts it in 3m unless a new head lands) now lives atsrc/docs/labels-and-control-signals/stage-labels.md:923. When this branch is rebased the hunk should be relocated there (and the monolithic page left alone), otherwise the "unless the author maintains this repository" wording ends up undocumented or in the wrong file. -
(advisory)
src/pkg/dashboard/stage_tracker_adoption.go:217-226adds twonevercases that duplicate the two generic cases below them verbatim except for a suffix, including thestageTrackerShortDuration(max(a.AutoAdoptAt.Sub(now), time.Minute))expression. Computing ahedgesuffix once (" or the author maintains this repository"whena.Policy == never) and appending it to the existing two branches would keep one source of truth for the countdown text. -
(out of scope, same mechanism) The engine reads the author's permission only once due for both policies (
src/pkg/github/automerge/automerge_contributor_adopt.go:660-669), so underaskthe row still promiseshive adopts it in Nmand then flips toadopt?. This PR deliberately scopes tonever; noting for backlog.
β hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88
The engine only reads a contributor's repository permission once adoption is due (adoptContributorPR gates maintainerHoldsAdoption behind the due check), so a stage/072 row under maintainer_policy: never had no AdoptionBlocked record before that moment and nothing to tell it apart, in the dashboard's own data, from a row the hive will truly auto-adopt. The tracker read "hive adopts it in Nm" right up to the due moment for a maintainer's own PR, then flipped to "not adopted: maintainer_policy is never". stageTrackerAdoptionText now names the exception for the never policy's auto-adopt countdown instead of promising an outcome it cannot back for every author: "β¦ unless the author maintains this repository". Hive-Run: #15692 Hive-Plan: review-backlog-correctness Hive-Spec: issue-15692#stage_tracker_adoption_never_policy_text Signed-off-by: onkar717 <shelkeonka@gmail.com>
β¦ll wordings Review follow-up for #15738. - stageTrackerAdoptionText: the two never-only cases repeated the AutoDue / AutoAdoptAt branches verbatim save for a trailing clause. stageTrackerAdoptionNeverHedge now computes that clause once and the two existing branches append it, so the countdown text has a single source of truth. Rendered strings are unchanged. - docs/dashboard-sections/activity-monitor.md: the 072 pill vocabulary now lists the two pre-due never wordings (β¦ unless a new head lands or the author maintains this repository / β¦ on the next sweep unless the author maintains this repository), matching the code. - Rebased onto v5: the hedge paragraph moved with the split page to docs/labels-and-control-signals/stage-labels.md (#15712). Hive-Fix-Attempt: 1/6 Hive-Run: #15692 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
ea23fb2 to
83630b6
Compare
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Supersedes #15717 (adopted at a maintainer's request; original commits by @onkar717 preserved).
This branch is #15717's head
ea23fb2b95f6as pushed by @onkar717 (forkonkar717/hivecommons-hive), unchanged. Last lane reason on the original:supersede-conflict.Hive fix agent: rebase this branch on
v5, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and theirSigned-off-by; add your own sign-off on your commits. Do not open another PR.Conflicts with
v5: the contributor head could not be replayed onto the base, so this copy opened as it is and the hive's fixer is resolving the conflicts on this branch (rebase-resolve episode, two attempts). If both fail the PR parks for a person: adopt the commits into a fresh branch, or close it as superseded.