scai 0.1.54 → 0.1.56

package/README.md

@@ -65,7 +65,7 @@ No more struggling to write pull request descriptions by hand. `scai git review`
 To interact with GitHub and create pull requests, `scai` needs a personal access token with **repo** permissions.
 
 1. **Create your GitHub Access Token**
-   Follow this link to generate a token: [https://github.com/settings/tokens?type=beta](https://github.com/settings/tokens?type=beta)
+   Follow this link to generate a token: [https://github.com/settings/personal-access-tokens](https://github.com/settings/personal-access-tokens)
 
    Make sure you enable at least:
 

package/dist/commands/ReviewCmd.js

@@ -1,8 +1,10 @@
 import readline from 'readline';
-import { reviewModule } from '../pipeline/modules/reviewModule.js';
 import { fetchOpenPullRequests, fetchPullRequestDiff, 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')
 export async function getPullRequestsForReview(token, owner, repo, username, branch = 'main', filterForUser = true) {
     const prs = await fetchOpenPullRequests(token, owner, repo);
@@ -30,17 +32,13 @@ export async function getPullRequestsForReview(token, owner, repo, username, bra
                 filtered.push({ pr, diff });
             }
             catch (err) {
-                console.warn(`⚠️ Could not fetch diff for PR #${pr.number}: ${err.message}`);
                 failedPRs.push(pr);
             }
         }
     }
     if (failedPRs.length > 0) {
-        console.warn(`\n⚠️ Skipped ${failedPRs.length} PR(s) due to diff fetch failures:`);
-        for (const pr of failedPRs) {
-            console.warn(`  - #${pr.number}: ${pr.title}`);
-        }
-        console.warn('These PRs will not be included in the review summary.\n');
+        const failedList = failedPRs.map(pr => `#${pr.number}`).join(', ');
+        console.warn(`⚠️ Skipped ${failedPRs.length} PR(s) (${failedList}) due to diff fetch errors.`);
     }
     return filtered;
 }
@@ -51,7 +49,7 @@ function askUserToPickPR(prs) {
             console.log("⚠️ No pull requests with review requested.");
             return resolve(null);
         }
-        console.log("\n📦 Open Pull Requests with review requested:");
+        console.log(chalk.blue("\n📦 Open Pull Requests with review requested:"));
         prs.forEach((pr, i) => {
             console.log(`${i + 1}) #${pr.number} - ${pr.title}`);
         });
@@ -59,14 +57,43 @@ function askUserToPickPR(prs) {
             input: process.stdin,
             output: process.stdout,
         });
-        rl.question(`\n👉 Choose a PR to review [1-${prs.length}]: `, (answer) => {
+        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
+function askReviewMethod() {
+    return new Promise((resolve) => {
+        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();
-            const index = parseInt(answer, 10);
-            if (!isNaN(index) && index >= 1 && index <= prs.length) {
-                resolve(index - 1); // Return array index, not PR number
+            if (answer === '1') {
+                resolve('whole');
+            }
+            else if (answer === '2') {
+                resolve('chunk');
             }
             else {
-                resolve(null);
+                console.log('⚠️ Invalid selection. Defaulting to "whole".');
+                resolve('whole');
             }
         });
     });
@@ -123,12 +150,52 @@ function promptCustomReview() {
         });
     });
 }
+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 };
+    });
+}
+// Function to color diff lines
+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)
+}
+// Updated reviewChunk function to apply coloring
+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?');
+    return reviewChoice;
+}
 export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
     try {
         console.log("🔍 Fetching pull requests and diffs...");
-        const token = await ensureGitHubAuth();
+        const token = await ensureGitHubAuth(); // Get GitHub token
         const username = await getGitHubUsername(token);
-        const { owner, repo } = getRepoDetails();
+        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}`);
@@ -147,32 +214,101 @@ export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
             console.log(`🔍 Fetching diff for PR #${pr.number}...`);
             prDiff = await fetchPullRequestDiff(pr, token);
         }
-        const result = await reviewModule.run({ content: prDiff });
-        const reviewSuggestion = result.content || 'No review suggestion generated.';
-        const reviewChoice = await askReviewApproval(reviewSuggestion);
-        let reviewEvent;
-        if (reviewChoice === 'approve') {
-            reviewEvent = 'APPROVE';
-            console.log(`✅ Review for PR #${pr.number} approved.`);
-            await submitReview(pr.number, reviewSuggestion, reviewEvent);
-        }
-        else if (reviewChoice === 'reject') {
-            reviewEvent = 'REQUEST_CHANGES';
-            console.log(`❌ Review for PR #${pr.number} rejected.`);
-            await submitReview(pr.number, reviewSuggestion, reviewEvent);
-        }
-        else if (reviewChoice === 'cancel') {
-            console.log(`🚪 Review process for PR #${pr.number} cancelled.`);
-            return; // Exit the function and cancel the review process
+        const chunkComments = {}; // Declare here for global access
+        const reviewMethod = await askReviewMethod(); // Ask user for review method (whole or chunk)
+        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");
+            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?');
+            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');
+            }
         }
         else {
-            reviewEvent = 'COMMENT';
-            const customReview = await promptCustomReview();
-            console.log(`💬 Custom review: ${customReview}`);
-            await submitReview(pr.number, customReview, reviewEvent);
+            const chunks = chunkDiff(prDiff); // Split the diff into chunks
+            // Log the total number of chunks
+            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'];
+                }
+                else if (reviewChoice === 'reject') {
+                    console.log('❌ Rejecting this chunk.');
+                    chunkComments[chunk.filePath] = ['Rejected'];
+                }
+                else if (reviewChoice === 'cancel') {
+                    console.log('🚪 Review process cancelled.');
+                    return; // Exit if user cancels
+                }
+                else {
+                    console.log('✍️ Custom review added.');
+                    const customReview = await promptCustomReview();
+                    console.log(`💬 Custom review: ${customReview}`);
+                    chunkComments[chunk.filePath] = [customReview];
+                }
+            }
+            // 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/github/postComments.js

