scai 0.1.83 → 0.1.84

package/dist/commands/RefactorCmd.js

@@ -2,15 +2,13 @@ import fs from 'fs/promises';
 import path from 'path';
 import { runModulePipeline } from '../pipeline/runModulePipeline.js';
 import { addCommentsModule } from '../pipeline/modules/commentModule.js';
+import { normalizePath } from '../utils/normalizePath.js';
 export async function handleRefactor(filepath, options = {}) {
     try {
-        // Normalize path: add ./ prefix if no directory specified
-        if (!filepath.startsWith('./') && !filepath.startsWith('/') && !filepath.includes('\\')) {
-            filepath = `./${filepath}`;
-        }
+        // Normalize and resolve filepath (includes expanding ~ and consistent slashes)
+        filepath = normalizePath(filepath);
         const { dir, name, ext } = path.parse(filepath);
         const refactoredPath = path.join(dir, `${name}.refactored${ext}`);
-        // --apply flag: use existing refactored file and overwrite original
         if (options.apply) {
             try {
                 const refactoredCode = await fs.readFile(refactoredPath, 'utf-8');
@@ -23,13 +21,10 @@ export async function handleRefactor(filepath, options = {}) {
             }
             return;
         }
-        // Read source code
         const content = await fs.readFile(filepath, 'utf-8');
-        // Run through pipeline modules
         const response = await runModulePipeline([addCommentsModule], { content });
         if (!response.content.trim())
             throw new Error('⚠️ Model returned empty result');
-        // Save refactored output
         await fs.writeFile(refactoredPath, response.content, 'utf-8');
         console.log(`✅ Refactored code saved to: ${refactoredPath}`);
         console.log(`ℹ️ Run again with '--apply' to overwrite the original.`);

package/dist/commands/ReviewCmd.js

@@ -164,24 +164,6 @@ 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) => {
@@ -212,23 +194,20 @@ function chunkDiff(diff, review_id) {
         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
+        // This counts diff lines for *this file only* (context/+/- lines after first @@)
+        let positionCounter = 0;
         const lines = fullChunk.split('\n');
         lines.forEach(line => {
-            const hunkHeaderMatch = line.match(/^@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+            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) {
+                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);
+                const oldLines = parseInt(hunkHeaderMatch[2] || '0', 10);
+                const newLines = parseInt(hunkHeaderMatch[4] || '0', 10);
                 currentHunk = {
                     oldStart,
                     newStart,
@@ -236,33 +215,33 @@ function chunkDiff(diff, review_id) {
                     newLines,
                     lines: [],
                 };
+                return; // don’t count @@ header line in positionCounter
             }
-            else if (currentHunk) {
-                // Process the lines inside the hunk
+            if (currentHunk) {
+                // Each line after @@ counts towards the diff position
+                positionCounter++;
                 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
+                    position: positionCounter, // <-- key for GitHub inline API
+                    review_id,
                 });
             }
         });
-        // Push the last hunk (if any)
-        if (currentHunk) {
+        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
+            hunks,
+            review_id,
         };
     });
 }
