bugzero 0.0.30 → 0.0.32

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> bugzero@0.0.30 build /home/runner/work/Bugzero/Bugzero/packages/cli
+> bugzero@0.0.32 build /home/runner/work/Bugzero/Bugzero/apps/bugzero
 > tsup src/index.ts --format cjs --dts
 
 CLI Building entry: src/index.ts
@@ -7,8 +7,8 @@
 CLI tsup v8.5.1
 CLI Target: es2022
 CJS Build start
-CJS dist/index.js 70.42 KB
-CJS ⚡️ Build success in 34ms
+CJS dist/index.js 77.80 KB
+CJS ⚡️ Build success in 32ms
 DTS Build start
-DTS ⚡️ Build success in 1230ms
+DTS ⚡️ Build success in 1160ms
 DTS dist/index.d.ts 20.00 B

package/README.md

@@ -74,6 +74,8 @@ bugzero rescue
 | Multi-model support | DeepSeek, Claude, GPT-4o, Gemini, Llama via OpenRouter |
 | Framework detection | Automatically identifies your project's tooling setup |
 | Safe file patching | Every modified file receives a `.opspilot.bak` backup |
+| Fuzzy patch matching | Falls back from exact match to whitespace-normalized and similarity-scored matching when the AI's snippet doesn't match the file verbatim |
+| Multi-file patches | A single fix attempt can edit several files at once, applied atomically — if any file's patch fails, every file touched in that attempt is rolled back |
 | Error type parsing | Parses TypeScript, ESLint, and Jest error formats |
 | Dry-run mode | Analyze and report without writing any files |
 | Local model config | Save preferred model to `.bugzerorc` per project |

package/dist/index.js

@@ -346,9 +346,9 @@ var require_main = __commonJS({
   }
 });
 
