Repository navigation
📖 docs: explain webhook claim ledger and pending stage recovery - #14975
hivecommons-hive[bot] merged 2 commits into
Conversation
Document pull_request claim writes, their snapshot and stage effects, and the merge trigger and ledger backfill proposed in hivecommons#14971. Hive-Run: hivecommons#14972 Hive-Plan: docs-currency-webhook-claim-ledger Hive-Spec: hivecommons#14972#webhook-ledger-documentation Signed-off-by: thatguywob <thatguywob@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 |
There was a problem hiding this comment.
The first two sections are accurate and worth landing; I'd split out the third.
Verified against v5 (at de64cb1)
- Action list (
opened…closed) matchessrc/pkg/github/webhook_pr_claims.go:96-102; the cover subset (opened,reopened,edited,ready_for_review) matches:229-232. ApplyPRDeliveryat:175;coverIssuesForWebhookPRat:270, two-minute boundwebhookPRCoverTimeoutat:237.prClaimsHookFor, both log strings (:34,:39) and theFilterClaimedIssuesre-filter (:63) are insrc/cmd/hive/webhook_pr_claims.go.runCloseOnMergeSweepis atsrc/cmd/hive/close_on_merge_sweep.go:99.
Concern — "Merge trigger and ledger-to-stage backfill (pending #14971)": this documents closeOnMergeForDelivery, reconcileLedgerCoverRecords and BackfillCoveredByLedger, none of which exist on v5. It is pinned to a specific commit of an open PR that is currently in mergeable_state=dirty (conflicts), so its shape may still change — and if #14971 is reworked or closed, webhooks.md ships operator-facing text describing behaviour the binary does not have, with nothing to flag the drift. The symbol names also won't be caught by the citation check since they aren't path:line references.
Suggestion: drop that subsection (and the closing "Until that PR lands…" paragraph) from this PR so the verified parts can merge now, and carry the #14971 text inside #14971 itself, where it will land in the same commit as the code and be deleted with it if the PR is abandoned. Alternatively, rebase this PR on top of #14971 once it merges.
— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether the "Merge trigger and ledger-to-stage backfill (pending #14971)" section of src/docs/webhooks.md should land now, describing #14971 at commit 36ed214 while that PR is still open and conflicted, or be split out and carried by #14971 itself.
Checked the current-state parts of this doc against v5: ClaimLedger.ApplyPRDelivery (src/pkg/github/webhook_pr_claims.go:175), the action set at :98–101 and the cover subset at :231–232, webhookPRCoverTimeout = 2 * time.Minute (:237), coverIssuesForWebhookPR (:270, called from webhook_cache.go:509 inside HandleWebhookEvent), and prClaimsHookFor with both log messages and FilterClaimedIssues (src/cmd/hive/webhook_pr_claims.go:20–63). All of that matches the code; the new "PR claims and issue stages" section reads accurately to me.
The part I can't settle: the "Merge trigger and ledger-to-stage backfill (pending #14971)" subsection documents closeOnMergeForDelivery, reconcileLedgerCoverRecords and BackfillCoveredByLedger, none of which exist on v5 — they are #14971's implementation, pinned to commit 36ed2141d. #14971 is currently dirty (merge conflicts), so its final shape may differ from what this doc states, and the "Until that PR lands…" sentence becomes stale the moment it merges. Two reasonable options: land this now and accept a follow-up edit, or move that subsection into #14971 so docs and code land together. That's a sequencing call for the #14971 author/owner, not a defect in this PR.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Needs a decision, not a merge:
Head: verdict requires_human @de64cb1, 57/57 checks green, DCO yes, soak 0s of 30m0s. How to release it:
Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
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 decision supersede now: adopt #14975 in supersede mode, preserving the author's commits and sign-off; do not wait for the grace deadline Rationale: the contributor is offline; adoption in supersede mode keeps the work moving (#13975). Decided by the hive at @clubanderson's request as the owner's delegate under the owner-delegate policy (rule |
|
@thatguywob the hive has adopted this PR ( |
|
@thatguywob this PR is back in your court ( Failing checks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Your relay could not take this as a |
Merge current v5 so the documented merge trigger and ledger-to-stage backfill ship with their implementation from hivecommons#14971. Remove the now-stale pending language. The reported ARM64 build was canceled by a newer run of the closed adoption PR hivecommons#14980; no compiler or dependency failure was reported. Push this updated head to the original PR branch for fresh CI. Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
There was a problem hiding this comment.
Reviewed (intent-alignment, delta de64cb1 → 792066b) — previous finding resolved.
- ✅ Fixed: the "pending / pinned to unmerged #14971" wording is gone from
src/docs/webhooks.md; #14971 is now inv5(294d0c7) and the new "Merge trigger and ledger-to-stage backfill" section matches head code (src/cmd/hive/webhook_pr_claims.go:23-84,src/cmd/hive/main.go:7220,10138-10152,src/pkg/github/stage_ledger_backfill.go:42-82,src/pkg/github/webhook_pr_claims.go:96-102,229-237). - ℹ️ Advisory: the PR title ("…and pending stage recovery") and body ("explicitly marked pending because that PR is still open") no longer describe the diff. Consider retitling to e.g.
📖 docs: explain webhook claim ledger and merge-triggered stage recoverybefore squash so the commit message isn't stale.
— hive: agent=adjudicator-4 backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Reviewed (style) at 792066b5c — prior finding resolved: the "pending #14971" caveat is gone from src/docs/webhooks.md:71-88 now that #14971 is on v5 (294d0c7), and every symbol the section cites exists at head (closeOnMergeForDelivery / closeOnMergeDeliveryTimeout = 2 * time.Minute in src/cmd/hive/webhook_pr_claims.go:62,84; reconcileLedgerCoverRecords called unconditionally after the SkipOptional guard in src/cmd/hive/main.go:7217-7220).
One low, non-blocking gap between body and diff: the PR description still says the section is "explicitly marked pending because that PR is still open against v5" and cites commit 36ed2141d. Since the body becomes the squash commit message, please update it to match the diff, e.g.:
Explain the merged-delivery close trigger and per-cycle ledger-to-stage backfill from #14971 (now merged into `v5`), distinguishing that stage repair from the existing scheduled close-on-merge backfill.
— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
stage 095-pre-merge-soak → 060-reviewed: required-check-pending:Sign-off survives the squash |
1 similar comment
|
Merged by hive contributor-lane auto-merge: CI green for ≥30m, reviewer verdict approve, @thatguywob holds the trusted tier in this hive's contributor registry. |
…als out of the merge gate (#15011) * Close superseded hive PRs automatically and re-stage adopted originals out of the merge gate A hive-authored PR whose closing targets are all closed, one of them by a different merged PR, and whose head conflicts with the base (or whose files that PR already covers) is now closed by the hive itself as hive/superseded with a notice naming the superseding PR: in the self-authored auto-merge lane before any review is dispatched, in the supersession sweep when the rebase is refused for a conflict, and in close-on-merge of the superseding PR. New knob governor.auto_close_superseded (default on); human-authored PRs are never auto-closed. A contributor PR adopted in supersede mode leaves stage/085-needs-decision in the adopting pass when the park was only the review swarm's requires_human verdict, renders in the CI/Review column with an 'Adopted -> #N' pill, and the duplicate-fix sweep no longer closes the superseding App PR as a duplicate of the PR it supersedes. Evidence: #14965 (closed by #14957 for #14952), #14975 -> #14980, Signed-off-by: Andrew Anderson <andy@clubanderson.com> #14947 -> #14977. * Move changelog fragment to repo-root changelog.d Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Closes #14972
Document the
pull_requestclaim-ledger writer alongside the snapshot writers: triggering actions, claim release/merge semantics, persistence, immediate suppression, stage facts and API costs.Explain the merged-delivery close trigger and per-cycle ledger-to-stage backfill from #14971, explicitly marked pending because that PR is still open against
v5. Distinguish that stage repair from the existing scheduled close-on-merge backfill.Validation: manually checked the descriptions against
upstream/v5and #14971 at commit36ed2141d952a8c11a67e503678457a94236b89c, including action lists, guards, timeouts, log messages and source paths. Tests not run (docs only); repository instructions reserve tests and docs guards for CI.— hive: backend=codex
🐝 Hive Agent:
contributor| SHA:de64cb1ad