scai 0.1.75 → 0.1.77

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');
@@ -143,6 +152,24 @@ function askReviewApproval(suggestion) {
         });
     });
 }
+function askFinalReviewApproval() {
+    return new Promise((resolve) => {
+        console.log('\n---');
+        console.log('1) ✅ Approve');
+        console.log('2) ❌ Request Changes');
+        console.log('3) 🚫 Cancel');
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        rl.question(`\n👉 Choose an option [1-3]: `, (answer) => {
+            rl.close();
+            if (answer === '1')
+                resolve('approve');
+            else if (answer === '2')
+                resolve('request-changes');
+            else
+                resolve('cancel');
+        });
+    });
+}
 // Prompt for custom review
 function promptCustomReview() {
     return new Promise((resolve) => {
@@ -167,15 +194,63 @@ export async function promptEditReview(suggestedReview) {
         .trim() || suggestedReview;
 }
 // Split diff into file-based chunks
-function chunkDiff(diff) {
+function chunkDiff(diff, review_id) {
     const rawChunks = diff.split(/^diff --git /m).filter(Boolean);
     return rawChunks.map(chunk => {
         const fullChunk = 'diff --git ' + chunk;
         const filePathMatch = fullChunk.match(/^diff --git a\/(.+?) b\//);
         const filePath = filePathMatch ? filePathMatch[1] : 'unknown';
+        // Now we extract hunks and lines as per the DiffHunk type
+        const hunks = [];
+        let currentHunk = null;
+        // Split chunk into lines
+        const lines = fullChunk.split('\n');
+        lines.forEach(line => {
+            const hunkHeaderMatch = line.match(/^@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+            if (hunkHeaderMatch) {
+                // When we encounter a new hunk, process the previous one (if it exists) and start a new one
+                if (currentHunk) {
+                    hunks.push(currentHunk);
+                }
+                // Parse the hunk header
+                const oldStart = parseInt(hunkHeaderMatch[1], 10);
+                const newStart = parseInt(hunkHeaderMatch[3], 10);
+                const oldLines = parseInt(hunkHeaderMatch[2], 10);
+                const newLines = parseInt(hunkHeaderMatch[4], 10);
+                currentHunk = {
+                    oldStart,
+                    newStart,
+                    oldLines,
+                    newLines,
+                    lines: [],
+                };
+            }
+            else if (currentHunk) {
+                // Process the lines inside the hunk
+                let lineType = 'context';
+                if (line.startsWith('+'))
+                    lineType = 'add';
+                if (line.startsWith('-'))
+                    lineType = 'del';
+                // Create the DiffLine object
+                currentHunk.lines.push({
+                    line,
+                    type: lineType,
+                    lineNumberOld: lineType === 'del' ? currentHunk.oldStart++ : undefined,
+                    lineNumberNew: lineType === 'add' ? currentHunk.newStart++ : undefined,
+                    review_id, // Assign the review_id here
+                });
+            }
+        });
+        // Push the last hunk (if any)
+        if (currentHunk) {
+            hunks.push(currentHunk);
+        }
         return {
             filePath,
             content: fullChunk,
+            hunks, // Return hunks, which now contain DiffLine objects with line numbers and review_id
+            review_id, // Assign the review_id here for each chunk
         };
     });
 }
@@ -191,18 +266,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 };
     }
-    return reviewChoice;
+    else if (choice === 'skip') {
+        await waitForSpaceOrQ(); // pause between chunks
+        return { choice: 'cancel', summary }; // skip this one
+    }
+    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) 💬  Approve and 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,19 +376,21 @@ 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();
+        const chunks = chunkDiff(diff, pr.number.toString());
+        const reviewMethod = chunks.length > 1 ? await askReviewMethod() : 'chunk';
+        let reviewComments = [];
         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');
             }
             else if (finalReviewChoice === 'reject') {
                 reviewText = 'Changes requested';
-                await submitReview(pr.number, reviewText, 'REQUEST_CHANGES');
+                await submitReview(pr.number, suggestion.content, 'REQUEST_CHANGES');
             }
             else if (finalReviewChoice === 'custom') {
                 reviewText = await promptCustomReview();
@@ -244,24 +402,72 @@ export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
             }
         }
         else {
-            const chunks = chunkDiff(diff);
             console.log(chalk.cyan(`🔍 Total Chunks: ${chunks.length}`));
+            let allApproved = true;
             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') {
+                    reviewComments.push({
+                        path: chunk.filePath,
+                        body: summary,
+                        line: chunk.hunks[0]?.newStart || 1,
+                        side: 'RIGHT',
+                    });
+                    console.log(`💬 Posted AI review for chunk ${i + 1}`);
                 }
-                else if (reviewResult === 'reject') {
-                    await submitReview(pr.number, 'Changes requested for chunk', 'REQUEST_CHANGES');
+                else if (choice === 'reject') {
+                    allApproved = false;
+                    reviewComments.push({
+                        path: chunk.filePath,
+                        body: summary,
+                        line: chunk.hunks[0]?.newStart || 1,
+                        side: 'RIGHT',
+                    });
                 }
-                else if (reviewResult === 'custom') {
+                else if (choice === 'custom') {
                     const customReview = await promptCustomReview();
-                    await submitReview(pr.number, customReview, 'COMMENT');
+                    reviewComments.push({
+                        path: chunk.filePath,
+                        body: customReview,
+                        line: chunk.hunks[0]?.newStart || 1,
+                        side: 'RIGHT',
+                    });
                 }
-                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') {
+                    reviewComments.push({
+                        path: chunk.filePath,
+                        body: choice,
+                        line: chunk.hunks[0]?.newStart || 1,
+                        side: 'RIGHT',
+                    });
+                }
+            }
+            console.log(chalk.blueBright('\n📝 Review Comments Preview:'));
+            reviewComments.forEach((comment, idx) => {
+                console.log(`${idx + 1}. ${comment.path}:${comment.line} [${comment.side}] — ${comment.body}`);
+            });
+            const shouldApprove = allApproved;
+            const hasInlineComments = reviewComments.length > 0;
+            // We always submit comments first if any
+            const initialReviewState = shouldApprove ? 'APPROVE' : 'REQUEST_CHANGES';
+            const initialReviewBody = shouldApprove
+                ? 'Reviewed all chunks.'
+                : 'Requested changes based on chunk reviews.';
+            console.log(shouldApprove && !hasInlineComments
+                ? chalk.green('✔️ All chunks approved. Submitting final PR approval.')
+                : !shouldApprove
+                    ? chalk.red('❌ Not all chunks were approved. Changes requested.')
+                    : chalk.green('📝 Submitting inline comments before approval.') // ✅ NEW
+            );
+            // ✅ Submit review with inline comments or direct approval/request
+            await submitReview(pr.number, initialReviewBody, initialReviewState, reviewComments);
+            // ✅ Then submit separate approval if needed
+            if (shouldApprove && hasInlineComments) {
+                await submitReview(pr.number, 'PR approved after inline comments.', 'APPROVE');
             }
         }
     }

