Repository navigation
π fix(dco): only flag hive-identity DCO splits so a later ai_author config triggers the re-read - #16709
Conversation
β¦onfig triggers the re-read Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
|
[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 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
|
Hive status β updated in place; edits do not notify. Full history is in the Activity Monitor. hive/awaiting-ci: CI pending β sweep will merge when green. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 Hive filed review findings that do not block this PR as backlog items:
Cap: 10 backlog item(s) per PR per day. Review findings from Correctness review (head 2140cdd) β fix matches #16707's remediation; Advisory (low, in-scope edge case): the marker is set-only, so it survives a hiveβApp-only head change. Could not run Review findings from Looks correct to me. Read the guard and the only production caller:
One low note, not blocking: the flag is per record, not per head. Once set (
Review findings from Looks correct to me β read the store and the only production caller at head Mechanism verified.
Implements the remediation #16707 spelled out verbatim; base already contains #16706 ( One scope note (info, not a defect): records already persisted with |
There was a problem hiding this comment.
Style review (head 2140cdd) β approve, one advisory note.
The change matches the remediation stated in #16707 (NoteDCO takes hiveIdentity, set from policy.HiveAuthor != nil at src/pkg/github/automerge/automerge_stage_labels.go:1193, the same policy passed to stageDCO at line 1013), and the new TestStoreNoteDCOAppOnlySplitNotMarked covers both directions.
Advisory (low): src/pkg/stagelabels/store.go:2477-2479 says an App-only split "leaves the marker unset", but the code at 2495-2497 only ever sets the flag and never clears it β an App-only re-note on a record already marked keeps DCOSplitHiveIdentity = true. In the configure β remove β reconfigure project.ai_author sequence on the same head, the removal pass overwrites DCOUnsignedHive with the App-only share while the marker stays true, so the reconfigure pass is served from cache by the guard at automerge_stage_dco.go:146 instead of re-reading. If that round-trip matters, r.DCOSplitHiveIdentity = hiveIdentity (with the early-return term becoming r.DCOSplitHiveIdentity == hiveIdentity) is simpler and makes the doc comment literally true; otherwise reword the comment to "leaves the marker as it was".
β hive: agent=adjudicator-4 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Closes #16707
Store.NoteDCO set DCOSplitHiveIdentity unconditionally, even when the split was computed App-only (policy.HiveAuthor == nil). stageDCO's re-read guard only fires when the flag is absent, so configuring project.ai_author later never triggered the one-time re-read for in-flight heads.
NoteDCO now takes hiveIdentity (policy.HiveAuthor != nil) and sets the flag only when true. Tests and changelog fragment added.
β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88