@nextclaw/ui 0.11.21 → 0.11.23

package/src/components/chat/adapters/chat-message.adapter.test.ts

@@ -223,7 +223,7 @@ it("keeps structured terminal results as structured data instead of raw json out
   });
 });
 
-it("renders spawn tool cards from structured subagent status updates", () => {
+it("renders session request tool cards from structured child-session status updates", () => {
   const adapted = adapt([
     {
       id: "assistant-subagent",
@@ -237,12 +237,15 @@ it("renders spawn tool cards from structured subagent status updates", () => {
             toolName: "spawn",
             args: '{"label":"Verifier","task":"Verify 1+1=2"}',
             result: {
-              kind: "nextclaw.subagent_run",
-              runId: "subagent-1",
-              label: "Verifier",
+              kind: "nextclaw.session_request",
+              requestId: "request-1",
+              sessionId: "child-session-1",
+              isChildSession: true,
+              title: "Verifier",
               task: "Verify 1+1=2",
               status: "completed",
-              result: "Verified 1+1=2.",
+              finalResponseText: "Verified 1+1=2.",
+              parentSessionId: "parent-session-1",
             },
           },
         },
@@ -254,21 +257,92 @@ it("renders spawn tool cards from structured subagent status updates", () => {
     type: "tool-card",
     card: {
       toolName: "spawn",
-      summary: "label: Verifier · run: subagent-1 · task: Verify 1+1=2",
+      summary: "title: Verifier · session: child-session-1 · task: Verify 1+1=2",
       output: [
-        "Run ID: subagent-1",
+        "Request ID: request-1",
         "",
-        "Label: Verifier",
+        "Session ID: child-session-1",
+        "",
+        "Target: child",
+        "",
+        "Title: Verifier",
         "",
         "Task:",
         "Verify 1+1=2",
         "",
-        "Result:",
+        "Final Response:",
         "Verified 1+1=2.",
       ].join("\n"),
       statusTone: "success",
       statusLabel: "Completed",
       titleLabel: "Tool Result",
+      action: {
+        kind: "open-session",
+        sessionId: "child-session-1",
+        sessionKind: "child",
+        label: "Verifier",
+        parentSessionId: "parent-session-1",
+      },
+    },
+  });
+});
+
+it("renders regular session request tool cards with session navigation instead of child navigation", () => {
+  const adapted = adapt([
+    {
+      id: "assistant-session-request",
+      role: "assistant",
+      parts: [
+        {
+          type: "tool-invocation",
+          toolInvocation: {
+            status: ToolInvocationStatus.RESULT,
+            toolCallId: "session-request-call-1",
+            toolName: "sessions_request",
+            args: '{"sessionId":"session-2","task":"Summarize the latest findings"}',
+            result: {
+              kind: "nextclaw.session_request",
+              requestId: "request-2",
+              sessionId: "session-2",
+              isChildSession: false,
+              title: "Research thread",
+              task: "Summarize the latest findings",
+              status: "completed",
+              finalResponseText: "Here is the summary.",
+            },
+          },
+        },
+      ],
+    },
+  ] as unknown as ChatMessageSource[]);
+
+  expect(adapted[0]?.parts[0]).toMatchObject({
+    type: "tool-card",
+    card: {
+      toolName: "sessions_request",
+      summary: "title: Research thread · session: session-2 · task: Summarize the latest findings",
+      output: [
+        "Request ID: request-2",
+        "",
+        "Session ID: session-2",
+        "",
+        "Target: session",
+        "",
+        "Title: Research thread",
+        "",
+        "Task:",
+        "Summarize the latest findings",
+        "",
+        "Final Response:",
+        "Here is the summary.",
+      ].join("\n"),
+      statusTone: "success",
+      action: {
+        kind: "open-session",
+        sessionId: "session-2",
+        sessionKind: "session",
+        label: "Research thread",
+      },
     },
   });
 });
@@ -488,6 +562,11 @@ it("builds edit-file previews from structured args before the tool finishes", ()
     },
   ] 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: {
@@ -513,6 +592,71 @@ it("builds edit-file previews from structured args before the tool finishes", ()
       },
     },
   });
+  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", () => {
@@ -577,7 +721,7 @@ it("keeps completed write-file cards in preview mode instead of falling back to
             toolName: "write_file",
             args: JSON.stringify({
               path: "games/snake.html",
-              content: "<!DOCTYPE html>\n<canvas id=\"game\"></canvas>",
+              content: '<!DOCTYPE html>\n<canvas id="game"></canvas>',
             }),
             result: "Wrote 3906 bytes to games/snake.html",
           },
@@ -605,7 +749,7 @@ it("keeps completed write-file cards in preview mode instead of falling back to
               },
               {
                 kind: "add",
-                text: "<canvas id=\"game\"></canvas>",
+                text: '<canvas id="game"></canvas>',
                 newLineNumber: 2,
               },
             ],
@@ -641,7 +785,7 @@ it("renders codex file_change results as structured diff previews", () => {
                   diff: [
                     "--- a/src/main.ts",
                     "+++ b/src/main.ts",
-                    "@@",
+                    "@@ -109,1 +109,1 @@",
                     "-console.log('old');",
                     "+console.log('new');",
                   ].join("\n"),
@@ -656,7 +800,7 @@ it("renders codex file_change results as structured diff previews", () => {
                   diff: [
                     "--- a/src/main.ts",
                     "+++ b/src/main.ts",
-                    "@@",
+                    "@@ -109,1 +109,1 @@",
                     "-console.log('old');",
                     "+console.log('new');",
                   ].join("\n"),
@@ -683,10 +827,12 @@ it("renders codex file_change results as structured diff previews", () => {
               {
                 kind: "remove",
                 text: "console.log('old');",
+                oldLineNumber: 109,
               },
               {
                 kind: "add",
                 text: "console.log('new');",
+                newLineNumber: 109,
               },
             ],
           },

package/src/components/chat/adapters/chat-message.session-request-tool-card.ts

@@ -0,0 +1,191 @@
+import {
+  stringifyUnknown,
+  summarizeToolArgs,
+  type ToolCard,
+} from "@/lib/chat-message";
+import type { ChatToolPartViewModel } from "@nextclaw/agent-chat-ui";
+
+type ToolCardViewSource = ToolCard & {
+  statusTone: ChatToolPartViewModel["statusTone"];
+  statusLabel: string;
+  action?: ChatToolPartViewModel["action"];
+};
+
+type SessionRequestInvocation = {
+  toolName: string;
+  toolCallId?: string;
+  args?: unknown;
+  result?: unknown;
+};
+
+type SessionRequestToolCardTexts = {
+  toolStatusRunningLabel: string;
+  toolStatusCompletedLabel: string;
+  toolStatusFailedLabel: string;
+};
+
+type SessionRequestResult = {
+  kind: string;
+  requestId?: string;
+  sessionId?: string;
+  isChildSession?: boolean;
+  title?: string;
+  task?: string;
+  status?: string;
+  message?: unknown;
+  finalResponseText?: unknown;
+  error?: unknown;
+  parentSessionId?: string;
+};
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function readOptionalString(value: unknown): string | null {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function readSessionRequestResult(value: unknown): SessionRequestResult | null {
+  if (!isRecord(value) || value.kind !== "nextclaw.session_request") {
+    return null;
+  }
+  return value as SessionRequestResult;
+}
+
+function buildSessionRequestDetail(
+  result: SessionRequestResult,
+  fallbackArgs: unknown,
+): string | undefined {
+  const detailParts = [
+    readOptionalString(result.title)
+      ? `title: ${result.title?.trim()}`
+      : null,
+    readOptionalString(result.sessionId)
+      ? `session: ${result.sessionId?.trim()}`
+      : null,
+    readOptionalString(result.task)
+      ? `task: ${result.task?.trim()}`
+      : null,
+  ].filter((value): value is string => Boolean(value));
+
+  return detailParts.join(" · ") || summarizeToolArgs(fallbackArgs);
+}
+
+function buildSessionRequestOutput(result: SessionRequestResult): string | undefined {
+  const requestId = readOptionalString(result.requestId);
+  const sessionId = readOptionalString(result.sessionId);
+  const title = readOptionalString(result.title);
+  const task = readOptionalString(result.task);
+  const messageText =
+    typeof result.message !== "undefined"
+      ? stringifyUnknown(result.message).trim()
+      : "";
+  const finalResponseText =
+    typeof result.finalResponseText !== "undefined"
+      ? stringifyUnknown(result.finalResponseText).trim()
+      : "";
+  const errorText =
+    typeof result.error !== "undefined"
+      ? stringifyUnknown(result.error).trim()
+      : "";
+
+  const sections = [
+    requestId ? `Request ID: ${requestId}` : null,
+    sessionId ? `Session ID: ${sessionId}` : null,
+    typeof result.isChildSession === "boolean"
+      ? `Target: ${result.isChildSession ? "child" : "session"}`
+      : null,
+    title ? `Title: ${title}` : null,
+    task ? `Task:\n${task}` : null,
+    finalResponseText
+      ? `Final Response:\n${finalResponseText}`
+      : errorText
+        ? `Error:\n${errorText}`
+        : messageText
+          ? `Status:\n${messageText}`
+        : null,
+  ].filter((value): value is string => Boolean(value));
+
+  return sections.length > 0 ? sections.join("\n\n") : undefined;
+}
+
+export function buildSessionRequestToolCard(params: {
+  invocation: SessionRequestInvocation;
+  texts: SessionRequestToolCardTexts;
+}): ToolCardViewSource | null {
+  if (
+    params.invocation.toolName !== "spawn" &&
+    params.invocation.toolName !== "sessions_request"
+  ) {
+    return null;
+  }
+
+  const sessionRequest = readSessionRequestResult(params.invocation.result);
+  if (!sessionRequest) {
+    return null;
+  }
+
+  const normalizedStatus = readOptionalString(sessionRequest.status)?.toLowerCase();
+  const detail = buildSessionRequestDetail(sessionRequest, params.invocation.args);
+  const output = buildSessionRequestOutput(sessionRequest);
+  const targetSessionId = readOptionalString(sessionRequest.sessionId);
+  const action =
+    targetSessionId
+      ? {
+          kind: "open-session" as const,
+          sessionId: targetSessionId,
+          sessionKind: sessionRequest.isChildSession === true ? ("child" as const) : ("session" as const),
+          ...(readOptionalString(sessionRequest.title)
+            ? { label: sessionRequest.title!.trim() }
+            : {}),
+          ...(readOptionalString(sessionRequest.parentSessionId)
+            ? { parentSessionId: sessionRequest.parentSessionId!.trim() }
+            : {}),
+        }
+      : undefined;
+
+  if (normalizedStatus === "failed") {
+    return {
+      kind: "result",
+      name: params.invocation.toolName,
+      detail,
+      text: output,
+      callId: params.invocation.toolCallId || undefined,
+      hasResult: Boolean(output),
+      statusTone: "error",
+      statusLabel: params.texts.toolStatusFailedLabel,
+      ...(action ? { action } : {}),
+    };
+  }
+
+  if (normalizedStatus === "completed") {
+    return {
+      kind: "result",
+      name: params.invocation.toolName,
+      detail,
+      text: output,
+      callId: params.invocation.toolCallId || undefined,
+      hasResult: Boolean(output),
+      statusTone: "success",
+      statusLabel: params.texts.toolStatusCompletedLabel,
+      ...(action ? { action } : {}),
+    };
+  }
+
+  return {
+    kind: "result",
+    name: params.invocation.toolName,
+    detail,
+    text: output,
+    callId: params.invocation.toolCallId || undefined,
+    hasResult: Boolean(output),
+    statusTone: "running",
+    statusLabel: params.texts.toolStatusRunningLabel,
+    ...(action ? { action } : {}),
+  };
+}