gitpadi 2.1.8 → 2.1.9

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:') }]);

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.1.9",
     "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:') }]);

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();
+}