@nextclaw/ui 0.11.21 → 0.11.22

package/src/components/chat/adapters/{chat-message.file-operation-diff.ts → file-operation/diff.ts}

@@ -1,4 +1,12 @@
 import type { ChatFileOperationLineViewModel } from "@nextclaw/agent-chat-ui";
+import {
+  buildLineDiff,
+  buildPreviewLines,
+  createLine,
+  incrementLineNumber,
+  readUnifiedDiffHunkStart,
+  splitLines,
+} from "@/components/chat/adapters/file-operation/line-builder";
 
 export type ParsedBlock = {
   path: string;
@@ -10,19 +18,15 @@ export type ParsedBlock = {
 };
 
 const MAX_VISIBLE_DIFF_LINES = 120;
-const MAX_DIFF_MATRIX_CELLS = 12_000;
-
-function splitLines(value: string): string[] {
-  const normalized = value.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-  return normalized === "" ? [] : normalized.split("\n");
-}
 
 function buildCaption(params: {
   operation?: string | null;
   lines: ChatFileOperationLineViewModel[];
 }): string | undefined {
   const additions = params.lines.filter((line) => line.kind === "add").length;
-  const deletions = params.lines.filter((line) => line.kind === "remove").length;
+  const deletions = params.lines.filter(
+    (line) => line.kind === "remove",
+  ).length;
   const parts: string[] = [];
   const normalizedOperation = params.operation?.trim().toLowerCase() ?? "";
   if (normalizedOperation && normalizedOperation !== "update") {
@@ -37,9 +41,39 @@ function buildCaption(params: {
   return parts.length > 0 ? parts.join(" · ") : undefined;
 }
 
-function limitLines(
-  lines: ChatFileOperationLineViewModel[],
-): { lines: ChatFileOperationLineViewModel[]; truncated: boolean } {
+function readDefaultDiffStartLines(params: {
+  operation?: string | null;
+  beforeText?: string | null;
+  afterText?: string | null;
+  oldStartLine?: number | null;
+  newStartLine?: number | null;
+}): {
+  oldStartLine?: number;
+  newStartLine?: number;
+} {
+  const normalizedOperation = params.operation?.trim().toLowerCase() ?? "";
+  const oldStartLine =
+    typeof params.oldStartLine === "number"
+      ? params.oldStartLine
+      : (normalizedOperation === "delete" ||
+            normalizedOperation === "remove") &&
+          params.beforeText != null
+        ? 1
+        : undefined;
+  const newStartLine =
+    typeof params.newStartLine === "number"
+      ? params.newStartLine
+      : (normalizedOperation === "write" || normalizedOperation === "add") &&
+          params.afterText != null
+        ? 1
+        : undefined;
+  return { oldStartLine, newStartLine };
+}
+
+function limitLines(lines: ChatFileOperationLineViewModel[]): {
+  lines: ChatFileOperationLineViewModel[];
+  truncated: boolean;
+} {
   if (lines.length <= MAX_VISIBLE_DIFF_LINES) {
     return { lines, truncated: false };
   }
@@ -53,26 +87,25 @@ export function buildRawPreviewBlock(params: {
   path: string;
   text: string;
   operation?: string | null;
+  oldStartLine?: number | null;
+  newStartLine?: number | null;
 }): ParsedBlock | null {
   const previewText = params.text.trim();
   if (!previewText) {
     return null;
   }
-  const previewKind = params.operation?.trim().toLowerCase() === "write" ? "add" : "context";
-  const lines = splitLines(previewText).map((line, index) =>
-    previewKind === "add"
-      ? {
-          kind: "add" as const,
-          text: line,
-          newLineNumber: index + 1,
-        }
-      : {
-          kind: "context" as const,
-          text: line,
-          oldLineNumber: index + 1,
-          newLineNumber: index + 1,
-        },
-  );
+  const previewKind =
+    params.operation?.trim().toLowerCase() === "write" ? "add" : "context";
+  const oldStartLine =
+    typeof params.oldStartLine === "number" ? params.oldStartLine : 1;
+  const newStartLine =
+    typeof params.newStartLine === "number" ? params.newStartLine : 1;
+  const lines = buildPreviewLines({
+    text: previewText,
+    kind: previewKind,
+    oldStartLine,
+    newStartLine,
+  });
   return {
     path: params.path,
     display: "preview",
@@ -84,149 +117,21 @@ export function buildRawPreviewBlock(params: {
   };
 }
 
-function buildFallbackDiffLines(params: {
-  beforeLines: string[];
-  afterLines: string[];
-}): ChatFileOperationLineViewModel[] {
-  return [
-    ...params.beforeLines.map((line, index) => ({
-      kind: "remove" as const,
-      text: line,
-      oldLineNumber: index + 1,
-    })),
-    ...params.afterLines.map((line, index) => ({
-      kind: "add" as const,
-      text: line,
-      newLineNumber: index + 1,
-    })),
-  ];
-}
-
-function buildLcsMatrix(params: {
-  beforeLines: string[];
-  afterLines: string[];
-}): number[][] {
-  const matrix: number[][] = Array.from(
-    { length: params.beforeLines.length + 1 },
-    () => Array.from({ length: params.afterLines.length + 1 }, () => 0),
-  );
-  for (let beforeIndex = params.beforeLines.length - 1; beforeIndex >= 0; beforeIndex -= 1) {
-    for (let afterIndex = params.afterLines.length - 1; afterIndex >= 0; afterIndex -= 1) {
-      matrix[beforeIndex]![afterIndex] =
-        params.beforeLines[beforeIndex] === params.afterLines[afterIndex]
-          ? (matrix[beforeIndex + 1]![afterIndex + 1] ?? 0) + 1
-          : Math.max(
-              matrix[beforeIndex + 1]![afterIndex] ?? 0,
-              matrix[beforeIndex]![afterIndex + 1] ?? 0,
-            );
-    }
-  }
-  return matrix;
-}
-
-function appendRemainingDiffLines(params: {
-  lines: ChatFileOperationLineViewModel[];
-  beforeLines: string[];
-  afterLines: string[];
-  beforeIndex: number;
-  afterIndex: number;
-  oldLineNumber: number;
-  newLineNumber: number;
-}): void {
-  for (let index = params.beforeIndex; index < params.beforeLines.length; index += 1) {
-    params.lines.push({
-      kind: "remove",
-      text: params.beforeLines[index] ?? "",
-      oldLineNumber: params.oldLineNumber,
-    });
-    params.oldLineNumber += 1;
-  }
-  for (let index = params.afterIndex; index < params.afterLines.length; index += 1) {
-    params.lines.push({
-      kind: "add",
-      text: params.afterLines[index] ?? "",
-      newLineNumber: params.newLineNumber,
-    });
-    params.newLineNumber += 1;
-  }
-}
-
-function buildLineDiff(
-  beforeText: string,
-  afterText: string,
-): ChatFileOperationLineViewModel[] {
-  const beforeLines = splitLines(beforeText);
-  const afterLines = splitLines(afterText);
-  if (beforeLines.length * afterLines.length > MAX_DIFF_MATRIX_CELLS) {
-    return buildFallbackDiffLines({
-      beforeLines,
-      afterLines,
-    });
-  }
-
-  const lcs = buildLcsMatrix({
-    beforeLines,
-    afterLines,
-  });
-  const lines: ChatFileOperationLineViewModel[] = [];
-  let beforeIndex = 0;
-  let afterIndex = 0;
-  let oldLineNumber = 1;
-  let newLineNumber = 1;
-  while (beforeIndex < beforeLines.length && afterIndex < afterLines.length) {
-    if (beforeLines[beforeIndex] === afterLines[afterIndex]) {
-      lines.push({
-        kind: "context",
-        text: beforeLines[beforeIndex] ?? "",
-        oldLineNumber,
-        newLineNumber,
-      });
-      beforeIndex += 1;
-      afterIndex += 1;
-      oldLineNumber += 1;
-      newLineNumber += 1;
-      continue;
-    }
-
-    if ((lcs[beforeIndex + 1]![afterIndex] ?? 0) >= (lcs[beforeIndex]![afterIndex + 1] ?? 0)) {
-      lines.push({
-        kind: "remove",
-        text: beforeLines[beforeIndex] ?? "",
-        oldLineNumber,
-      });
-      beforeIndex += 1;
-      oldLineNumber += 1;
-      continue;
-    }
-
-    lines.push({
-      kind: "add",
-      text: afterLines[afterIndex] ?? "",
-      newLineNumber,
-    });
-    afterIndex += 1;
-    newLineNumber += 1;
-  }
-
-  appendRemainingDiffLines({
-    lines,
-    beforeLines,
-    afterLines,
-    beforeIndex,
-    afterIndex,
-    oldLineNumber,
-    newLineNumber,
-  });
-  return lines;
-}
-
 export function buildFullReplaceBlock(params: {
   path: string;
   beforeText?: string | null;
   afterText?: string | null;
   operation?: string | null;
+  oldStartLine?: number | null;
+  newStartLine?: number | null;
 }): ParsedBlock | null {
-  const lines = buildLineDiff(params.beforeText ?? "", params.afterText ?? "");
+  const { oldStartLine, newStartLine } = readDefaultDiffStartLines(params);
+  const lines = buildLineDiff({
+    beforeText: params.beforeText ?? "",
+    afterText: params.afterText ?? "",
+    oldStartLine,
+    newStartLine,
+  });
   const limited = limitLines(lines);
   if (limited.lines.length === 0) {
     return null;
@@ -268,7 +173,10 @@ function updateApplyPatchCursor(params: {
 }): boolean {
   if (params.line.startsWith("*** Update File: ")) {
     params.flushCurrent();
-    params.setCurrent(params.line.slice("*** Update File: ".length).trim(), "update");
+    params.setCurrent(
+      params.line.slice("*** Update File: ".length).trim(),
+      "update",
+    );
     return true;
   }
   if (params.line.startsWith("*** Add File: ")) {
@@ -278,36 +186,69 @@ function updateApplyPatchCursor(params: {
   }
   if (params.line.startsWith("*** Delete File: ")) {
     params.flushCurrent();
-    params.setCurrent(params.line.slice("*** Delete File: ".length).trim(), "delete");
+    params.setCurrent(
+      params.line.slice("*** Delete File: ".length).trim(),
+      "delete",
+    );
     return true;
   }
   return false;
 }
 
-function appendPatchLine(
-  currentLines: ChatFileOperationLineViewModel[],
-  line: string,
-): void {
+function appendPatchLine(params: {
+  currentLines: ChatFileOperationLineViewModel[];
+  line: string;
+  oldLineNumber?: number;
+  newLineNumber?: number;
+}): {
+  oldLineNumber?: number;
+  newLineNumber?: number;
+} {
+  const { currentLines, line } = params;
   if (line.startsWith("+")) {
-    currentLines.push({
-      kind: "add",
-      text: line.slice(1),
-    });
-    return;
+    currentLines.push(
+      createLine({
+        kind: "add",
+        text: line.slice(1),
+        newLineNumber: params.newLineNumber,
+      }),
+    );
+    return {
+      oldLineNumber: params.oldLineNumber,
+      newLineNumber: incrementLineNumber(params.newLineNumber),
+    };
   }
   if (line.startsWith("-")) {
-    currentLines.push({
-      kind: "remove",
-      text: line.slice(1),
-    });
-    return;
+    currentLines.push(
+      createLine({
+        kind: "remove",
+        text: line.slice(1),
+        oldLineNumber: params.oldLineNumber,
+      }),
+    );
+    return {
+      oldLineNumber: incrementLineNumber(params.oldLineNumber),
+      newLineNumber: params.newLineNumber,
+    };
   }
   if (line.startsWith(" ")) {
-    currentLines.push({
-      kind: "context",
-      text: line.slice(1),
-    });
+    currentLines.push(
+      createLine({
+        kind: "context",
+        text: line.slice(1),
+        oldLineNumber: params.oldLineNumber,
+        newLineNumber: params.newLineNumber,
+      }),
+    );
+    return {
+      oldLineNumber: incrementLineNumber(params.oldLineNumber),
+      newLineNumber: incrementLineNumber(params.newLineNumber),
+    };
   }
+  return {
+    oldLineNumber: params.oldLineNumber,
+    newLineNumber: params.newLineNumber,
+  };
 }
 
 function parseApplyPatchText(patchText: string): ParsedBlock[] {
@@ -315,11 +256,15 @@ function parseApplyPatchText(patchText: string): ParsedBlock[] {
   let currentPath: string | null = null;
   let currentOperation: string | null = null;
   let currentLines: ChatFileOperationLineViewModel[] = [];
+  let currentOldLineNumber: number | undefined;
+  let currentNewLineNumber: number | undefined;
 
   const flushCurrent = () => {
     if (!currentPath) {
       currentLines = [];
       currentOperation = null;
+      currentOldLineNumber = undefined;
+      currentNewLineNumber = undefined;
       return;
     }
     blocks.push(
@@ -332,6 +277,8 @@ function parseApplyPatchText(patchText: string): ParsedBlock[] {
     currentPath = null;
     currentOperation = null;
     currentLines = [];
+    currentOldLineNumber = undefined;
+    currentNewLineNumber = undefined;
   };
 
   for (const line of splitLines(patchText)) {
@@ -347,13 +294,30 @@ function parseApplyPatchText(patchText: string): ParsedBlock[] {
     ) {
       continue;
     }
-    if (line.startsWith("*** Move to: ") || line.startsWith("*** Begin Patch") || line.startsWith("*** End Patch")) {
+    if (
+      line.startsWith("*** Move to: ") ||
+      line.startsWith("*** Begin Patch") ||
+      line.startsWith("*** End Patch")
+    ) {
       continue;
     }
-    if (line.startsWith("@@") || !currentPath) {
+    if (line.startsWith("@@")) {
+      const hunkStart = readUnifiedDiffHunkStart(line);
+      currentOldLineNumber = hunkStart?.oldLineNumber;
+      currentNewLineNumber = hunkStart?.newLineNumber;
       continue;
     }
-    appendPatchLine(currentLines, line);
+    if (!currentPath) {
+      continue;
+    }
+    const nextCursor = appendPatchLine({
+      currentLines,
+      line,
+      oldLineNumber: currentOldLineNumber,
+      newLineNumber: currentNewLineNumber,
+    });
+    currentOldLineNumber = nextCursor.oldLineNumber;
+    currentNewLineNumber = nextCursor.newLineNumber;
   }
 
   flushCurrent();
@@ -364,10 +328,14 @@ function parseUnifiedDiffText(patchText: string): ParsedBlock[] {
   const blocks: ParsedBlock[] = [];
   let currentPath: string | null = null;
   let currentLines: ChatFileOperationLineViewModel[] = [];
+  let currentOldLineNumber: number | undefined;
+  let currentNewLineNumber: number | undefined;
 
   const flushCurrent = () => {
     if (!currentPath) {
       currentLines = [];
+      currentOldLineNumber = undefined;
+      currentNewLineNumber = undefined;
       return;
     }
     blocks.push(
@@ -379,18 +347,40 @@ function parseUnifiedDiffText(patchText: string): ParsedBlock[] {
     );
     currentPath = null;
     currentLines = [];
+    currentOldLineNumber = undefined;
+    currentNewLineNumber = undefined;
   };
 
   for (const line of splitLines(patchText)) {
     if (line.startsWith("+++ ")) {
       flushCurrent();
-      currentPath = line.slice(4).trim().replace(/^b\//, "").replace(/^a\//, "");
+      currentPath = line
+        .slice(4)
+        .trim()
+        .replace(/^b\//, "")
+        .replace(/^a\//, "");
+      continue;
+    }
+    if (line.startsWith("--- ")) {
       continue;
     }
-    if (line.startsWith("--- ") || line.startsWith("@@") || !currentPath) {
+    if (line.startsWith("@@")) {
+      const hunkStart = readUnifiedDiffHunkStart(line);
+      currentOldLineNumber = hunkStart?.oldLineNumber;
+      currentNewLineNumber = hunkStart?.newLineNumber;
       continue;
     }
-    appendPatchLine(currentLines, line);
+    if (!currentPath) {
+      continue;
+    }
+    const nextCursor = appendPatchLine({
+      currentLines,
+      line,
+      oldLineNumber: currentOldLineNumber,
+      newLineNumber: currentNewLineNumber,
+    });
+    currentOldLineNumber = nextCursor.oldLineNumber;
+    currentNewLineNumber = nextCursor.newLineNumber;
   }
 
   flushCurrent();