You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Wave-Engineering/mcp-server-discord has merge-queue enabled but enablePullRequestAutoMerge disabled at the repo level. This violates policy_wave_engineering_merge_config (memory file), which requires BOTH features enabled across all Wave-Engineering repos.
Context
Discovered during /wavemachine run on 2026-04-26 executing discord-release-workflow-fix wave W-1 (PR #49). The pr_merge MCP tool's gh pr merge --auto call failed with:
The merge strategy for main is set by the merge queue
Auto merge is not allowed for this repository
Prime(post-flight) fell back to the GraphQL enqueuePullRequest path manually and the PR landed clean, but this should not require manual workarounds on any fleet repo.
Separately: the sister repo mcp-server-discord-watcher has the correct config — PR #27 merged on the first pr_merge call via auto-merge. So the drift is specific to mcp-server-discord.
Implementation Steps
Enable auto-merge on Wave-Engineering/mcp-server-discord via:
gh api repos/Wave-Engineering/mcp-server-discord -X PATCH -f allow_auto_merge=true
Or via the gh-settings helper if it has a kahuna-sandbox-style composite for GitHub repos (check first).
Verify via:
gh api repos/Wave-Engineering/mcp-server-discord --jq '.allow_auto_merge'# expect: true
Audit the rest of the Wave-Engineering GitHub fleet to confirm the remaining repos are in compliance:
Any other non-compliant repos: enable auto-merge in the same batch.
Test Procedures
Verify API response: Run gh api repos/Wave-Engineering/mcp-server-discord --jq '.allow_auto_merge' and confirm it returns true.
Policy compliance audit: Run the fleet audit script from Implementation Steps feat: add sync.sh for local-to-repo reverse sync #3 to verify all Wave-Engineering repos return true for allow_auto_merge. Document results.
End-to-end auto-merge test: Open a throwaway feature branch and PR against Wave-Engineering/mcp-server-discord (e.g. feature/496-test-autoMerge). Enable auto-merge on the PR via gh pr merge --auto, confirm the PR auto-merges once CI passes and approvals are met (verifies config-exists-==-config-works per CLAUDE.md's Infrastructure Verification rule). Close/revert if the PR lands.
Acceptance Criteria
gh api repos/Wave-Engineering/mcp-server-discord --jq '.allow_auto_merge' returns true
Full fleet audit script run and all Wave-Engineering repos return true
If any additional drift is found, it's fixed in the same pass
Related
policy_wave_engineering_merge_config.md (memory)
lesson_merge_queue_gh.md (memory)
Wave-Engineering/mcp-server-sdlc bug filed simultaneously: pr_merge auto-fallback (links will be updated)
Summary
Wave-Engineering/mcp-server-discordhas merge-queue enabled butenablePullRequestAutoMergedisabled at the repo level. This violatespolicy_wave_engineering_merge_config(memory file), which requires BOTH features enabled across all Wave-Engineering repos.Context
Discovered during
/wavemachinerun on 2026-04-26 executingdiscord-release-workflow-fixwave W-1 (PR #49). Thepr_mergeMCP tool'sgh pr merge --autocall failed with:Prime(post-flight) fell back to the GraphQL
enqueuePullRequestpath manually and the PR landed clean, but this should not require manual workarounds on any fleet repo.Separately: the sister repo
mcp-server-discord-watcherhas the correct config — PR #27 merged on the firstpr_mergecall via auto-merge. So the drift is specific tomcp-server-discord.Implementation Steps
Wave-Engineering/mcp-server-discordvia:gh-settingshelper if it has akahuna-sandbox-style composite for GitHub repos (check first).Test Procedures
Verify API response: Run
gh api repos/Wave-Engineering/mcp-server-discord --jq '.allow_auto_merge'and confirm it returnstrue.Policy compliance audit: Run the fleet audit script from Implementation Steps feat: add sync.sh for local-to-repo reverse sync #3 to verify all Wave-Engineering repos return
trueforallow_auto_merge. Document results.End-to-end auto-merge test: Open a throwaway feature branch and PR against
Wave-Engineering/mcp-server-discord(e.g.feature/496-test-autoMerge). Enable auto-merge on the PR viagh pr merge --auto, confirm the PR auto-merges once CI passes and approvals are met (verifies config-exists-==-config-works per CLAUDE.md's Infrastructure Verification rule). Close/revert if the PR lands.Acceptance Criteria
gh api repos/Wave-Engineering/mcp-server-discord --jq '.allow_auto_merge'returnstruetrueRelated
policy_wave_engineering_merge_config.md(memory)lesson_merge_queue_gh.md(memory)pr_mergeauto-fallback (links will be updated)— rules-lawyer 📜 (cc-workflow)