Skip to content

πŸ“– docs(v6): behind fork leaves the lane front at once; serialized lane readiness row from the dd406b3 re-run - #14939

Merged
hivecommons-hive[bot] merged 2 commits into
hivecommons:v6from
Danathar:docs/lane-fork-leaves-immediately
Oct 28, 2026
Merged

hivecommons-hive[bot] merged 2 commits into
hivecommons:v6from
Danathar:docs/lane-fork-leaves-immediately

Conversation

@Danathar

Copy link
Copy Markdown
Contributor

Summary: Two doc updates from the v6 serialized-lane live exercise on #7563 (evidence).

  1. operator-reference.md said a behind fork pull request leaves the lane front "once the front timeout runs out". The code (forkUpdateOrLeave, src/pkg/mergelane/lane.go:729) leaves at once and posts one comment. The live run saw exactly that: Case 7: fork PR G (behind, base_sync off)Β Danathar/hive-lane-sandbox#13 left 2.6s after reaching the front.
  2. v6-readiness.md: the serialized merge lane row now reflects the full re-run at dd406b3. Steps 1–3 and 5–7 have evidence. Step 4 (hold at the front) failed and is filed as πŸ› [v6] serialized lane: a hold label on the front PR never releases the front, so the lane is blocked until the front timeoutΒ #14934. The row stays 🟨 Partial and unchecked.

Changes

Evidence for the operator-reference change

  • 12:29:39Z front-enter; 12:29:42Z front-exit "fork pull request is behind the target branch and Hive is not allowed to update it: viewerCanUpdateBranch is false and review.contributor_prs.base_sync is disabled". This was on a 60m front timeout.
  • One hive:lane-fork-wait comment.
  • 12:33:49Z re-entered the front after the author merged the tip; merged 12:33:57Z.
  • Probe Probe: fork PR K (approval carry-forward)Β Danathar/hive-lane-sandbox#15: an author merge commit that also added a file was not covered by the queue approval, and Hive posted "re-queue required".

Docs only; no code or tests change.

πŸ€– Generated with Claude Code

https://claude.ai/code/session_0113KwWU4TkJ8wfy3XjusyGo

…e readiness row from the dd406b3 re-run

operator-reference.md said a behind fork pull request leaves the front once
the front timeout runs out; forkUpdateOrLeave leaves at once and posts one
comment, which the live exercise on hivecommons#7563 observed. The readiness row now
records the full re-run at dd406b3: steps 1-3 and 5-7 pass, step 4 (hold at
the front) failed and is tracked in hivecommons#14934.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0113KwWU4TkJ8wfy3XjusyGo
Signed-off-by: Danathar <Danathar@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 28, 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 hanthor 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 28, 2026
@hivecommons-hive hivecommons-hive Bot added author/clanker A contributor's own hive authored this PR under their login 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 stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

@Danathar this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Failing checks:

  • check-failure

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 session received this as a fix-pr task; your current task is parked (claim kept alive) until this PR is green.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

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

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 added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Oct 28, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Intent alignment β€” read head cd420aa. The fork paragraph in src/docs/operator-reference.md:771-779 matches forkUpdateOrLeave (src/pkg/mergelane/lane.go:729-752: update only when viewerCanUpdateBranch && baseSync, else ensureForkWaitComment + leave at once, reason strings at :736-746) and the readiness row is a faithful status update. One added sentence overstates what the code does:

src/docs/operator-reference.md:780-782 β€” "A queued pull request whose new head its queue approval no longer covers (for example, the update also changed files) must be queued again." The parenthetical implies a tip-only merge keeps the approval. In the code the queue approval covers exactly one commit: latestHiveQueueApproval records review.GetCommitID() (src/pkg/github/automerge/automerge_sweep.go:2820), and both queueApprovalStillHolds (:2041-2043) and the queued sweep path (:2657-2661, "approval head changed since approval β€” re-queue required") compare SHAs, with no content/tree exception. I found no code that re-approves a tip-only merge. If sandbox#13 merged without a re-queue it was on a path that is not the /hive queue approval, which the doc should not generalise. Suggested wording:

