Agent Skillsaaronjmars/aeon › Auto Merge

Auto Merge

GitHub

自动合并符合严格安全策略的PR,包括CI通过、无冲突及信任作者。支持大小限制、分支校验、重试熔断及干跑模式,防止意外发布。

skills/auto-merge/SKILL.md aaronjmars/aeon

Trigger Scenarios

用户请求自动合并PR 定时任务触发批量清理

Install

npx skills add aaronjmars/aeon --skill Auto Merge -g -y
More Options

Use without installing

npx skills use aaronjmars/aeon@Auto Merge

指定 Agent (Claude Code)

npx skills add aaronjmars/aeon --skill Auto Merge -a claude-code -g -y

安装 repo 全部 skill

npx skills add aaronjmars/aeon --all -g -y

预览 repo 内 skill

npx skills add aaronjmars/aeon --list

SKILL.md

Frontmatter
{
    "var": "",
    "name": "Auto Merge",
    "tags": [
        "dev",
        "meta"
    ],
    "type": "Skill",
    "category": "dev",
    "description": "Automatically merge open PRs that have passing CI, no blocking reviews, and no conflicts"
}

${var} — Repo (owner/repo) to target. If empty, uses every repo in memory/watched-repos.md. Env: AUTO_MERGE_DRY_RUN=1 logs intent without merging. MAX_AUTO_MERGE=N caps merges per run (default 3).

Merge open PRs that are fully green and pass an explicit safety policy. The policy exists because this skill runs autonomously with write access — a bug in the gate is a bug that ships to main.

Read memory/MEMORY.md and memory/watched-repos.md for repos to target. Read the last 2 days of memory/logs/ to avoid re-logging PRs already merged.

Safety policy

