Skip to content

Hive superseded its own PR #16619 for a missing sign-off instead of signing in place #16647

Closed

Description

@clubanderson

PR #16619 ("fix(dashboard): preserve settled review verdicts and explain findings", author @thatguywob — this hive's own project.ai_author, for #16617) was approved by the operator and green. The hive then adopted it with reason=signoff-rehome mode=supersede close_first=true and re-authored it as #16634, which restarted CI from zero, dropped the approval, immediately showed "needs rebase", and left three Activity Monitor rows for one change.

Root cause

No commit on #16619 was actually missing a sign-off. gh api repos/hivecommons/hive/pulls/16619/commits shows every non-merge commit signed; the only unsigned commit is 7dca36bc, a GitHub update-branch merge of v5 by hivecommons-hive[bot]/web-flow, which is DCO-exempt.

What tripped was the squash-attribution rule in pkg/github/automerge/automerge_stage_dco.go (dcoCommitStatsDetailedForAuthor): commit 59809967 was authored through the App and signed Signed-off-by: scanner <…+hivecommons-hive[bot]@…> rather than by the PR author thatguywob. Because thatguywob is not [bot]-suffixed, it was counted as squashUnsafeHive. That rule exists so a squash does not attribute an unsigned hive commit to an outside contributor — but thatguywob is the hive, so the concern does not apply. authorkind classifies that PR as Clanker (attribution trailer), not Hive, so the existing AuthorKind == Hive guards did not catch it and the automerge policy had no HiveIdentity.Matches predicate.

Code path that chose supersede

stageDCO → squashUnsafeHive=1 → adoptedHeadSignoffUnfixable → inPlaceRehomeReason returns AdoptReasonSignoffRehome → escapeStalledAdoption → supersedeAdoptedPR (close_first=true), all in pkg/github/automerge/automerge_contributor_adopt.go. Nothing on that path checked whether the PR author was a hive identity, nor whether the head already carried an operator approval.

Fix

  1. StageLabelPolicy.HiveAuthor (wired to hiveIdentity(cfg).Matches): hive-authored PRs are self-squash, so squashUnsafeHive is zero for them.
  2. signoff-rehome never supersedes a hive-authored PR; when the branch is pushable it amends in place, otherwise it stays put. A head with an operator approval is never rehomed.
  3. The App's signed re-author commit always carries a Signed-off-by trailer, and the push relay refuses a hive-identity commit that lacks one.

Activity

  1. added
    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.
    on Nov 4, 2026
  2. added a commit that references this issue on Nov 4, 2026
    655fa3f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions