deflake 1.0.6 → 1.0.8

package/cli.js

@@ -307,7 +307,7 @@ function extractFailureLocation(logText) {
     return null;
 }
 
-function printDetailedFix(fixText, location, sourceCode = null) {
+function printDetailedFix(fixText, location, sourceCode = null, isApplied = false) {
     const C = {
         RESET: "\x1b[0m",
         BRIGHT: "\x1b[1m",
@@ -332,32 +332,85 @@ function printDetailedFix(fixText, location, sourceCode = null) {
     } catch (e) { }
 
     console.log("\n" + C.GRAY + "─".repeat(50) + C.RESET);
-    if (location) {
-        // Label is default color, Value is colored
-        if (location.rootFile && location.rootLine) {
-            console.log(`💥 Runtime Error:  ${C.RED}${location.rootFile}:${location.rootLine}${C.RESET}`);
+
+    if (isApplied) {
+        // --- APPLIED VIEW ---
+        console.log(`${C.GREEN}${C.BRIGHT}✅ FIX APPLIED:${C.RESET}`);
+        if (location) {
+            // Label is default color, Value is colored
+            const fileLabel = location.specFile || location.rootFile;
+            let lineLabel = location.testLine || location.rootLine;
+
+            if (fileLabel) {
+                console.log(`${C.BRIGHT}📄 File:${C.RESET}   ${fileLabel}:${lineLabel}`);
+            }
         }
-        if (location.specFile) {
-            // Calculate a nice label for the target
-            let targetLabel = location.specFile;
-            if (location.testLine) targetLabel += `:${location.testLine}`;
-            console.log(`🎯 Fix Target:    ${C.CYAN}${targetLabel} (Definition)${C.RESET}`);
+
+        if (explanation) { // Highlight the reason as requested by user
+            console.log(`\n${C.BRIGHT}ℹ️  Reason:${C.RESET}  ${explanation}`);
+        }
+
+        console.log(C.GRAY + "─".repeat(20) + C.RESET);
+
+        // --- OLD CODE (Context) ---
+        if (sourceCode && location && location.rootLine) {
+            console.log(`${C.RED}🔴 OLD:${C.RESET}`);
+            try {
+                const lines = sourceCode.split('\n');
+                const centerIdx = parseInt(location.rootLine) - 1;
+                // Show a small window around the error
+                const start = Math.max(0, centerIdx - 2);
+                const end = Math.min(lines.length - 1, centerIdx + 2);
+
+                for (let i = start; i <= end; i++) {
+                    let prefix = (i === centerIdx) ? "> " : "  ";
+                    let line = lines[i];
+                    if (i === centerIdx) line = `${C.RED}${line}${C.RESET}`;
+                    else line = `${C.GRAY}${line}${C.RESET}`;
+                    console.log(prefix + line);
+                }
+            } catch (e) { }
+        }
+
+        // --- NEW CODE ---
+        console.log(`\n${C.GREEN}🟢 NEW:${C.RESET}`);
+        fixCode.split('\n').forEach(line => {
+            let colored = line
+                .replace(/(\/\/.*)/g, `${C.GRAY}$1${C.RESET}`)
+                .replace(/\b(const|let|var|await|async|function|return)\b/g, `${C.YELLOW}$1${C.RESET}`)
+                .replace(/('.*?')|(".*?")|(`.*?`)/g, `${C.GREEN}$1${C.RESET}`)
+                .replace(/(\.click|\.fill|\.locator)/g, `${C.CYAN}$1${C.RESET}`);
+            console.log("  " + colored);
+        });
+
+    } else {
+        // --- SUGGESTION VIEW (Default) ---
+        if (location) {
+            if (location.rootFile && location.rootLine) {
+                console.log(`💥 Runtime Error:  ${C.RED}${location.rootFile}:${location.rootLine}${C.RESET}`);
+            }
+            if (location.specFile) {
+                let targetLabel = location.specFile;
+                if (location.testLine) targetLabel += `:${location.testLine}`;
+                console.log(`🎯 Fix Target:    ${C.CYAN}${targetLabel} (Definition)${C.RESET}`);
+            }
         }
+        console.log(C.GRAY + "─".repeat(50) + C.RESET);
+
+        console.log(`${C.GREEN}${C.BRIGHT}✨ DEFLAKE SUGGESTION:${C.RESET}`);
+        if (explanation) console.log(`${C.GRAY}// ${explanation}${C.RESET}`);
+
+        // Print code with simple coloring
+        fixCode.split('\n').forEach(line => {
+            let colored = line
+                .replace(/(\/\/.*)/g, `${C.GRAY}$1${C.RESET}`)
+                .replace(/\b(const|let|var|await|async|function|return)\b/g, `${C.YELLOW}$1${C.RESET}`)
+                .replace(/('.*?')|(".*?")|(`.*?`)/g, `${C.GREEN}$1${C.RESET}`)
+                .replace(/(\.click|\.fill|\.locator)/g, `${C.CYAN}$1${C.RESET}`);
+            console.log("  " + colored);
+        });
     }
-    console.log(C.GRAY + "─".repeat(50) + C.RESET);
 
-    console.log(`${C.GREEN}${C.BRIGHT}✨ DEFLAKE SUGGESTION:${C.RESET}`);
-    if (explanation) console.log(`${C.GRAY}// ${explanation}${C.RESET}`);
-
-    // Print code with simple coloring
-    fixCode.split('\n').forEach(line => {
-        let colored = line
-            .replace(/(\/\/.*)/g, `${C.GRAY}$1${C.RESET}`)
-            .replace(/\b(const|let|var|await|async|function|return)\b/g, `${C.YELLOW}$1${C.RESET}`)
-            .replace(/('.*?')|(".*?")|(`.*?`)/g, `${C.GREEN}$1${C.RESET}`)
-            .replace(/(\.click|\.fill|\.locator)/g, `${C.CYAN}$1${C.RESET}`);
-        console.log("  " + colored);
-    });
     console.log(C.GRAY + "─".repeat(50) + C.RESET);
 }
 
@@ -658,11 +711,6 @@ async function analyzeFailures(artifacts, fullLog, client) {
         process.stdout.write(`\r⏳ Analyzing ${art.name}...        `);
         const result = await runHealer(specificLog, art.htmlPath, argv.apiUrl, art.name);
 
-        if (result && result.status === 'error' && result.detail === 'QUOTA_EXCEEDED') {
-            console.log(`\n${C.RED}🛑 Quota exceeded! Stopping.${C.RESET}`);
-            break;
-        }
-
         if (result && result.status === 'success') {
             results.push(result);
 
@@ -670,15 +718,18 @@ async function analyzeFailures(artifacts, fullLog, client) {
             if (argv.fix) {
                 await applySelfHealing(result);
             }
+        } else {
+            console.log(`\n  ${C.RED}❌ Analysis failed for ${art.name}:${C.RESET} ${result?.detail || 'Check server status'}`);
         }
     }
-    console.log("\r✅ Analysis complete.                        \n");
+    process.stdout.write("\r✅ Analysis complete.                        \n");
 
     // GROUPING & PRINTING
     const groups = {};
     for (const res of results) {
-        if (!res.location) continue;
-        const key = `${res.location.rootFile}:${res.location.rootLine}|${JSON.stringify(res.fix)}`;
+        // Use a unique key for grouping. If location is missing, use testName to ensure it shows up.
+        const locId = res.location ? `${res.location.rootFile}:${res.location.rootLine}` : `unknown-${res.testName}`;
+        const key = `${locId}|${JSON.stringify(res.fix)}`;
         if (!groups[key]) {
             groups[key] = { location: res.location, sourceCode: res.sourceCode, fix: res.fix, tests: [] };
         }
@@ -692,7 +743,13 @@ async function analyzeFailures(artifacts, fullLog, client) {
     });
 
     for (const key of sortedKeys) {
-        printDetailedFix(groups[key].fix, groups[key].location, groups[key].sourceCode);
+        printDetailedFix(groups[key].fix, groups[key].location, groups[key].sourceCode, argv.fix);
+    }
+
+    if (results.length > 0 && sortedKeys.length === 0) {
+        console.log(`${C.YELLOW}⚠️  Note: Some suggestions were found but could not be grouped for display.${C.RESET}`);
+    } else if (results.length === 0) {
+        console.log(`${C.GRAY}ℹ️  DeFlake analyzed the logs but couldn't find a confident fix for these errors.${C.RESET}`);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deflake",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "AI-powered self-healing tool for Playwright, Cypress, and WebdriverIO tests.",
   "main": "client.js",
   "bin": {