@@ -419,48 +398,36 @@ export async function reviewPullRequestCmd(branch = 'main', showAll = false) {
             for (let i = 0; i < chunks.length; i++) {
                 const chunk = chunks[i];
                 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 (choice === 'reject') {
-                    allApproved = false;
-                    reviewComments.push({
-                        path: chunk.filePath,
-                        body: summary,
-                        line: chunk.hunks[0]?.newStart || 1,
-                        side: 'RIGHT',
-                    });
+                if (choice === 'cancel' || choice === 'skip') {
+                    console.log(chalk.gray(`⏭️ Skipped chunk ${i + 1}`));
+                    continue;
                 }
-                else if (choice === 'custom') {
-                    const customReview = await promptCustomReview();
-                    reviewComments.push({
-                        path: chunk.filePath,
-                        body: customReview,
-                        line: chunk.hunks[0]?.newStart || 1,
-                        side: 'RIGHT',
-                    });
+                // Find the first line in the chunk with a valid position (usually the first 'add' or 'context' line)
+                const firstLineWithPosition = chunk.hunks
+                    .flatMap(hunk => hunk.lines)
+                    .find(line => line.position !== undefined);
+                if (!firstLineWithPosition) {
+                    console.warn(`⚠️ Could not find valid position for inline comment in chunk ${i + 1}. Skipping comment.`);
+                    continue;
                 }
-                else if (choice === 'cancel' || choice === 'skip') {
-                    console.log(chalk.gray(`⏭️ Skipped chunk ${i + 1}`));
+                let commentBody = summary;
+                if (choice === 'custom') {
+                    commentBody = await promptCustomReview();
                 }
-                else if (typeof choice === 'string') {
-                    reviewComments.push({
-                        path: chunk.filePath,
-                        body: choice,
-                        line: chunk.hunks[0]?.newStart || 1,
-                        side: 'RIGHT',
-                    });
+                else if (typeof choice === 'string' && !['approve', 'reject', 'custom'].includes(choice)) {
+                    commentBody = choice;
                 }
+                reviewComments.push({
+                    path: chunk.filePath,
+                    body: commentBody,
+                    position: firstLineWithPosition.position,
+                });
+                if (choice === 'reject')
+                    allApproved = false;
             }
             console.log(chalk.blueBright('\n📝 Review Comments Preview:'));
             reviewComments.forEach((comment, idx) => {
-                console.log(`${idx + 1}. ${comment.path}:${comment.line} [${comment.side}] — ${comment.body}`);
+                console.log(`${idx + 1}. ${comment.path}:${comment.position} — ${comment.body}`);
             });
             const shouldApprove = allApproved;
             const hasInlineComments = reviewComments.length > 0;

package/dist/github/github.js

@@ -81,30 +81,29 @@ export async function submitReview(prNumber, body, event, comments) {
     const token = await ensureGitHubAuth();
     const { owner, repo } = await getRepoDetails();
     const url = `https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}/reviews`;
+    // Prepare payload
+    const payload = { body, event };
+    if (comments && comments.length > 0) {
+        payload.comments = comments;
+    }
     const res = await fetch(url, {
         method: 'POST',
         headers: {
             Authorization: `token ${token}`,
             Accept: 'application/vnd.github.v3+json',
         },
-        body: JSON.stringify({
-            body,
-            event,
-            comments,
-        }),
+        body: JSON.stringify(payload),
     });
     if (!res.ok) {
         const errorText = await res.text();
-        // Attempt to parse error body
         let parsed = {};
         try {
             parsed = JSON.parse(errorText);
         }
         catch (_) {
-            // leave as raw text if parsing fails
+            // fallback to raw text
         }
-        const knownErrors = Array.isArray(parsed.errors) ? parsed.errors.join('; ') : '';
-        // Handle known error cases
+        const knownErrors = Array.isArray(parsed.errors) ? parsed.errors.map((e) => e.message || e).join('; ') : '';
         if (res.status === 422) {
             if (knownErrors.includes('Can not approve your own pull request')) {
                 console.warn(`⚠️ Skipping approval: You cannot approve your own pull request.`);
@@ -114,8 +113,8 @@ export async function submitReview(prNumber, body, event, comments) {
                 console.warn(`⚠️ Cannot post comments: PR has no diff.`);
                 return;
             }
-            if (knownErrors.includes('path is missing') || knownErrors.includes('line is missing')) {
-                console.warn(`⚠️ Some inline comments are missing a path or line number. Skipping review.`);
+            if (knownErrors.includes('path is missing') || knownErrors.includes('line is missing') || knownErrors.includes('position is missing')) {
+                console.warn(`⚠️ Some inline comments are missing required fields. Skipping review.`);
                 return;
             }
             if (knownErrors.includes('Position is invalid') || knownErrors.includes('line must be part of the diff')) {
@@ -123,7 +122,6 @@ export async function submitReview(prNumber, body, event, comments) {
                 return;
             }
         }
-        // Unknown error
         throw new Error(`Failed to submit review: ${res.status} ${res.statusText} - ${errorText}`);
     }
     console.log(`✅ Submitted ${event} review for PR #${prNumber}`);

package/dist/utils/normalizePath.js

@@ -1,4 +1,5 @@
 // src/utils/normalizePath.ts
+import os from 'os';
 import path from "path";
 /**
  * Normalizes a path string for loose, fuzzy matching:
@@ -11,6 +12,9 @@ export function normalizePathForLooseMatch(p) {
 }
 // Helper to normalize and resolve paths to a consistent format (forward slashes)
 export function normalizePath(p) {
+    if (p.startsWith('~')) {
+        p = path.join(os.homedir(), p.slice(1));
+    }
     return path.resolve(p).replace(/\\/g, '/');
 }
 export function getRepoKeyForPath(pathToMatch, config) {

package/package.json

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