@yasserkhanorg/impact-gate 2.1.2 → 2.1.4

package/dist/esm/qa-agent/orchestrator.js

@@ -109,13 +109,22 @@ export async function runQAAgent(inputConfig) {
         }
     }
     // -----------------------------------------------------------------------
+    // Compute remaining findings (exclude verified fixes)
+    // -----------------------------------------------------------------------
+    const verifiedIds = new Set((phase25?.fixes ?? [])
+        .filter((f) => f.status === 'verified')
+        .map((f) => f.findingId));
+    const remainingFindings = verifiedIds.size > 0
+        ? phase2.findings.filter((f) => !verifiedIds.has(f.id))
+        : phase2.findings;
+    // -----------------------------------------------------------------------
     // Regression comparison (optional)
     // -----------------------------------------------------------------------
     let regressionComparison;
     if (config.regression) {
         const baseline = loadBaseline(outputDir);
         if (baseline) {
-            regressionComparison = compareBaselines(healthScore, phase2.findings, baseline);
+            regressionComparison = compareBaselines(healthScore, remainingFindings, baseline);
             logger.info('Regression comparison', {
                 scoreDelta: regressionComparison.scoreDelta,
                 fixedIssues: regressionComparison.fixedIssues.length,
@@ -126,8 +135,8 @@ export async function runQAAgent(inputConfig) {
             logger.info('No baseline found — saving current run as baseline');
         }
     }
-    // Always save baseline for future comparisons
-    saveBaseline(outputDir, healthScore, phase2.findings, config.baseUrl);
+    // Always save baseline for future comparisons (use remaining findings, not stale originals)
+    saveBaseline(outputDir, healthScore, remainingFindings, config.baseUrl);
     // -----------------------------------------------------------------------
     // Phase 3: Report + Spec Generation + Verdict
     // -----------------------------------------------------------------------

package/dist/esm/qa-agent/phase25/fix_loop.js

@@ -47,7 +47,9 @@ ${evidence.consoleErrors?.length ? `- **Console errors:** ${evidence.consoleErro
 - Make the SMALLEST change that fixes the issue. Do NOT refactor surrounding code.
 - Only modify files directly related to the bug.
 - If you can't find the source after 3 search attempts, report that the fix is not possible.
-- If type checking fails after your fix, revert with git_revert.
+- If type checking or lint fails BEFORE you commit, use git_restore to discard your edits, then report the fix is not possible.
+- If you already committed and verification fails, use git_revert to undo the commit.
+- NEVER leave uncommitted edits behind. Always either commit or restore.
 - The base URL is ${baseUrl}.
 - When done, respond with text only (no tool use) explaining the result.`;
 }
@@ -92,6 +94,7 @@ export async function runFixLoop(config, findings, browser, projectRoot) {
         screenshotDir,
         screenshotCounter: 100, // Start at 100 to avoid collisions with Phase 2 screenshots
         qaCommitHashes: new Set(),
+        pendingWrittenFiles: new Set(),
     };
     for (const finding of fixable) {
         if (wtf.shouldStop()) {

package/dist/esm/qa-agent/phase25/fix_tools.js

@@ -80,6 +80,15 @@ export const FIX_TOOL_DEFINITIONS = [
             required: [],
         },
     },
+    {
+        name: 'git_restore',
+        description: 'Discard all uncommitted changes in the working tree. Use this if validation fails BEFORE you have committed, to clean up your attempted edits.',
+        input_schema: {
+            type: 'object',
+            properties: {},
+            required: [],
+        },
+    },
     {
         name: 'verify_in_browser',
         description: 'Navigate to a URL, take a screenshot, and report whether the fix resolved the issue. You MUST set fixed=true only if the original bug is no longer present. Set fixed=false if the bug still reproduces or if you cannot confirm.',
@@ -152,6 +161,7 @@ export function executeFixTool(ctx, name, input) {
             }
             const fullPath = resolve(ctx.projectRoot, filePath);
             writeFileSync(fullPath, String(input.content), 'utf-8');
+            ctx.pendingWrittenFiles.add(filePath);
             return { output: `Written: ${filePath}`, filesChanged: [filePath] };
         }
         case 'search_code': {
@@ -218,6 +228,7 @@ export function executeFixTool(ctx, name, input) {
                 execFileSync('git', ['commit', '-m', message], { cwd: ctx.projectRoot, encoding: 'utf-8' });
                 const hash = execFileSync('git', ['rev-parse', '--short', 'HEAD'], { cwd: ctx.projectRoot, encoding: 'utf-8' }).trim();
                 ctx.qaCommitHashes.add(hash);
+                ctx.pendingWrittenFiles.clear();
                 return { output: `Committed: ${hash} — ${message}`, commitHash: hash, filesChanged: files };
             }
             catch (err) {
@@ -242,6 +253,21 @@ export function executeFixTool(ctx, name, input) {
                 return { output: `Git revert failed: ${error.stderr || String(err)}` };
             }
         }
+        case 'git_restore': {
+            const filesToRestore = [...ctx.pendingWrittenFiles];
+            if (filesToRestore.length === 0) {
+                return { output: 'No pending edits to restore.' };
+            }
+            try {
+                execFileSync('git', ['checkout', '--', ...filesToRestore], { cwd: ctx.projectRoot, encoding: 'utf-8' });
+                ctx.pendingWrittenFiles.clear();
+                return { output: `Restored ${filesToRestore.length} file(s): ${filesToRestore.join(', ')}` };
+            }
+            catch (err) {
+                const error = err;
+                return { output: `Git restore failed: ${error.stderr || String(err)}` };
+            }
+        }
         case 'verify_in_browser': {
             const url = String(input.url);
             const label = String(input.label || 'verify').replace(/[^a-zA-Z0-9_-]/g, '_');

package/dist/qa-agent/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/qa-agent/orchestrator.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA0D,QAAQ,EAAE,QAAQ,EAAoC,MAAM,YAAY,CAAC;AAgB/I,wBAAsB,UAAU,CAAC,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAqJzE"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/qa-agent/orchestrator.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA0D,QAAQ,EAAE,QAAQ,EAAoC,MAAM,YAAY,CAAC;AAgB/I,wBAAsB,UAAU,CAAC,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiKzE"}

package/dist/qa-agent/orchestrator.js

@@ -112,13 +112,22 @@ async function runQAAgent(inputConfig) {
         }
     }
     // -----------------------------------------------------------------------
+    // Compute remaining findings (exclude verified fixes)
+    // -----------------------------------------------------------------------
+    const verifiedIds = new Set((phase25?.fixes ?? [])
+        .filter((f) => f.status === 'verified')
+        .map((f) => f.findingId));
+    const remainingFindings = verifiedIds.size > 0
+        ? phase2.findings.filter((f) => !verifiedIds.has(f.id))
+        : phase2.findings;
+    // -----------------------------------------------------------------------
     // Regression comparison (optional)
     // -----------------------------------------------------------------------
     let regressionComparison;
     if (config.regression) {
         const baseline = (0, baseline_js_1.loadBaseline)(outputDir);
         if (baseline) {
-            regressionComparison = (0, baseline_js_1.compareBaselines)(healthScore, phase2.findings, baseline);
+            regressionComparison = (0, baseline_js_1.compareBaselines)(healthScore, remainingFindings, baseline);
             logger_js_1.logger.info('Regression comparison', {
                 scoreDelta: regressionComparison.scoreDelta,
                 fixedIssues: regressionComparison.fixedIssues.length,
@@ -129,8 +138,8 @@ async function runQAAgent(inputConfig) {
             logger_js_1.logger.info('No baseline found — saving current run as baseline');
         }
     }
-    // Always save baseline for future comparisons
-    (0, baseline_js_1.saveBaseline)(outputDir, healthScore, phase2.findings, config.baseUrl);
+    // Always save baseline for future comparisons (use remaining findings, not stale originals)
+    (0, baseline_js_1.saveBaseline)(outputDir, healthScore, remainingFindings, config.baseUrl);
     // -----------------------------------------------------------------------
     // Phase 3: Report + Spec Generation + Verdict
     // -----------------------------------------------------------------------

package/dist/qa-agent/phase25/fix_loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix_loop.d.ts","sourceRoot":"","sources":["../../../src/qa-agent/phase25/fix_loop.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,OAAO,EAAqC,aAAa,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAuD7D,wBAAsB,UAAU,CAC5B,MAAM,EAAE,QAAQ,EAChB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,aAAa,CAAC,CA4FxB"}
+{"version":3,"file":"fix_loop.d.ts","sourceRoot":"","sources":["../../../src/qa-agent/phase25/fix_loop.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,OAAO,EAAqC,aAAa,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAyD7D,wBAAsB,UAAU,CAC5B,MAAM,EAAE,QAAQ,EAChB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,aAAa,CAAC,CA6FxB"}

package/dist/qa-agent/phase25/fix_loop.js

@@ -53,7 +53,9 @@ ${evidence.consoleErrors?.length ? `- **Console errors:** ${evidence.consoleErro
 - Make the SMALLEST change that fixes the issue. Do NOT refactor surrounding code.
 - Only modify files directly related to the bug.
 - If you can't find the source after 3 search attempts, report that the fix is not possible.
-- If type checking fails after your fix, revert with git_revert.
+- If type checking or lint fails BEFORE you commit, use git_restore to discard your edits, then report the fix is not possible.
+- If you already committed and verification fails, use git_revert to undo the commit.
+- NEVER leave uncommitted edits behind. Always either commit or restore.
 - The base URL is ${baseUrl}.
 - When done, respond with text only (no tool use) explaining the result.`;
 }
@@ -98,6 +100,7 @@ async function runFixLoop(config, findings, browser, projectRoot) {
         screenshotDir,
         screenshotCounter: 100, // Start at 100 to avoid collisions with Phase 2 screenshots
         qaCommitHashes: new Set(),
+        pendingWrittenFiles: new Set(),
     };
     for (const finding of fixable) {
         if (wtf.shouldStop()) {

package/dist/qa-agent/phase25/fix_tools.d.ts

@@ -9,6 +9,8 @@ export interface FixToolContext {
     screenshotCounter: number;
     /** Commit hashes created by the fix loop. Only these can be reverted. */
     qaCommitHashes: Set<string>;
+    /** Files written by the current fix attempt. Only these are restored on failure. */
+    pendingWrittenFiles: Set<string>;
 }
 export interface FixToolResult {
     output: string;

package/dist/qa-agent/phase25/fix_tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix_tools.d.ts","sourceRoot":"","sources":["../../../src/qa-agent/phase25/fix_tools.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,SAAS,MAAM,mBAAmB,CAAC;AAE/C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAM7D,eAAO,MAAM,oBAAoB,EAAE,SAAS,CAAC,IAAI,EAuFhD,CAAC;AAMF,MAAM,WAAW,cAAc;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,yEAAyE;IACzE,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0DAA0D;IAC1D,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AA2CD,wBAAgB,cAAc,CAC1B,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,aAAa,CAoJf"}
+{"version":3,"file":"fix_tools.d.ts","sourceRoot":"","sources":["../../../src/qa-agent/phase25/fix_tools.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,SAAS,MAAM,mBAAmB,CAAC;AAE/C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAM7D,eAAO,MAAM,oBAAoB,EAAE,SAAS,CAAC,IAAI,EAgGhD,CAAC;AAMF,MAAM,WAAW,cAAc;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,yEAAyE;IACzE,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,oFAAoF;IACpF,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,aAAa;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0DAA0D;IAC1D,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AA2CD,wBAAgB,cAAc,CAC1B,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,aAAa,CAqKf"}

package/dist/qa-agent/phase25/fix_tools.js

@@ -84,6 +84,15 @@ exports.FIX_TOOL_DEFINITIONS = [
             required: [],
         },
     },
+    {
+        name: 'git_restore',
+        description: 'Discard all uncommitted changes in the working tree. Use this if validation fails BEFORE you have committed, to clean up your attempted edits.',
+        input_schema: {
+            type: 'object',
+            properties: {},
+            required: [],
+        },
+    },
     {
         name: 'verify_in_browser',
         description: 'Navigate to a URL, take a screenshot, and report whether the fix resolved the issue. You MUST set fixed=true only if the original bug is no longer present. Set fixed=false if the bug still reproduces or if you cannot confirm.',
@@ -156,6 +165,7 @@ function executeFixTool(ctx, name, input) {
             }
             const fullPath = (0, path_1.resolve)(ctx.projectRoot, filePath);
             (0, fs_1.writeFileSync)(fullPath, String(input.content), 'utf-8');
+            ctx.pendingWrittenFiles.add(filePath);
             return { output: `Written: ${filePath}`, filesChanged: [filePath] };
         }
         case 'search_code': {
@@ -222,6 +232,7 @@ function executeFixTool(ctx, name, input) {
                 (0, child_process_1.execFileSync)('git', ['commit', '-m', message], { cwd: ctx.projectRoot, encoding: 'utf-8' });
                 const hash = (0, child_process_1.execFileSync)('git', ['rev-parse', '--short', 'HEAD'], { cwd: ctx.projectRoot, encoding: 'utf-8' }).trim();
                 ctx.qaCommitHashes.add(hash);
+                ctx.pendingWrittenFiles.clear();
                 return { output: `Committed: ${hash} — ${message}`, commitHash: hash, filesChanged: files };
             }
             catch (err) {
@@ -246,6 +257,21 @@ function executeFixTool(ctx, name, input) {
                 return { output: `Git revert failed: ${error.stderr || String(err)}` };
             }
         }
+        case 'git_restore': {
+            const filesToRestore = [...ctx.pendingWrittenFiles];
+            if (filesToRestore.length === 0) {
+                return { output: 'No pending edits to restore.' };
+            }
+            try {
+                (0, child_process_1.execFileSync)('git', ['checkout', '--', ...filesToRestore], { cwd: ctx.projectRoot, encoding: 'utf-8' });
+                ctx.pendingWrittenFiles.clear();
+                return { output: `Restored ${filesToRestore.length} file(s): ${filesToRestore.join(', ')}` };
+            }
+            catch (err) {
+                const error = err;
+                return { output: `Git restore failed: ${error.stderr || String(err)}` };
+            }
+        }
         case 'verify_in_browser': {
             const url = String(input.url);
             const label = String(input.label || 'verify').replace(/[^a-zA-Z0-9_-]/g, '_');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yasserkhanorg/impact-gate",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Diff-aware E2E impact analysis and coverage gating for Playwright/Cypress teams. Optional AI features can suggest, generate, and heal tests once your project has a route-families.json manifest.",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",