@nextclaw/ui 0.14.1-beta.0 → 0.14.1-beta.1

package/src/features/chat/features/message/utils/__tests__/chat-message.utils.test.ts

@@ -1,42 +1,5 @@
 import { ToolInvocationStatus, type UiMessage } from "@nextclaw/agent-chat";
-import { adaptChatMessages } from "../chat-message.utils";
-import type { ChatMessageSource } from "../chat-message.utils";
-
-function toSource(uiMessages: UiMessage[]): ChatMessageSource[] {
-  return uiMessages as unknown as ChatMessageSource[];
-}
-
-const defaultTexts = {
-  roleLabels: {
-    user: "You",
-    assistant: "Assistant",
-    tool: "Tool",
-    system: "System",
-    fallback: "Message",
-  },
-  reasoningLabel: "Reasoning",
-  toolCallLabel: "Tool Call",
-  toolResultLabel: "Tool Result",
-  toolInputLabel: "Input",
-  toolNoOutputLabel: "No output",
-  toolOutputLabel: "Output",
-  toolStatusPreparingLabel: "Preparing",
-  toolStatusRunningLabel: "Running",
-  toolStatusCompletedLabel: "Completed",
-  toolStatusFailedLabel: "Failed",
-  toolStatusCancelledLabel: "Cancelled",
-  imageAttachmentLabel: "Image attachment",
-  fileAttachmentLabel: "File attachment",
-  unknownPartLabel: "Unknown Part",
-};
-
-function adapt(uiMessages: ChatMessageSource[]) {
-  return adaptChatMessages({
-    uiMessages,
-    formatTimestamp: (value) => `formatted:${value}`,
-    texts: defaultTexts,
-  });
-}
+import { adapt, toSource, type ChatMessageSource } from "./chat-message-test.utils";
 
 it("maps markdown, reasoning, and tool parts into UI view models", () => {
   const messages: UiMessage[] = [
@@ -576,311 +539,3 @@ it("renders asset tool results as previewable files", () => {
     },
   });
 });
