editcodewithai 2.6.0 → 2.7.0

package/README.md

@@ -204,9 +204,11 @@ for (const warning of result.warnings ?? []) {
 | `NO_EDITS_PARSED`  | The model response contained no recognizable edits.                 |
 
 Matching is deterministic: only harmless formatting drift is absorbed (CRLF vs
-LF, a missing/extra trailing newline, trailing whitespace). Anything ambiguous or
-unmatched is skipped rather than guessed. Successful normalized matches produce
-no warnings.
+LF, a missing/extra trailing newline, trailing whitespace) plus filename drift —
+model-emitted decoration (backticks, bold, headings, a `File:` label, a trailing
+colon, a leading `./`) is stripped, and a target resolves by normalized name,
+case-insensitively, or by a unique basename. Anything ambiguous or unmatched is
+skipped rather than guessed. Successful normalized matches produce no warnings.
 
 `warnings` is optional, so existing consumers continue to work unchanged.
 
@@ -265,6 +267,7 @@ import {
 
   // --- Diff parsing (manual use) ---
   parseDiffs, // Parse search/replace blocks (diff format)
+  normalizeDiffFileName, // Normalize a model-emitted filename (strip decoration/path noise)
   applyDiffs, // Apply parsed diffs to a file set (throws on unmatched edits)
   applyDiffsSafe, // Best-effort apply: returns { files, warnings } instead of throwing
   parseDiffFenced, // Parse search/replace blocks (diff-fenced format)

package/dist/applyEngine.js

@@ -6,23 +6,44 @@ const matching_1 = require("./matching");
  * Normalizes a filename for comparison: trims, converts Windows separators to
  * "/", collapses duplicate separators, and strips leading "./" and "/".
  *
- * Case is intentionally preserved — case-insensitive matching is not part of
- * the deterministic behavior and is deferred.
+ * Case is intentionally preserved here; callers that need to tolerate case
+ * drift fall back to case-insensitive and basename matching after this exact
+ * normalized comparison fails.
  */
 function normalizeFileName(name) {
     return name
         .trim()
         .replace(/\\/g, "/")
         .replace(/\/+/g, "/")
-        .replace(/^\.\//, "")
+        .replace(/^(?:\.\/)+/, "")
         .replace(/^\/+/, "");
 }
+function normalizeForBasename(name) {
+    const normalized = normalizeFileName(name).toLowerCase();
+    return normalized.substring(normalized.lastIndexOf("/") + 1);
+}
 function resolveFileId(files, rawName) {
     const target = normalizeFileName(rawName);
-    const matches = Object.keys(files).filter((id) => normalizeFileName(files[id].name) === target);
-    if (matches.length === 1)
-        return { kind: "found", id: matches[0] };
-    if (matches.length > 1)
+    const ids = Object.keys(files);
+    // 1. Exact match on the normalized name.
+    const exact = ids.filter((id) => normalizeFileName(files[id].name) === target);
+    if (exact.length === 1)
+        return { kind: "found", id: exact[0] };
+    if (exact.length > 1)
+        return { kind: "ambiguous" };
+    // 2. Case-insensitive match on the normalized name.
+    const lowerTarget = target.toLowerCase();
+    const caseInsensitive = ids.filter((id) => normalizeFileName(files[id].name).toLowerCase() === lowerTarget);
+    if (caseInsensitive.length === 1)
+        return { kind: "found", id: caseInsensitive[0] };
+    if (caseInsensitive.length > 1)
+        return { kind: "ambiguous" };
+    // 3. Basename match (substring after the last "/"), case-insensitive.
+    const basename = lowerTarget.substring(lowerTarget.lastIndexOf("/") + 1);
+    const byBasename = ids.filter((id) => normalizeForBasename(files[id].name) === basename);
+    if (byBasename.length === 1)
+        return { kind: "found", id: byBasename[0] };
+    if (byBasename.length > 1)
         return { kind: "ambiguous" };
     return { kind: "none" };
 }

package/dist/fileUtils.d.ts

@@ -25,6 +25,15 @@ export interface Diff {
     search: string;
     replace: string;
 }
+/**
+ * Normalizes a model-emitted diff filename line, tolerating common
+ * decoration drift (markdown headings, list markers, labels, backticks,
+ * bold/italic asterisks, trailing colons) as well as path noise.
+ *
+ * Decoration-stripping rules are applied repeatedly until the string stops
+ * changing, so combinations (e.g. `- **`index.js`**:`) fully normalize.
+ */
+export declare function normalizeDiffFileName(raw: string): string;
 export declare function parseDiffs(responseText: string): Diff[];
 export declare function applyDiffs(originalFiles: VizFiles, diffs: Diff[]): VizFiles;
 export declare function parseDiffFenced(responseText: string): Diff[];

package/dist/fileUtils.js

@@ -4,6 +4,7 @@ exports.shouldDeleteFile = shouldDeleteFile;
 exports.isImageFile = isImageFile;
 exports.prepareFilesForPrompt = prepareFilesForPrompt;
 exports.mergeFileChanges = mergeFileChanges;
+exports.normalizeDiffFileName = normalizeDiffFileName;
 exports.parseDiffs = parseDiffs;
 exports.applyDiffs = applyDiffs;
 exports.parseDiffFenced = parseDiffFenced;
@@ -88,6 +89,35 @@ function mergeFileChanges(originalFiles, parsedFiles) {
     });
     return changedFiles;
 }