A PR merges only when every one of the following holds:

  • Author allowlist: author.login is one of dependabot[bot], renovate[bot], github-actions[bot], OR appears under a ## Trusted Authors section in memory/watched-repos.md. No allowlist → only the three bot logins are eligible.
  • Size cap: additions + deletions ≤ 500. Override by applying the label auto-merge-large on the PR.
  • Base branch: baseRefName is main or master. Refuse any other target.
  • Not a fork: isCrossRepository == false (fork CI can be tampered with).
  • Not draft: isDraft == false.
  • Not already queued: autoMergeRequest == null (avoid fighting GitHub's native auto-merge if a human enabled it).
  • No opt-out label: none of {do-not-merge, wip, hold, needs-review, blocked} present.
  • Mergeable state: mergeStateStatus == "CLEAN" (this is stricter than mergeable == "MERGEABLE" — CLEAN additionally requires branch-protection gates to be satisfied).
  • Reviews: reviewDecision != "CHANGES_REQUESTED".
  • Checks: every entry in statusCheckRollup has conclusion in {SUCCESS, NEUTRAL, SKIPPED}. Any FAILURE, TIMED_OUT, CANCELLED, PENDING, or null conclusion disqualifies the PR.
  • Retry cap: this PR has been attempted fewer than 3 times. A PR that has hit MERGE_FAIL three times across runs is paused — repeated failure on a CLEAN-looking PR usually means something subtle (a required check that didn't surface, branch-protection drift, token scope drift). Surface it and stop looping.

Steps

  1. Bootstrap state — per-PR retry counter lives in memory/topics/auto-merge-state.json:

    mkdir -p memory/topics
    [ -f memory/topics/auto-merge-state.json ] || echo '{"prs":{},"last_run":null}' > memory/topics/auto-merge-state.json
    

    Schema:

    {
      "last_run": "2026-05-23T08:00:00Z",
      "prs": {
        "owner/repo#123": {
          "first_seen": "2026-05-21T10:00:00Z",
          "last_attempt": "2026-05-23T08:00:00Z",
          "attempts": 2,
          "last_outcome": "merge_failed",
          "last_error": "Pull Request is in unstable state"
        }
      }
    }
    

    PR keys are <owner>/<repo>#<number> so state survives multi-repo runs. Cap to 50 most-recent entries (LRU by last_attempt). Validate with jq empty after write; restore from .bak on failure.

  2. List open PRs for each watched repo with the full field set:

    gh pr list -R owner/repo --state open --json number,title,author,isDraft,mergeable,mergeStateStatus,reviewDecision,statusCheckRollup,autoMergeRequest,isCrossRepository,labels,additions,deletions,baseRefName
    
  3. Handle UNKNOWN state — GitHub computes mergeStateStatus lazily. If a PR returns UNKNOWN, sleep 3 seconds and re-query once:

    sleep 3 && gh pr view NUMBER -R owner/repo --json mergeStateStatus,mergeable,statusCheckRollup
    

    If still UNKNOWN after the retry, skip the PR with reason UNKNOWN-persistent and let the next run retry.

  4. Apply the safety policy to each PR. Record a verdict for every PR: either MERGE or SKIP:<specific-reason>. Reasons must name the failing gate — e.g. SKIP:author-not-allowlisted:contributor123, SKIP:size-cap:823-lines, SKIP:mergeStateStatus=BEHIND, SKIP:label:do-not-merge, SKIP:check-failed:lint, SKIP:retry-cap:3-attempts. Vague reasons like SKIP:not-ready are not acceptable.

  5. Merge qualifying PRs, up to MAX_AUTO_MERGE (default 3):

    • If AUTO_MERGE_DRY_RUN=1, log DRY_RUN:would-merge #N and continue — do NOT invoke merge.
    • Otherwise:
      gh pr merge NUMBER -R owner/repo --squash --delete-branch
      
      Increment state.prs["<owner>/<repo>#<N>"].attempts on every attempt regardless of outcome. Set first_seen if absent. Reset to 0 (delete the entry) for PRs that no longer appear in the open list (already merged or closed since the last run). If the merge fails (non-zero exit), capture stderr and log MERGE_FAIL #N: <stderr>. Record last_outcome: merge_failed and last_error: <stderr ≤200 chars> on the state entry. A failed merge does NOT count toward the per-run MAX_AUTO_MERGE cap — continue to the next qualifying PR. A PR whose attempts has reached 3 is filtered out in step 3 with SKIP:retry-cap:3-attempts; surface it in step 5b instead of retrying.
  6. Send a notification only when at least one real (non-dry-run) merge succeeded or at least one PR has hit the retry cap (5b below). No merges and no cap hits → no notification, just a log entry.

    5a. At least one merge succeeded:

    *Auto Merge — ${today}*
    Merged N PR(s) on owner/repo:
    - #123: PR title (+45/-12, by @author) — squash merged abc1234
    Queue cleared. Self-improve cycle unblocked.
    

    5b. Retry cap reached on ≥1 PR (AUTO_MERGE_RETRY_CAP) — include in the same message if both fire, otherwise stand-alone:

    *Auto Merge — retry cap*
    Hit retry cap (3 attempts) on:
    - owner/repo#40 — last error: "Pull Request is in unstable state"
    Stopping auto-merge attempts on this PR. Investigate manually.
    

    Dedup: suppress re-notify if the exact same set of cap-hit PR keys already notified within the last 24h (grep memory/logs/ for prior AUTO_MERGE_RETRY_CAP entries).

  7. Persist state — write the updated memory/topics/auto-merge-state.json. Update last_run to current timestamp. Validate with jq empty; on failure restore from a .bak written before this run.

  8. Log to memory/logs/${today}.md under an ### auto-merge heading:

    • Mode: live | dry-run
    • Repo(s): list
    • Merged: #N title @author +A-D SHA per line
    • Skipped: #N SKIP:<reason> per line
    • Retry-capped: owner/repo#N — <last_error> per line (empty if none)
    • Totals: merged=X qualified=Y considered=Z retry_capped=R
    • If zero qualified, include a verdict breakdown: AUTO_MERGE_SKIP: 0/Z qualifying (behind=B blocked=L failing=F draft=D author-blocked=A size-blocked=S retry-capped=R)

Sandbox note

gh authenticates via the workflow's GITHUB_TOKEN — no curl needed. If gh pr merge fails with Resource not accessible by integration, the workflow token lacks merge permission on that repo; log once and notify at most once per 7 days (check memory/logs/ for prior notification) to avoid alert spam.

Constraints

  • Never merge a PR whose author is not allowlisted, even if every other gate is green.
  • Never bypass the size cap without the explicit auto-merge-large label (set by a human, not a bot).
  • Never auto-retry a MERGE_FAIL within the same run — if the first merge attempt fails, log and move on.
  • After 3 failed attempts across runs, stop retrying that PR. Surface it once via the retry-cap notification and let the operator investigate.
  • Do not modify PR state other than merging (no comments, no label edits, no branch updates).

Running this as an agent-shipping loop

To close the loop on PRs the agent itself opens (from feature, external-feature, self-improve, etc.), add the agent's GitHub identity under a ## Trusted Authors section in memory/watched-repos.md:

## Trusted Authors
- aeon-bot
- claude-code[bot]

Once allowlisted, agent PRs flow through the same safety policy as bot PRs and get auto-merged on green CI. The retry cap protects against runaway behavior on a stuck PR.

Version History

  • fb16753 Current 2026-07-05 12:05

Same Skill Collection

skills/action-converter/SKILL.md
skills/article/SKILL.md
skills/auto-workflow/SKILL.md
skills/autoresearch/SKILL.md
skills/bd-radar/SKILL.md
skills/changelog/SKILL.md
skills/code-health/SKILL.md
skills/cost-report/SKILL.md
skills/create-skill/SKILL.md
skills/ctrl/SKILL.md
skills/defi-overview/SKILL.md
skills/deploy-prototype/SKILL.md
skills/digest/SKILL.md
skills/distribute-tokens/SKILL.md
skills/ecosystem-pulse/SKILL.md
skills/fear-divergence/SKILL.md
skills/feature/SKILL.md
skills/fetch-tweets/SKILL.md
skills/fleet-control/SKILL.md
skills/fork-fleet/SKILL.md
skills/github-monitor/SKILL.md
skills/github-trending/SKILL.md
skills/heartbeat/SKILL.md
skills/idea-forge/SKILL.md
skills/idea-pipeline/SKILL.md
skills/inbox-triage/SKILL.md
skills/install-skill/SKILL.md
skills/investigation-report/SKILL.md
skills/issue-triage/SKILL.md
skills/last30/SKILL.md
skills/memory-flush/SKILL.md
skills/mention-radar/SKILL.md
skills/monitor-polymarket/SKILL.md
skills/narrative-convergence/SKILL.md
skills/narrative-tracker/SKILL.md
skills/okf-export/SKILL.md
skills/okf-ingest/SKILL.md
skills/onchain-monitor/SKILL.md
skills/operator-scorecard/SKILL.md
skills/picks-tracker/SKILL.md
skills/pm-manipulation/SKILL.md
skills/pm-pulse/SKILL.md
skills/pr-review/SKILL.md
skills/pr-triage/SKILL.md
skills/price-alert/SKILL.md
skills/reply-maker/SKILL.md
skills/repo-scanner/SKILL.md
skills/schedule-ads/SKILL.md
skills/search-skill/SKILL.md
skills/self-improve/SKILL.md
skills/send-email/SKILL.md
skills/skill-health/SKILL.md
skills/skill-repair/SKILL.md
skills/soul-builder/SKILL.md
skills/spawn-instance/SKILL.md
skills/strategy-builder/SKILL.md
skills/token-movers/SKILL.md
skills/token-pick/SKILL.md
skills/treasury-info/SKILL.md
skills/tx-explain/SKILL.md
skills/unlock-monitor/SKILL.md
skills/verdikta-hunter/SKILL.md
skills/vuln-scanner/SKILL.md
skills/vuln-tracker/SKILL.md
skills/workflow-audit/SKILL.md
skills/write-tweet/SKILL.md
skills/x402-monitor/SKILL.md
skills/base-mcp/SKILL.md
skills/star-milestone/SKILL.md

Metadata

Files
0
Version
fb16753
Hash
c440720a
Indexed
2026-07-05 12:05

Accueil - Wiki
Copyright © 2011-2026 iteam. Current version is 2.155.2. UTC+08:00, 2026-07-08 19:53
浙ICP备14020137号-1 $Carte des visiteurs$