scai 0.1.73 → 0.1.75

package/README.md

@@ -1,4 +1,4 @@
-# ⚙️ scai — Smart Commit & Review AI ✨
+# ⚙️ scai — Smart Commit AI ✨
 
 > AI-powered CLI tool for commit messages **and** pull request reviews — using local models.
 

package/dist/commands/ReviewCmd.js

@@ -1,314 +1,271 @@
 import readline from 'readline';
-import { fetchOpenPullRequests, fetchPullRequestDiff, getGitHubUsername, submitReview } from '../github/github.js';
+import { fetchOpenPullRequests, getGitHubUsername, submitReview } from '../github/github.js';
 import { getRepoDetails } from '../github/repo.js';
 import { ensureGitHubAuth } from '../github/auth.js';
-import { postReviewComment } from '../github/postComments.js';
 import { reviewModule } from '../pipeline/modules/reviewModule.js';
 import chalk from 'chalk';
-// Function to fetch the PRs with requested reviews for a specific branch (default to 'main')
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { spawnSync } from 'child_process';
+import columnify from 'columnify';
+function truncate(str, length) {
+    return str.length > length ? str.slice(0, length - 3) + '...' : str;
+}
+// Fetch open PRs with review requested
 export async function getPullRequestsForReview(token, owner, repo, username, branch = 'main', filterForUser = true) {
     const prs = await fetchOpenPullRequests(token, owner, repo);
     const filtered = [];
     const failedPRs = [];
     for (const pr of prs) {
-        const isDraft = pr.draft;
-        const isMerged = pr.merged_at != null;
-        const shouldInclude = !isDraft &&
-            !isMerged &&
+        const shouldInclude = !pr.draft &&
+            !pr.merged_at &&
             (!filterForUser || pr.requested_reviewers?.some(r => r.login === username));
         if (shouldInclude) {
-            const diffUrl = `https://api.github.com/repos/${owner}/${repo}/pulls/${pr.number}.diff`;
             try {
-                const diffRes = await fetch(diffUrl, {
+                const prNumber = pr.number;
+                const prRes = await fetch(`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}`, {
+                    headers: {
+                        Authorization: `token ${token}`,
+                        Accept: 'application/vnd.github.v3+json',
+                    },
+                });
+                if (!prRes.ok)
+                    throw new Error(`Failed to fetch full PR #${prNumber}`);
+                const fullPR = await prRes.json();
+                pr.body = fullPR.body ?? '';
+                const diffRes = await fetch(`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}.diff`, {
                     headers: {
                         Authorization: `token ${token}`,
                         Accept: 'application/vnd.github.v3.diff',
                     },
                 });
-                if (!diffRes.ok) {
-                    throw new Error(`${diffRes.status} ${diffRes.statusText}`);
-                }
+                if (!diffRes.ok)
+                    throw new Error(`Failed to fetch diff for PR #${prNumber}`);
                 const diff = await diffRes.text();
                 filtered.push({ pr, diff });
             }
             catch (err) {
+                console.warn(`⚠️ Skipping PR #${pr.number}: ${err.message}`);
                 failedPRs.push(pr);
             }
         }
     }
+    // After collecting filtered PRs
+    if (filtered.length === 0) {
+        if (filterForUser) {
+            console.log(`ℹ️ No open pull requests found for review by '${username}'.`);
+        }
+        else {
+            console.log(`ℹ️ No open pull requests found.`);
+        }
+    }
     if (failedPRs.length > 0) {
         const failedList = failedPRs.map(pr => `#${pr.number}`).join(', ');
-        console.warn(`⚠️ Skipped ${failedPRs.length} PR(s) (${failedList}) due to diff fetch errors.`);
+        console.warn(`⚠️ Skipped ${failedPRs.length} PR(s): ${failedList}`);
     }
     return filtered;
 }
-// Ask user to pick a PR to review
+// Prompt user to select PR
 function askUserToPickPR(prs) {
     return new Promise((resolve) => {
         if (prs.length === 0) {
             console.log("⚠️ No pull requests with review requested.");
             return resolve(null);
         }
-        console.log(chalk.blue("\n📦 Open Pull Requests with review requested:"));
-        prs.forEach((pr, i) => {
-            console.log(`${i + 1}) #${pr.number} - ${pr.title}`);
-        });
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
+        const rows = prs.map((pr, i) => ({
+            '#': i + 1,
+            ID: `#${pr.number}`,
+            Title: truncate(pr.title, 50),
+            Author: pr.user || '—',
+            Status: pr.draft ? 'Draft' : 'Open',
+            Created: pr.created_at?.split('T')[0] || '',
+            Reviewers: pr.requested_reviewers?.map(r => r.login).join(', ') || '—',
+        }));
+        console.log(chalk.blue("\n📦 Open Pull Requests:"));
+        console.log(columnify(rows, {
+            columnSplitter: '  ',
+            headingTransform: (h) => chalk.cyan(h.toUpperCase()),
+            config: {
+                Title: { maxWidth: 50 },
+                Reviewers: { maxWidth: 30 }
+            }
+        }));
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        rl.question(`\n👉 Choose a PR to review [1-${prs.length}]: `, (answer) => {
+            rl.close();
+            const index = parseInt(answer, 10);
+            if (!isNaN(index) && index >= 1 && index <= prs.length) {
+                resolve(index - 1);
+            }
+            else {
+                console.log('⚠️ Invalid selection.');
+                resolve(null);
+            }
         });
-        const askQuestion = () => {
-            rl.question(`\n👉 Choose a PR to review [1-${prs.length}]: `, (answer) => {
-                const index = parseInt(answer, 10);
-                if (!isNaN(index) && index >= 1 && index <= prs.length) {
-                    resolve(index - 1); // Return array index, not PR number
-                    rl.close();
-                }
-                else {
-                    console.log('⚠️ Invalid selection. Please enter a number between 1 and ' + prs.length);
-                    askQuestion(); // Retry asking for input
-                }
-            });
-        };
-        askQuestion(); // Initial call to ask the user
     });
 }
-// Ask user to choose review method: whole PR or chunk-by-chunk
+// Prompt for review method
 function askReviewMethod() {
     return new Promise((resolve) => {
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
         console.log("\n🔍 Choose review method:");
         console.log('1) Review whole PR at once');
         console.log('2) Review chunk by chunk');
         rl.question(`👉 Choose an option [1-2]: `, (answer) => {
             rl.close();
-            if (answer === '1') {
-                resolve('whole');
-            }
-            else if (answer === '2') {
-                resolve('chunk');
-            }
-            else {
-                console.log('⚠️ Invalid selection. Defaulting to "whole".');
-                resolve('whole');
-            }
+            resolve(answer === '2' ? 'chunk' : 'whole');
         });
     });
 }
-// Ask user to approve or reject the review suggestion
+// Prompt for review approval
 function askReviewApproval(suggestion) {
     return new Promise((resolve) => {
-        console.log('\n💡 AI-suggested review:\n');
-        console.log(suggestion);
         console.log('\n---');
         console.log('1) ✅ Approve');
         console.log('2) ❌ Reject');
         console.log('3) ✍️ Edit');
         console.log('4) ⌨️ Write your own review');
         console.log('5) 🚫 Cancel');
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
         rl.question(`\n👉 Choose an option [1-5]: `, (answer) => {
             rl.close();
-            if (answer === '1') {
+            if (answer === '1')
                 resolve('approve');
-            }
-            else if (answer === '2') {
+            else if (answer === '2')
                 resolve('reject');
-            }
-            else if (answer === '3') {
+            else if (answer === '3')
                 resolve('edit');
-            }
-            else if (answer === '4') {
+            else if (answer === '4')
                 resolve('custom');
-            }
-            else if (answer === '5') {
+            else
                 resolve('cancel');
-            }
-            else {
-                console.log('⚠️ Invalid selection. Defaulting to "approve".');
-                resolve('approve');
-            }
         });
     });
 }
-// Prompt for custom review input
+// Prompt for custom review
 function promptCustomReview() {
     return new Promise((resolve) => {
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
         rl.question('\n📝 Enter your custom review:\n> ', (input) => {
             rl.close();
             resolve(input.trim());
         });
     });
 }
+// Prompt for editing review
+export async function promptEditReview(suggestedReview) {
+    const tmpFilePath = path.join(os.tmpdir(), 'scai-review.txt');
+    fs.writeFileSync(tmpFilePath, `# Edit your review below.\n# Lines starting with '#' will be ignored.\n\n${suggestedReview}`);
+    const editor = process.env.EDITOR || (process.platform === 'win32' ? 'notepad' : 'vi');
+    spawnSync(editor, [tmpFilePath], { stdio: 'inherit' });
+    const editedContent = fs.readFileSync(tmpFilePath, 'utf-8');
+    return editedContent
+        .split('\n')
+        .filter(line => !line.trim().startsWith('#'))
+        .join('\n')
+        .trim() || suggestedReview;
+}
+// Split diff into file-based chunks
 function chunkDiff(diff) {
     const rawChunks = diff.split(/^diff --git /m).filter(Boolean);
     return rawChunks.map(chunk => {
         const fullChunk = 'diff --git ' + chunk;
-        // Try to extract the file name from the diff header
-        const match = fullChunk.match(/^diff --git a\/(.+?) b\/.+?\n/);
-        const filePath = match ? match[1] : 'unknown';
-        return { filePath, content: fullChunk };
+        const filePathMatch = fullChunk.match(/^diff --git a\/(.+?) b\//);
+        const filePath = filePathMatch ? filePathMatch[1] : 'unknown';
+        return {
+            filePath,
+            content: fullChunk,
+        };
     });
 }
-// Function to color diff lines
+// Color lines in diff
 function colorDiffLine(line) {
-    if (line.startsWith('+')) {
-        return chalk.green(line); // New lines (added)
-    }
-    else if (line.startsWith('-')) {
-        return chalk.red(line); // Deleted lines
-    }
-    else if (line.startsWith('@@')) {
-        return chalk.yellow(line); // Modified lines (with context)
-    }
-    return line; // Default case (unchanged lines)
+    if (line.startsWith('+'))
+        return chalk.green(line);
+    if (line.startsWith('-'))
+        return chalk.red(line);
+    if (line.startsWith('@@'))
+        return chalk.yellow(line);
+    return line;
 }
-// Updated reviewChunk function to apply coloring
+// Review a single chunk
 export async function reviewChunk(chunk, chunkIndex, totalChunks) {
     console.log(chalk.yellow(`\n🔍 Reviewing chunk ${chunkIndex + 1} of ${totalChunks}:`));
     console.log(`File: ${chunk.filePath}`);
-    // Split the chunk content into lines and color each line accordingly
     const coloredDiff = chunk.content.split('\n').map(colorDiffLine).join('\n');
-    // Log the colored diff with line numbers and progress
-    console.log(`Starting line number: 30`); // Adjust based on actual starting line logic
     console.log(coloredDiff);
-    // Get the review suggestion from the model (as before)
     const suggestion = await reviewModule.run({ content: chunk.content, filepath: chunk.filePath });
     console.log("\n💡 AI-suggested review:\n");
     console.log(suggestion.content);
-    // Ask user to approve or reject the chunk
-    const reviewChoice = await askReviewApproval('Do you approve this code chunk?');
+    const reviewChoice = await askReviewApproval(suggestion.content);
+    if (reviewChoice === 'edit') {
+        return await promptEditReview(suggestion.content);
+    }
     return reviewChoice;
 }
+// Main command to review PR
 export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
     try {
-        console.log("🔍 Fetching pull requests and diffs...");
-        const token = await ensureGitHubAuth(); // Get GitHub token
+        const token = await ensureGitHubAuth();
         const username = await getGitHubUsername(token);
-        const { owner, repo } = getRepoDetails(); // Get repository details (owner, repo name)
-        console.log(`👤 Authenticated user: ${username}`);
-        console.log(`📦 GitHub repo: ${owner}/${repo}`);
-        console.log(`🔍 Filtering ${showAll ? "all" : "user-specific"} PRs for branch: ${branch}`);
+        const { owner, repo } = getRepoDetails();
         const prsWithReviewRequested = await getPullRequestsForReview(token, owner, repo, username, branch, !showAll);
-        console.log(`🔍 Found ${prsWithReviewRequested.length} PR(s) requiring review.`);
-        if (prsWithReviewRequested.length === 0) {
-            console.log("⚠️ No PRs found with review requested.");
+        if (prsWithReviewRequested.length === 0)
             return;
-        }
         const selectedIndex = await askUserToPickPR(prsWithReviewRequested.map(p => p.pr));
         if (selectedIndex === null)
             return;
         const { pr, diff } = prsWithReviewRequested[selectedIndex];
-        let prDiff = diff;
-        if (!prDiff) {
-            console.log(`🔍 Fetching diff for PR #${pr.number}...`);
-            prDiff = await fetchPullRequestDiff(pr, token);
+        if (pr.body) {
+            console.log(chalk.magentaBright('\n📝 PR Description:\n') + chalk.gray(pr.body));
         }
-        const chunkComments = {}; // Declare here for global access
-        const reviewMethod = await askReviewMethod(); // Ask user for review method (whole or chunk)
+        const reviewMethod = await askReviewMethod();
         if (reviewMethod === 'whole') {
-            console.log(`🔍 Reviewing the entire PR at once...`);
-            const suggestion = await reviewModule.run({ content: prDiff, filepath: 'Whole PR Diff' });
-            console.log("\n💡 AI-suggested review:\n");
+            const suggestion = await reviewModule.run({ content: diff, filepath: 'Whole PR Diff' });
             console.log(suggestion.content);
-            // Store the entire review choice in chunkComments
-            const finalReviewChoice = await askReviewApproval('Do you approve, reject, or leave a final review for this PR?');
+            const finalReviewChoice = await askReviewApproval(suggestion.content);
+            let reviewText = '';
             if (finalReviewChoice === 'approve') {
-                console.log(`✅ Review for PR #${pr.number} approved.`);
-                await postReviewComments(pr, chunkComments, token);
-                await submitReview(pr.number, 'PR approved', 'APPROVE');
+                reviewText = 'PR approved';
+                await submitReview(pr.number, reviewText, 'APPROVE');
             }
             else if (finalReviewChoice === 'reject') {
-                console.log(`❌ Review for PR #${pr.number} rejected.`);
-                await postReviewComments(pr, chunkComments, token);
-                await submitReview(pr.number, 'Changes requested', 'REQUEST_CHANGES');
+                reviewText = 'Changes requested';
+                await submitReview(pr.number, reviewText, 'REQUEST_CHANGES');
             }
-            else if (finalReviewChoice === 'cancel') {
-                console.log(`🚪 Review process cancelled.`);
-                return;
+            else if (finalReviewChoice === 'custom') {
+                reviewText = await promptCustomReview();
+                await submitReview(pr.number, reviewText, 'COMMENT');
             }
-            else {
-                const customReview = await promptCustomReview();
-                console.log(`💬 Custom review: ${customReview}`);
-                await postReviewComments(pr, chunkComments, token);
-                await submitReview(pr.number, customReview, 'COMMENT');
+            else if (finalReviewChoice === 'edit') {
+                reviewText = await promptEditReview(suggestion.content);
+                await submitReview(pr.number, reviewText, 'COMMENT');
             }
         }
         else {
-            const chunks = chunkDiff(prDiff); // Split the diff into chunks
-            // Log the total number of chunks
+            const chunks = chunkDiff(diff);
             console.log(chalk.cyan(`🔍 Total Chunks: ${chunks.length}`));
-            // Iterate over each chunk, passing the index and total chunk count
             for (let i = 0; i < chunks.length; i++) {
                 const chunk = chunks[i];
-                // Pass the chunk, index (i), and totalChunks to the reviewChunk function
-                const reviewChoice = await reviewChunk(chunk, i, chunks.length); // Review each chunk
-                if (reviewChoice === 'approve') {
-                    console.log('✅ Approving this chunk.');
-                    chunkComments[chunk.filePath] = ['Approved'];
+                const reviewResult = await reviewChunk(chunk, i, chunks.length);
+                if (reviewResult === 'approve') {
+                    await submitReview(pr.number, 'Approved chunk', 'APPROVE');
                 }
-                else if (reviewChoice === 'reject') {
-                    console.log('❌ Rejecting this chunk.');
-                    chunkComments[chunk.filePath] = ['Rejected'];
+                else if (reviewResult === 'reject') {
+                    await submitReview(pr.number, 'Changes requested for chunk', 'REQUEST_CHANGES');
                 }
-                else if (reviewChoice === 'cancel') {
-                    console.log('🚪 Review process cancelled.');
-                    return; // Exit if user cancels
+                else if (reviewResult === 'custom') {
+                    const customReview = await promptCustomReview();
+                    await submitReview(pr.number, customReview, 'COMMENT');
                 }
                 else {
-                    console.log('✍️ Custom review added.');
-                    const customReview = await promptCustomReview();
-                    console.log(`💬 Custom review: ${customReview}`);
-                    chunkComments[chunk.filePath] = [customReview];
+                    await submitReview(pr.number, reviewResult, 'COMMENT');
                 }
             }
-            // After chunk review, ask for the final approval decision
-            const finalReviewChoice = await askReviewApproval('Do you approve, reject, or leave a final review for this PR?');
-            if (finalReviewChoice === 'approve') {
-                console.log(`✅ Review for PR #${pr.number} approved.`);
-                await postReviewComments(pr, chunkComments, token);
-                await submitReview(pr.number, 'PR approved', 'APPROVE');
-            }
-            else if (finalReviewChoice === 'reject') {
-                console.log(`❌ Review for PR #${pr.number} rejected.`);
-                await postReviewComments(pr, chunkComments, token);
-                await submitReview(pr.number, 'Changes requested', 'REQUEST_CHANGES');
-            }
-            else if (finalReviewChoice === 'cancel') {
-                console.log(`🚪 Review process cancelled.`);
-                return;
-            }
-            else {
-                const customReview = await promptCustomReview();
-                console.log(`💬 Custom review: ${customReview}`);
-                await postReviewComments(pr, chunkComments, token);
-                await submitReview(pr.number, customReview, 'COMMENT');
-            }
         }
     }
     catch (err) {
         console.error("❌ Error reviewing PR:", err.message);
     }
 }
-// Function to post all comments to GitHub after the review
-async function postReviewComments(pr, chunkComments, token) {
-    const { owner, repo } = getRepoDetails(); // Get the repo details
-    for (const chunk in chunkComments) {
-        const comments = chunkComments[chunk];
-        const fileName = chunk; // Use chunk's file path
-        const lineNumber = 10; // Extract the actual line number from the chunk content
-        for (const comment of comments) {
-            await postReviewComment(token, owner, repo, pr.number, fileName, lineNumber, comment);
-        }
-    }
-}

package/dist/utils/summarizer.js

@@ -1,4 +1,4 @@
-import columnify from 'columnify';
+import columnify from "columnify";
 export function styleOutput(summaryText) {
     const terminalWidth = process.stdout.columns || 80;
     // You can control wrapping here

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scai",
-  "version": "0.1.73",
+  "version": "0.1.75",
   "type": "module",
   "bin": {
     "scai": "./dist/index.js"