Skip to content

chore(repo): adopt claude/ auto-merge convention; author AGENTS.md#450

Merged
ANcpLua merged 1 commit into
mainfrom
claude/auto-merge-claude-prefix
Jun 30, 2026
Merged

chore(repo): adopt claude/ auto-merge convention; author AGENTS.md#450
ANcpLua merged 1 commit into
mainfrom
claude/auto-merge-claude-prefix

Conversation

@ANcpLua

@ANcpLua ANcpLua commented Jun 30, 2026

Copy link
Copy Markdown
Owner

What

Standardize qyl on Claude Code for agent-driven work and drop the OpenAI Codex connector. Two coupled changes:

  1. Sync auto-merge.yml to the new fleet template — native auto-merge now keys on claude/ (+ copilot/) branches instead of codex/. The chatgpt-codex-connector[bot] approval clause and the now-dead pull_request_review trigger are removed. Kept byte-identical to github-settings-automation/templates/auto-merge.yml so the weekly enforce-repo-settings sweep treats it as canonical (no drift, no revert).
  2. Author AGENTS.md — fixes the long-standing broken CLAUDE.md → AGENTS.md symlink (the umbrella repo had no effective agent-instructions file; flagged as a defect in docs/qyl-fleet-consolidation-plan.md TODO B2). It encodes the repo's hard rules and — crucially — the claude/ branch convention the auto-merge trigger keys on, so the prefix stays consistent and the trigger doesn't rot.

Why AGENTS.md is bundled here

Adding the claude/ auto-merge trigger is only durable if branches are actually named claude/. claude/ is already used across the fleet (qyl #432, control-plane #18/#20) but inconsistently. AGENTS.md is the natural home to make the convention explicit — and it resolves a real missing-file defect at the same time.

Companion PR

Pairs with ANcpLua/github-settings-automation#28 (the fleet template + control-plane copy). Merge that first, then this — so qyl's auto-merge.yml matches the merged template and the sweep never reverts it.

Verification

  • auto-merge.yml confirmed byte-identical to the new template; parsed with yaml.safe_load; claude/+copilot/ present, codex/chatgpt-codex-connector absent.
  • CLAUDE.md symlink now resolves to the new AGENTS.md.
  • BuildVerify.cs left untouched (its codex tokens are a removed-feature guard, not agent config).

Complete and verified.

🤖 Generated with Claude Code

Owner is standardizing on Claude Code for agent work and dropping the
OpenAI Codex connector. Two coupled changes:

- Sync auto-merge.yml to the new fleet template: native auto-merge now
  keys on claude/ (+ copilot/) branches instead of codex/, and the
  chatgpt-codex-connector[bot] approval clause + dead pull_request_review
  trigger are gone. Kept byte-identical to
  github-settings-automation/templates/auto-merge.yml so the weekly
  enforce-repo-settings sweep treats it as canonical.
- Author AGENTS.md, fixing the long-standing broken CLAUDE.md -> AGENTS.md
  symlink (the umbrella repo had no effective agent-instructions file).
  It encodes the repo's hard rules (single-sourced contracts, no
  hand-edited generated files, Version.props version ownership, the
  BuildVerify removed-token guard), the toolchain, build/test/run, and
  crucially the claude/ branch convention that the auto-merge trigger
  keys on — so the prefix stays consistent and the trigger does not rot.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@coderabbitai

coderabbitai Bot commented Jun 30, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 1d631908-a3ed-4c0d-ad8d-e57f40559425

📥 Commits

Reviewing files that changed from the base of the PR and between 9397918 and c9860fe.

⛔ Files ignored due to path filters (1)
  • AGENTS.md is excluded by none and included by none
📒 Files selected for processing (1)
  • .github/workflows/auto-merge.yml
