Skip to content

πŸ› fix: never-policy 072 row stops promising adoption it can't back - #15738

Merged
hivecommons-hive[bot] merged 2 commits into
v5from
hive/adopt-15717
Oct 30, 2026
Merged

hivecommons-hive[bot] merged 2 commits into
v5from
hive/adopt-15717

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Supersedes #15717 (adopted at a maintainer's request; original commits by @onkar717 preserved).

This branch is #15717's head ea23fb2b95f6 as pushed by @onkar717 (fork onkar717/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 their Signed-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.

@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 30, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign nicholasjackson for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 30, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator-4 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed β€” no findings from this perspective.

β€” hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Hive filed review findings that do not block this PR as backlog items:

Cap: 10 backlog item(s) per PR per day.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

  1. In-scope, advisory (rebase): the PR is CONFLICTING with v5 because the paragraph edited at src/docs/labels-and-control-signals.md:1931-1938 was moved on v5 to src/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.

  2. Out-of-scope (adjacent): maintainer_policy: ask has the same pre-due gap β€” maintainerHoldsAdoption (automerge_contributor_adopt.go:1580-1589) holds a maintainer's head under ask too, 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 are never-only); backlog candidate.

β€” hive: agent=adjudicator-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@github-actions

github-actions Bot commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

Conflicts are checked with every PR merged onto the current tip of v5, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#15308 ✨ feature: enqueue eligible PRs into GitHub native merge queues same files src/docs/labels-and-control-signals/stage-labels.md

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docs-currency β€” one in-scope fix.

  1. Doc hunk lands in a file that no longer holds this section on v5. The diff edits src/docs/labels-and-control-signals.md:1931-1938, but on v5 (since #15712, the merge-base) that file is a 33-line index; the paragraph now lives at src/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 pr15738 reports CONFLICT (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 same maintainer_policy: never sentence after stage-labels.md:926 so the operator-facing doc actually describes the new strings in src/pkg/dashboard/stage_tracker_adoption.go:217-224.

  2. (low) src/docs/dashboard-sections/activity-monitor.md:247 enumerates the 072 pill wordings per policy and gives only … β€” not adopted: maintainer_policy is never for never; 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

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style review (head ea23fb2, reading the diff plus stage_tracker_adoption.go at head and current v5).

  1. Doc hunk targets a page that moved on v5. The diff edits src/docs/labels-and-control-signals.md:1931-1938, but on v5 the 072 pill copy (… hive adopts it in 3m unless a new head lands) now lives at src/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.

  2. (advisory) src/pkg/dashboard/stage_tracker_adoption.go:217-226 adds two never cases that duplicate the two generic cases below them verbatim except for a suffix, including the stageTrackerShortDuration(max(a.AutoAdoptAt.Sub(now), time.Minute)) expression. Computing a hedge suffix once (" or the author maintains this repository" when a.Policy == never) and appending it to the existing two branches would keep one source of truth for the countdown text.

  3. (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 under ask the row still promises hive adopts it in Nm and then flips to adopt?. This PR deliberately scopes to never; noting for backlog.

β€” hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

onkar717 and others added 2 commits October 30, 2026 08:17
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>
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 30, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed β€” no findings from this perspective.

β€” hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator-4 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot removed the stage/050-review-pending Review swarm requested; awaiting a verdict for the current head label Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot added the stage/080-awaiting-merge-admission CI green, verdict approve, no modifiers; the automerge lane has not admitted it yet label Oct 30, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive
hivecommons-hive Bot merged commit 1d45dde into v5 Oct 30, 2026
84 of 88 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the hive/adopt-15717 branch October 30, 2026 12:49
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author
Evidence bundle `#1573883630b6` sha256:a8588b3fbdac81e9dcdb5bc4953ba8bcea706a0f180eac3991d264c1d437b362 β€” download from the dashboard or `hivectl review evidence #15738`.

@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/hive This repository's own hive (the App or one of its agent lanes) authored this PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/M Denotes a PR that changes 30-99 lines, ignoring generated files. stage/080-awaiting-merge-admission CI green, verdict approve, no modifiers; the automerge lane has not admitted it yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants