Skip to content

[guide] docs: document the auto_merge App self-merge sweep block (operator-reference.md) - #6199

Open
kubestellar-hive[bot] wants to merge 1 commit into
v4from
guide/docs-automerge-block
Open

[guide] docs: document the auto_merge App self-merge sweep block (operator-reference.md)#6199
kubestellar-hive[bot] wants to merge 1 commit into
v4from
guide/docs-automerge-block

Conversation

@kubestellar-hive

Copy link
Copy Markdown
Contributor

Documentation Fix

Documents the top-level auto_merge: config block (AutoMergeConfig, src/pkg/config/config.go) in src/docs/operator-reference.md — previously mentioned in no doc despite being operator-facing and default-ON:

  • adds an auto_merge row to the Configuration blocks table
  • adds a dedicated App self-merge sweep (auto_merge) section covering:
    • auto_merge.self_authored — default on; the only off switch for SweepSelfAuthoredAutoMerges (src/pkg/github/automerge_sweep.go)
    • the acmm_level >= 6 fail-closed gate (config.SelfMergeMinACMMLevel) — unset ACMM never self-merges, and the boot log line that names the blocked condition
    • auto_merge.max_merges (default 3, DefaultAutoMergeSweepMaxMerges)
    • auto_merge.required_checks and why it exists (the branch-protection API needs administration:read, which the App does not hold; the allowlist fallback can block on non-required checks)
    • per-PR eligibility (open, non-draft, App-authored re-verified per PR, mergeable, green on required checks, head SHA re-verified at merge)
    • the rate-limit-aware sweep interval (10s floor ≤4 repos, budget-share scaled above)
  • distinguishes the sweep from the human governor.labels.automerge queue and cross-links the two

Claimed ground: src/docs/operator-reference.md only — disjoint from all open guide PRs (#6091 fleet-drift docs, #6117 audit-log, #6126 contributor-relay/env-vars, #6146 env-vars, #6154 hivectl, #6168 token-tracking, #6182 api-reference, #6193 hive.yaml.example).

Fixes #6198


Filed by guide agent (ACMM L5 — hold-gated mode). Hold-gated: human review required.

— hive: agent=guide backend=copilot model=claude-sonnet-4-6

operator-reference.md never mentioned the top-level auto_merge: block
(AutoMergeConfig, src/pkg/config/config.go) that gates
SweepSelfAuthoredAutoMerges — the sweep by which the Forge App merges
its own CI-green PRs over REST, bypassing tide. Adds:

- an auto_merge row to the Configuration blocks table
- a dedicated section: self_authored (default ON), max_merges
  (default 3), required_checks and its administration:read fallback
  rationale, the acmm_level >= 6 fail-closed gate, per-PR eligibility,
  and the rate-limit-aware sweep interval
- the distinction from the governor.labels.automerge human queue,
  cross-linked from that Notable-fields row

Refs #6198

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: hive-guide <sec-check@hive.kubestellar.io>
@kubestellar-hive kubestellar-hive Bot added the hold label Sep 7, 2026
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Sep 7, 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

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

Labels

copilot dco-signoff: yes Indicates the PR's author has signed the DCO. hold size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[guide] docs: top-level auto_merge config block (App self-merge sweep) is undocumented

0 participants