fix: async loop expansion, tool-tracking race, MCP skill-gate (#3307) #2637
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Auto Merge Conflict → Claude | |
| # Detects internal PRs with mergeStateStatus=DIRTY and posts @claude to trigger claude.yml. | |
| on: | |
| push: | |
| branches: [main] | |
| pull_request: | |
| types: [opened, synchronize, reopened] | |
| workflow_dispatch: | |
| schedule: | |
| - cron: '0 */6 * * *' | |
| concurrency: | |
| group: merge-conflict-scan-${{ github.repository }}-${{ github.event.pull_request.number || github.run_id }} | |
| cancel-in-progress: true | |
| env: | |
| # PAT posts as MervinPraison so issue_comment triggers claude.yml (GITHUB_TOKEN cannot chain workflows) | |
| GH_TOKEN: ${{ secrets.GH_TOKEN || github.token }} | |
| permissions: | |
| pull-requests: write | |
| issues: write | |
| jobs: | |
| detect-and-trigger: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Detect conflicting PRs and trigger Claude | |
| uses: actions/github-script@v7 | |
| with: | |
| github-token: ${{ env.GH_TOKEN }} | |
| script: | | |
| const owner = context.repo.owner; | |
| const repo = context.repo.repo; | |
| const baseRepo = `${owner}/${repo}`; | |
| const COOLDOWN_MS = 12 * 60 * 60 * 1000; | |
| const AUTO_ACTORS = ['github-actions[bot]', 'MervinPraison']; | |
| const LABEL = 'claude-conflict-pending'; | |
| const COMMENT_BODY = [ | |
| '@claude this PR has merge conflicts with `main`.', | |
| 'Please rebase onto latest `main`, resolve conflicts (keep this PR\'s intent, merge in newer main logic),', | |
| 'run targeted tests, and force-push with `--force-with-lease`.', | |
| 'Comment which files you resolved.', | |
| 'Do not bloat the Agent class with additional params — only if absolutely required; we already support many params.', | |
| 'Keep the resolution minimal — the aim is a lightweight and powerful package; do not introduce scope creep while resolving conflicts.', | |
| ].join(' '); | |
| const sleep = (ms) => new Promise((r) => setTimeout(r, ms)); | |
| async function getMergeState(prNumber) { | |
| const query = ` | |
| query($owner: String!, $repo: String!, $number: Int!) { | |
| repository(owner: $owner, name: $repo) { | |
| pullRequest(number: $number) { | |
| mergeStateStatus | |
| maintainerCanModify | |
| isDraft | |
| headRef { repository { nameWithOwner } } | |
| } | |
| } | |
| } | |
| `; | |
| for (let attempt = 0; attempt < 3; attempt++) { | |
| const result = await github.graphql(query, { owner, repo, number: prNumber }); | |
| const prGql = result.repository.pullRequest; | |
| const status = (prGql?.mergeStateStatus || '').toUpperCase(); | |
| if (status && status !== 'UNKNOWN') { | |
| return { | |
| status, | |
| isDraft: prGql.isDraft, | |
| headRepo: prGql.headRef?.repository?.nameWithOwner, | |
| maintainerCanModify: prGql.maintainerCanModify === true, | |
| }; | |
| } | |
| if (attempt < 2) await sleep(10000); | |
| } | |
| const pr = await github.rest.pulls.get({ owner, repo, pull_number: prNumber }); | |
| return { | |
| status: (pr.data.mergeable_state || '').toUpperCase(), | |
| isDraft: pr.data.draft, | |
| headRepo: pr.data.head.repo?.full_name, | |
| maintainerCanModify: pr.data.maintainer_can_modify === true, | |
| }; | |
| } | |
| function hasFinalClaudeReviewTrigger(comments) { | |
| return comments.some((c) => { | |
| const body = (c.body || '').toLowerCase(); | |
| if (!AUTO_ACTORS.includes(c.user.login)) return false; | |
| if (!body.includes('@claude')) return false; | |
| if (body.includes('merge conflict')) return false; | |
| return body.includes('final architecture reviewer') || body.includes('lead engineer'); | |
| }); | |
| } | |
| function hasRecentAutoComment(comments) { | |
| const cutoff = Date.now() - COOLDOWN_MS; | |
| return comments.some((c) => { | |
| if (!AUTO_ACTORS.includes(c.user.login)) return false; | |
| const body = (c.body || '').toLowerCase(); | |
| if (!body.includes('@claude') || !body.includes('merge conflict')) return false; | |
| return new Date(c.created_at).getTime() > cutoff; | |
| }); | |
| } | |
| async function processPR(prNumber) { | |
| const { status, isDraft, headRepo, maintainerCanModify } = await getMergeState(prNumber); | |
| core.info(`PR #${prNumber}: mergeState=${status}, head=${headRepo}, draft=${isDraft}, maintainerCanModify=${maintainerCanModify}`); | |
| const { data: issue } = await github.rest.issues.get({ | |
| owner, | |
| repo, | |
| issue_number: prNumber, | |
| }); | |
| const labels = issue.labels.map((l) => l.name); | |
| if (status !== 'DIRTY' && labels.includes(LABEL)) { | |
| await github.rest.issues.removeLabel({ | |
| owner, | |
| repo, | |
| issue_number: prNumber, | |
| name: LABEL, | |
| }); | |
| core.info(`Removed ${LABEL} from PR #${prNumber}`); | |
| } | |
| if (status !== 'DIRTY') return { skipped: true, reason: 'not dirty' }; | |
| if (isDraft) return { skipped: true, reason: 'draft' }; | |
| if (headRepo && headRepo !== baseRepo && !maintainerCanModify) { | |
| return { skipped: true, reason: 'fork without maintainer edits' }; | |
| } | |
| if (labels.includes(LABEL)) { | |
| return { skipped: true, reason: 'conflict resolution pending' }; | |
| } | |
| const { data: comments } = await github.rest.issues.listComments({ | |
| owner, | |
| repo, | |
| issue_number: prNumber, | |
| per_page: 100, | |
| }); | |
| if (hasRecentAutoComment(comments)) { | |
| return { skipped: true, reason: 'recent auto comment' }; | |
| } | |
| if (!hasFinalClaudeReviewTrigger(comments)) { | |
| return { skipped: true, reason: 'awaiting final claude review trigger' }; | |
| } | |
| await github.rest.issues.addLabels({ | |
| owner, | |
| repo, | |
| issue_number: prNumber, | |
| labels: [LABEL], | |
| }); | |
| await github.rest.issues.createComment({ | |
| owner, | |
| repo, | |
| issue_number: prNumber, | |
| body: COMMENT_BODY, | |
| }); | |
| return { triggered: true }; | |
| } | |
| let prNumbers = []; | |
| if (context.eventName === 'pull_request') { | |
| prNumbers = [context.payload.pull_request.number]; | |
| } else { | |
| const prs = await github.paginate(github.rest.pulls.list, { | |
| owner, | |
| repo, | |
| state: 'open', | |
| per_page: 100, | |
| }); | |
| prNumbers = prs.map((p) => p.number); | |
| } | |
| const results = []; | |
| for (const num of prNumbers) { | |
| results.push({ pr: num, ...(await processPR(num)) }); | |
| } | |
| core.summary.addRaw('```json\n' + JSON.stringify(results, null, 2) + '\n```'); | |
| await core.summary.write(); |