Skip to content

🐛 fix(review): require sign-off on review-fix follow-up commits - #14628

Merged
hivecommons-hive[bot] merged 1 commit into
v5from
scanner/fix-14605
Oct 28, 2026
Merged

hivecommons-hive[bot] merged 1 commit into
v5from
scanner/fix-14605

Conversation

@hivecommons-hive

@hivecommons-hive hivecommons-hive Bot commented Oct 27, 2026 •

Copy link
Copy Markdown
Contributor

Follow-up commits from hive/relay agents were unsigned, bouncing PRs to no-dco / 072 (and the hive nudged itself). The review-fix kick prompt (BuildFixPrompt) and relay fix-pr prompts now state that every follow-up commit must use git commit -s / git rebase --signoff.

Not included: the push-guard refusal and the no-dco → fix-attempt routing. The only push hook (push_branch_request_watcher.go) has no commit-inspection logic or hive-owned-head notion, so that needs a separate design; I didn't invent a new guard.

Refs #14605 (deliberately partial — this PR does not close #14605; #14605 stays open: push-guard rebase --signoff on hive-owned heads and hive-owned no-dco → one bounded 070 fix attempt remain open on the issue and get their own PR(s), per the maintainer decision on this PR)

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 requested_by=@clubanderson

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 27, 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 the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 27, 2026
@github-actions

github-actions Bot commented Oct 27, 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
#14702 ✨ review: scale reviewer concurrency up and down with backlog same files src/pkg/review/dispatch.go

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: CI pending — sweep will merge when green.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@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/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 27, 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.

Decision needed: @clubanderson should decide whether this PR may close #14605 with only the prompt-text requirement landed, or should cite Refs #14605 and leave the issue open for the push-guard refusal and the no-dco → fix-attempt routing it also asks for.

The code change is correct and minimal; the open question is the issue link, not the diff.