📜 Recent review details
🧰 Additional context used
📓 Path-based instructions (1)
.github/**

⚙️ CodeRabbit configuration file

GitHub Actions workflows. Review for: action version pinning (use SHA not tags for third-party actions), proper secret handling (no secrets in logs, use GITHUB_TOKEN where possible), unnecessary workflow triggers, and job dependency correctness. Flag missing concurrency groups on push-triggered workflows. Ensure matrix strategies cover the supported .NET TFMs.

Files:

  • .github/workflows/auto-merge.yml
🧠 Learnings (1)
📓 Common learnings
Learnt from: CR
Repo: ANcpLua/qyl

Timestamp: 2026-06-30T15:36:15.099Z
Learning: Public API request/response/DTO/schema shapes must remain single-sourced in the external `qyl-api-schema` TypeSpec repo and flow into this monorepo through the `Qyl.Api.Contracts` package; do not add new public API models in `qyl.collector` or create a second contract source here.
Learnt from: CR
Repo: ANcpLua/qyl

Timestamp: 2026-06-30T15:36:15.099Z
Learning: Do not hand-edit generated files; fix the generator or schema input, regenerate, and commit the result (including Roslyn `*.g.cs`, generated protobuf, and the dashboard's generated TS API types).
Learnt from: CR
Repo: ANcpLua/qyl

Timestamp: 2026-06-30T15:36:15.099Z
Learning: Do not reintroduce removed code; if `eng/build/BuildVerify.cs` fails due to `removedCollectorTokens`, keep the symbol removed rather than deleting the guard entry.
Learnt from: CR
Repo: ANcpLua/qyl

Timestamp: 2026-06-30T15:36:15.099Z
Learning: Use the repo's pinned toolchain: .NET SDK from `global.json` (currently `10.0.301` with `latestFeature` roll-forward), C# 14, Microsoft.Testing.Platform, and the dashboard stack of ESM, Node 20+, React 19, Vite, TanStack, and Tailwind 4; do not add new external runtime dependencies unless already declared in `package.json`.
Learnt from: CR
Repo: ANcpLua/qyl

Timestamp: 2026-06-30T15:36:15.099Z
Learning: Use Conventional Commits for branch/PR titles and squash-merge messages, and deliver changes through a PR after CI passes; agent-authored branches should use the `claude/…` prefix for auto-merge eligibility.
🔇 Additional comments (1)
.github/workflows/auto-merge.yml (1)

8-10: LGTM!

Also applies to: 28-28, 46-47


Summary by CodeRabbit

  • Chores
    • Narrowed auto-merge support to trusted automation branches starting with claude/ and copilot/.
    • Removed older merge trigger conditions, making auto-merge behavior more consistent and predictable.

Walkthrough

Removes codex/ branch support from the auto-merge workflow. The pull_request_review (submitted) trigger is deleted, policy comment bullets are updated, and the job if condition now gates on claude/ and copilot/ head refs only.

Auto-merge Policy Narrowing

Layer / File(s) Summary
Comments, triggers, and job gate
.github/workflows/auto-merge.yml
Policy comment, branch-prefix bullets, pull_request_review trigger block, and jobs.enable-auto-merge.if condition all updated to permit only claude/ and copilot/ branches.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

  • ANcpLua/ErrorOrX#10: Identical change to the same workflow file — removes/narrows allowed head branch prefixes and triggers.
  • ANcpLua/ANcpLua.Analyzers#147: Same workflow, same narrowing of branch prefixes and removal of pull_request_review/bot-approval conditions.
  • ANcpLua/ANcpLua.NET.Sdk#149: Same workflow, same job-gating change restricting auto-merge to claude/ and copilot/.

Suggested labels

area:infra


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error, 4 inconclusive)

Check name Status Explanation Resolution
Title check ❌ Error The title is relevant, but the scope uses repo instead of an allowed area label, so it does not meet the required format. Change the scope to one of the allowed labels (dashboard, ingestion, mcp, loom, infra) and keep it under 72 characters.
Otel Instrumentation Required ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
No Unbounded Mcp Responses ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Duckdb Backpressure On Write Paths ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Cancellationtoken Threading ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
✅ Passed checks (3 passed)
Check name Status Explanation
Description check ✅ Passed The description directly matches the workflow and AGENTS.md changes.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

Comment @coderabbitai help to get the list of available commands.

@ANcpLua ANcpLua merged commit 034aeab into main Jun 30, 2026
6 checks passed
@ANcpLua ANcpLua deleted the claude/auto-merge-claude-prefix branch June 30, 2026 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant