deflake 1.1.6 → 1.2.0

package/cli.js

@@ -177,35 +177,50 @@ function stripAnsi(str) {
 }
 
 function parsePlaywrightLogs(fullLog) {
-    // Strip ANSI codes to reliable regex matching
     const cleanLog = stripAnsi(fullLog);
     const errorBlocks = [];
-
-    // Regex to find start of a test failure: "  1) [chromium] › ..."
     const errorHeaderRegex = /^\s*(\d+)\)\s+\[(.*?)\]\s+/gm;
     let match;
 
-    // Find all start indices
     const indices = [];
     while ((match = errorHeaderRegex.exec(cleanLog)) !== null) {
-        indices.push({ index: match.index, browser: match[2] }); // Group 2 is browser
+        indices.push({ index: match.index, name: match[0].trim() });
     }
 
-    // Slice log into blocks
     for (let i = 0; i < indices.length; i++) {
         const start = indices[i].index;
         const end = (i + 1 < indices.length) ? indices[i + 1].index : cleanLog.length;
-        const content = cleanLog.slice(start, end);
         errorBlocks.push({
-            browser: indices[i].browser, // e.g. 'chromium'
-            content: content
+            name: indices[i].name,
+            content: cleanLog.slice(start, end)
         });
     }
-
     return errorBlocks;
 }
 
-async function runHealer(logContent, htmlPath, apiUrl, testName) {
+function parseCypressLogs(fullLog) {
+    const cleanLog = stripAnsi(fullLog);
+    const specBlocks = [];
+    const specHeaderRegex = /Running:\s+([^\s]+)\s+\(\d+\s+of\s+\d+\)/g;
+    let match;
+
+    const indices = [];
+    while ((match = specHeaderRegex.exec(cleanLog)) !== null) {
+        indices.push({ index: match.index, spec: match[1] });
+    }
+
+    for (let i = 0; i < indices.length; i++) {
+        const start = indices[i].index;
+        const end = (i + 1 < indices.length) ? indices[i + 1].index : cleanLog.length;
+        specBlocks.push({
+            spec: indices[i].spec,
+            content: cleanLog.slice(start, end)
+        });
+    }
+    return specBlocks;
+}
+
+async function runHealer(logContent, htmlPath, apiUrl, testName, applyFix = false) {
     // Check file size limit (Basic check to avoid 429s on huge files)
     if (htmlPath && fs.existsSync(htmlPath)) {
         const stats = fs.statSync(htmlPath);
@@ -267,7 +282,7 @@ async function runHealer(logContent, htmlPath, apiUrl, testName) {
     }
 
     try {
-        const result = await client.heal(finalLogPath, htmlPath, failureLoc, sourceCodeContent);
+        const result = await client.heal(finalLogPath, htmlPath, failureLoc, sourceCodeContent, applyFix);
 
         if (result && result.status === 'success') {
             // Return structured object for grouping
@@ -625,7 +640,10 @@ async function runDoctor(argv) {
         if (result.status === 'success') {
             const usage = result.data;
             process.stdout.write(`\r  ✅ API Connected! (Tier: ${C.GREEN}${usage.tier.toUpperCase()}${C.RESET})                              \n`);
-            console.log(`     Quota: ${usage.usage}/${usage.limit}`);
+            const u = usage;
+            const remaining = u.limit - u.usage;
+            console.log(`     Fix Quota:  ${C.GREEN}${remaining}/${u.limit} remaining${C.RESET}`);
+            console.log(`     Analysis:   ${C.GREEN}FREE${C.RESET} (Pay-per-fix model enabled)`);
         } else {
             process.stdout.write(`\r  ❌ ${C.RED}API Connectivity Failed${C.RESET}       \n`);
             if (result.code === 401 || result.code === 403) {
@@ -715,23 +733,30 @@ async function analyzeFailures(artifacts, fullLog, client) {
         console.log(`   (Processing the first ${limit}...)\n`);
     }
 
-    const errorBlocks = parsePlaywrightLogs(fullLog || "");
-    const results = [];
-    const processLimit = Math.min(artifacts.length, limit);
-    const batchArtifacts = artifacts.slice(0, processLimit);
+    const framework = artifacts.length > 0 && artifacts[0].htmlPath?.includes('cypress') ? 'Cypress' : 'Playwright';
 
     console.log(`🔍 Analyzing ${batchArtifacts.length} failure(s)...`);
 
+    const playwrightBlocks = (framework === 'Playwright') ? parsePlaywrightLogs(fullLog || "") : [];
+    const cypressBlocks = (framework === 'Cypress') ? parseCypressLogs(fullLog || "") : [];
+
     for (const art of batchArtifacts) {
         let specificLog = fullLog;
-        if (art.htmlPath && art.htmlPath.endsWith('.md') && errorBlocks.length > 0) {
+
+        if (framework === 'Cypress' && cypressBlocks.length > 0) {
+            // Match screenshot path to spec log
+            // Screenshot typically: cypress/screenshots/folder/file.cy.ts/Test Name (failed).png
+            const match = cypressBlocks.find(b => art.htmlPath && art.htmlPath.includes(b.spec));
+            if (match) {
+                specificLog = match.content;
+            }
+        } else if (framework === 'Playwright' && playwrightBlocks.length > 0) {
+            // Heuristic matching for Playwright error blocks
             let bestMatch = null;
             let bestScore = -1;
-            const artifactTokens = art.name.toLowerCase().replace(/[-_]/g, ' ').split(' ').filter(w => w.length > 3 && w !== 'chromium' && w !== 'firefox' && w !== 'webkit');
-            const browser = art.name.toLowerCase().includes('firefox') ? 'firefox' : art.name.toLowerCase().includes('webkit') ? 'webkit' : 'chromium';
-            const candidates = errorBlocks.filter(b => b.browser.toLowerCase().includes(browser));
+            const artifactTokens = art.name.toLowerCase().replace(/[-_]/g, ' ').split(' ').filter(w => w.length > 3);
 
-            for (const block of candidates) {
+            for (const block of playwrightBlocks) {
                 let score = 0;
                 const blockLower = block.content.toLowerCase();
                 for (const token of artifactTokens) { if (blockLower.includes(token)) score++; }
@@ -739,8 +764,6 @@ async function analyzeFailures(artifacts, fullLog, client) {
             }
             if (bestMatch && bestScore > 0) {
                 specificLog = bestMatch.content;
-                const idx = errorBlocks.indexOf(bestMatch);
-                if (idx > -1) errorBlocks.splice(idx, 1);
             }
         }
 
@@ -748,7 +771,7 @@ async function analyzeFailures(artifacts, fullLog, client) {
         process.stdout.write(`\r⏳ Analyzing ${displayName}...          `);
 
         try {
-            const result = await runHealer(specificLog, art.htmlPath, argv.apiUrl, art.name);
+            const result = await runHealer(specificLog, art.htmlPath, argv.apiUrl, art.name, argv.fix);
 
             if (result && result.status === 'success') {
                 results.push(result);
@@ -804,7 +827,7 @@ async function analyzeFailures(artifacts, fullLog, client) {
         if (updatedUsage.status === 'success') {
             const u = updatedUsage.data;
             const remaining = u.limit - u.usage;
-            console.log(`  - Monthly Quota:     ${C.GREEN}${remaining}/${u.limit} remaining${C.RESET}`);
+            console.log(`  - Fix Quota:         ${C.GREEN}${remaining}/${u.limit} remaining (Analysis is FREE)${C.RESET}`);
         }
     } catch (e) {
         // usage fetch failed is non-critical

package/client.js

@@ -94,7 +94,7 @@ class DeFlakeClient {
         }
     }
 
-    async heal(logPath, htmlPath, failureLocation = null, sourceCode = null) {
+    async heal(logPath, htmlPath, failureLocation = null, sourceCode = null, applyFix = false) {
         try {
             // ... (rest of the check logic) ...
             if (!fs.existsSync(logPath)) throw new Error(`Log file not found: ${logPath}`);
@@ -119,7 +119,8 @@ class DeFlakeClient {
                 html_snapshot: htmlContent || "",
                 failing_line: failureLocation ? `Line ${failureLocation.rootLine}` : "",
                 source_code: sourceCode || "",
-                framework: this.framework
+                framework: this.framework,
+                apply_fix: applyFix
             };
 
             const response = await axios.post(this.apiUrl, payload, {

package/package.json

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