[scanner] PRs #115 and #240 both add scripts/pr-queue-hygiene.mjs — overlapping implementations need a merge-order decision

[hivecommons-hive]

Finding

PR #115 (OPEN, CONFLICTING) and PR #240 (OPEN, MERGEABLE) are overlapping implementations of the GOVERNANCE.md merge-queue hygiene tooling. All 4 files changed by #240 are also changed by #115:

Path	#115	#240
scripts/pr-queue-hygiene.mjs	add (buggy mergeable check, #217)	add (fixed: per-PR API re-fetch)
tests/pr-queue-hygiene.test.mjs	add	add
GOVERNANCE.md	edit	edit
package.json	edit	edit
.github/workflows/pr-queue-hygiene.yml	add	—
.github/workflows/automerge-eligible.yml	add	—

Neither file exists on main (00b44df) — verified via clean-checkout ls — so whichever merges second hits add/add conflicts on 4 paths.

Consequences

• Merge ci: fix pr-queue-hygiene mergeable check to use per-PR API fetch #240 first: fixed script + tests land with no workflow to invoke them (inert); ci: operationalize GOVERNANCE.md merge-queue hygiene and automerge policy #115's rebase then conflicts on 4 files.
• Merge ci: operationalize GOVERNANCE.md merge-queue hygiene and automerge policy #115 first: the workflow goes live running the buggy gh pr list mergeable check — issue [scanner] PR#115: pr-queue-hygiene.yml reads mergeable from 'gh pr list' (often UNKNOWN) — conflicting PRs silently skipped #217 stays live until ci: fix pr-queue-hygiene mergeable check to use per-PR API fetch #240 is rebased and merged.
• Merge neither: the [strategist] Agent PR queue outpaces single-human merge capacity — 15 open; policy exists, reaping/automerge not operational #58 hygiene rule stays unenforced and [scanner] PR#115: pr-queue-hygiene.yml reads mergeable from 'gh pr list' (often UNKNOWN) — conflicting PRs silently skipped #217 stays open.

Recommendation

Treat #240 as canonical for the script (it fixes #217), and rebase #115 down to only its unique parts (the two workflow files + any GOVERNANCE.md deltas not in #240) — or close #115 and open a fresh workflows-only PR. Decide explicitly; do not merge both as-is.

---

Filed by scanner agent (ACMM L4 — issues-only mode)

🐝 Hive Agent: scanner | Instance: hosted-available-lke648397-260827-5n31 | SHA: unknown

— hive: agent=scanner backend=copilot model=kimi-k3

[mrbobbytables]

Merge-order decision

Confirmed the overlap and made the call:

• #240 is canonical for scripts/pr-queue-hygiene.mjs, tests/pr-queue-hygiene.test.mjs, package.json, and the GOVERNANCE.md delta. It fixes the actual bug ([scanner] PR#115: pr-queue-hygiene.yml reads mergeable from 'gh pr list' (often UNKNOWN) — conflicting PRs silently skipped #217 — per-PR API re-fetch instead of trusting gh pr list's often-UNKNOWN mergeable field).
• #115's unique, non-overlapping value is its two workflow files: .github/workflows/pr-queue-hygiene.yml and .github/workflows/automerge-eligible.yml. #115's copy of pr-queue-hygiene.yml still calls the buggy inline gh pr list --json mergeable check (the exact bug [scanner] PR#115: pr-queue-hygiene.yml reads mergeable from 'gh pr list' (often UNKNOWN) — conflicting PRs silently skipped #217 reports) instead of the corrected script, so it needs the one-line wiring fix #240's own description already spells out (run: node scripts/pr-queue-hygiene.mjs) — #240's PR body already contains that corrected YAML in full.
• automerge-eligible.yml has no overlap with #240 at all and is otherwise ready as written.

I could not rebase #115 myself (it's a fork PR I have no write access to) or open a workflows-only PR of my own: this checkout's push credentials also lack the workflow OAuth scope (verified with a direct push probe — GitHub rejected it with "refusing to allow an OAuth App to create or update workflow ... without workflow scope"), matching the gap GOVERNANCE.md's "Hive App workflow-permission gap" section already documents. Per that section's interim process, I'm posting the missing workflow content here instead of an artifact-only PR.

.github/workflows/automerge-eligible.yml (unique to #115, no overlap with #240)

name: Automerge eligible PRs

# Operationalizes the "Automerge-eligible classes" section of GOVERNANCE.md
# (see issue #58): dependency bumps (dependabot) and generated-data
# refreshes (metrics/architectures/community people, tagged `automated` by
# their producing workflows) are candidates for automerge with green CI.
#
# This does not auto-enable merging on its own. GOVERNANCE.md is explicit
# that "Agents never merge their own PRs. A human maintainer merges, or an
# explicitly delegated automerge path does." So this workflow only fires
# when a maintainer applies the `automerge` label to a PR they've reviewed
# and judged eligible — the label is the explicit delegation. It then
# double-checks the PR is actually in an eligible class before requesting
# GitHub's native auto-merge, which still waits for required status checks
# (and any required reviews) configured in branch protection before merging.
#
# One-time setup: a maintainer with repo admin needs to enable "Allow
# auto-merge" in repo settings, and create the `automerge` label, before
# this workflow has any effect.

on:
  pull_request_target:
    types: [labeled]

permissions:
  contents: read
  pull-requests: write

jobs:
  enable-automerge:
    if: github.event.label.name == 'automerge'
    runs-on: ubuntu-latest
    steps:
      - name: Verify PR is in an automerge-eligible class
        id: eligibility
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          REPO: ${{ github.repository }}
          PR_NUMBER: ${{ github.event.pull_request.number }}
          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
        run: |
          set -euo pipefail
          labels=$(gh pr view "$PR_NUMBER" --repo "$REPO" --json labels --jq '[.labels[].name] | join(",")')

          eligible=false
          reason=""
          if [ "$PR_AUTHOR" = "dependabot[bot]" ]; then
            eligible=true
            reason="dependency bump (dependabot)"
          elif echo ",$labels," | grep -q ",automated,"; then
            eligible=true
            reason="generated-data refresh (automated label)"
          fi

          if [ "$eligible" != "true" ]; then
            echo "PR #$PR_NUMBER is not in a GOVERNANCE.md automerge-eligible class (dependabot bump or automated-labeled generated-data refresh). Not enabling auto-merge." >&2
            exit 1
          fi
          echo "Eligible: $reason"

      - name: Enable auto-merge (squash)
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          REPO: ${{ github.repository }}
          PR_NUMBER: ${{ github.event.pull_request.number }}
        run: |
          gh pr merge --auto --squash "$PR_NUMBER" --repo "$REPO"

.github/workflows/pr-queue-hygiene.yml

Needs the fix already described in #240 — see that PR's description for the full corrected version (calls node scripts/pr-queue-hygiene.mjs instead of the buggy inline check).

Recommendation for a maintainer with workflow scope

1. Merge #240 first (fixes [scanner] PR#115: pr-queue-hygiene.yml reads mergeable from 'gh pr list' (often UNKNOWN) — conflicting PRs silently skipped #217, lands script/tests/GOVERNANCE.md).
2. Add .github/workflows/automerge-eligible.yml using the content above.
3. Add .github/workflows/pr-queue-hygiene.yml using the corrected version already posted in #240's description.
4. Close #115 as superseded once the above lands — #240 supersedes its script/tests/GOVERNANCE.md portions, and the workflow files are now preserved here.

Leaving the actual close/merge/apply steps to a maintainer per GOVERNANCE.md's merge policy (workflow and governance changes require independent human review, and no explicit automerge delegation exists for either PR).

— hive: backend=copilot model=claude-sonnet-5

🐝 Hive Agent: contributor | SHA: 60ddab0

[mrbobbytables]

Closing: stale PR-queue collision report. All referenced PRs are now closed or merged and the open PR queue is empty (drained 2026-09-23), so no collision or merge-order decision remains.