scai 0.1.76 → 0.1.77

package/dist/commands/ReviewCmd.js

@@ -152,6 +152,24 @@ function askReviewApproval() {
         });
     });
 }
+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) => {
@@ -176,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
         };
     });
 }
@@ -247,10 +313,10 @@ function waitForSpaceOrQ() {
 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('  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('  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
@@ -310,10 +376,9 @@ export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
         if (pr.body) {
             console.log(chalk.magentaBright('\n📝 PR Description:\n') + chalk.gray(pr.body));
         }
-        // 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
+        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(chalk.yellowBright("Suggestion: ", suggestion));
@@ -321,55 +386,88 @@ export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
             let reviewText = '';
             if (finalReviewChoice === 'approve') {
                 reviewText = 'PR approved';
-                await submitReview(pr.number, suggestion.content, 'APPROVE'); // Final review approval
+                await submitReview(pr.number, suggestion.content, 'APPROVE');
             }
             else if (finalReviewChoice === 'reject') {
                 reviewText = 'Changes requested';
-                await submitReview(pr.number, suggestion.content, 'REQUEST_CHANGES'); // Final review rejection
+                await submitReview(pr.number, suggestion.content, 'REQUEST_CHANGES');
             }
             else if (finalReviewChoice === 'custom') {
                 reviewText = await promptCustomReview();
-                await submitReview(pr.number, reviewText, 'COMMENT'); // Custom comment
+                await submitReview(pr.number, reviewText, 'COMMENT');
             }
             else if (finalReviewChoice === 'edit') {
                 reviewText = await promptEditReview(suggestion.content);
-                await submitReview(pr.number, reviewText, 'COMMENT'); // Edited comment
+                await submitReview(pr.number, reviewText, 'COMMENT');
             }
         }
         else {
             console.log(chalk.cyan(`🔍 Total Chunks: ${chunks.length}`));
+            let allApproved = true;
             for (let i = 0; i < chunks.length; i++) {
                 const chunk = chunks[i];
                 const { choice, summary } = await reviewChunk(chunk, i, chunks.length);
                 if (choice === 'approve') {
-                    console.log(`✔️ Approved chunk ${i + 1}`);
-                    await submitReview(pr.number, summary, 'COMMENT');
+                    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 (choice === 'reject') {
                     allApproved = false;
-                    const reviewText = `Changes requested for chunk ${i + 1}: ${summary}`;
-                    await submitReview(pr.number, reviewText, 'REQUEST_CHANGES');
+                    reviewComments.push({
+                        path: chunk.filePath,
+                        body: summary,
+                        line: chunk.hunks[0]?.newStart || 1,
+                        side: 'RIGHT',
+                    });
                 }
                 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 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');
+                    reviewComments.push({
+                        path: chunk.filePath,
+                        body: choice,
+                        line: chunk.hunks[0]?.newStart || 1,
+                        side: 'RIGHT',
+                    });
                 }
             }
-            // 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
+            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/package.json

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