-
-it("builds edit-file previews from structured args before the tool finishes", () => {
-  const adapted = adapt([
-    {
-      id: "assistant-edit-preview",
-      role: "assistant",
-      parts: [
-        {
-          type: "tool-invocation",
-          toolInvocation: {
-            status: ToolInvocationStatus.CALL,
-            toolCallId: "edit-call-1",
-            toolName: "edit_file",
-            args: JSON.stringify({
-              path: "src/app.ts",
-              oldText: "const color = 'red';",
-              newText: "const color = 'blue';",
-            }),
-            parsedArgs: {
-              path: "src/app.ts",
-              oldText: "const color = 'red';",
-              newText: "const color = 'blue';",
-            },
-          },
-        },
-      ],
-    },
-  ] as unknown as ChatMessageSource[]);
-
-  const editLines =
-    adapted[0]?.parts[0]?.type === "tool-card"
-      ? (adapted[0].parts[0].card.fileOperation?.blocks[0]?.lines ?? [])
-      : [];
-
-  expect(adapted[0]?.parts[0]).toMatchObject({
-    type: "tool-card",
-    card: {
-      toolName: "edit_file",
-      summary: "src/app.ts",
-      statusTone: "running",
-      fileOperation: {
-        blocks: [
-          {
-            path: "src/app.ts",
-            lines: [
-              {
-                kind: "remove",
-                text: "const color = 'red';",
-              },
-              {
-                kind: "add",
-                text: "const color = 'blue';",
-              },
-            ],
-          },
-        ],
-      },
-    },
-  });
-  expect(editLines[0]).not.toHaveProperty("oldLineNumber");
-  expect(editLines[1]).not.toHaveProperty("newLineNumber");
-});
-
-it("uses structured edit-file result line numbers after the tool finishes", () => {
-  const adapted = adapt([
-    {
-      id: "assistant-edit-result",
-      role: "assistant",
-      parts: [
-        {
-          type: "tool-invocation",
-          toolInvocation: {
-            status: ToolInvocationStatus.RESULT,
-            toolCallId: "edit-result-1",
-            toolName: "edit_file",
-            args: JSON.stringify({
-              path: "src/app.ts",
-              oldText: "const color = 'red';",
-              newText: "const color = 'blue';",
-            }),
-            parsedArgs: {
-              path: "src/app.ts",
-              oldText: "const color = 'red';",
-              newText: "const color = 'blue';",
-            },
-            result: {
-              path: "src/app.ts",
-              oldStartLine: 27,
-              newStartLine: 27,
-              message: "Edited src/app.ts",
-            },
-          },
-        },
-      ],
-    },
-  ] as unknown as ChatMessageSource[]);
-
-  expect(adapted[0]?.parts[0]).toMatchObject({
-    type: "tool-card",
-    card: {
-      toolName: "edit_file",
-      summary: "src/app.ts",
-      statusTone: "success",
-      fileOperation: {
-        blocks: [
-          {
-            path: "src/app.ts",
-            lines: [
-              {
-                kind: "remove",
-                text: "const color = 'red';",
-                oldLineNumber: 27,
-              },
-              {
-                kind: "add",
-                text: "const color = 'blue';",
-                newLineNumber: 27,
-              },
-            ],
-          },
-        ],
-      },
-    },
-  });
-});
-
-it("builds write-file previews from partial native args before the JSON is complete", () => {
-  const adapted = adapt([
-    {
-      id: "assistant-write-preview",
-      role: "assistant",
-      parts: [
-        {
-          type: "tool-invocation",
-          toolInvocation: {
-            status: ToolInvocationStatus.PARTIAL_CALL,
-            toolCallId: "write-call-1",
-            toolName: "write_file",
-            args: '{"path":"games/snake.html","content":"<!DOCTYPE html>\\n<canvas id=\\"game\\"></canvas>\\n<script>const score = 1;',
-          },
-        },
-      ],
-    },
-  ] as unknown as ChatMessageSource[]);
-
-  expect(adapted[0]?.parts[0]).toMatchObject({
-    type: "tool-card",
-    card: {
-      toolName: "write_file",
-      summary: "games/snake.html",
-      statusTone: "running",
-      statusLabel: "Running",
-      fileOperation: {
-        blocks: [
-          {
-            display: "preview",
-            path: "games/snake.html",
-            lines: expect.arrayContaining([
-              expect.objectContaining({
-                kind: "add",
-                text: "<!DOCTYPE html>",
-              }),
-              expect.objectContaining({
-                kind: "add",
-                text: '<canvas id="game"></canvas>',
-              }),
-            ]),
-          },
-        ],
-      },
-    },
-  });
-});
-
-it("keeps completed write-file cards in preview mode instead of falling back to raw byte summaries", () => {
-  const adapted = adapt([
-    {
-      id: "assistant-write-result",
-      role: "assistant",
-      parts: [
-        {
-          type: "tool-invocation",
-          toolInvocation: {
-            status: ToolInvocationStatus.RESULT,
-            toolCallId: "write-result-1",
-            toolName: "write_file",
-            args: JSON.stringify({
-              path: "games/snake.html",
-              content: '<!DOCTYPE html>\n<canvas id="game"></canvas>',
-            }),
-            result: "Wrote 3906 bytes to games/snake.html",
-          },
-        },
-      ],
-    },
-  ] as unknown as ChatMessageSource[]);
-
-  expect(adapted[0]?.parts[0]).toMatchObject({
-    type: "tool-card",
-    card: {
-      toolName: "write_file",
-      summary: "games/snake.html",
-      statusTone: "success",
-      fileOperation: {
-        blocks: [
-          {
-            display: "preview",
-            path: "games/snake.html",
-            lines: [
-              {
-                kind: "add",
-                text: "<!DOCTYPE html>",
-                newLineNumber: 1,
-              },
-              {
-                kind: "add",
-                text: '<canvas id="game"></canvas>',
-                newLineNumber: 2,
-              },
-            ],
-          },
-        ],
-      },
-    },
-  });
-  expect(adapted[0]?.parts[0]).not.toMatchObject({
-    type: "tool-card",
-    card: {
-      output: "Wrote 3906 bytes to games/snake.html",
-    },
-  });
-});
-
-it("renders codex file_change results as structured diff previews", () => {
-  const adapted = adapt([
-    {
-      id: "assistant-file-change",
-      role: "assistant",
-      parts: [
-        {
-          type: "tool-invocation",
-          toolInvocation: {
-            status: ToolInvocationStatus.RESULT,
-            toolCallId: "file-change-1",
-            toolName: "file_change",
-            args: JSON.stringify({
-              changes: [
-                {
-                  path: "src/main.ts",
-                  diff: [
-                    "--- a/src/main.ts",
-                    "+++ b/src/main.ts",
-                    "@@ -109,1 +109,1 @@",
-                    "-console.log('old');",
-                    "+console.log('new');",
-                  ].join("\n"),
-                },
-              ],
-            }),
-            result: {
-              status: "completed",
-              changes: [
-                {
-                  path: "src/main.ts",
-                  diff: [
-                    "--- a/src/main.ts",
-                    "+++ b/src/main.ts",
-                    "@@ -109,1 +109,1 @@",
-                    "-console.log('old');",
-                    "+console.log('new');",
-                  ].join("\n"),
-                },
-              ],
-            },
-          },
-        },
-      ],
-    },
-  ] as unknown as ChatMessageSource[]);
-
-  expect(adapted[0]?.parts[0]).toMatchObject({
-    type: "tool-card",
-    card: {
-      toolName: "file_change",
-      summary: "src/main.ts",
-      statusTone: "success",
-      fileOperation: {
-        blocks: [
-          {
-            path: "src/main.ts",
-            lines: [
-              {
-                kind: "remove",
-                text: "console.log('old');",
-                oldLineNumber: 109,
-              },
-              {
-                kind: "add",
-                text: "console.log('new');",
-                newLineNumber: 109,
-              },
-            ],
-          },
-        ],
-      },
-    },
-  });
-});