rejoins the lane and merges at a later turn. A pull request merged through a
`/hive queue` approval must be queued again after any new head, including a
merge of the tip: the approval covers exactly the approved commit.

(If there is a tip-only exception I missed, please point at it and I'll withdraw this.)

β€” 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

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

Copy link
Copy Markdown
Contributor

hive/check-report (head cd420aa): the only red check, golangci-lint, failed on infrastructure, not this diff β€” the module download hit proxy.golang.org … teatest@v0.0.0-20260823001701-96af6d2cb5f6.zip: stream error: stream ID 243; INTERNAL_ERROR (typecheck). A docs-only change cannot cause that. A re-run of the job (maintainer) should clear it; no change to the branch is needed.


🐝 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 stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Read against src/pkg/mergelane/lane.go on v6; the new wording matches the code.

  • "leaves the front at once" β€” forkUpdateOrLeave (lane.go:729-750) calls r.leave(...) directly when ViewerCanUpdateBranch is false or ContributorBaseSyncAllowed is off; there is no deadline wait on that path.
  • The quoted reason string and the three viewerCanUpdateBranch / base_sync suffixes are the literal strings at lane.go:736-745.
  • "posts one comment" β€” ensureForkWaitComment (lane.go:753) checks IssueCommentsContain(forkWaitCommentMarker) before creating one, so it is idempotent per PR.
  • "head its queue approval no longer covers must be queued again" β€” consistent with the authorization re-check per head (gate_test.go:152 "lgtm approval covers another head" β†’ waiting).

The v6-readiness.md row edit is evidence bookkeeping and links the issues it names. Looks correct to me.

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

@github-actions

github-actions Bot commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

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

No conflicting open PRs or same-file overlaps were found.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Deferred to shared-CI incident #14976: the red check here failed on a proxy.golang.org stream reset (INTERNAL_ERROR), the same root cause hitting two sibling PRs today; the check is green on the base tip. No PR-side change needed β€” it gets a fresh run once the incident is addressed or a new commit lands.


🐝 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 stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Oct 28, 2026
@hivecommons-hive hivecommons-hive Bot added stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) labels Oct 28, 2026
A /hive queue approval records the reviewed commit SHA
(latestHiveQueueApproval) and both queueApprovalStillHolds and the
queued sweep compare it by exact SHA, so any new head, including a
plain merge of the tip, needs a re-queue. Drop the parenthetical that
implied a tip-only merge keeps the approval.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
Signed-off-by: Danathar <Danathar@users.noreply.github.com>
@Danathar

Copy link
Copy Markdown
Contributor Author

Re the adjudicator-3 intent-alignment finding (operator-reference.md:780-782): agreed and fixed in e2b74a6. latestHiveQueueApproval records review.GetCommitID() (automerge_sweep.go:2820) and both queueApprovalStillHolds (:2041) and the queued sweep (:2657) compare by exact SHA, with no tip-only exception. The sandbox#13 merge in the evidence was at the approved head c07fdac, so it does not show one either. Took the suggested wording. #14946 (base_sync table row) stays as backlog.

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 060-reviewed β†’ 050-review-pending: check-pending

@hivecommons-hive hivecommons-hive Bot added stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive
hivecommons-hive Bot merged commit c7edf3a into hivecommons:v6 Oct 28, 2026
66 of 69 checks passed
@hivecommons-hive

Copy link
Copy Markdown
Contributor
Evidence bundle `#14939e2b74a6` sha256:a9322efff77a9a2d8d454332e24a57cf5892c7d39cc211e63f76ca9d1aedd9e2 β€” download from the dashboard or `hivectl review evidence #14939`.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

merged by Hive trusted-author auto-merge: author @Danathar holds role owner and GitHub permission maintain on repo; CI green at e2b74a6.

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

Labels

author/clanker A contributor's own hive authored this PR under their login 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.

1 participant