From e29a9c1ee8716b2a3a0a810edba86b43fb4f59b1 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 03:11:30 +0000
Subject: [PATCH] fix(ci): improve logging and error handling in
 automated-pr-review.mjs

- Wrap `main` execution in try-catch block to ensure process exits with code 1 on failure.
- Update `runCommand` to throw meaningful errors on spawn failure (e.g. command not found).
- Add explicit check for `gh` CLI availability in CI environment.
- Improve git command error logging in `getChangedFiles` to capture stderr (e.g. "no merge base").

Co-authored-by: PR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
---
 scripts/automated-pr-review.mjs | 38 +++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/scripts/automated-pr-review.mjs b/scripts/automated-pr-review.mjs
index dea6b0dd..e1534747 100644
--- a/scripts/automated-pr-review.mjs
+++ b/scripts/automated-pr-review.mjs
@@ -15,7 +15,12 @@ const SENSITIVE_PATHS = [
 
 function runCommand(command, args = [], options = {}) {
   console.log(`\n> ${command} ${args.join(' ')}`);
-  return spawnSync(command, args, { stdio: 'pipe', encoding: 'utf-8', ...options });
+  const result = spawnSync(command, args, { stdio: 'pipe', encoding: 'utf-8', ...options });
+
+  if (result.error) {
+    throw new Error(`Failed to execute command "${command}": ${result.error.message}`);
+  }
+  return result;
 }
 
 function getChangedFiles() {
@@ -33,14 +38,14 @@ function getChangedFiles() {
       }
       console.log(`Fetching ${remote}/${baseRef} from ${baseUrl}...`);
       try {
-        execSync(`git fetch ${remote} ${baseRef}`, { stdio: 'ignore' });
+        execSync(`git fetch ${remote} ${baseRef}`, { stdio: 'pipe', encoding: 'utf-8' });
       } catch (e) {
-        console.error(`Failed to fetch ${remote}/${baseRef}:`, e.message);
+        console.error(`Failed to fetch ${remote}/${baseRef}:`, e.stderr || e.message);
       }
     } else {
       // Fallback for local testing or if env var missing
       try {
-        execSync(`git fetch origin ${baseRef} --depth=1`, { stdio: 'ignore' });
+        execSync(`git fetch origin ${baseRef} --depth=1`, { stdio: 'pipe', encoding: 'utf-8' });
       } catch (e) {
         // Ignore
       }
@@ -53,7 +58,7 @@ function getChangedFiles() {
     const output = execSync(cmd, { encoding: 'utf-8' });
     return output.split('\n').filter(Boolean).map(f => f.trim());
   } catch (error) {
-    console.error('Error getting changed files:', error.message);
+    console.error('Error getting changed files:', error.stderr || error.message);
     // Fallback: try 2-dot diff if 3-dot failed (e.g. shallow clone issues)
     try {
        const baseRef = process.env.GITHUB_BASE_REF || 'main';
@@ -63,7 +68,7 @@ function getChangedFiles() {
        const output = execSync(cmd, { encoding: 'utf-8' });
        return output.split('\n').filter(Boolean).map(f => f.trim());
     } catch (e) {
-       console.error('Fallback diff failed:', e.message);
+       console.error('Fallback diff failed:', e.stderr || e.message);
        return [];
     }
   }
@@ -86,9 +91,10 @@ function checkReleaseChannel(changedFiles) {
 }
 
 async function main() {
-  console.log('Starting Automated PR Review...');
-  let commentBody = '## 🤖 Automated PR Review\n\n';
-  let hasFailures = false;
+  try {
+    console.log('Starting Automated PR Review...');
+    let commentBody = '## 🤖 Automated PR Review\n\n';
+    let hasFailures = false;
   let hasFormatChanges = false;
   let microFixesStatus = '';
 
@@ -167,6 +173,9 @@ async function main() {
 
   // 6. Post Comment (if in CI)
   if (process.env.GITHUB_TOKEN && process.env.PR_NUMBER) {
+    // Verify gh CLI is available
+    console.log('Verifying GitHub CLI...');
+    runCommand('gh', ['--version']);
 
     // Attempt Micro-fixes
     if (hasFormatChanges) {
@@ -233,9 +242,16 @@ async function main() {
     console.log('---------------------------------------------------');
   }
 
-  if (hasFailures) {
+    if (hasFailures) {
+      process.exit(1);
+    }
+  } catch (error) {
+    console.error('Automated PR Review failed:', error);
     process.exit(1);
   }
 }
 
-main();
+main().catch(error => {
+  console.error('Unhandled error in main execution:', error);
+  process.exit(1);
+});