Code Issues Pull Requests Actions Security InsightsSettings

fix(gates): merge-conflict copy is AI-availability-aware; resolver uses model tiers #5455

Merged⚡ AI-generatedXSccantynz wants to mergefix/honest-merge-conflict-promises→mainopened 24d ago

ccantynzcommented 24d ago

Owner flagged the Merge check gate promising "auto-resolution will be attempted" while the AI is unavailable — a conflicted merge would stall on a doomed API call and fail after promising rescue.

Merge-check gate detail + both PR merge-box strings now branch on isAiAvailable(): with AI down they say "resolve manually — AI resolution unavailable; merging now will fail."
merge-resolver.ts routes through modelForTask() instead of a hardcoded legacy Sonnet id that bypassed the /admin/flags model tiers.
Deeper design concern (unreviewed AI resolutions landing directly in the merge commit on the default branch) tracked separately — behavior unchanged here.

tsc clean; merge/gate suites green (3 pre-existing failures identical on main).

🤖 Generated with Claude Code

ccantynzAI Reviewcommented 24d ago

AI Triage

(no summary)

Priority: medium Risk area: mixed

Suggested labels: (no label suggestions) Suggested reviewers: (no reviewer suggestions)

Suggestions only — nothing has been applied. The PR author stays in control.

gluecron[bot]🤖 botAI Reviewcommented 24d ago

AI review unavailable

The platform's AI balance is exhausted, so AI generation is temporarily unavailable. Nothing was lost. You can queue this as a repair for the internal agent from the repository's Health page, or try again once the balance is restored. The PR is otherwise unchanged.

Cross-repo impact

See what breaks downstream if this PR merges.

Analyze →

⮌ Merged

This pull request was merged into main.

c comment · e edit title · m merge · a approve · r request changes · ? shortcuts