package/dist/github/github.js

@@ -48,7 +48,7 @@ export async function fetchPullRequestDiff(pr, token) {
     }
     return await res.text();
 }
-export async function submitReview(prNumber, body, event = 'COMMENT') {
+export async function submitReview(prNumber, body, event, comments) {
     const token = await ensureGitHubAuth();
     const { owner, repo } = getRepoDetails();
     const url = `https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}/reviews`;
@@ -61,6 +61,7 @@ export async function submitReview(prNumber, body, event = 'COMMENT') {
         body: JSON.stringify({
             body,
             event,
+            comments
         }),
     });
     if (!res.ok) {
@@ -69,3 +70,52 @@ export async function submitReview(prNumber, body, event = 'COMMENT') {
     }
     console.log(`✅ Submitted ${event} review for PR #${prNumber}`);
 }
+export async function postInlineComment(prNumber, commitId, path, body, line, side = 'RIGHT', reviewId = null // Associate with a review if available
+) {
+    const token = await ensureGitHubAuth();
+    const { owner, repo } = getRepoDetails();
+    const url = `https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}/comments`;
+    const res = await fetch(url, {
+        method: 'POST',
+        headers: {
+            Authorization: `token ${token}`,
+            Accept: 'application/vnd.github.v3+json',
+        },
+        body: JSON.stringify({
+            body,
+            commit_id: commitId,
+            path,
+            line,
+            side,
+            review_id: reviewId, // Include review_id if available
+        }),
+    });
+    if (!res.ok) {
+        const errorText = await res.text();
+        throw new Error(`Failed to post inline comment: ${res.status} ${res.statusText} - ${errorText}`);
+    }
+    console.log(`💬 Posted inline comment on ${path}:${line}`);
+}
+export async function createReviewForPR(prNumber, body, event = 'COMMENT') {
+    const token = await ensureGitHubAuth();
+    const { owner, repo } = getRepoDetails();
+    const url = `https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}/reviews`;
+    const res = await fetch(url, {
+        method: 'POST',
+        headers: {
+            Authorization: `token ${token}`,
+            Accept: 'application/vnd.github.v3+json',
+        },
+        body: JSON.stringify({
+            body,
+            event,
+        }),
+    });
+    if (!res.ok) {
+        const errorText = await res.text();
+        throw new Error(`Failed to create review: ${res.status} ${res.statusText} - ${errorText}`);
+    }
+    const review = await res.json();
+    console.log(`✅ Created review for PR #${prNumber}`);
+    return review.id; // Return the review ID to be used for inline comments
+}

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.77",
   "type": "module",
   "bin": {
     "scai": "./dist/index.js"