Skip to content

governance: merge-queue ruleset——agent-registry/template-service 先行（P2-7，ADR-0042） #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
randypanding merged 1 commit into from
Aug 20, 2026
Merged

governance: merge-queue ruleset——agent-registry/template-service 先行（P2-7，ADR-0042） #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions governance/rulesets/merge-queue.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "merge-queue",
"target": "branch",
"enforcement": "active",
"conditions": {
"ref_name": {
"include": [
"~DEFAULT_BRANCH"
],
"exclude": []
},
"repository_name": {
"include": [
"agent-registry",
"template-service"
],
"exclude": []
}
},
"bypass_actors": [
{
"actor_id": null,
"actor_type": "OrganizationAdmin",
"bypass_mode": "always"
}
],
"rules": [
{
"type": "merge_queue",
"parameters": {
"check_response_timeout_seconds": 3600,
"max_entries_to_build": 5,
"merge_method": "squash",
"min_entries_to_merge": 1
Comment on lines +31 to +34

@qodo-code-review qodo-code-review Bot Aug 20, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Action required

1. Invalid merge queue payload 🐞 Bug ≡ Correctness

The merge queue uses an unsupported timeout field and lowercase merge method while omitting three
required parameters, so apply.sh will receive an API validation failure instead of creating the
ruleset. This prevents merge-queue enablement for both targeted repositories.
Agent Prompt 
## Issue description
The merge-queue parameters do not match GitHub's organization ruleset API schema. Replace `check_response_timeout_seconds` with `check_response_timeout_minutes` (using `60` for the intended one-hour timeout), use the uppercase `SQUASH` enum, and provide required `grouping_strategy`, `max_entries_to_merge`, and `min_entries_to_merge_wait_minutes` values; use `max_entries_to_merge: 1` to preserve the stated serial grouping policy.

## Issue Context
`governance/apply.sh` submits each ruleset JSON directly to GitHub without transforming its parameters, so the checked-in file must already match the REST API request schema.

## Fix Focus Areas
- governance/rulesets/merge-queue.json[30-35]

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools

}
}
]
}