optimize review result

Author: anc95

action/index.cjs

@@ -150544,17 +150544,25 @@ const robot = (app) => {
                 continue;
             }
             try {
-                // Split patch into individual hunks (by @@ markers)
-                const hunks = splitPatchIntoHunks(patch);
-                for (const hunk of hunks) {
-                    const res = await chat?.codeReview(hunk.content);
-                    if (!res.lgtm && !!res.review_comment) {
-                        const { line, side } = computeLineAndSideFromPatch(hunk.content);
+                const res = await chat?.codeReview(patch);
+                // res can be a single review or an array of reviews (one for each hunk)
+                const reviews = Array.isArray(res) ? res : [res];
+                for (const review of reviews) {
+                    if (!review.lgtm && !!review.review_comment) {
+                        let line;
+                        let side = 'RIGHT';
+                        // Extract line number from hunk header if available
+                        if (review.hunk_header) {
+                            const hunkMatch = review.hunk_header.match(/@@\s+-\d+(?:,\d+)?\s+\+(\d+)(?:,(\d+))?\s+@@/);
+                            if (hunkMatch) {
+                                line = parseInt(hunkMatch[1], 10);
+                            }
+                        }
                         ress.push({
                             path: file.filename,
-                            body: res.review_comment,
-                            line: hunk.newStart + line - 1,
-                            side,
+                            body: review.review_comment,
+                            line: line,
+                            side: side,
                         });
                     }
                 }
@@ -150601,109 +150609,6 @@ const matchPatterns = (patterns, path) => {
         }
     });
 };
-const computeLineAndSideFromPatch = (patch) => {
-    // Returns first suitable line number and side for a review comment.
-    // Preference order: first added line ('+' -> RIGHT), then context (' ' -> RIGHT), then deletion ('-' -> LEFT).
-    if (!patch)
-        return { line: 1, side: 'RIGHT' };
-    const lines = patch.split('\n');
-    let currentOld = 0;
-    let currentNew = 0;
-    // helper to parse the hunk header like: @@ -oldStart,oldCount +newStart,newCount @@
-    const parseHunkHeader = (hdr) => {
-        const m = hdr.match(/@@\s+-(\d+)(?:,(\d+))?\s+\+(\d+)(?:,(\d+))?\s+@@/);
-        if (!m)
-            return null;
-        const oldStart = parseInt(m[1], 10);
-        const newStart = parseInt(m[3], 10);
-        return { oldStart, newStart };
-    };
-    // track first matches
-    let firstAdded = null;
-    let firstContext = null;
-    let firstDeleted = null;
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        if (line.startsWith('@@')) {
-            const parsed = parseHunkHeader(line);
-            if (parsed) {
-                currentOld = parsed.oldStart;
-                currentNew = parsed.newStart;
-            }
-            continue;
-        }
-        if (line.startsWith('+')) {
-            // addition: belongs to new file
-            if (firstAdded === null)
-                firstAdded = currentNew;
-            currentNew++;
-            continue;
-        }
-        if (line.startsWith('-')) {
-            // deletion: belongs to old file
-            if (firstDeleted === null)
-                firstDeleted = currentOld;
-            currentOld++;
-            continue;
-        }
-        // context line (starts with space or other)
-        if (line.startsWith(' ') || line.length === 0) {
-            if (firstContext === null)
-                firstContext = currentNew;
-            currentOld++;
-            currentNew++;
-            continue;
-        }
-    }
-    if (firstAdded !== null)
-        return { line: firstAdded, side: 'RIGHT' };
-    if (firstContext !== null)
-        return { line: firstContext, side: 'RIGHT' };
-    if (firstDeleted !== null)
-        return { line: firstDeleted, side: 'LEFT' };
-    return { line: 1, side: 'RIGHT' };
-};
-const splitPatchIntoHunks = (patch) => {
-    // Split patch into individual hunks by @@ markers
-    const hunks = [];
-    const lines = patch.split('\n');
-    let currentHunk = [];
-    let currentHeader = '';
-    let currentNewStart = 0;
-    const parseHunkHeader = (hdr) => {
-        const m = hdr.match(/@@\s+-\d+(?:,\d+)?\s+\+(\d+)(?:,\d+)?\s+@@/);
-        if (!m)
-            return 0;
-        return parseInt(m[1], 10);
-    };
-    for (const line of lines) {
-        if (line.startsWith('@@')) {
-            // Save previous hunk if it exists
-            if (currentHunk.length > 0) {
-                hunks.push({
-                    header: currentHeader,
-                    newStart: currentNewStart,
-                    content: currentHunk.join('\n'),
-                });
-            }
-            currentHeader = line;
-            currentNewStart = parseHunkHeader(line);
-            currentHunk = [line];
-        }
-        else if (currentHunk.length > 0) {
-            currentHunk.push(line);
-        }
-    }
-    // Save the last hunk
-    if (currentHunk.length > 0) {
-        hunks.push({
-            header: currentHeader,
-            newStart: currentNewStart,
-            content: currentHunk.join('\n'),
-        });
-    }
-    return hunks;
-};
 
 
 /***/ }),
@@ -150747,10 +150652,16 @@ class Chat {
         const userPrompt = process.env.PROMPT || 'Please review the following code patch. Focus on potential bugs, risks, and improvement suggestions.';
         const jsonFormatRequirement = '\nProvide your feedback in a strict JSON format with the following structure:\n' +
             '{\n' +
-            '  "lgtm": boolean, // true if the code looks good to merge, false if there are concerns\n' +
-            '  "review_comment": string // Your detailed review comments. You can use markdown syntax in this string, but the overall response must be a valid JSON\n' +
+            '  "reviews": [\n' +
+            '    {\n' +
+            '      "hunk_header": string, // The @@ hunk header (e.g., "@@ -10,5 +10,7 @@"), optional\n' +
+            '      "lgtm": boolean, // true if this hunk looks good, false if there are concerns\n' +
+            '      "review_comment": string // Your detailed review comments for this hunk. Can use markdown syntax. Empty string if lgtm is true.\n' +
+            '    }\n' +
+            '  ]\n' +
             '}\n' +
-            'Ensure your response is a valid JSON object.\n';
+            'Review each hunk (marked by @@) separately and provide feedback for hunks that need improvement.\n' +
+            'Ensure your response is a valid JSON object with a reviews array.\n';
         return `${userPrompt}${jsonFormatRequirement} ${answerLanguage}:
     ${patch}
     `;
@@ -150783,11 +150694,17 @@ class Chat {
         if (res.choices.length) {
             try {
                 const json = JSON.parse(res.choices[0].message.content || "");
+                // If response has a 'reviews' array, return it directly
+                if (json.reviews && Array.isArray(json.reviews)) {
+                    return json.reviews;
+                }
+                // Otherwise, treat as a single review response
                 return json;
             }
             catch (e) {
                 return {
                     lgtm: false,
+                    hunk_header: patch.split('\n')[0].startsWith('@@') ? patch.split('\n')[0] : undefined,
                     review_comment: res.choices[0].message.content || ""
                 };
             }

action/src/chat.d.ts

@@ -4,8 +4,13 @@ export declare class Chat {
     private isGithubModels;
     constructor(apikey: string);
     private generatePrompt;
-    codeReview: (patch: string) => Promise<{
+    codeReview: (patch: string) => Promise<Array<{
         lgtm: boolean;
         review_comment: string;
+        hunk_header?: string;
+    }> | {
+        lgtm: boolean;
+        review_comment: string;
+        hunk_header?: string;
     }>;
 }