@@ -0,0 +1,69 @@
+import { Octokit } from '@octokit/rest';
+/**
+ * Parses the PR diff to determine the correct position for inline comments.
+ * The position is the "index" of the changed line in the diff.
+ * @param diff The diff content of the PR
+ * @param lineNumber The line number to convert to a position in the diff
+ */
+function getLinePositionFromDiff(diff, lineNumber) {
+    const lines = diff.split('\n');
+    let currentLine = 0;
+    // Iterate through the lines and determine the correct position for the lineNumber
+    for (let i = 0; i < lines.length; i++) {
+        // Only count the lines that are part of a diff chunk
+        if (lines[i].startsWith('+') || lines[i].startsWith('-')) {
+            currentLine++;
+            if (currentLine === lineNumber) {
+                return i; // Position is the index of the changed line in the diff
+            }
+        }
+    }
+    return null; // Return null if lineNumber is not found in the diff
+}
+/**
+ * Posts an inline review comment on a specific line of a PR.
+ *
+ * @param token GitHub personal access token
+ * @param owner Repository owner (e.g. 'my-org')
+ * @param repo Repository name (e.g. 'my-repo')
+ * @param prNumber Pull Request number
+ * @param fileName Path to the file in the PR (relative to repo root)
+ * @param lineNumber Line number to comment on in the file (not in the diff)
+ * @param comment Text of the comment
+ */
+export async function postReviewComment(token, owner, repo, prNumber, fileName, lineNumber, comment) {
+    const octokit = new Octokit({ auth: `token ${token}` });
+    // First, get PR details so we can retrieve the head commit SHA
+    const pr = await octokit.pulls.get({
+        owner,
+        repo,
+        pull_number: prNumber,
+    });
+    const commitId = pr.data.head.sha;
+    // Fetch the PR diff by getting the full diff URL from the PR
+    const diffUrl = pr.data.diff_url;
+    const diffRes = await fetch(diffUrl);
+    const diff = await diffRes.text();
+    // Get the position of the line in the diff
+    const position = getLinePositionFromDiff(diff, lineNumber);
+    if (position === null) {
+        console.error(`❌ Unable to find line ${lineNumber} in the diff for PR #${prNumber}.`);
+        return;
+    }
+    // Now, post the inline comment
+    try {
+        await octokit.pulls.createReviewComment({
+            owner,
+            repo,
+            pull_number: prNumber,
+            commit_id: commitId,
+            path: fileName,
+            body: comment,
+            position: position, // Use the position calculated from the diff
+        });
+        console.log(`✅ Inline comment posted to ${fileName} at diff position ${position}.`);
+    }
+    catch (err) {
+        console.error(`❌ Error posting inline comment: ${err.message}`);
+    }
+}

package/dist/index.js

@@ -25,6 +25,7 @@ import { runInspectCommand } from "./commands/InspectCmd.js";
 import { reviewPullRequestCmd } from "./commands/ReviewCmd.js";
 import { promptForToken } from "./github/token.js";
 import { validateGitHubTokenAgainstRepo } from "./github/githubAuthCheck.js";
+import { checkGit } from "./commands/GitCmd.js";
 // 🎛️ CLI Setup
 const cmd = new Command('scai')
     .version(version)
@@ -54,6 +55,12 @@ git
     .option('-c, --commit', 'Automatically commit with suggested message')
     .option('-l, --changelog', 'Generate and optionally stage a changelog entry')
     .action((options) => suggestCommitMessage(options));
+git
+    .command('check')
+    .description('Check Git working directory and branch status')
+    .action(() => {
+    checkGit();
+});
 // Add auth-related commands
 const auth = cmd.command('auth').description('GitHub authentication commands');
 auth

package/dist/pipeline/modules/reviewModule.js

@@ -7,7 +7,8 @@ export const reviewModule = {
         const model = Config.getModel();
         const prompt = `
 You are a senior software engineer reviewing a pull request. 
-Give clear, constructive feedback based on the code changes below.
+Give clear and very short constructive feedback based on the code changes below.
+Only mention issues of greater concern. Less is more. 
 
 Changes:
 ${content}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scai",
-  "version": "0.1.54",
+  "version": "0.1.56",
   "type": "module",
   "bin": {
     "scai": "./dist/index.js"
@@ -36,9 +36,11 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
+    "@octokit/rest": "^22.0.0",
     "acorn": "^8.11.3",
     "acorn-walk": "^8.3.2",
     "better-sqlite3": "^12.1.1",
+    "chalk": "^5.4.1",
     "commander": "^11.0.0",
     "fast-glob": "^3.3.3",
     "proper-lockfile": "^4.1.2",
@@ -57,4 +59,4 @@
     "dist/",
     "README.md"
   ]
-}
+}