bugzero 0.0.30 → 0.0.31

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> bugzero@0.0.30 build /home/runner/work/Bugzero/Bugzero/packages/cli
+> bugzero@0.0.31 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 dist/index.js 74.91 KB
 CJS ⚡️ Build success in 34ms
 DTS Build start
-DTS ⚡️ Build success in 1230ms
+DTS ⚡️ Build success in 1100ms
 DTS dist/index.d.ts 20.00 B

package/README.md

@@ -74,6 +74,7 @@ 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 |
 | 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;
@@ -928,9 +928,9 @@ Critical rules:
   }
 });
 
-// ../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 +961,112 @@ var require_dist5 = __commonJS({
     var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var index_exports = {};
     __export(index_exports, {
-      applyPatch: () => applyPatch
+      applyPatch: () => applyPatch,
+      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,17 +1076,18 @@ 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 };
       }
@@ -993,9 +1095,9 @@ var require_dist5 = __commonJS({
   }
 });
 
-// ../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;
@@ -1141,6 +1243,9 @@ Please check if the file path is correct relative to the project root and make s
         };
       } else {
         console.log(`[BugZero] Backup saved to: ${result.backupPath}`);
+        if (result.matchStrategy && result.matchStrategy !== "exact") {
+          console.log(`[BugZero] Note: exact match failed \u2014 patch applied via ${result.matchStrategy} matching.`);
+        }
       }
       return {};
     }
@@ -1178,9 +1283,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;

package/package.json

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