gitpadi 2.1.8 → 2.2.0

package/dist/cli.js

@@ -24,6 +24,7 @@ import * as applyForIssue from './commands/apply-for-issue.js';
 import { runBountyHunter } from './commands/bounty-hunter.js';
 import { dripsMenu } from './commands/drips.js';
 import { remindContributors } from './remind-contributors.js';
+import { checkConflicts } from './conflict-checker.js';
 import * as gitlabIssues from './commands/gitlab-issues.js';
 import * as gitlabMRs from './commands/gitlab-mrs.js';
 import * as gitlabPipelines from './commands/gitlab-pipelines.js';
@@ -1077,6 +1078,7 @@ async function maintainerMenu() {
                     { name: `${red('🚀')}  ${bold('Releases')}          ${dim('— create, list, tag releases')}`, value: 'releases' },
                     { name: `${green('🎯')}  ${bold('Bounty Hunter')}    ${dim('— auto-apply to Drips Wave & GrantFox')}`, value: 'hunt' },
                     { name: `${cyan('🔔')}  ${bold('Remind Contributors')} ${dim('— warn assignees with no PR (12h)')}`, value: 'remind' },
+                    { name: `${red('⚔️')}   ${bold('Conflict Checker')}    ${dim('— warn PRs with merge conflicts')}`, value: 'conflicts' },
                     new inquirer.Separator(dim('  ─────────────────────────────────────────')),
                     { name: `${dim('⚙️')}   ${dim('Switch Repo')}`, value: 'switch' },
                     { name: `${dim('⬅')}   ${dim('Back to Mode Selector')}`, value: 'back' },
@@ -1104,6 +1106,8 @@ async function maintainerMenu() {
             await runBountyHunter({ platform: 'all', maxApplications: 3, dryRun: false });
         else if (category === 'remind')
             await safeMenu(remindContributors);
+        else if (category === 'conflicts')
+            await safeMenu(checkConflicts);
         else if (category === 'review-merge') {
             await ensureTargetRepo();
             const { prNum } = await ask([{ type: 'input', name: 'prNum', message: cyan('PR number to review:') }]);
@@ -1547,6 +1551,8 @@ async function prMenu() {
                 { name: `  ${green('▸')} List pull requests`, value: 'list' },
                 { name: `  ${green('▸')} Merge PR ${dim('(checks CI first)')}`, value: 'merge' },
                 { name: `  ${yellow('▸')} Force merge ${dim('(skip CI checks)')}`, value: 'force-merge' },
+                { name: `  ${green('▸')} Merge ALL open PRs ${dim('(checks CI per PR)')}`, value: 'merge-all' },
+                { name: `  ${yellow('▸')} Force merge ALL open PRs ${dim('(skip CI)')}`, value: 'force-merge-all' },
                 { name: `  ${red('▸')} Close PR`, value: 'close' },
                 { name: `  ${yellow('▸')} Auto-review PR`, value: 'review' },
                 { name: `  ${green('▸')} Approve PR`, value: 'approve' },
@@ -1562,6 +1568,20 @@ async function prMenu() {
         ]);
         await prs.listPRs({ state: a.state, limit: parseInt(a.limit) });
     }
+    else if (action === 'merge-all' || action === 'force-merge-all') {
+        const a = await ask([
+            {
+                type: 'list', name: 'method', message: 'Merge method:', choices: [
+                    { name: `${green('squash')} ${dim('— clean single commit')}`, value: 'squash' },
+                    { name: `${cyan('merge')}  ${dim('— preserve all commits')}`, value: 'merge' },
+                    { name: `${yellow('rebase')} ${dim('— linear history')}`, value: 'rebase' },
+                ]
+            },
+            { type: 'confirm', name: 'confirm', message: action === 'force-merge-all' ? yellow('⚠️  Force merge ALL open PRs (skip CI)?') : red('⚠️  Merge ALL open PRs?'), default: false },
+        ]);
+        if (a.confirm)
+            await prs.mergeAllPRs({ method: a.method, force: action === 'force-merge-all' });
+    }
     else if (action === 'merge' || action === 'force-merge') {
         const a = await ask([
             { type: 'input', name: 'n', message: yellow('PR #') + dim(' (q=back):') },
@@ -1805,6 +1825,8 @@ function setupCommander() {
         .action(async (o) => { await prs.listPRs({ state: o.state, limit: parseInt(o.limit) }); });
     p.command('merge <n>').option('-m, --method <m>', '', 'squash').option('--message <msg>').option('-f, --force', 'Skip CI checks')
         .action(async (n, o) => { await prs.mergePR(parseInt(n), o); });
+    p.command('merge-all').option('-m, --method <m>', '', 'squash').option('-f, --force', 'Skip CI checks')
+        .action(async (o) => { await prs.mergeAllPRs(o); });
     p.command('close <n>').action(async (n) => { await prs.closePR(parseInt(n)); });
     p.command('review <n>').action(async (n) => { await prs.reviewPR(parseInt(n)); });
     p.command('approve <n>').action(async (n) => { await prs.approvePR(parseInt(n)); });

package/dist/commands/prs.js

@@ -142,6 +142,113 @@ export async function mergePR(number, opts) {
         console.error(chalk.red(`  ❌ ${e.message}`));
     }
 }
+export async function mergeAllPRs(opts) {
+    requireRepo();
+    const octokit = getOctokit();
+    const method = (opts.method || 'squash');
+    const spinner = ora(`Fetching open PRs from ${chalk.cyan(getFullRepo())}...`).start();
+    let openPRs = [];
+    try {
+        const { data } = await octokit.pulls.list({ owner: getOwner(), repo: getRepo(), state: 'open', per_page: 100 });
+        openPRs = data;
+        spinner.stop();
+    }
+    catch (e) {
+        spinner.fail(e.message);
+        return;
+    }
+    if (openPRs.length === 0) {
+        console.log(chalk.yellow('\n  No open PRs found.\n'));
+        return;
+    }
+    console.log(`\n${chalk.bold(`🔀 Merge All Open PRs — ${getFullRepo()}`)} (${openPRs.length} PRs)\n`);
+    const results = [];
+    for (const pr of openPRs) {
+        console.log(chalk.dim(`  ─── PR #${pr.number}: ${pr.title.substring(0, 60)} ───`));
+        try {
+            if (opts.force) {
+                const s = ora(`  Force merging #${pr.number}...`).start();
+                const { data } = await octokit.pulls.merge({
+                    owner: getOwner(), repo: getRepo(), pull_number: pr.number,
+                    merge_method: method,
+                });
+                if (data.merged) {
+                    s.succeed(`  Merged #${pr.number} ${chalk.yellow('(CI skipped)')}`);
+                    results.push({ number: pr.number, title: pr.title, status: 'merged' });
+                }
+                else {
+                    s.fail(`  Could not merge #${pr.number}: ${data.message}`);
+                    results.push({ number: pr.number, title: pr.title, status: 'failed', reason: data.message });
+                }
+            }
+            else {
+                // Check CI
+                const s = ora(`  Checking CI for #${pr.number}...`).start();
+                const sha = pr.head.sha;
+                let attempts = 0;
+                let allComplete = false;
+                let ciChecks = [];
+                while (!allComplete && attempts < 90) {
+                    const { data: checkRuns } = await octokit.checks.listForRef({ owner: getOwner(), repo: getRepo(), ref: sha, per_page: 100 });
+                    const { data: statusData } = await octokit.repos.getCombinedStatusForRef({ owner: getOwner(), repo: getRepo(), ref: sha });
+                    ciChecks = checkRuns.check_runs.map((c) => ({ name: c.name, status: c.status, conclusion: c.conclusion }));
+                    statusData.statuses.forEach((st) => {
+                        if (!ciChecks.find((c) => c.name === st.context))
+                            ciChecks.push({ name: st.context, status: st.state === 'pending' ? 'in_progress' : 'completed', conclusion: st.state === 'pending' ? null : st.state });
+                    });
+                    if (ciChecks.length === 0)
+                        break;
+                    allComplete = ciChecks.every((c) => c.status === 'completed');
+                    if (!allComplete) {
+                        s.text = chalk.dim(`  Waiting for CI on #${pr.number}... (${attempts * 10}s)`);
+                        await new Promise((r) => setTimeout(r, 10000));
+                        attempts++;
+                    }
+                }
+                s.stop();
+                if (!allComplete) {
+                    console.log(chalk.yellow(`  ⚠️  CI still running for #${pr.number} after 15 min — skipping.\n`));
+                    results.push({ number: pr.number, title: pr.title, status: 'skipped', reason: 'CI timeout' });
+                    continue;
+                }
+                const allPassed = ciChecks.length === 0 || ciChecks.every((c) => c.conclusion === 'success' || c.conclusion === 'neutral' || c.conclusion === 'skipped');
+                if (!allPassed) {
+                    console.log(chalk.red(`  ❌ CI failed for #${pr.number} — skipping.\n`));
+                    results.push({ number: pr.number, title: pr.title, status: 'skipped', reason: 'CI failed' });
+                    continue;
+                }
+                const ms = ora(`  Merging #${pr.number}...`).start();
+                const { data } = await octokit.pulls.merge({ owner: getOwner(), repo: getRepo(), pull_number: pr.number, merge_method: method });
+                if (data.merged) {
+                    ms.succeed(`  Merged #${pr.number}`);
+                    results.push({ number: pr.number, title: pr.title, status: 'merged' });
+                }
+                else {
+                    ms.fail(`  Could not merge #${pr.number}: ${data.message}`);
+                    results.push({ number: pr.number, title: pr.title, status: 'failed', reason: data.message });
+                }
+            }
+        }
+        catch (e) {
+            console.error(chalk.red(`  ❌ #${pr.number}: ${e.message}`));
+            results.push({ number: pr.number, title: pr.title, status: 'failed', reason: e.message });
+        }
+        console.log('');
+    }
+    // Summary table
+    const table = new Table({
+        head: ['#', 'Title', 'Result'].map((h) => chalk.cyan(h)),
+        style: { head: [], border: [] },
+    });
+    results.forEach((r) => {
+        const icon = r.status === 'merged' ? chalk.green('✅ merged') : r.status === 'skipped' ? chalk.yellow(`⏭️  skipped${r.reason ? ` (${r.reason})` : ''}`) : chalk.red(`❌ failed${r.reason ? ` (${r.reason})` : ''}`);
+        table.push([`#${r.number}`, r.title.substring(0, 50), icon]);
+    });
+    const merged = results.filter((r) => r.status === 'merged').length;
+    console.log(`${chalk.bold('📊 Summary')}\n`);
+    console.log(table.toString());
+    console.log(`\n  ${chalk.green(`${merged} merged`)}, ${chalk.yellow(`${results.filter((r) => r.status === 'skipped').length} skipped`)}, ${chalk.red(`${results.filter((r) => r.status === 'failed').length} failed`)}\n`);
+}
 export async function closePR(number) {
     requireRepo();
     const spinner = ora(`Closing PR #${number}...`).start();

package/dist/conflict-checker.js

@@ -0,0 +1,103 @@
+import { initGitHub, getOctokit, getOwner, getRepo } from './core/github.js';
+import chalk from 'chalk';
+// Signature marker to prevent posting duplicate conflict warnings on the same PR
+const SIG_CONFLICT = '<!-- gitpadi-conflict-warning -->';
+export async function checkConflicts() {
+    console.log(chalk.bold('\n⚔️  GitPadi Conflict Checker\n'));
+    try {
+        initGitHub();
+        const octokit = getOctokit();
+        const owner = getOwner();
+        const repo = getRepo();
+        if (!owner || !repo) {
+            console.error(chalk.red('❌ Owner or Repo not found in environment/config.'));
+            process.exit(1);
+        }
+        console.log(chalk.dim(`🔎 Scanning open PRs in ${owner}/${repo} for merge conflicts...\n`));
+        // Fetch all open PRs
+        const { data: prs } = await octokit.pulls.list({
+            owner, repo, state: 'open', per_page: 100,
+        });
+        if (prs.length === 0) {
+            console.log(chalk.green('✅ No open PRs found.'));
+            return;
+        }
+        let conflictCount = 0;
+        let skippedCount = 0;
+        let cleanCount = 0;
+        for (const pr of prs) {
+            const prNumber = pr.number;
+            const author = pr.user?.login ?? 'unknown';
+            process.stdout.write(chalk.cyan(`  ▸ PR #${prNumber}: "${pr.title.substring(0, 50)}" (@${author}) — `));
+            // Fetch the full PR to get the mergeable field
+            // GitHub computes mergeability lazily; we may need to retry once
+            let fullPr = (await octokit.pulls.get({ owner, repo, pull_number: prNumber })).data;
+            // If mergeability is still being computed (null), wait briefly and retry
+            if (fullPr.mergeable === null) {
+                await new Promise((r) => setTimeout(r, 3000));
+                fullPr = (await octokit.pulls.get({ owner, repo, pull_number: prNumber })).data;
+            }
+            const hasConflict = fullPr.mergeable === false && fullPr.mergeable_state === 'dirty';
+            if (!hasConflict) {
+                process.stdout.write(chalk.green('✅ No conflict\n'));
+                cleanCount++;
+                continue;
+            }
+            // Check if we already posted a conflict warning on this PR
+            const { data: comments } = await octokit.issues.listComments({
+                owner, repo, issue_number: prNumber,
+            });
+            const alreadyWarned = comments.some((c) => c.body?.includes(SIG_CONFLICT));
+            if (alreadyWarned) {
+                process.stdout.write(chalk.dim('⏩ Already warned\n'));
+                skippedCount++;
+                continue;
+            }
+            // Post the conflict warning comment
+            const conflictingFiles = fullPr.mergeable_state === 'dirty'
+                ? '\n\nTo see which files are conflicting, open the PR on GitHub and click **"Resolve conflicts"**.'
+                : '';
+            const message = [
+                `⚠️ **Merge Conflict Detected** — Hi @${author}!`,
+                ``,
+                `Your branch **\`${fullPr.head.ref}\`** has conflicts with the base branch **\`${fullPr.base.ref}\`** that must be resolved before this PR can be merged.`,
+                ``,
+                `**How to fix it:**`,
+                `\`\`\`bash`,
+                `# 1. Pull the latest base branch`,
+                `git checkout ${fullPr.base.ref}`,
+                `git pull origin ${fullPr.base.ref}`,
+                ``,
+                `# 2. Switch to your branch and merge/rebase`,
+                `git checkout ${fullPr.head.ref}`,
+                `git merge ${fullPr.base.ref}`,
+                ``,
+                `# 3. Resolve the conflicts, then commit and push`,
+                `git add .`,
+                `git commit -m "fix: resolve merge conflicts"`,
+                `git push origin ${fullPr.head.ref}`,
+                `\`\`\``,
+                conflictingFiles,
+                ``,
+                `If you need help resolving conflicts, check out the [GitHub guide on resolving conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line).`,
+                ``,
+                `${SIG_CONFLICT}`,
+            ].join('\n');
+            await octokit.issues.createComment({
+                owner, repo, issue_number: prNumber, body: message,
+            });
+            process.stdout.write(chalk.red('🔴 Conflict — warning posted\n'));
+            conflictCount++;
+        }
+        console.log(chalk.bold(`\n✨ Conflict scan complete.`));
+        console.log(chalk.dim(`   📊 Conflicts warned: ${conflictCount} | Already warned: ${skippedCount} | Clean: ${cleanCount}\n`));
+    }
+    catch (error) {
+        console.error(chalk.red(`\n❌ Error during conflict scan: ${error.message}`));
+        process.exit(1);
+    }
+}
+// Standalone entry point (npx tsx src/conflict-checker.ts)
+if (process.argv[1]?.endsWith('conflict-checker.ts') || process.argv[1]?.endsWith('conflict-checker.js')) {
+    checkConflicts();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitpadi",
-    "version": "2.1.8",
+    "version": "2.2.0",
     "description": "GitPadi — AI-powered GitHub & GitLab management CLI. Fork repos, manage issues & PRs, score contributors, grade assignments, and automate everything. Powered by Anthropic Claude via GitLab Duo Agent Platform.",
     "type": "module",
     "bin": {

package/src/cli.ts

@@ -32,6 +32,7 @@ import * as applyForIssue from './commands/apply-for-issue.js';
 import { runBountyHunter } from './commands/bounty-hunter.js';
 import { dripsMenu } from './commands/drips.js';
 import { remindContributors } from './remind-contributors.js';
+import { checkConflicts } from './conflict-checker.js';
 import * as gitlabIssues from './commands/gitlab-issues.js';
 import * as gitlabMRs from './commands/gitlab-mrs.js';
 import * as gitlabPipelines from './commands/gitlab-pipelines.js';
@@ -1122,6 +1123,7 @@ async function maintainerMenu() {
                 { name: `${red('🚀')}  ${bold('Releases')}          ${dim('— create, list, tag releases')}`, value: 'releases' },
                 { name: `${green('🎯')}  ${bold('Bounty Hunter')}    ${dim('— auto-apply to Drips Wave & GrantFox')}`, value: 'hunt' },
                 { name: `${cyan('🔔')}  ${bold('Remind Contributors')} ${dim('— warn assignees with no PR (12h)')}`, value: 'remind' },
+                { name: `${red('⚔️')}   ${bold('Conflict Checker')}    ${dim('— warn PRs with merge conflicts')}`, value: 'conflicts' },
                 new inquirer.Separator(dim('  ─────────────────────────────────────────')),
                 { name: `${dim('⚙️')}   ${dim('Switch Repo')}`, value: 'switch' },
                 { name: `${dim('⬅')}   ${dim('Back to Mode Selector')}`, value: 'back' },
@@ -1144,6 +1146,7 @@ async function maintainerMenu() {
         else if (category === 'releases') await safeMenu(releaseMenu);
         else if (category === 'hunt') await runBountyHunter({ platform: 'all', maxApplications: 3, dryRun: false });
         else if (category === 'remind') await safeMenu(remindContributors);
+        else if (category === 'conflicts') await safeMenu(checkConflicts);
         else if (category === 'review-merge') {
             await ensureTargetRepo();
             const { prNum } = await ask([{ type: 'input', name: 'prNum', message: cyan('PR number to review:') }]);
@@ -1615,6 +1618,8 @@ async function prMenu() {
             { name: `  ${green('▸')} List pull requests`, value: 'list' },
             { name: `  ${green('▸')} Merge PR ${dim('(checks CI first)')}`, value: 'merge' },
             { name: `  ${yellow('▸')} Force merge ${dim('(skip CI checks)')}`, value: 'force-merge' },
+            { name: `  ${green('▸')} Merge ALL open PRs ${dim('(checks CI per PR)')}`, value: 'merge-all' },
+            { name: `  ${yellow('▸')} Force merge ALL open PRs ${dim('(skip CI)')}`, value: 'force-merge-all' },
             { name: `  ${red('▸')} Close PR`, value: 'close' },
             { name: `  ${yellow('▸')} Auto-review PR`, value: 'review' },
             { name: `  ${green('▸')} Approve PR`, value: 'approve' },
@@ -1630,6 +1635,18 @@ async function prMenu() {
             { type: 'input', name: 'limit', message: dim('Max results:'), default: '50' },
         ]);
         await prs.listPRs({ state: a.state, limit: parseInt(a.limit) });
+    } else if (action === 'merge-all' || action === 'force-merge-all') {
+        const a = await ask([
+            {
+                type: 'list', name: 'method', message: 'Merge method:', choices: [
+                    { name: `${green('squash')} ${dim('— clean single commit')}`, value: 'squash' },
+                    { name: `${cyan('merge')}  ${dim('— preserve all commits')}`, value: 'merge' },
+                    { name: `${yellow('rebase')} ${dim('— linear history')}`, value: 'rebase' },
+                ]
+            },
+            { type: 'confirm', name: 'confirm', message: action === 'force-merge-all' ? yellow('⚠️  Force merge ALL open PRs (skip CI)?') : red('⚠️  Merge ALL open PRs?'), default: false },
+        ]);
+        if (a.confirm) await prs.mergeAllPRs({ method: a.method, force: action === 'force-merge-all' });
     } else if (action === 'merge' || action === 'force-merge') {
         const a = await ask([
             { type: 'input', name: 'n', message: yellow('PR #') + dim(' (q=back):') },
@@ -1869,6 +1886,8 @@ function setupCommander(): Command {
         .action(async (o) => { await prs.listPRs({ state: o.state, limit: parseInt(o.limit) }); });
     p.command('merge <n>').option('-m, --method <m>', '', 'squash').option('--message <msg>').option('-f, --force', 'Skip CI checks')
         .action(async (n, o) => { await prs.mergePR(parseInt(n), o); });
+    p.command('merge-all').option('-m, --method <m>', '', 'squash').option('-f, --force', 'Skip CI checks')
+        .action(async (o) => { await prs.mergeAllPRs(o); });
     p.command('close <n>').action(async (n) => { await prs.closePR(parseInt(n)); });
     p.command('review <n>').action(async (n) => { await prs.reviewPR(parseInt(n)); });
     p.command('approve <n>').action(async (n) => { await prs.approvePR(parseInt(n)); });

package/src/commands/prs.ts

@@ -152,6 +152,101 @@ export async function mergePR(number: number, opts: { method?: string; message?:
 }
 
 
+export async function mergeAllPRs(opts: { method?: string; force?: boolean }) {
+    requireRepo();
+    const octokit = getOctokit();
+    const method = (opts.method || 'squash') as 'merge' | 'squash' | 'rebase';
+
+    const spinner = ora(`Fetching open PRs from ${chalk.cyan(getFullRepo())}...`).start();
+    let openPRs: any[] = [];
+    try {
+        const { data } = await octokit.pulls.list({ owner: getOwner(), repo: getRepo(), state: 'open', per_page: 100 });
+        openPRs = data;
+        spinner.stop();
+    } catch (e: any) { spinner.fail(e.message); return; }
+
+    if (openPRs.length === 0) { console.log(chalk.yellow('\n  No open PRs found.\n')); return; }
+
+    console.log(`\n${chalk.bold(`🔀 Merge All Open PRs — ${getFullRepo()}`)} (${openPRs.length} PRs)\n`);
+
+    const results: Array<{ number: number; title: string; status: 'merged' | 'failed' | 'skipped'; reason?: string }> = [];
+
+    for (const pr of openPRs) {
+        console.log(chalk.dim(`  ─── PR #${pr.number}: ${pr.title.substring(0, 60)} ───`));
+        try {
+            if (opts.force) {
+                const s = ora(`  Force merging #${pr.number}...`).start();
+                const { data } = await octokit.pulls.merge({
+                    owner: getOwner(), repo: getRepo(), pull_number: pr.number,
+                    merge_method: method,
+                });
+                if (data.merged) { s.succeed(`  Merged #${pr.number} ${chalk.yellow('(CI skipped)')}`); results.push({ number: pr.number, title: pr.title, status: 'merged' }); }
+                else { s.fail(`  Could not merge #${pr.number}: ${data.message}`); results.push({ number: pr.number, title: pr.title, status: 'failed', reason: data.message }); }
+            } else {
+                // Check CI
+                const s = ora(`  Checking CI for #${pr.number}...`).start();
+                const sha = pr.head.sha;
+                let attempts = 0;
+                let allComplete = false;
+                let ciChecks: Array<{ name: string; status: string; conclusion: string | null }> = [];
+
+                while (!allComplete && attempts < 90) {
+                    const { data: checkRuns } = await octokit.checks.listForRef({ owner: getOwner(), repo: getRepo(), ref: sha, per_page: 100 });
+                    const { data: statusData } = await octokit.repos.getCombinedStatusForRef({ owner: getOwner(), repo: getRepo(), ref: sha });
+                    ciChecks = checkRuns.check_runs.map((c) => ({ name: c.name, status: c.status, conclusion: c.conclusion }));
+                    statusData.statuses.forEach((st) => {
+                        if (!ciChecks.find((c) => c.name === st.context))
+                            ciChecks.push({ name: st.context, status: st.state === 'pending' ? 'in_progress' : 'completed', conclusion: st.state === 'pending' ? null : st.state });
+                    });
+                    if (ciChecks.length === 0) break;
+                    allComplete = ciChecks.every((c) => c.status === 'completed');
+                    if (!allComplete) { s.text = chalk.dim(`  Waiting for CI on #${pr.number}... (${attempts * 10}s)`); await new Promise((r) => setTimeout(r, 10000)); attempts++; }
+                }
+                s.stop();
+
+                if (!allComplete) {
+                    console.log(chalk.yellow(`  ⚠️  CI still running for #${pr.number} after 15 min — skipping.\n`));
+                    results.push({ number: pr.number, title: pr.title, status: 'skipped', reason: 'CI timeout' });
+                    continue;
+                }
+
+                const allPassed = ciChecks.length === 0 || ciChecks.every((c) =>
+                    c.conclusion === 'success' || c.conclusion === 'neutral' || c.conclusion === 'skipped');
+
+                if (!allPassed) {
+                    console.log(chalk.red(`  ❌ CI failed for #${pr.number} — skipping.\n`));
+                    results.push({ number: pr.number, title: pr.title, status: 'skipped', reason: 'CI failed' });
+                    continue;
+                }
+
+                const ms = ora(`  Merging #${pr.number}...`).start();
+                const { data } = await octokit.pulls.merge({ owner: getOwner(), repo: getRepo(), pull_number: pr.number, merge_method: method });
+                if (data.merged) { ms.succeed(`  Merged #${pr.number}`); results.push({ number: pr.number, title: pr.title, status: 'merged' }); }
+                else { ms.fail(`  Could not merge #${pr.number}: ${data.message}`); results.push({ number: pr.number, title: pr.title, status: 'failed', reason: data.message }); }
+            }
+        } catch (e: any) {
+            console.error(chalk.red(`  ❌ #${pr.number}: ${e.message}`));
+            results.push({ number: pr.number, title: pr.title, status: 'failed', reason: e.message });
+        }
+        console.log('');
+    }
+
+    // Summary table
+    const table = new Table({
+        head: ['#', 'Title', 'Result'].map((h) => chalk.cyan(h)),
+        style: { head: [], border: [] },
+    });
+    results.forEach((r) => {
+        const icon = r.status === 'merged' ? chalk.green('✅ merged') : r.status === 'skipped' ? chalk.yellow(`⏭️  skipped${r.reason ? ` (${r.reason})` : ''}`) : chalk.red(`❌ failed${r.reason ? ` (${r.reason})` : ''}`);
+        table.push([`#${r.number}`, r.title.substring(0, 50), icon]);
+    });
+
+    const merged = results.filter((r) => r.status === 'merged').length;
+    console.log(`${chalk.bold('📊 Summary')}\n`);
+    console.log(table.toString());
+    console.log(`\n  ${chalk.green(`${merged} merged`)}, ${chalk.yellow(`${results.filter((r) => r.status === 'skipped').length} skipped`)}, ${chalk.red(`${results.filter((r) => r.status === 'failed').length} failed`)}\n`);
+}
+
 export async function closePR(number: number) {
     requireRepo();
     const spinner = ora(`Closing PR #${number}...`).start();

package/src/conflict-checker.ts

@@ -0,0 +1,126 @@
+import { initGitHub, getOctokit, getOwner, getRepo } from './core/github.js';
+import chalk from 'chalk';
+
+// Signature marker to prevent posting duplicate conflict warnings on the same PR
+const SIG_CONFLICT = '<!-- gitpadi-conflict-warning -->';
+
+export async function checkConflicts() {
+    console.log(chalk.bold('\n⚔️  GitPadi Conflict Checker\n'));
+
+    try {
+        initGitHub();
+        const octokit = getOctokit();
+        const owner = getOwner();
+        const repo = getRepo();
+
+        if (!owner || !repo) {
+            console.error(chalk.red('❌ Owner or Repo not found in environment/config.'));
+            process.exit(1);
+        }
+
+        console.log(chalk.dim(`🔎 Scanning open PRs in ${owner}/${repo} for merge conflicts...\n`));
+
+        // Fetch all open PRs
+        const { data: prs } = await octokit.pulls.list({
+            owner, repo, state: 'open', per_page: 100,
+        });
+
+        if (prs.length === 0) {
+            console.log(chalk.green('✅ No open PRs found.'));
+            return;
+        }
+
+        let conflictCount = 0;
+        let skippedCount = 0;
+        let cleanCount = 0;
+
+        for (const pr of prs) {
+            const prNumber = pr.number;
+            const author = pr.user?.login ?? 'unknown';
+
+            process.stdout.write(chalk.cyan(`  ▸ PR #${prNumber}: "${pr.title.substring(0, 50)}" (@${author}) — `));
+
+            // Fetch the full PR to get the mergeable field
+            // GitHub computes mergeability lazily; we may need to retry once
+            let fullPr = (await octokit.pulls.get({ owner, repo, pull_number: prNumber })).data;
+
+            // If mergeability is still being computed (null), wait briefly and retry
+            if (fullPr.mergeable === null) {
+                await new Promise((r) => setTimeout(r, 3000));
+                fullPr = (await octokit.pulls.get({ owner, repo, pull_number: prNumber })).data;
+            }
+
+            const hasConflict = fullPr.mergeable === false && fullPr.mergeable_state === 'dirty';
+
+            if (!hasConflict) {
+                process.stdout.write(chalk.green('✅ No conflict\n'));
+                cleanCount++;
+                continue;
+            }
+
+            // Check if we already posted a conflict warning on this PR
+            const { data: comments } = await octokit.issues.listComments({
+                owner, repo, issue_number: prNumber,
+            });
+
+            const alreadyWarned = comments.some((c) => c.body?.includes(SIG_CONFLICT));
+
+            if (alreadyWarned) {
+                process.stdout.write(chalk.dim('⏩ Already warned\n'));
+                skippedCount++;
+                continue;
+            }
+
+            // Post the conflict warning comment
+            const conflictingFiles = fullPr.mergeable_state === 'dirty'
+                ? '\n\nTo see which files are conflicting, open the PR on GitHub and click **"Resolve conflicts"**.'
+                : '';
+
+            const message = [
+                `⚠️ **Merge Conflict Detected** — Hi @${author}!`,
+                ``,
+                `Your branch **\`${fullPr.head.ref}\`** has conflicts with the base branch **\`${fullPr.base.ref}\`** that must be resolved before this PR can be merged.`,
+                ``,
+                `**How to fix it:**`,
+                `\`\`\`bash`,
+                `# 1. Pull the latest base branch`,
+                `git checkout ${fullPr.base.ref}`,
+                `git pull origin ${fullPr.base.ref}`,
+                ``,
+                `# 2. Switch to your branch and merge/rebase`,
+                `git checkout ${fullPr.head.ref}`,
+                `git merge ${fullPr.base.ref}`,
+                ``,
+                `# 3. Resolve the conflicts, then commit and push`,
+                `git add .`,
+                `git commit -m "fix: resolve merge conflicts"`,
+                `git push origin ${fullPr.head.ref}`,
+                `\`\`\``,
+                conflictingFiles,
+                ``,
+                `If you need help resolving conflicts, check out the [GitHub guide on resolving conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line).`,
+                ``,
+                `${SIG_CONFLICT}`,
+            ].join('\n');
+
+            await octokit.issues.createComment({
+                owner, repo, issue_number: prNumber, body: message,
+            });
+
+            process.stdout.write(chalk.red('🔴 Conflict — warning posted\n'));
+            conflictCount++;
+        }
+
+        console.log(chalk.bold(`\n✨ Conflict scan complete.`));
+        console.log(chalk.dim(`   📊 Conflicts warned: ${conflictCount} | Already warned: ${skippedCount} | Clean: ${cleanCount}\n`));
+
+    } catch (error: any) {
+        console.error(chalk.red(`\n❌ Error during conflict scan: ${error.message}`));
+        process.exit(1);
+    }
+}
+
+// Standalone entry point (npx tsx src/conflict-checker.ts)
+if (process.argv[1]?.endsWith('conflict-checker.ts') || process.argv[1]?.endsWith('conflict-checker.js')) {
+    checkConflicts();
+}