What I verified. src/pkg/review/dispatch.go:1368 appends the sign-off requirement unconditionally inside BuildFixPrompt, after the Hive-Fix-Attempt trailer line and before the human-change-request section, so every review-fix kick carries it. bin/contributor-relay.js:4023-4025 appends FIX_PR_SIGNOFF_REQUIREMENT only when task.kind === FIX_PR_KIND, after the HIVE_WORKSPACE_DIR substitution, so issue/other task prompts are untouched; resolveTaskPrompt is already exported (the existing #7908 test at contributor-relay.test.js:14233 calls it), so the new test at :14246 exercises the real function. Both tests fail without the change. Nothing else in the tree is affected.

Issue-link scope. #14605's Expected section asks for three things: (1) prompt-level git commit -s / git rebase --signoff requirement, (2) a gh-wrapper / push-guard refusal for hive-owned heads whose new commits lack the trailer, (3) routing a hive-owned no-dco head straight back into a bounded "add sign-off" fix attempt instead of 072. This PR delivers (1) and the body explicitly says (2) and (3) are "not included" because push_branch_request_watcher.go has no commit-inspection seam. That reasoning is sound — but the body then writes Closes #14605, which would close the issue on merge with two of its three asks unimplemented and untracked. If the deferral stands, Refs #14605 (push-guard refusal and no-dco → fix-attempt routing still open: push watcher has no commit-inspection seam) keeps the remainder visible; otherwise a follow-up issue for (2)+(3) should exist before this closes the parent.

Not a defect in the change itself — I'd merge the diff as-is once the link wording is settled.

— hive: agent=reviewer 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.

Decision needed: @clubanderson should decide whether #14628 may keep Closes #14605 (closing the issue with the push-guard refusal and the no-dco → fix-attempt routing still undone) or should become Refs #14605 with a follow-up tracking the remaining two expectations.

The code is fine; the issue link is the question.

Verified on this head: src/pkg/review/dispatch.go:1368 appends the sign-off requirement to every BuildFixPrompt output (the only caller is dispatch.go:1207), and bin/contributor-relay.js:4021-4026 appends FIX_PR_SIGNOFF_REQUIREMENT only when task.kind === 'fix-pr', so issue/PR tasks are untouched. Both tests fail without the change.

What I cannot settle: #14605 "Expected" lists three things — (1) the prompt wording, (2) a push guard that refuses a hive-owned head whose new commits lack the trailer, (3) routing a hive-owned no-dco head straight back into a bounded fix attempt. This PR does (1) and the body explicitly says (2) and (3) are not included because push_branch_request_watcher.go has no commit-inspection hook. Yet it says Closes #14605, so merging will close the issue with the two mechanical safeguards unimplemented and untracked — the symptom (unsigned fix commits bouncing to 072) recurs whenever a model ignores the prompt text.

Options: keep Closes and accept (2)/(3) as out of scope, or switch to Refs #14605 and open a follow-up for the guard/routing. Either is defensible; it is a scope call, not a defect, so I have not marked it as one.

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot added stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 27, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Needs a decision, not a merge:

  • the reviewer swarm returned requires_human @3b4a2b5
  • reviewer question: @clubanderson should decide whether 🐛 fix(review): require sign-off on review-fix follow-up commits #14628 may keep Closes #14605 (closing the issue with the push-guard refusal and the no-dco → fix-attempt routing still undone) or should become Refs #14605 with a follow-up tracking the remaining two expectations.
  • the automerge lane will not merge this unattended

Head: verdict requires_human @3b4a2b5, 66/66 checks green, DCO yes, soak 0s of 30m0s.

What to do: approve this head (3b4a2b5) to merge as-is, or leave a changes requested review (or reply /hive decision <what to change>) and the hive will push the fix.

How to release it:

  • After reading the verdict, a trusted merger can submit a GitHub Approve review for the current head and the lane clears the hold on its next pass; /hive approve replies on a PR are acknowledged but not consumed.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@clubanderson

Copy link
Copy Markdown
Member

/hive decision approve

Land the prompt-text change now — it is a correct, cheap first step. But it does not close #14605:

  1. Change the body from Closes #14605 to Refs #14605 (hive-owned head; the hive may edit its own PR body).
  2. 🐛 review-fix: follow-up commits pushed by hive/relay agents lack Signed-off-by, bouncing the PR to no-dco / 072 #14605 stays open for the two remaining expectations from my decision there: push-guard rebase --signoff on hive-owned heads, and hive-owned no-dco → one bounded 070 fix attempt instead of 072. Those get their own PR(s) against 🐛 review-fix: follow-up commits pushed by hive/relay agents lack Signed-off-by, bouncing the PR to no-dco / 072 #14605.
  3. Once the body is Refs, this PR needs no further human input — merge on green.

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Decision recorded by @clubanderson for head 3b4a2b5. The hive is treating it as a changes requested review: this PR moves to the fixing stage and the author agent pushes a new head following your instruction verbatim. The review swarm then re-reviews that head; if it approves, the PR comes back for your merge approval.

@hivecommons-hive hivecommons-hive Bot added stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue labels Oct 27, 2026
@hivecommons-hive hivecommons-hive Bot added stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 27, 2026
@clubanderson clubanderson added stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue labels Oct 27, 2026
@hivecommons-hive hivecommons-hive Bot added stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 27, 2026
@hivecommons-hive hivecommons-hive Bot added stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Oct 27, 2026
@hivecommons-hive hivecommons-hive Bot added stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Applied the decision: body changed from Closes #14605 to Refs #14605 with the two remaining expectations (push-guard rebase --signoff on hive-owned heads; hive-owned no-dco → one bounded 070 fix attempt) named on the same line. No code change was requested, so head 3b4a2b5 is unchanged — per item 3 of the decision this PR needs no further human input and merges on green.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: 3f3b3e786

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Approval recorded by @clubanderson for head 3b4a2b5. The hive is treating it as your answer to the review swarm's question: nothing is sent back to the author, and the PR follows the merge path on the next pass (merged when the merge gates pass, or handed to you at the ready-for-merge stage where a person has to press the button).

Recorded from the hive dashboard.

@hivecommons-hive
hivecommons-hive Bot merged commit 527fe6d into v5 Oct 28, 2026
112 of 125 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the scanner/fix-14605 branch October 28, 2026 03:34
@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

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author
Evidence bundle `#146283b4a2b5` sha256:6c82adcf5c32cd34cc3543214aadedaa111505fe6163c7b0a3bb86bdfad9f239 — download from the dashboard or `hivectl review evidence #14628`.

@hivecommons-hive hivecommons-hive Bot removed 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 stage/stalled In its current stage longer than expected labels Oct 28, 2026
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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

🐛 review-fix: follow-up commits pushed by hive/relay agents lack Signed-off-by, bouncing the PR to no-dco / 072

1 participant