fix: bound edit mismatch diagnostics before normalization

qingminglong · qingminglong · commit b5ed9e2d4bf1 · 2026-07-06T19:40:04.000+08:00
diff --git a/src/agents/sessions/tools/edit.test.ts b/src/agents/sessions/tools/edit.test.ts
@@ -154,12 +154,12 @@ describe("edit tool", () => {
     expect(message).not.toContain(targetTail);
   });
 
-  it("bounds many-line mismatch candidate diagnostics before collecting lines", async () => {
+  it("bounds CRLF mismatch candidate diagnostics before collecting lines", async () => {
     const scannedCandidate = "inside-scan-candidate";
     const unscannedCandidate = "outside-scan-candidate";
     const filler = Array.from({ length: 999 }, (_, index) => `filler ${index + 1}`);
     const filePath = await createTempFile(
-      `${filler.join("\n")}\nalpha ${scannedCandidate}\nalpha ${unscannedCandidate}\n`,
+      `${filler.join("\r\n")}\r\nalpha ${scannedCandidate}\r\nalpha ${unscannedCandidate}\r\n`,
     );
     const tool = createEditTool(tmpDir);
 
diff --git a/src/agents/sessions/tools/edit.ts b/src/agents/sessions/tools/edit.ts
@@ -214,17 +214,39 @@ function splitBoundedDiagnosticLines(text: string): string[] {
 }
 
 function collectBoundedDiagnosticLines(text: string): string[] {
-  const normalized = normalizeToLF(text);
   const lines: string[] = [];
-  let start = 0;
-  while (lines.length < EDIT_MISMATCH_SCAN_LINE_LIMIT) {
-    const end = normalized.indexOf("\n", start);
-    const rawLine = end === -1 ? normalized.slice(start) : normalized.slice(start, end);
-    lines.push(truncateDiagnosticLine(rawLine));
-    if (end === -1) {
-      break;
+  let line = "";
+  let lineTruncated = false;
+
+  const pushLine = () => {
+    lines.push(lineTruncated ? `${line}... (line truncated)` : line);
+    line = "";
+    lineTruncated = false;
+  };
+
+  for (
+    let index = 0;
+    index < text.length && lines.length < EDIT_MISMATCH_SCAN_LINE_LIMIT;
+    index++
+  ) {
+    const char = text[index];
+    if (char === "\r" || char === "\n") {
+      pushLine();
+      if (char === "\r" && text[index + 1] === "\n") {
+        index++;
+      }
+      continue;
     }
-    start = end + 1;
+
+    if (line.length < EDIT_MISMATCH_LINE_TEXT_LIMIT) {
+      line += char;
+    } else {
+      lineTruncated = true;
+    }
+  }
+
+  if (lines.length < EDIT_MISMATCH_SCAN_LINE_LIMIT) {
+    pushLine();
   }
   if (lines.length > 1 && lines[lines.length - 1] === "") {
     lines.pop();