package/src/features/chat/features/message/utils/chat-message-tool-card.utils.ts

@@ -150,17 +150,18 @@ export function resolveToolCardStatus(params: {
   ChatToolPartViewModel,
   "kind" | "hasResult" | "statusTone" | "statusLabel"
 > {
+  const { cancelled, error, result, status, texts } = params;
   const rawStatus =
-    typeof params.status === "string" ? params.status.trim().toLowerCase() : "";
+    typeof status === "string" ? status.trim().toLowerCase() : "";
   const hasError =
-    typeof params.error === "string" && params.error.trim().length > 0;
-  const isCancelled = params.cancelled === true || rawStatus === "cancelled";
+    typeof error === "string" && error.trim().length > 0;
+  const isCancelled = cancelled === true || rawStatus === "cancelled";
   if (isCancelled) {
     return {
       kind: "result",
       hasResult: true,
       statusTone: "cancelled",
-      statusLabel: params.texts.toolStatusCancelledLabel,
+      statusLabel: texts.toolStatusCancelledLabel,
     };
   }
   if (hasError || rawStatus === "error") {
@@ -168,15 +169,15 @@ export function resolveToolCardStatus(params: {
       kind: "result",
       hasResult: true,
       statusTone: "error",
-      statusLabel: params.texts.toolStatusFailedLabel,
+      statusLabel: texts.toolStatusFailedLabel,
     };
   }
-  if (rawStatus === "result" || params.result != null) {
+  if (rawStatus === "result" || result != null) {
     return {
       kind: "result",
       hasResult: true,
       statusTone: "success",
-      statusLabel: params.texts.toolStatusCompletedLabel,
+      statusLabel: texts.toolStatusCompletedLabel,
     };
   }
   if (rawStatus === "partial-call") {
@@ -184,14 +185,14 @@ export function resolveToolCardStatus(params: {
       kind: "call",
       hasResult: false,
       statusTone: "running",
-      statusLabel: params.texts.toolStatusRunningLabel,
+      statusLabel: texts.toolStatusRunningLabel,
     };
   }
   return {
     kind: "call",
     hasResult: false,
     statusTone: "running",
-    statusLabel: params.texts.toolStatusRunningLabel,
+    statusLabel: texts.toolStatusRunningLabel,
   };
 }
 

package/src/features/chat/features/message/utils/file-operation/diff.utils.ts

@@ -24,16 +24,17 @@ export function buildRawPreviewBlock(params: {
   oldStartLine?: number | null;
   newStartLine?: number | null;
 }): ParsedBlock | null {
-  const previewText = params.text.trim();
+  const { newStartLine: rawNewStartLine, oldStartLine: rawOldStartLine, operation, path, text } = params;
+  const previewText = text.trim();
   if (!previewText) {
     return null;
   }
   const previewKind =
-    params.operation?.trim().toLowerCase() === "write" ? "add" : "context";
+    operation?.trim().toLowerCase() === "write" ? "add" : "context";
   const oldStartLine =
-    typeof params.oldStartLine === "number" ? params.oldStartLine : 1;
+    typeof rawOldStartLine === "number" ? rawOldStartLine : 1;
   const newStartLine =
-    typeof params.newStartLine === "number" ? params.newStartLine : 1;
+    typeof rawNewStartLine === "number" ? rawNewStartLine : 1;
   const lines = buildPreviewLines({
     text: previewText,
     kind: previewKind,
@@ -41,10 +42,10 @@ export function buildRawPreviewBlock(params: {
     newStartLine,
   });
   return {
-    path: params.path,
+    path,
     display: "preview",
     caption: buildCaption({
-      operation: params.operation,
+      operation,
       lines,
     }),
     lines,
@@ -62,10 +63,11 @@ export function buildFullReplaceBlock(params: {
   oldStartLine?: number | null;
   newStartLine?: number | null;
 }): ParsedBlock | null {
+  const { afterText, beforeText, operation, path } = params;
   const { oldStartLine, newStartLine } = readDefaultDiffStartLines(params);
   const lines = buildLineDiff({
-    beforeText: params.beforeText ?? "",
-    afterText: params.afterText ?? "",
+    beforeText: beforeText ?? "",
+    afterText: afterText ?? "",
     oldStartLine,
     newStartLine,
   });
@@ -74,16 +76,16 @@ export function buildFullReplaceBlock(params: {
     return null;
   }
   return {
-    path: params.path,
+    path,
     display: "diff",
     caption: buildCaption({
-      operation: params.operation,
+      operation,
       lines,
     }),
     lines: limited.lines,
     ...(limited.truncated ? { fullLines: lines } : {}),
-    ...(params.beforeText != null ? { beforeText: params.beforeText } : {}),
-    ...(params.afterText != null ? { afterText: params.afterText } : {}),
+    ...(beforeText != null ? { beforeText } : {}),
+    ...(afterText != null ? { afterText } : {}),
     ...(typeof oldStartLine === "number" ? { oldStartLine } : {}),
     ...(typeof newStartLine === "number" ? { newStartLine } : {}),
     truncated: limited.truncated,
@@ -95,23 +97,24 @@ function updateApplyPatchCursor(params: {
   flushCurrent: () => void;
   setCurrent: (path: string, operation: string) => void;
 }): boolean {
-  if (params.line.startsWith("*** Update File: ")) {
-    params.flushCurrent();
-    params.setCurrent(
-      params.line.slice("*** Update File: ".length).trim(),
+  const { flushCurrent, line, setCurrent } = params;
+  if (line.startsWith("*** Update File: ")) {
+    flushCurrent();
+    setCurrent(
+      line.slice("*** Update File: ".length).trim(),
       "update",
     );
     return true;
   }
-  if (params.line.startsWith("*** Add File: ")) {
-    params.flushCurrent();
-    params.setCurrent(params.line.slice("*** Add File: ".length).trim(), "add");
+  if (line.startsWith("*** Add File: ")) {
+    flushCurrent();
+    setCurrent(line.slice("*** Add File: ".length).trim(), "add");
     return true;
   }
-  if (params.line.startsWith("*** Delete File: ")) {
-    params.flushCurrent();
-    params.setCurrent(
-      params.line.slice("*** Delete File: ".length).trim(),
+  if (line.startsWith("*** Delete File: ")) {
+    flushCurrent();
+    setCurrent(
+      line.slice("*** Delete File: ".length).trim(),
       "delete",
     );
     return true;
@@ -128,18 +131,18 @@ function appendPatchLine(params: {
   oldLineNumber?: number;
   newLineNumber?: number;
 } {
-  const { currentLines, line } = params;
+  const { currentLines, line, newLineNumber, oldLineNumber } = params;
   if (line.startsWith("+")) {
     currentLines.push(
       createLine({
         kind: "add",
         text: line.slice(1),
-        newLineNumber: params.newLineNumber,
+        newLineNumber,
       }),
     );
     return {
-      oldLineNumber: params.oldLineNumber,
-      newLineNumber: incrementLineNumber(params.newLineNumber),
+      oldLineNumber,
+      newLineNumber: incrementLineNumber(newLineNumber),
     };
   }
   if (line.startsWith("-")) {
@@ -147,12 +150,12 @@ function appendPatchLine(params: {
       createLine({
         kind: "remove",
         text: line.slice(1),
-        oldLineNumber: params.oldLineNumber,
+        oldLineNumber,
       }),
     );
     return {
-      oldLineNumber: incrementLineNumber(params.oldLineNumber),
-      newLineNumber: params.newLineNumber,
+      oldLineNumber: incrementLineNumber(oldLineNumber),
+      newLineNumber,
     };
   }
   if (line.startsWith(" ")) {
@@ -160,18 +163,18 @@ function appendPatchLine(params: {
       createLine({
         kind: "context",
         text: line.slice(1),
-        oldLineNumber: params.oldLineNumber,
-        newLineNumber: params.newLineNumber,
+        oldLineNumber,
+        newLineNumber,
       }),
     );
     return {
-      oldLineNumber: incrementLineNumber(params.oldLineNumber),
-      newLineNumber: incrementLineNumber(params.newLineNumber),
+      oldLineNumber: incrementLineNumber(oldLineNumber),
+      newLineNumber: incrementLineNumber(newLineNumber),
     };
   }
   return {
-    oldLineNumber: params.oldLineNumber,
-    newLineNumber: params.newLineNumber,
+    oldLineNumber,
+    newLineNumber,
   };
 }