scai 0.1.75 → 0.1.76

package/dist/commands/ReviewCmd.js

@@ -13,15 +13,20 @@ function truncate(str, length) {
     return str.length > length ? str.slice(0, length - 3) + '...' : str;
 }
 // Fetch open PRs with review requested
+import { Spinner } from '../lib/spinner.js'; // adjust path as needed
 export async function getPullRequestsForReview(token, owner, repo, username, branch = 'main', filterForUser = true) {
-    const prs = await fetchOpenPullRequests(token, owner, repo);
+    const spinner = new Spinner('Fetching pull requests and diffs...');
+    spinner.start();
     const filtered = [];
     const failedPRs = [];
-    for (const pr of prs) {
-        const shouldInclude = !pr.draft &&
-            !pr.merged_at &&
-            (!filterForUser || pr.requested_reviewers?.some(r => r.login === username));
-        if (shouldInclude) {
+    try {
+        const prs = await fetchOpenPullRequests(token, owner, repo);
+        for (const pr of prs) {
+            const shouldInclude = !pr.draft &&
+                !pr.merged_at &&
+                (!filterForUser || pr.requested_reviewers?.some(r => r.login === username));
+            if (!shouldInclude)
+                continue;
             try {
                 const prNumber = pr.number;
                 const prRes = await fetch(`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}`, {
@@ -50,21 +55,25 @@ export async function getPullRequestsForReview(token, owner, repo, username, bra
                 failedPRs.push(pr);
             }
         }
-    }
-    // After collecting filtered PRs
-    if (filtered.length === 0) {
-        if (filterForUser) {
-            console.log(`ℹ️ No open pull requests found for review by '${username}'.`);
+        if (filtered.length === 0) {
+            const msg = filterForUser
+                ? `No open pull requests found for review by '${username}'.`
+                : `No open pull requests found.`;
+            spinner.succeed(msg);
         }
         else {
-            console.log(`ℹ️ No open pull requests found.`);
+            spinner.succeed(`Fetched ${filtered.length} PR(s) with diffs.`);
+        }
+        if (failedPRs.length > 0) {
+            const failedList = failedPRs.map(pr => `#${pr.number}`).join(', ');
+            console.warn(`⚠️ Skipped ${failedPRs.length} PR(s): ${failedList}`);
         }
+        return filtered;
     }
-    if (failedPRs.length > 0) {
-        const failedList = failedPRs.map(pr => `#${pr.number}`).join(', ');
-        console.warn(`⚠️ Skipped ${failedPRs.length} PR(s): ${failedList}`);
+    catch (err) {
+        spinner.fail(`Error fetching pull requests: ${err.message}`);
+        return [];
     }
-    return filtered;
 }
 // Prompt user to select PR
 function askUserToPickPR(prs) {
@@ -119,7 +128,7 @@ function askReviewMethod() {
     });
 }
 // Prompt for review approval
-function askReviewApproval(suggestion) {
+function askReviewApproval() {
     return new Promise((resolve) => {
         console.log('\n---');
         console.log('1) ✅ Approve');
@@ -191,18 +200,99 @@ function colorDiffLine(line) {
 }
 // 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}`);
-    const coloredDiff = chunk.content.split('\n').map(colorDiffLine).join('\n');
+    const lines = chunk.content.split('\n');
+    const coloredDiff = lines.map(colorDiffLine).join('\n');
+    console.log(chalk.gray('\n' + '━'.repeat(60)));
+    console.log(`📄 ${chalk.bold('File')}: ${chalk.cyan(chunk.filePath)}`);
+    console.log(`🔢 ${chalk.bold('Chunk')}: ${chunkIndex + 1} of ${totalChunks}`);
+    const suggestion = await reviewModule.run({
+        content: chunk.content,
+        filepath: chunk.filePath
+    });
+    const summary = suggestion.content?.trim() || 'AI review summary not available.';
+    console.log(`🔍 ${chalk.bold('Summary')}: ${summary}`);
+    console.log(`\n${chalk.bold('--- Diff ---')}\n`);
     console.log(coloredDiff);
-    const suggestion = await reviewModule.run({ content: chunk.content, filepath: chunk.filePath });
-    console.log("\n💡 AI-suggested review:\n");
-    console.log(suggestion.content);
-    const reviewChoice = await askReviewApproval(suggestion.content);
-    if (reviewChoice === 'edit') {
-        return await promptEditReview(suggestion.content);
+    console.log(`\n${chalk.bold('--- AI Review ---')}\n`);
+    console.log(chalk.blue(`💬 ${summary}`));
+    console.log(chalk.gray('━'.repeat(60)));
+    const choice = await promptChunkReviewMenu();
+    if (choice === 'edit') {
+        const edited = await promptEditReview(summary); // edit based on the suggestion
+        return { choice: edited, summary: edited };
+    }
+    else if (choice === 'skip') {
+        await waitForSpaceOrQ(); // pause between chunks
+        return { choice: 'cancel', summary }; // skip this one
     }
-    return reviewChoice;
+    return { choice, summary };
+}
+function waitForSpaceOrQ() {
+    return new Promise(resolve => {
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        process.stdout.write('\n⏭️ (Press [space] to skip, [q] to quit, or any other key to show menu)\n');
+        function onKeyPress(chunk) {
+            const key = chunk.toString();
+            if (key === ' ' || key === 'q' || key === 'Q') {
+                process.stdin.setRawMode(false);
+                process.stdin.pause();
+                process.stdin.removeListener('data', onKeyPress);
+                resolve();
+            }
+        }
+        process.stdin.on('data', onKeyPress);
+    });
+}
+export async function promptChunkReviewMenu() {
+    return new Promise((resolve) => {
+        console.log('\nReview options for this chunk:');
+        console.log('  1) 💬 Post AI review as comment');
+        console.log('  2) ✍️  Edit the review before posting');
+        console.log('  3) ⌨️  Write a custom comment');
+        console.log('  4) ❌ Mark this chunk as needing changes');
+        console.log('  5) ⏭️  Skip this chunk without commenting');
+        console.log(chalk.gray('  (Press [space] to skip chunk, [q] to quit review, or any other key to show menu)\n'));
+        // Fallback to menu input if key was not space/q
+        function askWithReadline() {
+            const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+            rl.question('👉 Choose [1–5]: ', (answer) => {
+                rl.close();
+                switch (answer.trim()) {
+                    case '1': return resolve('approve');
+                    case '2': return resolve('edit');
+                    case '3': return resolve('custom');
+                    case '4': return resolve('reject');
+                    case '5': return resolve('skip');
+                    default:
+                        console.log('⚠️ Invalid option. Skipping chunk.');
+                        return resolve('skip');
+                }
+            });
+        }
+        // Raw key listener for quick actions
+        function onKeyPress(key) {
+            const keyStr = key.toString().toLowerCase();
+            process.stdin.setRawMode(false);
+            process.stdin.pause();
+            if (keyStr === ' ') {
+                return resolve('skip');
+            }
+            else if (keyStr === 'q') {
+                console.log('\n👋 Exiting review.');
+                process.exit(0);
+            }
+            else {
+                // flush any remaining input
+                process.stdin.removeAllListeners('data');
+                askWithReadline();
+            }
+        }
+        // Prepare for keypress
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        process.stdin.once('data', onKeyPress);
+    });
 }
 // Main command to review PR
 export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
@@ -220,49 +310,67 @@ export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
         if (pr.body) {
             console.log(chalk.magentaBright('\n📝 PR Description:\n') + chalk.gray(pr.body));
         }
-        const reviewMethod = await askReviewMethod();
+        // Skip review method if there's only one chunk
+        const chunks = chunkDiff(diff);
+        const reviewMethod = chunks.length > 1 ? await askReviewMethod() : 'chunk'; // Auto-select chunk review if only 1 chunk
+        let allApproved = true; // Track if everything is approved
         if (reviewMethod === 'whole') {
             const suggestion = await reviewModule.run({ content: diff, filepath: 'Whole PR Diff' });
-            console.log(suggestion.content);
-            const finalReviewChoice = await askReviewApproval(suggestion.content);
+            console.log(chalk.yellowBright("Suggestion: ", suggestion));
+            const finalReviewChoice = await askReviewApproval();
             let reviewText = '';
             if (finalReviewChoice === 'approve') {
                 reviewText = 'PR approved';
-                await submitReview(pr.number, reviewText, 'APPROVE');
+                await submitReview(pr.number, suggestion.content, 'APPROVE'); // Final review approval
             }
             else if (finalReviewChoice === 'reject') {
                 reviewText = 'Changes requested';
-                await submitReview(pr.number, reviewText, 'REQUEST_CHANGES');
+                await submitReview(pr.number, suggestion.content, 'REQUEST_CHANGES'); // Final review rejection
             }
             else if (finalReviewChoice === 'custom') {
                 reviewText = await promptCustomReview();
-                await submitReview(pr.number, reviewText, 'COMMENT');
+                await submitReview(pr.number, reviewText, 'COMMENT'); // Custom comment
             }
             else if (finalReviewChoice === 'edit') {
                 reviewText = await promptEditReview(suggestion.content);
-                await submitReview(pr.number, reviewText, 'COMMENT');
+                await submitReview(pr.number, reviewText, 'COMMENT'); // Edited comment
             }
         }
         else {
-            const chunks = chunkDiff(diff);
             console.log(chalk.cyan(`🔍 Total Chunks: ${chunks.length}`));
             for (let i = 0; i < chunks.length; i++) {
                 const chunk = chunks[i];
-                const reviewResult = await reviewChunk(chunk, i, chunks.length);
-                if (reviewResult === 'approve') {
-                    await submitReview(pr.number, 'Approved chunk', 'APPROVE');
+                const { choice, summary } = await reviewChunk(chunk, i, chunks.length);
+                if (choice === 'approve') {
+                    console.log(`✔️ Approved chunk ${i + 1}`);
+                    await submitReview(pr.number, summary, 'COMMENT');
                 }
-                else if (reviewResult === 'reject') {
-                    await submitReview(pr.number, 'Changes requested for chunk', 'REQUEST_CHANGES');
+                else if (choice === 'reject') {
+                    allApproved = false;
+                    const reviewText = `Changes requested for chunk ${i + 1}: ${summary}`;
+                    await submitReview(pr.number, reviewText, 'REQUEST_CHANGES');
                 }
-                else if (reviewResult === 'custom') {
+                else if (choice === 'custom') {
                     const customReview = await promptCustomReview();
                     await submitReview(pr.number, customReview, 'COMMENT');
                 }
-                else {
-                    await submitReview(pr.number, reviewResult, 'COMMENT');
+                else if (choice === 'cancel' || choice === 'skip') {
+                    console.log(chalk.gray(`⏭️ Skipped chunk ${i + 1}`));
+                }
+                else if (typeof choice === 'string') {
+                    // e.g., from 'edit' returning custom text
+                    await submitReview(pr.number, choice, 'COMMENT');
                 }
             }
+            // After reviewing all chunks, approve or reject the whole PR based on chunk reviews
+            if (allApproved) {
+                console.log(chalk.green('✔️ All chunks approved. Submitting final PR approval.'));
+                await submitReview(pr.number, 'PR approved after reviewing all chunks', 'APPROVE'); // Final PR approval
+            }
+            else {
+                console.log(chalk.red('❌ Not all chunks were approved. Changes requested.'));
+                await submitReview(pr.number, 'PR changes requested based on chunk reviews', 'REQUEST_CHANGES'); // Final PR rejection
+            }
         }
     }
     catch (err) {

package/dist/pipeline/modules/reviewModule.js

@@ -7,8 +7,12 @@ export const reviewModule = {
         const model = Config.getModel();
         const prompt = `
 You are a senior software engineer reviewing a pull request. 
-Give clear and very short constructive feedback based on the code changes below.
-Only mention issues of greater concern. Less is more. 
+ALWAYS make 3 concise suggestions for improvements based on the input code diff.
+Use this format ONLY and output ONLY those suggestions:
+
+1. ...
+2. ...
+3. ...
 
 Changes:
 ${content}

package/package.json

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