bingocode 1.1.176 → 1.1.178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.1.176",
+  "version": "1.1.178",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",

package/src/tools/FileEditTool/FileEditTool.ts

@@ -73,6 +73,7 @@ import {
   areFileEditsInputsEquivalent,
   findActualString,
   findClosestLines,
+  findFuzzySuggestion,
   getPatchForEdit,
   preserveQuoteStyle,
   visibleWhitespace,
@@ -317,11 +318,15 @@ export const FileEditTool = buildTool({
     // Use findActualString to handle quote normalization
     const actualOldString = findActualString(file, old_string)
     if (!actualOldString) {
-      const BASE = 'String to replace not found.'
+const BASE = 'String to replace not found.'
       const matches = findClosestLines(file, old_string)
+      const fuzzy = findFuzzySuggestion(file, old_string)
+      const fuzzyBlock = fuzzy
+        ? `\n\nDid you mean:\n  line ${fuzzy.lineNumber}: ${visibleWhitespace(fuzzy.suggestion)}\n  (edit distance ${fuzzy.distance})`
+        : ''
       const msg = matches.length
-      ? `${BASE}\n→ = tab · = space\nProvided:\n${visibleWhitespace(old_string)}\nClosest matches:\n${matches.map(m => `  line ${m.lineNumber} (${m.diffType})\n    ${visibleWhitespace(m.snippet)}`).join('\n')}\n↑ check visible whitespace markers above.`
-        : `${BASE}.\n→ = tab · = space\nProvided:\n${visibleWhitespace(old_string)}\n↑ check visible whitespace markers above.`
+        ? `${BASE}\n→ = tab · = space\nProvided:\n${visibleWhitespace(old_string)}\nClosest matches:\n${matches.map(m => `  line ${m.lineNumber} (${m.diffType})\n    ${visibleWhitespace(m.snippet)}`).join('\n')}${fuzzyBlock}\n↑ check visible whitespace markers above.`
+        : `${BASE}.\n→ = tab · = space\nProvided:\n${visibleWhitespace(old_string)}${fuzzyBlock}\n↑ check visible whitespace markers above.`
       return {
         result: false,
         behavior: 'ask',

package/src/tools/FileEditTool/utils.ts

@@ -15,6 +15,108 @@ import {
 } from '../../utils/file.js'
 import type { EditInput, FileEdit } from './types.js'
 
+/**
+ * Computes Levenshtein distance between two strings using Wagner-Fischer DP.
+ * O(n*m) time, O(min(n,m)) space (two-row optimization).
+ */
+export function levenshteinDistance(a: string, b: string): number {
+  // Ensure a is the shorter string for memory efficiency
+  if (a.length > b.length) {
+    ;[a, b] = [b, a]
+  }
+  const m = a.length
+  const n = b.length
+
+  let prevRow = new Uint16Array(m + 1)
+  let currRow = new Uint16Array(m + 1)
+
+  for (let i = 0; i <= m; i++) prevRow[i] = i
+  for (let j = 1; j <= n; j++) {
+    currRow[0] = j
+    for (let i = 1; i <= m; i++) {
+      const cost = a.charCodeAt(i - 1) === b.charCodeAt(j - 1) ? 0 : 1
+      // d[i][j] = min(d[i-1][j]+1, d[i][j-1]+1, d[i-1][j-1]+cost)
+      //   deletion: remove char from s → d[i-1][j] + 1 → currRow[i - 1] + 1
+      //   insertion: add char from t → d[i][j-1] + 1 → prevRow[i] + 1
+      //   substitution: swap or match → d[i-1][j-1] + cost → prevRow[i - 1] + cost
+      currRow[i] = Math.min(
+        currRow[i - 1]! + 1,
+        prevRow[i]! + 1,
+        prevRow[i - 1]! + cost,
+    }
+    ;[prevRow, currRow] = [currRow, prevRow]
+  }
+  return prevRow[m]!
+}
+
+/**
+ * Fuzzy matching — finds the best match in fileContent for searchString
+ * when the edit distance is within threshold.  Used as a secondary pass
+ * after exact/normalized matching fails, to suggest "Did you mean: X"
+ * when the model's old_string is only a few characters off.
+ *
+ * For multi-line search strings: compares each contiguous block of lines
+ * whose total length is within tolerance.  Returns null when no match is
+ * within threshold.
+ */
+export function findFuzzySuggestion(
+  fileContent: string,
+  searchString: string,
+  threshold: number = 2,
+): { suggestion: string; lineNumber: number; distance: number } | null {
+  const searchLines = searchString.split('\n')
+  const fileLines = fileContent.split('\n')
+  const searchLen = searchString.length
+
+  // For single-line searches, scan all lines with similar length
+  if (searchLines.length === 1) {
+    const lenTolerance = searchLen + threshold * 2
+    let bestLine: string | null = null
+    let bestDist = Infinity
+    let bestIdx = -1
+
+    for (let i = 0; i < fileLines.length; i++) {
+      const line = fileLines[i]!
+      if (Math.abs(line.length - searchLen) > lenTolerance) continue
+      const dist = levenshteinDistance(line, searchString)
+      if (dist < bestDist) {
+        bestDist = dist
+        bestLine = line
+        bestIdx = i
+      }
+    }
+
+    if (bestLine && bestDist > 0 && bestDist <= threshold) {
+      return {
+        suggestion: bestLine.replace(/\s+$/, ''),
+        lineNumber: bestIdx + 1,
+        distance: bestDist,
+      }
+    }
+    // No match within threshold (or distance 0 = exact match already present)
+    return null
+  }
+
+  // Multi-line: compare contiguous blocks of lines
+  const maxBlockLen = searchLen + threshold * searchLines.length
+  let best: { suggestion: string; lineNumber: number; distance: number } | null = null
+
+  for (let i = 0; i <= fileLines.length - searchLines.length; i++) {
+    const block = fileLines.slice(i, i + searchLines.length).join('\n')
+    if (Math.abs(block.length - searchLen) > maxBlockLen) continue
+    const dist = levenshteinDistance(block.replace(/\s+$/, ''), searchString.replace(/\s+$/, ''))
+    if (dist > 0 && dist <= threshold && dist < (best?.distance ?? Infinity)) {
+      best = {
+        suggestion: block.replace(/\s+$/, ''),
+        lineNumber: i + 1,
+        distance: dist,
+      }
+    }
+  }
+
+  return best
+}
+
 // Claude can't output curly quotes, so we define them as constants here for Claude to use
 // in the code. We do this because we normalize curly quotes to straight quotes
 // when applying edits.
@@ -266,7 +368,11 @@ export class EditNotFoundError extends Error {
  * tab → '→', space → '·'
  */
 export function visibleWhitespace(str: string): string {
-  return str.replace(/\t/g, '→').replace(/ /g, '·')
+  return str
+    .replace(/\t/g, '→')
+    .replace(/ /g, '·')
+    .replace(/\n/g, '↵')
+    .replace(/\r/g, '␍')
 }
 
 /**
@@ -432,11 +538,15 @@ export function getPatchForEdits({
     // If this edit didn't change anything, throw an error
     if (updatedFile === previousContent) {
       const closest = findClosestLines(fileContents, edit.old_string)
+      const fuzzy = findFuzzySuggestion(fileContents, edit.old_string)
+      const fuzzyBlock = fuzzy
+        ? `\n\nDid you mean:\n  line ${fuzzy.lineNumber}: ${visibleWhitespace(fuzzy.suggestion)}\n  (edit distance ${fuzzy.distance})`
+        : ''
       throw new EditNotFoundError(
         closest.length
           ? `Edit failed — closest match:
-${closest.map(m => `  line ${m.lineNumber}: ${visibleWhitespace(m.snippet)} (${m.diffType})`).join('\n')}`
-          : 'Edit failed — string not found in file.',
+${closest.map(m => `  line ${m.lineNumber}: ${visibleWhitespace(m.snippet)} (${m.diffType})`).join('\n')}${fuzzyBlock}`
+          : `Edit failed — string not found in file.${fuzzyBlock}`,
         {
           searchString: edit.old_string,
           visibleSearch: visibleWhitespace(edit.old_string),