deflake 1.2.37 → 1.2.39

package/cli.js

@@ -46,15 +46,63 @@ async function main() {
     console.log(`🔍 Detected Framework: ${C.GREEN}${fw.toUpperCase()}${C.RESET}`);
 
     if (commandToRun) {
-        const { code, output } = await runNative(commandToRun);
-        if (code !== 0) {
+        const MAX_ATTEMPTS = 5;
+        let { code, output } = await runNative(commandToRun);
+        
+        if (code !== 0 && argv.fix) {
             console.log(`\n🔴 Command failed with code ${code}. Activating DeFlake...`);
-            const artifacts = detectFailures();
-            const applied = await analyzeAndFix(artifacts, client, argv, output);
-            if (applied > 0 && argv.fix) {
-                console.log(`\n${C.BRIGHT}💉 Fixes applied. Re-running tests to verify...${C.RESET}`);
-                await runNative(commandToRun);
+            
+            // Save backups of all source files before any modifications
+            const backups = new Map(); // path -> original content
+            let prevFailCount = Infinity;
+            
+            for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+                console.log(`\n${C.BRIGHT}${C.CYAN}🔄 Fix attempt ${attempt}/${MAX_ATTEMPTS}${C.RESET}`);
+                
+                const artifacts = detectFailures();
+                const currentFailCount = artifacts.length;
+                
+                if (currentFailCount === 0) {
+                    console.log(`${C.GREEN}🎉 All tests passing! No failures detected.${C.RESET}`);
+                    break;
+                }
+                
+                // If failures INCREASED since last attempt, rollback all changes
+                if (attempt > 1 && currentFailCount > prevFailCount) {
+                    console.log(`${C.RED}⚠️  Failures increased (${prevFailCount} → ${currentFailCount}). Rolling back all changes...${C.RESET}`);
+                    for (const [filePath, originalContent] of backups) {
+                        fs.writeFileSync(filePath, originalContent);
+                        console.log(`   ${C.YELLOW}↩️  Restored: ${path.basename(filePath)}${C.RESET}`);
+                    }
+                    break;
+                }
+                prevFailCount = currentFailCount;
+                
+                const applied = await analyzeAndFix(artifacts, client, argv, output, backups);
+                
+                if (applied === 0) {
+                    console.log(`${C.YELLOW}⚠️  No fixes could be applied. Stopping retry loop.${C.RESET}`);
+                    break;
+                }
+                
+                
+                console.log(`\n${C.BRIGHT}💉 ${applied} fix(es) applied. Re-running tests to verify (attempt ${attempt})...${C.RESET}`);
+                const rerun = await runNative(commandToRun);
+                output = rerun.output; // Use new output for next iteration's AI context
+                
+                if (rerun.code === 0) {
+                    console.log(`\n${C.GREEN}${C.BRIGHT}🎉 All tests passing after attempt ${attempt}!${C.RESET}`);
+                    break;
+                }
+                
+                if (attempt === MAX_ATTEMPTS) {
+                    console.log(`\n${C.YELLOW}⚠️  Max attempts (${MAX_ATTEMPTS}) reached. Some failures may persist.${C.RESET}`);
+                }
             }
+        } else if (code !== 0) {
+            console.log(`\n🔴 Command failed with code ${code}. Activating DeFlake...`);
+            const artifacts = detectFailures();
+            await analyzeAndFix(artifacts, client, argv, output, new Map());
         }
     }
     if (argv.report) showReport();
@@ -110,7 +158,7 @@ function detectFailures() {
     return results;
 }
 
-async function analyzeAndFix(artifacts, client, argv, capturedOutput = '') {
+async function analyzeAndFix(artifacts, client, argv, capturedOutput = '', backups = new Map()) {
     if (artifacts.length === 0) {
         console.log(`  ${C.YELLOW}⚠️  No failure artifacts detected. Run 'npx deflake doctor' to check permissions.${C.RESET}`);
         return 0;
@@ -186,7 +234,7 @@ async function analyzeAndFix(artifacts, client, argv, capturedOutput = '') {
                             }
                             if (fixLoc) {
                                 console.log(`   ${C.BRIGHT}💉 Applying patches...${C.RESET}`);
-                                if (await applyFix(res, fixLoc)) {
+                                if (await applyFix(res, fixLoc, backups)) {
                                    count++;
                                    console.log(`   ${C.GREEN}${C.BRIGHT}✅ Fix applied to ${path.basename(fixLoc.path)}:${fixLoc.line}${C.RESET}`);
                                 } else {
@@ -239,7 +287,7 @@ function checkBalance(code) {
     return { balanced: true, detail: 'ok' };
 }
 
-async function applyFix(res, loc) {
+async function applyFix(res, loc, backups = new Map()) {
     if (!loc?.path) {
         console.log(`   ${C.YELLOW}⚠️  Cannot apply fix: failure location not detected.${C.RESET}`);
         return false;
@@ -251,6 +299,10 @@ async function applyFix(res, loc) {
             return false;
         }
         const original = fs.readFileSync(loc.path, 'utf8');
+        // Save backup before first modification
+        if (!backups.has(loc.path)) {
+            backups.set(loc.path, original);
+        }
         let content = original;
         let appliedCount = 0;
         for (const p of patches) {
@@ -281,9 +333,44 @@ async function applyFix(res, loc) {
                     lines.splice(p.line, 0, cleanLine);
                     console.log(`   ${C.GREEN}+  Line ${p.line + 1}: ${cleanLine.trim()}${C.RESET}`);
                 } else {
-                    lines[idx] = cleanLine;
-                    console.log(`   ${C.RED}-  Line ${p.line}: ${originalLine.trim()}${C.RESET}`);
-                    console.log(`   ${C.GREEN}+  Line ${p.line}: ${cleanLine.trim()}${C.RESET}`);
+                    // REPLACE action
+                    // SMART: Handle multi-line expression replacement
+                    // If the original line starts a multi-line expression (has unclosed parens)
+                    // and the replacement is a complete statement, remove continuation lines
+                    const origOpen = (originalLine.match(/\(/g) || []).length;
+                    const origClose = (originalLine.match(/\)/g) || []).length;
+                    const replOpen = (cleanLine.match(/\(/g) || []).length;
+                    const replClose = (cleanLine.match(/\)/g) || []).length;
+                    
+                    if (origOpen > origClose && replOpen <= replClose) {
+                        // Original has unclosed parens, replacement is complete
+                        // Find the closing of the multi-line expression
+                        let depth = origOpen - origClose;
+                        let endIdx = idx;
+                        for (let j = idx + 1; j < lines.length && depth > 0; j++) {
+                            const lo = (lines[j].match(/\(/g) || []).length;
+                            const lc = (lines[j].match(/\)/g) || []).length;
+                            depth += lo - lc;
+                            endIdx = j;
+                        }
+                        if (endIdx > idx) {
+                            const removedLines = endIdx - idx;
+                            console.log(`   ${C.GRAY}🔧 Expanding REPLACE to cover ${removedLines + 1}-line expression (lines ${p.line}-${endIdx + 1})${C.RESET}`);
+                            for (let j = idx; j <= endIdx; j++) {
+                                console.log(`   ${C.RED}-  Line ${j + 1}: ${lines[j].trim()}${C.RESET}`);
+                            }
+                            lines.splice(idx, endIdx - idx + 1, cleanLine);
+                            console.log(`   ${C.GREEN}+  Line ${p.line}: ${cleanLine.trim()}${C.RESET}`);
+                        } else {
+                            lines[idx] = cleanLine;
+                            console.log(`   ${C.RED}-  Line ${p.line}: ${originalLine.trim()}${C.RESET}`);
+                            console.log(`   ${C.GREEN}+  Line ${p.line}: ${cleanLine.trim()}${C.RESET}`);
+                        }
+                    } else {
+                        lines[idx] = cleanLine;
+                        console.log(`   ${C.RED}-  Line ${p.line}: ${originalLine.trim()}${C.RESET}`);
+                        console.log(`   ${C.GREEN}+  Line ${p.line}: ${cleanLine.trim()}${C.RESET}`);
+                    }
                 }
                 content = lines.join('\n');
                 appliedCount++;

package/package.json

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