deflake 1.2.38 → 1.2.40

package/cli.js

@@ -54,29 +54,35 @@ async function main() {
             
             // Save backups of all source files before any modifications
             const backups = new Map(); // path -> original content
-            let prevFailCount = Infinity;
+            let prevFailNames = new Set(); // Track specific failures by name
             
             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;
+                const currentNames = new Set(artifacts.map(a => a.name));
                 
-                if (currentFailCount === 0) {
+                if (artifacts.length === 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}`);
+                // Check for NEW failures (tests that weren't failing before)
+                if (attempt > 1) {
+                    const newFailures = [...currentNames].filter(n => !prevFailNames.has(n));
+                    if (newFailures.length > 0) {
+                        console.log(`${C.RED}⚠️  New failures detected after fix attempt! Rolling back all changes...${C.RESET}`);
+                        for (const name of newFailures) {
+                            console.log(`   ${C.RED}🆕 ${name}${C.RESET}`);
+                        }
+                        for (const [filePath, originalContent] of backups) {
+                            fs.writeFileSync(filePath, originalContent);
+                            console.log(`   ${C.YELLOW}↩️  Restored: ${path.basename(filePath)}${C.RESET}`);
+                        }
+                        break;
                     }
-                    break;
                 }
-                prevFailCount = currentFailCount;
+                prevFailNames = currentNames;
                 
                 const applied = await analyzeAndFix(artifacts, client, argv, output, backups);
                 
@@ -333,9 +339,44 @@ async function applyFix(res, loc, backups = new Map()) {
                     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.38",
+  "version": "1.2.40",
   "description": "AI-powered self-healing tool for Playwright, Cypress, and WebdriverIO tests.",
   "main": "client.js",
   "bin": {