+/**
+ * Normalizes a model-emitted diff filename line, tolerating common
+ * decoration drift (markdown headings, list markers, labels, backticks,
+ * bold/italic asterisks, trailing colons) as well as path noise.
+ *
+ * Decoration-stripping rules are applied repeatedly until the string stops
+ * changing, so combinations (e.g. `- **`index.js`**:`) fully normalize.
+ */
+function normalizeDiffFileName(raw) {
+    let name = raw;
+    let previous;
+    do {
+        previous = name;
+        name = name.trim();
+        name = name.replace(/^#{1,6}\s+/, "");
+        name = name.replace(/^[-*+]\s+/, "");
+        name = name.replace(/^(?:file|path)\s*:\s*/i, "");
+        name = name.replace(/^`+|`+$/g, "");
+        name = name.replace(/^\*+|\*+$/g, "");
+        name = name.replace(/:\s*$/, "");
+        name = name.trim();
+    } while (name !== previous);
+    return name
+        .replace(/\\/g, "/")
+        .replace(/\/+/g, "/")
+        .replace(/^(?:\.\/)+/, "")
+        .replace(/^\/+/, "")
+        .trim();
+}
 function parseDiffs(responseText) {
     const diffs = [];
     // This regex captures the file path, and the content of the SEARCH and REPLACE blocks.
@@ -96,7 +126,7 @@ function parseDiffs(responseText) {
     for (const match of matches) {
         const [_, fileName, search, replace] = match;
         diffs.push({
-            fileName: fileName.trim(),
+            fileName: normalizeDiffFileName(fileName),
             search,
             replace,
         });
@@ -127,7 +157,7 @@ function parseDiffFenced(responseText) {
     for (const match of matches) {
         const [_, fileName, search, replace] = match;
         diffs.push({
-            fileName: fileName.trim(),
+            fileName: normalizeDiffFileName(fileName),
             search,
             replace,
         });

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import type { PerformAiEditParams, PerformAiEditResult } from "./types";
 import { PROMPT_TEMPLATE_VERSION, assembleFullPrompt, FORMAT_INSTRUCTIONS } from "./prompt";
 import { getGenerationMetadata } from "./metadata";
-import { prepareFilesForPrompt, mergeFileChanges, parseDiffs, applyDiffs, applyDiffsSafe, parseDiffFenced, parseUdiffs, applyUdiffs, applyUdiffsSafe, applyHybridEdits, applyHybridEditsSafe, isImageFile } from "./fileUtils";
+import { prepareFilesForPrompt, mergeFileChanges, parseDiffs, applyDiffs, applyDiffsSafe, parseDiffFenced, normalizeDiffFileName, parseUdiffs, applyUdiffs, applyUdiffsSafe, applyHybridEdits, applyHybridEditsSafe, isImageFile } from "./fileUtils";
 export type { LlmFunction, PerformAiEditParams, PerformAiEditResult, EditFormat, ApplyWarning, ApplyWarningCode, ApplyResult, ParsedEdit, } from "./types";
-export { FORMAT_INSTRUCTIONS, mergeFileChanges, prepareFilesForPrompt, isImageFile, parseDiffs, applyDiffs, applyDiffsSafe, parseDiffFenced, parseUdiffs, applyUdiffs, applyUdiffsSafe, applyHybridEdits, applyHybridEditsSafe, assembleFullPrompt, getGenerationMetadata, PROMPT_TEMPLATE_VERSION, };
+export { FORMAT_INSTRUCTIONS, mergeFileChanges, prepareFilesForPrompt, isImageFile, parseDiffs, applyDiffs, applyDiffsSafe, parseDiffFenced, normalizeDiffFileName, parseUdiffs, applyUdiffs, applyUdiffsSafe, applyHybridEdits, applyHybridEditsSafe, assembleFullPrompt, getGenerationMetadata, PROMPT_TEMPLATE_VERSION, };
 /**
  * Core AI logic for:
  * - Building the prompt (including context)

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROMPT_TEMPLATE_VERSION = exports.getGenerationMetadata = exports.assembleFullPrompt = exports.applyHybridEditsSafe = exports.applyHybridEdits = exports.applyUdiffsSafe = exports.applyUdiffs = exports.parseUdiffs = exports.parseDiffFenced = exports.applyDiffsSafe = exports.applyDiffs = exports.parseDiffs = exports.isImageFile = exports.prepareFilesForPrompt = exports.mergeFileChanges = exports.FORMAT_INSTRUCTIONS = void 0;
+exports.PROMPT_TEMPLATE_VERSION = exports.getGenerationMetadata = exports.assembleFullPrompt = exports.applyHybridEditsSafe = exports.applyHybridEdits = exports.applyUdiffsSafe = exports.applyUdiffs = exports.parseUdiffs = exports.normalizeDiffFileName = exports.parseDiffFenced = exports.applyDiffsSafe = exports.applyDiffs = exports.parseDiffs = exports.isImageFile = exports.prepareFilesForPrompt = exports.mergeFileChanges = exports.FORMAT_INSTRUCTIONS = void 0;
 exports.performAiEdit = performAiEdit;
 const llm_code_format_1 = require("llm-code-format");
 const prompt_1 = require("./prompt");
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "parseDiffs", { enumerable: true, get: function (
 Object.defineProperty(exports, "applyDiffs", { enumerable: true, get: function () { return fileUtils_1.applyDiffs; } });
 Object.defineProperty(exports, "applyDiffsSafe", { enumerable: true, get: function () { return fileUtils_1.applyDiffsSafe; } });
 Object.defineProperty(exports, "parseDiffFenced", { enumerable: true, get: function () { return fileUtils_1.parseDiffFenced; } });
+Object.defineProperty(exports, "normalizeDiffFileName", { enumerable: true, get: function () { return fileUtils_1.normalizeDiffFileName; } });
 Object.defineProperty(exports, "parseUdiffs", { enumerable: true, get: function () { return fileUtils_1.parseUdiffs; } });
 Object.defineProperty(exports, "applyUdiffs", { enumerable: true, get: function () { return fileUtils_1.applyUdiffs; } });
 Object.defineProperty(exports, "applyUdiffsSafe", { enumerable: true, get: function () { return fileUtils_1.applyUdiffsSafe; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "editcodewithai",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "Edit Code With AI",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",