-// ../config/dist/index.js
+// ../../packages/config/dist/index.js
 var require_dist = __commonJS({
-  "../config/dist/index.js"(exports2, module2) {
+  "../../packages/config/dist/index.js"(exports2, module2) {
     "use strict";
     var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
@@ -433,9 +433,9 @@ var require_dist = __commonJS({
   }
 });
 
-// ../analyzers/dist/index.js
+// ../../packages/analyzers/dist/index.js
 var require_dist2 = __commonJS({
-  "../analyzers/dist/index.js"(exports2, module2) {
+  "../../packages/analyzers/dist/index.js"(exports2, module2) {
     "use strict";
     var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
@@ -586,9 +586,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// ../ai-provider/dist/index.js
+// ../../packages/ai-provider/dist/index.js
 var require_dist3 = __commonJS({
-  "../ai-provider/dist/index.js"(exports2, module2) {
+  "../../packages/ai-provider/dist/index.js"(exports2, module2) {
     "use strict";
     var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
@@ -709,9 +709,9 @@ var require_dist3 = __commonJS({
   }
 });
 
-// ../prompts/dist/index.js
+// ../../packages/prompts/dist/index.js
 var require_dist4 = __commonJS({
-  "../prompts/dist/index.js"(exports2, module2) {
+  "../../packages/prompts/dist/index.js"(exports2, module2) {
     "use strict";
     var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
@@ -908,29 +908,35 @@ ${compilerLogs}
 Your task:
 1. Root Cause: Identify the root cause of the build failure.
 2. Codebase Context: Read the provided file contents and directory listings under "\u{1F4C1} Codebase Context" to locate the correct files, imports, and file paths. Do not guess filenames or contents that are not in the context.
-3. Patch: Provide the minimal, precise fix.
+3. Patch: Provide the minimal, precise fix. If the fix genuinely requires changes in more than one file (for example, a renamed export and every place that imports it), include one patch entry per file \u2014 all patches in your response are applied together, atomically.
 
 Reply with ONLY a valid JSON object in this exact shape \u2014 no markdown fences, no extra text:
 {
   "rootCause": "One-sentence explanation of the error",
-  "filePath": "relative/path/from/project/root/to/file.ts",
-  "search": "exact code that currently exists in the file and must be replaced",
-  "replace": "the corrected code that replaces the search string",
-  "explanation": "short explanation of what you changed and why"
+  "explanation": "short explanation of what you changed and why",
+  "patches": [
+    {
+      "filePath": "relative/path/from/project/root/to/file.ts",
+      "search": "exact code that currently exists in the file and must be replaced",
+      "replace": "the corrected code that replaces the search string"
+    }
+  ]
 }
 
 Critical rules:
-- "filePath" must be a relative path from the project root (no leading /).
-- "search" must be an EXACT character-for-character substring of the current file content.
-- "replace" must be syntactically valid code.
+- "patches" must contain at least one entry. Only include more than one when the fix truly requires editing multiple files \u2014 most fixes need just one.
+- Each "filePath" must be a relative path from the project root (no leading /).
+- Each "search" must be an EXACT character-for-character substring of that file's current content.
+- Each "replace" must be syntactically valid code.
+- If two patches target the same file, list them in the order they should be applied, and make sure each "search" reflects the file's content *after* the previous patch in this list has been applied to it.
 - Do NOT add backticks, markdown, or any text outside the JSON object.`;
     }
   }
 });
 
-// ../patcher/dist/index.js
+// ../../packages/patcher/dist/index.js
 var require_dist5 = __commonJS({
-  "../patcher/dist/index.js"(exports2, module2) {
+  "../../packages/patcher/dist/index.js"(exports2, module2) {
     "use strict";
     var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
@@ -961,11 +967,113 @@ var require_dist5 = __commonJS({
     var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var index_exports = {};
     __export(index_exports, {
-      applyPatch: () => applyPatch
+      applyPatch: () => applyPatch,
+      applyPatches: () => applyPatches,
+      findMatch: () => findMatch,
+      lineSimilarity: () => lineSimilarity
     });
     module2.exports = __toCommonJS(index_exports);
     var import_fs = __toESM2(require("fs"));
     var import_path2 = __toESM2(require("path"));
+    var SIMILARITY_THRESHOLD = 0.85;
+    var AMBIGUITY_MARGIN = 0.05;
+    var MAX_LINES_FOR_SIMILARITY_PASS = 2e4;
+    function splitLinesWithOffsets(text) {
+      const lines = [];
+      let start = 0;
+      for (let i = 0; i < text.length; i++) {
+        if (text[i] === "\n") {
+          let end = i;
+          if (end > start && text[end - 1] === "\r") end -= 1;
+          lines.push({ text: text.slice(start, end), start, end });
+          start = i + 1;
+        }
+      }
+      lines.push({ text: text.slice(start), start, end: text.length });
+      return lines;
+    }
+    function normalizeLine(line) {
+      return line.trim().replace(/\s+/g, " ");
+    }
+    function levenshtein(a, b) {
+      const m = a.length;
+      const n = b.length;
+      if (m === 0) return n;
+      if (n === 0) return m;
+      const dp = new Array(n + 1);
+      for (let j = 0; j <= n; j++) dp[j] = j;
+      for (let i = 1; i <= m; i++) {
+        let prev = dp[0];
+        dp[0] = i;
+        for (let j = 1; j <= n; j++) {
+          const temp = dp[j];
+          dp[j] = a[i - 1] === b[j - 1] ? prev : 1 + Math.min(prev, dp[j], dp[j - 1]);
+          prev = temp;
+        }
+      }
+      return dp[n];
+    }
+    function lineSimilarity(a, b) {
+      const maxLen = Math.max(a.length, b.length);
+      if (maxLen === 0) return 1;
+      return 1 - levenshtein(a, b) / maxLen;
+    }
+    function findWhitespaceNormalizedMatch(content, search) {
+      const searchLines = search.split(/\r\n|\n/).map(normalizeLine);
+      const contentLines = splitLinesWithOffsets(content);
+      if (searchLines.length === 0 || searchLines.length > contentLines.length) return null;
+      const normalizedContentLines = contentLines.map((l) => normalizeLine(l.text));
+      for (let i = 0; i + searchLines.length <= contentLines.length; i++) {
+        let matches = true;
+        for (let j = 0; j < searchLines.length; j++) {
+          if (normalizedContentLines[i + j] !== searchLines[j]) {
+            matches = false;
+            break;
+          }
+        }
+        if (matches) {
+          const firstLine = contentLines[i];
+          const lastLine = contentLines[i + searchLines.length - 1];
+          return { start: firstLine.start, end: lastLine.end, strategy: "whitespace", score: 1 };
+        }
+      }
+      return null;
+    }
+    function findSimilarityMatch(content, search) {
+      const searchLines = search.split(/\r\n|\n/);
+      const contentLines = splitLinesWithOffsets(content);
+      if (searchLines.length === 0 || searchLines.length > contentLines.length) return null;
+      if (contentLines.length > MAX_LINES_FOR_SIMILARITY_PASS) return null;
+      let bestIndex = -1;
+      let bestScore = -1;
+      let secondBestScore = -1;
+      for (let i = 0; i + searchLines.length <= contentLines.length; i++) {
+        let total = 0;
+        for (let j = 0; j < searchLines.length; j++) {
+          total += lineSimilarity(searchLines[j], contentLines[i + j].text);
+        }
+        const avgScore = total / searchLines.length;
+        if (avgScore > bestScore) {
+          secondBestScore = bestScore;
+          bestScore = avgScore;
+          bestIndex = i;
+        } else if (avgScore > secondBestScore) {
+          secondBestScore = avgScore;
+        }
+      }
+      if (bestIndex === -1 || bestScore < SIMILARITY_THRESHOLD) return null;
+      if (secondBestScore >= 0 && bestScore - secondBestScore < AMBIGUITY_MARGIN) return null;
+      const firstLine = contentLines[bestIndex];
+      const lastLine = contentLines[bestIndex + searchLines.length - 1];
+      return { start: firstLine.start, end: lastLine.end, strategy: "similarity", score: bestScore };
+    }
+    function findMatch(content, search) {
+      const exactIndex = content.indexOf(search);
+      if (exactIndex !== -1) {
+        return { start: exactIndex, end: exactIndex + search.length, strategy: "exact", score: 1 };
+      }
+      return findWhitespaceNormalizedMatch(content, search) ?? findSimilarityMatch(content, search);
+    }
     function applyPatch(absoluteFilePath, search, replace) {
       try {
         if (!import_fs.default.existsSync(absoluteFilePath)) {
@@ -975,33 +1083,88 @@ var require_dist5 = __commonJS({
           };
         }
         const original = import_fs.default.readFileSync(absoluteFilePath, "utf-8");
-        if (!original.includes(search)) {
+        const match = findMatch(original, search);
+        if (!match) {
           return {
             success: false,
-            error: `Search string not found in ${import_path2.default.basename(absoluteFilePath)}. The AI's "search" field did not match file content.`
+            error: `Search string not found in ${import_path2.default.basename(absoluteFilePath)} (tried exact, whitespace-normalized, and fuzzy matching). The AI's "search" field did not match file content.`
           };
         }
         const backupPath = absoluteFilePath + ".opspilot.bak";
         import_fs.default.writeFileSync(backupPath, original, "utf-8");
-        const fixed = original.replace(search, replace);
+        const fixed = original.slice(0, match.start) + replace + original.slice(match.end);
         import_fs.default.writeFileSync(absoluteFilePath, fixed, "utf-8");
-        return { success: true, backupPath };
+        return { success: true, backupPath, matchStrategy: match.strategy };
       } catch (err) {
         return { success: false, error: err.message };
       }
     }
+    var import_fs2 = __toESM2(require("fs"));
+    var import_path22 = __toESM2(require("path"));
+    function rollback(originalContent, backupPaths) {
+      for (const [absolutePath, content] of originalContent) {
+        try {
+          import_fs2.default.writeFileSync(absolutePath, content, "utf-8");
+        } catch {
+        }
+      }
+      for (const backupPath of backupPaths) {
+        try {
+          import_fs2.default.unlinkSync(backupPath);
+        } catch {
+        }
+      }
+    }
+    function applyPatches(cwd, patches) {
+      if (patches.length === 0) {
+        return { success: false, error: "No patches to apply.", applied: [] };
+      }
+      const originalContent = /* @__PURE__ */ new Map();
+      const backupPaths = /* @__PURE__ */ new Set();
+      const applied = [];
+      for (const patch of patches) {
+        const absolutePath = import_path22.default.resolve(cwd, patch.filePath);
+        if (!originalContent.has(absolutePath)) {
+          try {
+            originalContent.set(absolutePath, import_fs2.default.readFileSync(absolutePath, "utf-8"));
+          } catch {
+            rollback(originalContent, backupPaths);
+            return {
+              success: false,
+              error: `Failed to patch "${patch.filePath}": File not found: ${absolutePath}`,
+              applied: []
+            };
+          }
+        }
+        const result = applyPatch(absolutePath, patch.search, patch.replace);
+        if (result.backupPath) backupPaths.add(result.backupPath);
+        if (!result.success) {
+          rollback(originalContent, backupPaths);
+          return {
+            success: false,
+            error: `Failed to patch "${patch.filePath}": ${result.error}`,
+            applied: []
+          };
+        }
+        applied.push({
+          filePath: patch.filePath,
+          absolutePath,
+          backupPath: result.backupPath,
+          matchStrategy: result.matchStrategy
+        });
+      }
+      return { success: true, applied };
+    }
   }
 });
 
-// ../agents/dist/index.js
+// ../../packages/agents/dist/index.js
 var require_dist6 = __commonJS({
-  "../agents/dist/index.js"(exports2, module2) {
+  "../../packages/agents/dist/index.js"(exports2, module2) {
     "use strict";
-    var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __getProtoOf2 = Object.getPrototypeOf;
     var __hasOwnProp2 = Object.prototype.hasOwnProperty;
     var __export = (target, all) => {
       for (var name in all)
@@ -1015,14 +1178,6 @@ var require_dist6 = __commonJS({
       }
       return to;
     };
-    var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-      // If the importer is in node compatibility mode or this is not an ESM
-      // file that has been converted to a CommonJS file using a Babel-
-      // compatible transform (i.e. "__esModule" has not been set), then set
-      // "default" to the CommonJS "module.exports" for node compatibility.
-      isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
-      mod
-    ));
     var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var index_exports = {};
     __export(index_exports, {
@@ -1030,7 +1185,6 @@ var require_dist6 = __commonJS({
     });
     module2.exports = __toCommonJS(index_exports);
     var import_langgraph2 = require("@langchain/langgraph");
-    var import_path2 = __toESM2(require("path"));
     var import_langgraph = require("@langchain/langgraph");
     var GraphState = import_langgraph.Annotation.Root({
       /** Absolute path to the project being fixed */
@@ -1102,7 +1256,12 @@ var require_dist6 = __commonJS({
         const cleaned = response.replace(/```json\n?/g, "").replace(/```\n?/g, "").trim();
         const jsonMatch = cleaned.match(/\{[\s\S]*\}/);
         if (jsonMatch) {
-          fixSuggestion = JSON.parse(jsonMatch[0]);
+          const parsed = JSON.parse(jsonMatch[0]);
+          if (Array.isArray(parsed.patches) && parsed.patches.length > 0) {
+            fixSuggestion = parsed;
+          } else {
+            console.warn('[BugZero] AI response JSON did not contain a non-empty "patches" array.');
+          }
         } else {
           console.warn("[BugZero] AI response did not contain a valid JSON object.");
         }
@@ -1123,24 +1282,28 @@ var require_dist6 = __commonJS({
         console.warn("[BugZero] No fix suggestion available \u2014 skipping patch.");
         return {};
       }
-      const { filePath, search, replace, explanation } = state.fixSuggestion;
-      const absolutePath = import_path2.default.resolve(state.cwd, filePath);
-      console.log(`[BugZero] Patching: ${filePath}`);
+      const { patches, explanation } = state.fixSuggestion;
+      const fileList = patches.map((p) => p.filePath).join(", ");
+      console.log(`[BugZero] Patching ${patches.length} file${patches.length === 1 ? "" : "s"}: ${fileList}`);
       console.log(`[BugZero] Reason:   ${explanation}`);
-      const result = (0, import_patcher.applyPatch)(absolutePath, search, replace);
+      const result = (0, import_patcher.applyPatches)(state.cwd, patches);
       if (!result.success) {
         console.error(`[BugZero] Patch failed: ${result.error}`);
         const updatedLogs = `${state.logs}
 
-\u26A0\uFE0F [BugZero System Warning] Your previous patch suggestion for "${filePath}" failed with the following error:
+\u26A0\uFE0F [BugZero System Warning] Your previous patch suggestion failed with the following error:
 - ${result.error}
 
-Please check if the file path is correct relative to the project root and make sure you target the correct file that contains the build error.`;
+Any other files from that same suggestion were rolled back to keep the change atomic. Please check if the file path(s) are correct relative to the project root and make sure you target the correct file(s) that contain the build error.`;
         return {
           logs: updatedLogs
         };
-      } else {
-        console.log(`[BugZero] Backup saved to: ${result.backupPath}`);
+      }
+      for (const applied of result.applied) {
+        console.log(`[BugZero] Backup saved to: ${applied.backupPath}`);
+        if (applied.matchStrategy !== "exact") {
+          console.log(`[BugZero] Note: exact match failed for ${applied.filePath} \u2014 patch applied via ${applied.matchStrategy} matching.`);
+        }
       }
       return {};
     }
@@ -1178,9 +1341,9 @@ Please check if the file path is correct relative to the project root and make s
   }
 });
 
-// ../core/dist/index.js
+// ../../packages/core/dist/index.js
 var require_dist7 = __commonJS({
-  "../core/dist/index.js"(exports2, module2) {
+  "../../packages/core/dist/index.js"(exports2, module2) {
     "use strict";
     var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
@@ -1327,6 +1490,30 @@ var require_dist7 = __commonJS({
       });
       return result;
     }
+    function formatPatchesForPrompt(appliedFix) {
+      return appliedFix.patches.map(
+        (p, i) => `File ${i + 1}: ${p.filePath}
+- Search code:
+${p.search}
+- Replace code:
+${p.replace}`
+      ).join("\n\n");
+    }
+    function formatPatchesMarkdown(appliedFix) {
+      return appliedFix.patches.map(
+        (p) => `**File:** \`${p.filePath}\`
+
+**Search (Before):**
+\`\`\`typescript
+${p.search}
+\`\`\`
+
+**Replace (After):**
+\`\`\`typescript
+${p.replace}
+\`\`\``
+      ).join("\n\n---\n\n");
+    }
     async function writeReport(cwd, type, data) {
       let content = "";
       const provider = new import_ai_provider.OpenRouterProvider();
@@ -1405,14 +1592,12 @@ ${logs}
         const { success, attempts, maxAttempts, appliedFix, error, rawOutput, modelUsed, promptTokens, completionTokens } = data;
         if (success && appliedFix) {
           console.log("[BugZero] Calling AI to write solution summary report...");
-          const prompt = `You are an expert software engineer assistant. An automated AI agent successfully resolved a build/lint/test failure in a project located at "${cwd}" after ${attempts} attempts by applying a patch to "${appliedFix.filePath}".
+          const patchedFiles = appliedFix.patches.map((p) => p.filePath).join(", ");
+          const prompt = `You are an expert software engineer assistant. An automated AI agent successfully resolved a build/lint/test failure in a project located at "${cwd}" after ${attempts} attempts by applying a patch to: ${patchedFiles}.
 Here is the patch details:
 - Root Cause: ${appliedFix.rootCause}
 - Explanation: ${appliedFix.explanation}
-- Search code:
-${appliedFix.search}
-- Replace code:
-${appliedFix.replace}
+${formatPatchesForPrompt(appliedFix)}
 
 Please generate a professional, beautifully formatted Markdown report summarizing:
 1. **Repair Summary:** Celebrate the success and explain the fix.
@@ -1445,20 +1630,12 @@ Generate the Markdown report directly. Do not wrap it in markdown block fences (
 - **Token Usage:** ${promptTokens !== void 0 && completionTokens !== void 0 ? `Prompt: **${promptTokens}** | Completion: **${completionTokens}** | Total: **${promptTokens + completionTokens}**` : "*N/A*"}
 
 ## \u{1F6E0}\uFE0F Applied Solution
-- **Target File:** \`${appliedFix.filePath}\`
+- **Target File(s):** ${appliedFix.patches.map((p) => `\`${p.filePath}\``).join(", ")}
 - **Root Cause:** ${appliedFix.rootCause}
 - **Explanation:** ${appliedFix.explanation}
 
 ### \u{1F4DD} Code Changes
-**Search (Before):**
-\`\`\`typescript
-${appliedFix.search}
-\`\`\`
-
-**Replace (After):**
-\`\`\`typescript
-${appliedFix.replace}
-\`\`\`
+${formatPatchesMarkdown(appliedFix)}
 `;
           }
         } else {
@@ -1588,7 +1765,8 @@ program.command("rescue").description("Detect build failures and automatically a
         console.log(`   Tokens: Prompt: ${result.promptTokens} | Completion: ${result.completionTokens} | Total: ${result.promptTokens + result.completionTokens}`);
       }
       if (result.appliedFix) {
-        console.log(`   File:   ${result.appliedFix.filePath}`);
+        const files = result.appliedFix.patches.map((p) => p.filePath).join(", ");
+        console.log(`   File${result.appliedFix.patches.length === 1 ? "" : "s"}:   ${files}`);
         console.log(`   Reason: ${result.appliedFix.explanation}`);
         console.log(`   Root cause: ${result.appliedFix.rootCause}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bugzero",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "An autonomous, AI-powered CLI tool for automatic build error detection and repair.",
   "license": "MIT",
   "bin": {

package/src/index.ts

@@ -75,7 +75,8 @@ program
           console.log(`   Tokens: Prompt: ${result.promptTokens} | Completion: ${result.completionTokens} | Total: ${result.promptTokens + result.completionTokens}`);
         }
         if (result.appliedFix) {
-          console.log(`   File:   ${result.appliedFix.filePath}`);
+          const files = result.appliedFix.patches.map((p) => p.filePath).join(", ");
+          console.log(`   File${result.appliedFix.patches.length === 1 ? "" : "s"}:   ${files}`);
           console.log(`   Reason: ${result.appliedFix.explanation}`);
           console.log(`   Root cause: ${result.appliedFix.rootCause}`);
         }