@mrsf/cli 0.5.0 → 0.6.0

package/dist/index.cjs

@@ -31,20 +31,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/lib/parser.ts
-var parser_exports = {};
-__export(parser_exports, {
-  parseSidecar: () => parseSidecar,
-  parseSidecarContent: () => parseSidecarContent,
-  parseSidecarContentLenient: () => parseSidecarContentLenient,
-  parseSidecarLenient: () => parseSidecarLenient,
-  readDocumentLines: () => readDocumentLines
-});
-async function parseSidecar(filePath) {
-  const abs = import_node_path3.default.resolve(filePath);
-  const content = await (0, import_promises2.readFile)(abs, "utf-8");
-  return parseSidecarContent(content, abs);
-}
+// src/lib/serialize.ts
 function parseSidecarContent(content, filenameHint) {
   const trimmed = content.trim();
   let parsed;
@@ -67,16 +54,6 @@ function parseSidecarContent(content, filenameHint) {
   }
   return parsed;
 }
-async function parseSidecarLenient(filePath) {
-  const abs = import_node_path3.default.resolve(filePath);
-  let content;
-  try {
-    content = await (0, import_promises2.readFile)(abs, "utf-8");
-  } catch (e) {
-    return { doc: null, error: `Cannot read file: ${e.message}` };
-  }
-  return parseSidecarContentLenient(content, abs);
-}
 function parseSidecarContentLenient(content, filenameHint) {
   const trimmed = content.trim();
   if (!trimmed) {
@@ -163,18 +140,59 @@ function salvageYaml(content) {
     partialComments: salvaged.length > 0 ? salvaged : void 0
   };
 }
+function toYaml(doc) {
+  const yamlDoc = new import_yaml.Document(doc);
+  return yamlDoc.toString({ lineWidth: 0 });
+}
+function toJson(doc) {
+  return JSON.stringify(doc, null, 2) + "\n";
+}
+var import_js_yaml2, import_yaml;
+var init_serialize = __esm({
+  "src/lib/serialize.ts"() {
+    "use strict";
+    import_js_yaml2 = __toESM(require("js-yaml"), 1);
+    import_yaml = require("yaml");
+  }
+});
+
+// src/lib/parser.ts
+var parser_exports = {};
+__export(parser_exports, {
+  parseSidecar: () => parseSidecar,
+  parseSidecarContent: () => parseSidecarContent,
+  parseSidecarContentLenient: () => parseSidecarContentLenient,
+  parseSidecarLenient: () => parseSidecarLenient,
+  readDocumentLines: () => readDocumentLines
+});
+async function parseSidecar(filePath) {
+  const abs = import_node_path3.default.resolve(filePath);
+  const content = await (0, import_promises2.readFile)(abs, "utf-8");
+  return parseSidecarContent(content, abs);
+}
+async function parseSidecarLenient(filePath) {
+  const abs = import_node_path3.default.resolve(filePath);
+  let content;
+  try {
+    content = await (0, import_promises2.readFile)(abs, "utf-8");
+  } catch (e) {
+    return { doc: null, error: `Cannot read file: ${e.message}` };
+  }
+  return parseSidecarContentLenient(content, abs);
+}
 async function readDocumentLines(filePath) {
   const content = await (0, import_promises2.readFile)(import_node_path3.default.resolve(filePath), "utf-8");
   const lines = content.replace(/\r\n?/g, "\n").split("\n");
   return ["", ...lines];
 }
-var import_promises2, import_node_path3, import_js_yaml2;
+var import_promises2, import_node_path3;
 var init_parser = __esm({
   "src/lib/parser.ts"() {
     "use strict";
     import_promises2 = require("node:fs/promises");
     import_node_path3 = __toESM(require("node:path"), 1);
-    import_js_yaml2 = __toESM(require("js-yaml"), 1);
+    init_serialize();
+    init_serialize();
   }
 });
 
@@ -358,7 +376,9 @@ var import_promises3 = require("node:fs/promises");
 var import_node_fs2 = require("node:fs");
 var import_node_crypto = require("node:crypto");
 var import_node_path4 = __toESM(require("node:path"), 1);
-var import_yaml = require("yaml");
+var import_yaml2 = require("yaml");
+init_serialize();
+init_serialize();
 var writeQueue = /* @__PURE__ */ new Map();
 function enqueueWrite(abs, fn) {
   const prev = writeQueue.get(abs) ?? Promise.resolve();
@@ -558,13 +578,6 @@ function deepEqual(a, b) {
   if (typeof a === "number" && typeof b === "number") return a === b;
   return false;
 }
-function toYaml(doc) {
-  const yamlDoc = new import_yaml.Document(doc);
-  return yamlDoc.toString({ lineWidth: 0 });
-}
-function toJson(doc) {
-  return JSON.stringify(doc, null, 2) + "\n";
-}
 async function writeSidecar(filePath, doc) {
   const abs = import_node_path4.default.resolve(filePath);
   return enqueueWrite(abs, () => writeSidecarInternal(abs, doc));
@@ -593,14 +606,14 @@ async function writeSidecarInternal(abs, doc) {
   }
   let tokens;
   try {
-    tokens = [...new import_yaml.Parser().parse(raw)];
+    tokens = [...new import_yaml2.Parser().parse(raw)];
   } catch {
     await atomicWriteFile(abs, toYaml(doc));
     return;
   }
   let currentDoc = null;
   try {
-    currentDoc = (0, import_yaml.parse)(raw);
+    currentDoc = (0, import_yaml2.parse)(raw);
   } catch {
   }
   if (currentDoc && !Array.isArray(currentDoc.comments)) {
@@ -687,7 +700,7 @@ async function writeSidecarInternal(abs, doc) {
       }
     }
   }
-  const result = tokens.map((t) => import_yaml.CST.stringify(t)).join("");
+  const result = tokens.map((t) => import_yaml2.CST.stringify(t)).join("");
   await atomicWriteFile(abs, result);
 }
 
@@ -1349,11 +1362,13 @@ async function detectRenames(fromCommit, toCommit, repoRoot) {
 // src/lib/reanchor-core.ts
 var HIGH_THRESHOLD = 0.8;
 var DEFAULT_THRESHOLD = 0.6;
+var DEFAULT_PROXIMITY_WINDOW = 5;
 function toReanchorLines(documentText) {
   return ["", ...documentText.replace(/\r\n/g, "\n").split("\n")];
 }
 function reanchorComment(comment, documentLines, opts = {}) {
   const threshold = opts.threshold ?? DEFAULT_THRESHOLD;
+  const proximityWindow = opts.proximityWindow ?? DEFAULT_PROXIMITY_WINDOW;
   const commentId = comment.id;
   const selectedText = comment.selected_text;
   if (!selectedText && comment.line == null) {
@@ -1404,30 +1419,46 @@ function reanchorComment(comment, documentLines, opts = {}) {
   }
   if (selectedText) {
     const exactCandidates = exactMatch(documentLines, selectedText);
+    let chosen;
+    let chosenReason = "";
     if (exactCandidates.length === 1) {
-      const candidate = exactCandidates[0];
-      return {
-        commentId,
-        status: "anchored",
-        score: 1,
-        newLine: candidate.line,
-        newEndLine: candidate.endLine,
-        newStartColumn: candidate.startColumn,
-        newEndColumn: candidate.endColumn,
-        reason: "Exact text match (unique)."
-      };
-    }
-    if (exactCandidates.length > 1 && comment.line != null) {
-      const best = closestToLine(exactCandidates, comment.line);
+      chosen = exactCandidates[0];
+      chosenReason = "Exact text match (unique).";
+    } else if (exactCandidates.length > 1 && comment.line != null) {
+      chosen = closestToLine(exactCandidates, comment.line);
+      chosenReason = `Exact text match (${exactCandidates.length} occurrences; chose nearest to original line ${comment.line}).`;
+    }
+    if (chosen) {
+      if (isImplausibleExactRelocation(comment, chosen, documentLines, proximityWindow)) {
+        const textAtOrigin = extractText(
+          documentLines,
+          comment.line,
+          comment.end_line,
+          comment.start_column,
+          comment.end_column
+        );
+        return {
+          commentId,
+          status: "fuzzy",
+          score: 0.5,
+          newLine: comment.line,
+          newEndLine: comment.end_line,
+          newStartColumn: comment.start_column,
+          newEndColumn: comment.end_column,
+          anchoredText: textAtOrigin ?? void 0,
+          previousSelectedText: selectedText,
+          reason: `Lone exact match at line ${chosen.line} is beyond the proximity window (\xB1${proximityWindow}) of original line ${comment.line} and the text at the original position changed; kept at original position, needs re-anchoring.`
+        };
+      }
       return {
         commentId,
         status: "anchored",
         score: 1,
-        newLine: best.line,
-        newEndLine: best.endLine,
-        newStartColumn: best.startColumn,
-        newEndColumn: best.endColumn,
-        reason: `Exact text match (${exactCandidates.length} occurrences; chose nearest to original line ${comment.line}).`
+        newLine: chosen.line,
+        newEndLine: chosen.endLine,
+        newStartColumn: chosen.startColumn,
+        newEndColumn: chosen.endColumn,
+        reason: chosenReason
       };
     }
     const normCandidates = normalizedMatch(documentLines, selectedText);
@@ -1685,6 +1716,20 @@ function closestToLine(candidates, targetLine) {
     (best, candidate) => Math.abs(candidate.line - targetLine) < Math.abs(best.line - targetLine) ? candidate : best
   );
 }
+function isImplausibleExactRelocation(comment, candidate, lines, proximityWindow) {
+  if (comment.line == null) return false;
+  if (comment.line <= 0 || comment.line >= lines.length) return false;
+  if (Math.abs(candidate.line - comment.line) <= proximityWindow) return false;
+  const textAtOrigin = extractText(
+    lines,
+    comment.line,
+    comment.end_line,
+    comment.start_column,
+    comment.end_column
+  );
+  if (textAtOrigin === comment.selected_text) return false;
+  return true;
+}
 function getLineShift2(diffHunks, line) {
   let shift = 0;
   let modified = false;
@@ -1708,6 +1753,7 @@ var import_node_path6 = __toESM(require("node:path"), 1);
 async function reanchorDocument(doc, documentLines, opts = {}) {
   const results = [];
   const threshold = opts.threshold ?? DEFAULT_THRESHOLD;
+  const proximityWindow = opts.proximityWindow;
   let diffHunks;
   let commitIsStale = false;
   if (!opts.noGit && await isGitAvailable()) {
@@ -1724,19 +1770,20 @@ async function reanchorDocument(doc, documentLines, opts = {}) {
           const result = reanchorComment(comment, documentLines, {
             diffHunks: hunks,
             threshold,
-            commitIsStale: true
+            commitIsStale: true,
+            proximityWindow
           });
           results.push(result);
           continue;
         }
         results.push(
-          reanchorComment(comment, documentLines, { threshold, commitIsStale: false })
+          reanchorComment(comment, documentLines, { threshold, commitIsStale: false, proximityWindow })
         );
       }
       return results;
     }
   }
-  return reanchorDocumentLines(doc, documentLines, { threshold });
+  return reanchorDocumentLines(doc, documentLines, { threshold, proximityWindow });
 }
 async function reanchorFile(sidecarPath, opts = {}) {
   const doc = await parseSidecar(sidecarPath);